April 2015 - Tutti-commits - mailman.cloud.codelutin.com

branch develop updated (7dedfd4 -> 5951a67)
by codelutin.com scm April 2, 2015

April 2, 2015

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 7dedfd4 fixes #6698: [IMPORT GENERIQUE] Rapport d’import transmissible par mail Merge branch 'feature/6698' into develop new 5951a67 refs #6886: ajout d'une exception lors qu'un taxon ne peut être chargé The 1 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 5951a67e45b90472a27f432800f1a096f0cac7a7 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Apr 2 08:44:02 2015 +0200 refs #6886: ajout d'une exception lors qu'un taxon ne peut être chargé Summary of changes: .../referential/CouldNotLoadTaxonException.java | 26 +++++++++++++++++ .../referential/SpeciesPersistenceServiceImpl.java | 34 +++++++++++++--------- 2 files changed, 47 insertions(+), 13 deletions(-) create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/CouldNotLoadTaxonException.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (c2d4a8a -> 7dedfd4)
by codelutin.com scm April 1, 2015

April 1, 2015

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 c2d4a8a fixes #6822: [IMPORT GENERIQUE] Définir les différentes statégies d'import possible Merge branch 'feature/6822' into develop new afa33f9 mise à jour des données de test de l'import générique new cf014cd mise en place du rapport d'import + amélioration API d'import new 56faee6 amélioration des rapports d'import générique new 0ce79ed fix i18n new 7dedfd4 fixes #6698: [IMPORT GENERIQUE] Rapport d’import transmissible par mail Merge branch 'feature/6698' into develop The 5 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 7dedfd49b7bf4ca0b38b46f06aab4b2ca6d1564c Merge: c2d4a8a 0ce79ed Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Apr 1 23:13:07 2015 +0200 fixes #6698: [IMPORT GENERIQUE] Rapport d’import transmissible par mail Merge branch 'feature/6698' into develop commit 0ce79eddbe68d62af25d9780f7cc74cb16232aa0 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Apr 1 23:12:59 2015 +0200 fix i18n commit 56faee65c8e60b73ef283cc3f326d46c3d13a58e Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Apr 1 22:15:20 2015 +0200 amélioration des rapports d'import générique commit cf014cddd57f570b0c06badc27c2f42f57ac74fe Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Apr 1 19:49:22 2015 +0200 mise en place du rapport d'import + amélioration API d'import commit afa33f9d1f1898d94baf5c93bf0779abae238ab0 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Apr 1 19:45:10 2015 +0200 mise à jour des données de test de l'import générique Summary of changes: .../entities/data/FishingOperations.java | 2 +- .../genericformat/GenericFormatContextSupport.java | 8 +- .../GenericFormatImportCruiseContext.java | 18 +- .../GenericFormatImportCruiseResult.java | 69 +- .../GenericFormatImportOperationResult.java | 78 +- .../genericformat/GenericFormatImportResult.java | 69 +- .../genericformat/GenericFormatResultSupport.java | 10 +- .../GenericFormatValidateFileContext.java | 2 +- .../GenericformatImportPersistenceHelper.java | 15 +- .../importactions/DoCheckWeightAction.java | 2 +- .../importactions/DoCleanWeightAction.java | 2 +- .../importactions/ImportAccidentalCatchAction.java | 2 +- .../importactions/ImportCatchAction.java | 4 +- .../ImportIndividualObservationAction.java | 2 +- .../importactions/ImportMarineLitterAction.java | 2 +- .../importactions/ImportOperationAction.java | 24 +- .../importactions/ImportParameterAction.java | 2 +- .../resources/ftl/genericFormatImportReport_fr.ftl | 281 ++++--- .../ftl/genericFormatValidateReport_fr.ftl | 19 +- .../resources/i18n/tutti-service_fr_FR.properties | 2 +- .../GenericFormatImportServiceTest.java | 16 +- .../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 +- 31 files changed, 836 insertions(+), 687 deletions(-) create mode 100644 tutti-service/src/test/resources/genericFormat/default/attachments.csv create mode 100644 tutti-service/src/test/resources/genericFormat/empty/attachments.csv -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 5

branch develop updated (2feb60c -> c2d4a8a)
by codelutin.com scm April 1, 2015

April 1, 2015

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(a)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(a)codelutin.com> Date: Wed Apr 1 14:42:02 2015 +0200 fix count lines of import files commit a8cfff8c3bb261dab943d61ce50834c46c421c66 Author: Tony CHEMIT <chemit(a)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(a)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(a)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(a)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(a)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(a)codelutin.com>.

1 7