This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit c2ece40cda7139382a2e9829a1c9100e2988a407 Merge: 275156c 76d5dd7 Author: Maven Release <maven-release@codelutin.com> Date: Wed May 11 18:46:01 2016 +0200 [jgitflow-maven-plugin]merging 'release/4.5.1' into 'master' 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 +- .../service/csv/StringSetParserFormatter.java | 58 +++ .../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, 1160 insertions(+), 679 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.