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 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 .../CalcifiedPiecesSamplingDefinitions.java | 7 + .../protocol/CaracteristicMappingRows.java | 7 +- .../entities/protocol/CaracteristicType.java | 1 + .../entities/protocol/SpeciesProtocols.java | 20 +- .../entities/protocol/TuttiProtocols.java | 58 +-- .../service/csv/StringSetParserFormatter.java | 58 +++ .../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, 900 insertions(+), 498 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.