This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from 88fd133 Livrable #8291 Mauvais éditeur sur le code de prélèvement new e6f692b fix i18n typos new ecba160 Ajout nouvelle méthode pour créer des CPSD new cdafea2 Pourquoi moi ? le code écrit n'est jamais consulté :() new 9d494d9 On arrête d'utiliser guava en faveur de java 8 new 01f13d8 On recharge les ui après avoir charge le modèle new 4869f1a o Revue des imports du protocole (pas tout, pas le temps...) o Nettoyage code o Bien importer les maturités + autres caractéristiques lors d'un import de caractéristiques sur le procole (See #8302, #8301) new 9ec9d2e Introduction d'un nouveau service qui fait les import-exports des caractéristiques du protocole + correction import/export maturités (See #8301) new 00a5751 Livrable #8301 Livrable #8302 Merge branch 'feature/8302' into develop The 8 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 00a57515f451e3aecffb54892180a744a5728c5a Merge: 88fd133 9ec9d2e Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed May 11 16:49:32 2016 +0200 Livrable #8301 Livrable #8302 Merge branch 'feature/8302' into develop commit 9ec9d2e72efb59d121bb628cc4f51650f9add071 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed May 11 16:49:22 2016 +0200 Introduction d'un nouveau service qui fait les import-exports des caractéristiques du protocole + correction import/export maturités (See #8301) commit 4869f1ae5b17d222175b20c3347e0eb6cf0de7b2 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed May 11 09:59:38 2016 +0200 o Revue des imports du protocole (pas tout, pas le temps...) o Nettoyage code o Bien importer les maturités + autres caractéristiques lors d'un import de caractéristiques sur le procole (See #8302, #8301) commit 01f13d8f11132ee6cb87234987cdd867f4c12504 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed May 11 09:55:19 2016 +0200 On recharge les ui après avoir charge le modèle commit 9d494d93f8758b71067dd50d3bc0b34c6e2d08ee Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed May 11 09:54:28 2016 +0200 On arrête d'utiliser guava en faveur de java 8 commit cdafea28a57c9d9d14ed545c90e6060c84c29672 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed May 11 09:49:21 2016 +0200 Pourquoi moi ? le code écrit n'est jamais consulté :() commit ecba1604ca4807d753f077ae948aff2f3841f712 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed May 11 09:48:52 2016 +0200 Ajout nouvelle méthode pour créer des CPSD commit e6f692bbfa4a4c096efbdf0a9ad2036c554eb702 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue May 10 22:16:36 2016 +0200 fix i18n typos Summary of changes: .../CalcifiedPiecesSamplingDefinitions.java | 7 + .../protocol/CaracteristicMappingRows.java | 7 +- .../entities/protocol/CaracteristicType.java | 1 + .../entities/protocol/SpeciesProtocols.java | 20 +- .../entities/protocol/TuttiProtocols.java | 58 +-- ...ormatter.java => StringSetParserFormatter.java} | 24 +- .../fr/ifremer/tutti/service/csv/TuttiCsvUtil.java | 3 + .../FishingOperationImportService.java | 4 +- .../tutti/service/protocol/CaracteristicRow.java | 12 + .../service/protocol/CaracteristicRowModel.java | 60 ++- .../ProtocolCaracteristicsImportExportService.java | 259 +++++++++++ .../protocol/ProtocolImportExportService.java | 481 ++++++++------------- .../service/pupitri/PupitriImportService.java | 38 +- .../resources/i18n/tutti-service_en_GB.properties | 1 + .../resources/i18n/tutti-service_fr_FR.properties | 1 + ...tocolCaracteristicsImportExportServiceTest.java | 149 +++++++ .../protocol/ProtocolImportExportServiceTest.java | 167 ++++--- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 5 + .../actions/ExportAllCaracteristicAction.java | 7 +- .../actions/ExportProtocolCaracteristicAction.java | 14 +- .../actions/ImportProtocolCaracteristicAction.java | 38 +- .../actions/LoadProtocolImportColumnsAction.java | 4 +- .../resources/i18n/tutti-ui-swing_fr_FR.properties | 4 +- 23 files changed, 853 insertions(+), 511 deletions(-) copy tutti-service/src/main/java/fr/ifremer/tutti/service/csv/{IntegerListParserFormatter.java => StringSetParserFormatter.java} (65%) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolCaracteristicsImportExportService.java create mode 100644 tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/ProtocolCaracteristicsImportExportServiceTest.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.