This is an automated email from the git hooks/post-receive script. New change to branch master in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from 275156c [jgitflow-maven-plugin]merging 'release/4.5' into 'master' adds f9b8891 [jgitflow-maven-plugin]updating poms for 4.5.1-SNAPSHOT development adds 786ad19 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 2f6103e [jgitflow-maven-plugin]merging 'master' into 'develop' adds ce25d23 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 88fd133 Livrable #8291 Mauvais éditeur sur le code de prélèvement adds e6f692b fix i18n typos adds ecba160 Ajout nouvelle méthode pour créer des CPSD adds cdafea2 Pourquoi moi ? le code écrit n'est jamais consulté :() adds 9d494d9 On arrête d'utiliser guava en faveur de java 8 adds 01f13d8 On recharge les ui après avoir charge le modèle adds 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) adds 9ec9d2e Introduction d'un nouveau service qui fait les import-exports des caractéristiques du protocole + correction import/export maturités (See #8301) adds 00a5751 Livrable #8301 Livrable #8302 Merge branch 'feature/8302' into develop adds 6898472 [TECHN] préciser dans le texte "login Extranet" quand on charge un référentiel (Livrable #8303) adds 28ab226 [ERGO] libellés à améliorer (Livrable #8306) adds 83e8129 Correction de l'id des lots à utiliser lors de l'import générique (Livrable #8309) adds f92468b Autoriser de lier une personne temporaire même si on la trouve plusieurs fois (See #8310) adds 42f8073 Add missing license headers adds 76d5dd7 [jgitflow-maven-plugin]updating poms for branch'release/4.5.1' with non-snapshot versions adds c2ece40 [jgitflow-maven-plugin]merging 'release/4.5.1' into 'master' No new revisions were added by this update. Summary of changes: pom.xml | 2 +- tutti-caliper/pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../CalcifiedPiecesSamplingDefinitions.java | 7 + .../protocol/CaracteristicMappingRows.java | 7 +- .../entities/protocol/CaracteristicType.java | 1 + .../entities/protocol/SpeciesProtocols.java | 20 +- .../entities/protocol/TuttiProtocols.java | 58 +-- .../referential/PersonPersistenceServiceImpl.java | 25 +- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- ...ormatter.java => StringSetParserFormatter.java} | 24 +- .../fr/ifremer/tutti/service/csv/TuttiCsvUtil.java | 3 + .../consumer/CsvConsumerForCatch.java | 2 +- .../FishingOperationImportService.java | 4 +- .../tutti/service/protocol/CaracteristicRow.java | 12 + .../service/protocol/CaracteristicRowModel.java | 60 ++- .../ProtocolCaracteristicsImportExportService.java | 283 ++++++++++++ .../protocol/ProtocolImportExportService.java | 481 ++++++++------------- .../service/pupitri/PupitriImportService.java | 38 +- .../resources/i18n/tutti-service_en_GB.properties | 1 + .../resources/i18n/tutti-service_fr_FR.properties | 5 +- ...tocolCaracteristicsImportExportServiceTest.java | 173 ++++++++ .../protocol/ProtocolImportExportServiceTest.java | 167 ++++--- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 5 + .../swing/content/config/TuttiConfigUIHandler.java | 320 +++++++------- .../actions/ExportAllCaracteristicAction.java | 7 +- .../actions/ExportProtocolCaracteristicAction.java | 14 +- .../actions/ImportProtocolCaracteristicAction.java | 38 +- .../actions/LoadProtocolImportColumnsAction.java | 4 +- .../resources/i18n/tutti-ui-swing_fr_FR.properties | 30 +- 34 files changed, 1113 insertions(+), 692 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>.