This is an automated email from the git hooks/post-receive script. New change to branch master in repository tutti. See http://git.codelutin.com/tutti.git from d6c044c Merge branch 'release/3.14.2' adds 17ee604 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 25ae879 Merge branch 'master' into develop adds 48e8416 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds dc0722c refs #6819: ajout des pièces jointes dans l'export adds e40976e add some logs when deleting an attachment adds 41ae140 move some code adds aaeb470 problème d'égalite d'une campagne si le surveyPart est vide ou null adds 4550174 suppression des pieces jointes d'une catchBatch a sa suppression adds 5f907f3 amélioration de la suppression d'une pièce jointe adds 59e93c7 decompresser l'archive d'import des le debut (on ne travaille plus sur les entrées du zip adds ee8aa17 refs #6820 modification des imports pour pouvoir importer les pj adds 1432b54 refs #6820 ajout de l'import des pj adds b53e9a7 fix typo adds ded5f75 delete pj before deleting catch batch adds 2e3fee3 all pj imports wokrs now adds 3cbcdc3 fixes #6820: [IMPORT GENERIQUE] Import des pièces jointes Merge branch 'feature/6820' into develop adds 6f42ce0 fixes #6877: [IMPORT GENERIQUE] Après une erreur (visualisation du rapport d'import), l'application est bloquée adds 4c5f70a fix build adds 9dc3d00 introduce export action API adds 9390469 amélioration de l'API d'export adds 04ac0f0 fixes #6876: [EXPORT GENERIQUE] L'export n'est plus produit si une erreur d'élévation se produit Merge branch 'feature/6876' into develop adds d4d4bac fixes #6882: [IMPORT GENERIQUE] On ne peut pas ouvrir les rapports d'import adds 29dd28c introduction d'une configuration pour l'export et utilisation dans les exports existants adds 057b4a8 introduce DataModel API in persistence module adds 80c5987 improve CSVProducer API adds c5240d3 can now export partial data adds 148837e impact Export API in Report service adds a95fae1 impact Export API in legacy export actions adds bf8a93c add new export screen adds c4d6063 generic format import action only from menu + improve select popup open (add a timer for this) adds 538357d fixes #6879: [TECH] Passer sur adagio 3.8.6.1 (sur la version 3.14.x) adds d2bcd62 add comment adds 2feb60c fixes #6883: [ERGO] Masquer par défaut la jauge mémoire adds 9cfdbf5 add optionalId in DataModel API + nice method to get child adds 538d596 les interface graphiques sont ok pour l'import - export avec la sélection des données adds a07f55f debut de mise en place de l'import avec selection des données adds ad0adf1 ajout dans le tip des noeuds les identifiants + ajout dans la configuration d'import de propriétés manquantes adds a8cfff8 mise en place de l'import avec selection des données + meilleur design des actions (persistenceHelper ne contient plus de logique) adds 12408e1 fix count lines of import files adds c2d4a8a fixes #6822: [IMPORT GENERIQUE] Définir les différentes statégies d'import possible Merge branch 'feature/6822' into develop adds afa33f9 mise à jour des données de test de l'import générique adds cf014cd mise en place du rapport d'import + amélioration API d'import adds 56faee6 amélioration des rapports d'import générique adds 0ce79ed fix i18n adds 7dedfd4 fixes #6698: [IMPORT GENERIQUE] Rapport d’import transmissible par mail Merge branch 'feature/6698' into develop adds cf16680 fixes #6886: ajout d'une exception lors qu'un taxon ne peut être chargé adds 2e5b8bf fixes #6887: Mettre à jour l'aide en ligne adds 9df592d refs #6889: [EXPORT GENERIQUE] Supprimer les actions d'export générique adds b9e4944 fixes #6889: [EXPORT GENERIQUE] Supprimer les actions d'export générique Merge branch 'feature/6889' into develop adds 4ce5c15 fix NPE if no catch on fishing operation adds 8334053 refs #6821 : la selection des campagnes n'est pas à exporter n'est pas corrrecte adds c585946 refs #6698: ajout au rapport de l'import des résultats des opérations de suppresions des poids en doubles et élévation des poids adds 17b3b9c refs #6822 , mieux gérer les fichiers non importés adds 6cddf72 [jgitflow-maven-plugin]updating poms for branch '3.14.3' with snapshot versions adds eb3e8a2 prepare release adds 6adb3a8 [jgitflow-maven-plugin]updating poms for branch'release/3.14.3' with non-snapshot versions adds 8bc5347 Merge branch 'release/3.14.3' No new revisions were added by this update. Summary of changes: pom.xml | 5 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../java/fr/ifremer/tutti/TuttiConfiguration.java | 5 + .../fr/ifremer/tutti/TuttiConfigurationOption.java | 7 + .../tutti/persistence/TuttiPersistence.java | 33 + .../tutti/persistence/TuttiPersistenceImpl.java | 78 +- .../persistence/TuttiPersistenceNoDbImpl.java | 16 + .../tutti/persistence/entities/data/Cruises.java | 49 +- .../entities/data/FishingOperations.java | 19 + .../tutti/persistence/model/CruiseDataModel.java | 77 ++ .../tutti/persistence/model/DataModelSupport.java | 90 +++ .../persistence/model/OperationDataModel.java | 35 +- .../tutti/persistence/model/ProgramDataModel.java | 77 ++ .../service/AttachmentPersistenceServiceImpl.java | 32 +- .../FishingOperationPersistenceServiceImpl.java | 15 +- .../CaracteristicPersistenceServiceImpl.java | 4 +- .../referential/CouldNotLoadTaxonException.java | 22 +- .../referential/GearPersistenceServiceImpl.java | 56 +- .../LocationPersistenceServiceImpl.java | 11 +- .../referential/PersonPersistenceServiceImpl.java | 24 +- .../ReferentialPersistenceServiceSupport.java | 5 +- .../referential/SpeciesPersistenceServiceImpl.java | 37 +- .../referential/VesselPersistenceServiceImpl.java | 25 +- .../service/util/BatchPersistenceHelper.java | 9 + .../i18n/tutti-persistence_en_GB.properties | 1 + .../i18n/tutti-persistence_fr_FR.properties | 1 + .../src/main/resources/queries-failsafe.hbm.xml | 36 +- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../ifremer/tutti/service/PersistenceService.java | 18 +- .../service/catches/WeightCleaningService.java | 10 +- .../fr/ifremer/tutti/service/csv/CsvProducer.java | 37 +- .../genericformat/GenericFormatArchive.java | 195 ++--- ...ort.java => GenericFormatCheckDataService.java} | 98 ++- .../genericformat/GenericFormatContextSupport.java | 147 ++-- .../GenericFormatExportActionEngine.java | 218 ++++++ .../GenericFormatExportConfiguration.java | 146 ++++ .../genericformat/GenericFormatExportContext.java | 268 ++++--- ....java => GenericFormatExportCruiseContext.java} | 32 +- .../GenericFormatExportOperationContext.java | 35 +- .../genericformat/GenericFormatExportRequest.java | 101 +++ ...ception.java => GenericFormatExportResult.java} | 39 +- .../genericformat/GenericFormatExportService.java | 723 +++-------------- .../genericformat/GenericFormatFileResult.java | 12 +- .../GenericFormatImportConfiguration.java | 139 +++- .../GenericFormatImportCruiseContext.java | 115 ++- .../GenericFormatImportCruiseResult.java | 80 +- .../GenericFormatImportOperationContext.java | 39 + .../GenericFormatImportOperationResult.java | 100 ++- .../genericformat/GenericFormatImportRequest.java | 93 ++- .../genericformat/GenericFormatImportResult.java | 76 +- .../genericformat/GenericFormatImportService.java | 70 +- .../GenericFormatImportValidationHelper.java | 74 +- .../genericformat/GenericFormatResultSupport.java | 21 +- .../GenericFormatValidateFileContext.java | 64 +- .../GenericFormatValidateFileResult.java | 1 + .../GenericformatImportPersistenceHelper.java | 287 +++++++ .../GenericformatImportPersitenceHelper.java | 472 ----------- .../consumer/CsvConsumerForAccidentalCatch.java | 45 +- ...xception.java => CsvConsumerForAttachment.java} | 33 +- .../consumer/CsvConsumerForCatch.java | 34 +- .../consumer/CsvConsumerForGearCaracteristic.java | 55 +- .../CsvConsumerForIndividualObservation.java | 45 +- .../consumer/CsvConsumerForMarineLitter.java | 14 +- .../consumer/CsvConsumerForOperation.java | 81 +- .../consumer/CsvConsumerForParameter.java | 57 +- .../consumer/CsvConsumerForSurvey.java | 12 +- .../service/genericformat/csv/AttachmentModel.java | 89 +++ .../service/genericformat/csv/AttachmentRow.java | 87 ++- .../service/genericformat/csv/CatchModel.java | 5 +- .../tutti/service/genericformat/csv/CatchRow.java | 6 +- .../genericformat/csv/ExportSampleCategory.java | 12 + .../genericformat/csv/MarineLitterModel.java | 2 + .../service/genericformat/csv/MarineLitterRow.java | 14 +- .../service/genericformat/csv/OperationModel.java | 22 +- .../service/genericformat/csv/OperationRow.java | 211 +++-- .../service/genericformat/csv/SurveyModel.java | 2 + .../tutti/service/genericformat/csv/SurveyRow.java | 12 + .../exportactions/CheckDataAction.java | 69 ++ .../CreateAccidentalCatchRowsAction.java | 90 +++ .../exportactions/CreateCatchBatchRowsAction.java | 248 ++++++ .../CreateIndividualObservationRowsAction.java | 89 +++ .../CreateMarineLitterRowsAction.java | 90 +++ .../exportactions/CreateOperationRowsAction.java | 110 +++ .../exportactions/CreateParameterRowsAction.java | 58 ++ .../ExportCruiseActionSupport.java} | 31 +- .../ExportFishingOperationActionSupport.java} | 24 +- .../ExportGearCaracteristicAction.java | 84 ++ .../exportactions/ExportProtocolAction.java | 65 ++ .../exportactions/ExportReferentialGearAction.java | 70 ++ .../ExportReferentialPersonAction.java | 70 ++ .../ExportReferentialSpeciesAction.java | 70 ++ .../ExportReferentialVesselAction.java | 71 ++ .../ExportSampleCategoryModelAction.java | 63 ++ .../exportactions/ExportSpeciesUsedAction.java | 60 ++ .../exportactions/ExportSurveyAction.java | 103 +++ .../ExportTechnicalActionSupport.java} | 18 +- .../exportactions/FinalizeExportAction.java | 77 ++ .../exportactions/FlushOperationAction.java | 67 ++ .../GenerateExportArchiveAction.java} | 32 +- .../exportactions/LoadDataAction.java | 76 ++ .../importactions/DoCheckWeightAction.java | 14 +- .../importactions/DoCleanWeightAction.java | 6 +- .../importactions/ImportAccidentalCatchAction.java | 102 ++- .../importactions/ImportCatchAction.java | 231 +++++- .../ImportGearCaracteristicAction.java | 57 +- .../ImportIndividualObservationAction.java | 102 ++- .../importactions/ImportMarineLitterAction.java | 102 ++- .../importactions/ImportOperationAction.java | 242 +++++- .../importactions/ImportParameterAction.java | 87 ++- .../importactions/ImportProtocolAction.java | 46 +- .../importactions/ImportReferentialGearAction.java | 32 +- .../ImportReferentialPersonAction.java | 32 +- .../ImportReferentialSpeciesAction.java | 32 +- .../ImportReferentialVesselAction.java | 31 +- .../importactions/ImportSurveyAction.java | 168 +++- .../importactions/ImpotSampleCategoryAction.java | 10 +- ...ationAction.java => LoadAttachmentsAction.java} | 61 +- .../ValidateAccidentalCatchAction.java | 2 +- .../importactions/ValidateCatchAction.java | 2 +- .../ValidateGearCaracteristicAction.java | 6 +- .../ValidateIndividualObservationAction.java | 2 +- .../importactions/ValidateMarineLitterAction.java | 2 +- .../importactions/ValidateOperationAction.java | 11 +- .../importactions/ValidateParameterAction.java | 2 +- .../importactions/ValidateSurveyAction.java | 35 +- .../producer/CsvProducerForAttachment.java | 84 ++ .../producer/CsvProducerForCatch.java | 39 +- .../producer/CsvProducerForOperation.java | 1 - .../producer/CsvProducerForSurvey.java | 1 + .../service/report/ReportGenerationRequest.java | 13 + .../service/report/ReportGenerationService.java | 24 +- .../resources/ftl/genericFormatImportReport_fr.ftl | 343 +++++--- .../ftl/genericFormatValidateReport_fr.ftl | 19 +- .../resources/i18n/tutti-service_en_GB.properties | 21 + .../resources/i18n/tutti-service_fr_FR.properties | 38 +- .../genericformat/GenericFormatArchiveTest.java | 62 ++ .../GenericFormatExportServiceAno5804Test.java | 11 +- .../GenericFormatExportServiceTest.java | 378 ++++----- .../GenericFormatImportServiceTest.java | 26 +- .../GenericFormatImportServiceValidTest.java | 13 +- .../genericFormat/default/attachments.csv | 1 + .../test/resources/genericFormat/default/catch.csv | 866 ++++++++++----------- .../genericFormat/default/marineLitter.csv | 8 +- .../resources/genericFormat/default/operation.csv | 6 +- .../resources/genericFormat/default/survey.csv | 4 +- .../resources/genericFormat/empty/attachments.csv | 1 + .../test/resources/genericFormat/empty/catch.csv | 2 +- .../resources/genericFormat/empty/marineLitter.csv | 2 +- .../resources/genericFormat/empty/operation.csv | 2 +- .../test/resources/genericFormat/empty/survey.csv | 2 +- .../genericFormat/test_countLines/oneEmptyLine.txt | 0 .../genericFormat/test_countLines/oneLine.txt | 1 + .../genericFormat/test_countLines/twoLines.txt | 2 + .../test_countLines/twoLines_secondEmpty.txt | 1 + .../genericFormat/test_countLines/zeroLines.txt | 0 tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- .../src/main/assembly/launcher/README.txt | 3 + .../filtered-resources/tutti-help-fr.properties | 28 +- .../help/Guide_utilisation_Allegro_Campagne.pdf | Bin 0 -> 1996569 bytes .../src/main/help/fr/Aide_Allegro_Campagne.odt | Bin 37715 -> 0 bytes tutti-ui-swing/src/main/help/fr/config.html | Bin 6741 -> 15560 bytes .../src/main/help/fr/editFishingOperation.html | Bin 50215 -> 135058 bytes tutti-ui-swing/src/main/help/fr/editProtocol.html | Bin 9132 -> 21122 bytes .../src/main/help/fr/editSampleCategory.html | Bin 3016 -> 7262 bytes tutti-ui-swing/src/main/help/fr/faq.html | Bin 14048 -> 29980 bytes .../main/help/fr/manageTemporaryReferential.html | Bin 3904 -> 10688 bytes tutti-ui-swing/src/main/help/fr/report.html | Bin 2186 -> 6128 bytes tutti-ui-swing/src/main/help/fr/selectCruise.html | Bin 6285 -> 16034 bytes .../fr/ifremer/tutti/ui/swing/TuttiScreen.java | 6 + .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 2 + .../fr/ifremer/tutti/ui/swing/content/MainUI.css | 17 +- .../fr/ifremer/tutti/ui/swing/content/MainUI.jaxx | 2 + .../tutti/ui/swing/content/MainUIHandler.java | 8 + .../OpenGenericFormatExportScreen.java} | 23 +- .../actions/OpenGenericFormatImportScreen.java | 3 +- .../swing/content/config/TuttiConfigUIHandler.java | 4 + .../genericformat/GenericFormatExportUI.css | 164 ++++ .../genericformat/GenericFormatExportUI.jaxx | 112 +++ .../GenericFormatExportUIHandler.java | 206 +++++ .../genericformat/GenericFormatExportUIModel.java | 193 +++++ .../genericformat/GenericFormatImportUI.css | 106 ++- .../genericformat/GenericFormatImportUI.jaxx | 43 +- .../GenericFormatImportUIHandler.java | 69 +- .../genericformat/GenericFormatImportUIModel.java | 161 +++- .../actions/ExportFoldAllDataAction.java | 68 ++ .../actions/ExportSelectAllDataAction.java} | 18 +- .../actions/ExportUnfoldAllDataAction.java | 68 ++ .../actions/ExportUnselectAllDataAction.java} | 18 +- .../actions/GenericFormatExportAction.java | 137 ++++ .../actions/GenericFormatImportAction.java | 2 +- .../actions/GenericFormatValidateAction.java | 2 +- .../actions/ImportFoldAllDataAction.java | 68 ++ .../actions/ImportSelectAllDataAction.java} | 22 +- .../actions/ImportUnfoldAllDataAction.java | 68 ++ .../actions/ImportUnselectAllDataAction.java} | 21 +- .../OpenGenericFormatImportReportAction.java | 41 +- .../OpenGenericFormatValidateReportAction.java | 41 +- .../genericformat/tree/CruiseSelectTreeNode.java | 154 ++++ .../genericformat/tree/DataSelectTreeModel.java | 199 +++++ .../tree/DataSelectTreeNodeSupport.java | 82 ++ .../tree/ExportDataSelectTreeCellRenderer.java | 136 ++++ .../tree/ImportDataSelectTreeCellRenderer.java | 167 ++++ .../tree/OperationSelectTreeNode.java | 75 ++ .../genericformat/tree/ProgramSelectTreeNode.java | 88 +++ .../tutti/ui/swing/content/home/SelectCruiseUI.css | 32 +- .../ui/swing/content/home/SelectCruiseUI.jaxx | 31 +- .../swing/content/home/SelectCruiseUIHandler.java | 90 +-- .../actions/ExportGenericFormatCruiseAction.java | 127 --- .../ExportGenericFormatProgramCruisesAction.java | 130 ---- .../ImportGenericFormatProgramCruisesAction.java | 138 ---- .../ui/swing/content/report/ReportUIHandler.java | 4 + .../ui/swing/content/report/ReportUIModel.java | 10 + .../report/actions/GenerateReportAction.java | 17 +- .../ifremer/tutti/ui/swing/util/TuttiUIUtil.java | 33 - .../resources/i18n/tutti-ui-swing_en_GB.properties | 82 ++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 92 ++- .../src/main/resources/icons/action-collapse.png | Bin 0 -> 372 bytes .../src/main/resources/icons/action-expand.png | Bin 0 -> 371 bytes .../src/main/resources/icons/action-select.png | Bin 0 -> 392 bytes .../src/main/resources/icons/action-unselect.png | Bin 0 -> 311 bytes 223 files changed, 10062 insertions(+), 3801 deletions(-) create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/model/CruiseDataModel.java create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/model/DataModelSupport.java copy tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/FishingOperationAlreadyImportedException.java => tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/model/OperationDataModel.java (52%) create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/model/ProgramDataModel.java copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/update/ApplicationUpdateException.java => tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/CouldNotLoadTaxonException.java (67%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/{GenericFormatServiceSupport.java => GenericFormatCheckDataService.java} (66%) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportActionEngine.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportConfiguration.java copy tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/{consumer/CruiseAlreadyImportedException.java => GenericFormatExportCruiseContext.java} (57%) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportRequest.java copy tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/{GenericFormatArchiveInvalidLayoutException.java => GenericFormatExportResult.java} (55%) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericformatImportPersistenceHelper.java delete mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericformatImportPersitenceHelper.java copy tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/{CruiseAlreadyExistException.java => CsvConsumerForAttachment.java} (54%) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/AttachmentModel.java copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentItemModel.java => tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/AttachmentRow.java (51%) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/CheckDataAction.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/CreateAccidentalCatchRowsAction.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/CreateCatchBatchRowsAction.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/CreateIndividualObservationRowsAction.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/CreateMarineLitterRowsAction.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/CreateOperationRowsAction.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/CreateParameterRowsAction.java copy tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/{consumer/CruiseAlreadyExistException.java => exportactions/ExportCruiseActionSupport.java} (60%) copy tutti-service/src/main/java/fr/ifremer/tutti/service/{csv/CommentParserFormatter.java => genericformat/exportactions/ExportFishingOperationActionSupport.java} (59%) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportGearCaracteristicAction.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportProtocolAction.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportReferentialGearAction.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportReferentialPersonAction.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportReferentialSpeciesAction.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportReferentialVesselAction.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportSampleCategoryModelAction.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportSpeciesUsedAction.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportSurveyAction.java copy tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/{GenericFormatValidateFileResult.java => exportactions/ExportTechnicalActionSupport.java} (69%) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/FinalizeExportAction.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/FlushOperationAction.java copy tutti-service/src/main/java/fr/ifremer/tutti/service/{csv/StringParserFormatter.java => genericformat/exportactions/GenerateExportArchiveAction.java} (59%) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/LoadDataAction.java copy tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/{ValidateOperationAction.java => LoadAttachmentsAction.java} (55%) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForAttachment.java create mode 100644 tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatArchiveTest.java create mode 100644 tutti-service/src/test/resources/genericFormat/default/attachments.csv create mode 100644 tutti-service/src/test/resources/genericFormat/empty/attachments.csv copy tutti-ichtyometer/README.txt => tutti-service/src/test/resources/genericFormat/test_countLines/oneEmptyLine.txt (100%) create mode 100644 tutti-service/src/test/resources/genericFormat/test_countLines/oneLine.txt create mode 100644 tutti-service/src/test/resources/genericFormat/test_countLines/twoLines.txt create mode 100644 tutti-service/src/test/resources/genericFormat/test_countLines/twoLines_secondEmpty.txt copy tutti-ichtyometer/README.txt => tutti-service/src/test/resources/genericFormat/test_countLines/zeroLines.txt (100%) create mode 100644 tutti-ui-swing/src/main/help/Guide_utilisation_Allegro_Campagne.pdf delete mode 100644 tutti-ui-swing/src/main/help/fr/Aide_Allegro_Campagne.odt copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/{home/actions/OpenGenericFormatImportScreen.java => actions/OpenGenericFormatExportScreen.java} (74%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/{home => }/actions/OpenGenericFormatImportScreen.java (94%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatExportUI.css create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatExportUI.jaxx create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatExportUIHandler.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatExportUIModel.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/ExportFoldAllDataAction.java copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/{operation/fishing/actions/VesselUseFeatureAddRowAction.java => genericformat/actions/ExportSelectAllDataAction.java} (63%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/ExportUnfoldAllDataAction.java copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/{operation/fishing/actions/GearUseFeatureRemoveRowAction.java => genericformat/actions/ExportUnselectAllDataAction.java} (63%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/GenericFormatExportAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/ImportFoldAllDataAction.java copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/{report/actions/OpenReportAction.java => genericformat/actions/ImportSelectAllDataAction.java} (63%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/ImportUnfoldAllDataAction.java copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/{operation/catches/accidental/create/actions/CreateAccidentalBatchCancelAction.java => genericformat/actions/ImportUnselectAllDataAction.java} (64%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/CruiseSelectTreeNode.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/DataSelectTreeModel.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/DataSelectTreeNodeSupport.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/ExportDataSelectTreeCellRenderer.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/ImportDataSelectTreeCellRenderer.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/OperationSelectTreeNode.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/ProgramSelectTreeNode.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/actions/ExportGenericFormatCruiseAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/actions/ExportGenericFormatProgramCruisesAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/actions/ImportGenericFormatProgramCruisesAction.java create mode 100644 tutti-ui-swing/src/main/resources/icons/action-collapse.png create mode 100644 tutti-ui-swing/src/main/resources/icons/action-expand.png create mode 100644 tutti-ui-swing/src/main/resources/icons/action-select.png create mode 100644 tutti-ui-swing/src/main/resources/icons/action-unselect.png -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.