This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 2feb60c fixes #6883: [ERGO] Masquer par défaut la jauge mémoire new 9cfdbf5 add optionalId in DataModel API + nice method to get child new 538d596 les interface graphiques sont ok pour l'import - export avec la sélection des données new a07f55f debut de mise en place de l'import avec selection des données new ad0adf1 ajout dans le tip des noeuds les identifiants + ajout dans la configuration d'import de propriétés manquantes new a8cfff8 mise en place de l'import avec selection des données + meilleur design des actions (persistenceHelper ne contient plus de logique) new 12408e1 fix count lines of import files new c2d4a8a fixes #6822: [IMPORT GENERIQUE] Définir les différentes statégies d'import possible Merge branch 'feature/6822' into develop The 7 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit c2d4a8af53efb4e093be6b7729d6af7d9a9d06e4 Merge: 2feb60c 12408e1 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 1 14:42:14 2015 +0200 fixes #6822: [IMPORT GENERIQUE] Définir les différentes statégies d'import possible Merge branch 'feature/6822' into develop commit 12408e1d65846a1ad084a6e12b54bb9450bb1f0b Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 1 14:42:02 2015 +0200 fix count lines of import files commit a8cfff8c3bb261dab943d61ce50834c46c421c66 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 1 12:03:17 2015 +0200 mise en place de l'import avec selection des données + meilleur design des actions (persistenceHelper ne contient plus de logique) commit ad0adf1d5fd9085c4484b868d4e5599bf43a8aa4 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 1 12:01:57 2015 +0200 ajout dans le tip des noeuds les identifiants + ajout dans la configuration d'import de propriétés manquantes commit a07f55f3c5132c0dcb0f799b5b6714679ff4ce72 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Mar 31 19:49:40 2015 +0200 debut de mise en place de l'import avec selection des données commit 538d59602518500e7b2f525d4ebba1ee7e92e821 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Mar 31 19:48:49 2015 +0200 les interface graphiques sont ok pour l'import - export avec la sélection des données commit 9cfdbf543a8a41d2641d9f17fe6c36844e98c90f Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Mar 31 14:55:31 2015 +0200 add optionalId in DataModel API + nice method to get child Summary of changes: .../tutti/persistence/entities/data/Cruises.java | 31 ++ .../entities/data/FishingOperations.java | 19 + .../tutti/persistence/model/CruiseDataModel.java | 14 + .../tutti/persistence/model/DataModelSupport.java | 19 + .../tutti/persistence/model/ProgramDataModel.java | 14 + .../genericformat/GenericFormatArchive.java | 40 +- .../genericformat/GenericFormatContextSupport.java | 108 ++-- .../GenericFormatImportConfiguration.java | 139 +++++- .../GenericFormatImportCruiseContext.java | 101 +++- .../GenericFormatImportCruiseResult.java | 2 +- .../GenericFormatImportOperationContext.java | 13 + .../GenericFormatImportOperationResult.java | 9 +- .../genericformat/GenericFormatImportRequest.java | 93 +++- .../genericformat/GenericFormatImportService.java | 69 +-- .../GenericFormatImportValidationHelper.java | 74 ++- .../genericformat/GenericFormatResultSupport.java | 11 + .../GenericFormatValidateFileContext.java | 64 ++- .../GenericFormatValidateFileResult.java | 1 + .../GenericformatImportPersistenceHelper.java | 277 +++++++++++ .../GenericformatImportPersitenceHelper.java | 550 --------------------- .../consumer/CsvConsumerForAccidentalCatch.java | 44 +- .../consumer/CsvConsumerForCatch.java | 26 +- .../consumer/CsvConsumerForGearCaracteristic.java | 55 +-- .../CsvConsumerForIndividualObservation.java | 44 +- .../consumer/CsvConsumerForMarineLitter.java | 14 +- .../consumer/CsvConsumerForOperation.java | 81 +-- .../consumer/CsvConsumerForParameter.java | 57 +-- .../consumer/CsvConsumerForSurvey.java | 12 +- .../service/genericformat/csv/OperationModel.java | 18 +- .../importactions/DoCheckWeightAction.java | 2 +- .../importactions/DoCleanWeightAction.java | 1 + .../importactions/ImportAccidentalCatchAction.java | 95 +++- .../importactions/ImportCatchAction.java | 223 ++++++++- .../ImportGearCaracteristicAction.java | 57 ++- .../ImportIndividualObservationAction.java | 95 +++- .../importactions/ImportMarineLitterAction.java | 95 +++- .../importactions/ImportOperationAction.java | 171 ++++++- .../importactions/ImportParameterAction.java | 87 +++- .../importactions/ImportProtocolAction.java | 46 +- .../importactions/ImportReferentialGearAction.java | 32 +- .../ImportReferentialPersonAction.java | 32 +- .../ImportReferentialSpeciesAction.java | 32 +- .../ImportReferentialVesselAction.java | 31 +- .../importactions/ImportSurveyAction.java | 167 ++++++- .../importactions/ImpotSampleCategoryAction.java | 10 +- .../importactions/LoadAttachmentsAction.java | 9 +- .../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 +- .../resources/i18n/tutti-service_en_GB.properties | 17 + .../resources/i18n/tutti-service_fr_FR.properties | 33 +- .../genericformat/GenericFormatArchiveTest.java | 38 ++ .../GenericFormatImportServiceTest.java | 12 +- .../GenericFormatImportServiceValidTest.java | 13 +- .../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 .../filtered-resources/tutti-help-fr.properties | 14 +- .../genericformat/GenericFormatExportUI.css | 21 +- .../genericformat/GenericFormatExportUI.jaxx | 33 +- .../GenericFormatExportUIHandler.java | 32 +- .../genericformat/GenericFormatExportUIModel.java | 15 +- .../genericformat/GenericFormatImportUI.css | 102 ++++ .../genericformat/GenericFormatImportUI.jaxx | 43 +- .../GenericFormatImportUIHandler.java | 69 ++- .../genericformat/GenericFormatImportUIModel.java | 161 +++++- ...ataAction.java => ExportFoldAllDataAction.java} | 9 +- .../actions/ExportSelectAllDataAction.java | 29 ++ ...aAction.java => ExportUnfoldAllDataAction.java} | 11 +- .../actions/ExportUnselectAllDataAction.java | 29 ++ ...ataAction.java => ImportFoldAllDataAction.java} | 17 +- .../actions/ImportSelectAllDataAction.java | 29 ++ ...aAction.java => ImportUnfoldAllDataAction.java} | 19 +- .../actions/ImportUnselectAllDataAction.java | 29 ++ .../genericformat/actions/SelectAllDataAction.java | 35 -- .../actions/UnselectAllDataAction.java | 35 -- .../genericformat/tree/CruiseSelectTreeNode.java | 22 +- .../tree/DataSelectTreeCellEditor.java | 65 --- .../genericformat/tree/DataSelectTreeModel.java | 175 +++++++ .../tree/DataSelectTreeNodeSupport.java | 9 + ....java => ExportDataSelectTreeCellRenderer.java} | 6 +- ....java => ImportDataSelectTreeCellRenderer.java} | 99 ++-- .../resources/i18n/tutti-ui-swing_en_GB.properties | 23 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 24 +- 91 files changed, 3137 insertions(+), 1381 deletions(-) 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 create mode 100644 tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatArchiveTest.java 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%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/{FoldAllDataAction.java => ExportFoldAllDataAction.java} (74%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/ExportSelectAllDataAction.java copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/{UnfoldAllDataAction.java => ExportUnfoldAllDataAction.java} (69%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/ExportUnselectAllDataAction.java rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/{FoldAllDataAction.java => ImportFoldAllDataAction.java} (66%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/ImportSelectAllDataAction.java rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/{UnfoldAllDataAction.java => ImportUnfoldAllDataAction.java} (62%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/ImportUnselectAllDataAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/SelectAllDataAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/UnselectAllDataAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/DataSelectTreeCellEditor.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/DataSelectTreeModel.java copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/{DataSelectTreeCellRenderer.java => ExportDataSelectTreeCellRenderer.java} (94%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/{DataSelectTreeCellRenderer.java => ImportDataSelectTreeCellRenderer.java} (50%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.