This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit ec70ee55fdb3b0a99b6e70162e964c46a1bfc2c1 Merge: 33c2d43 34b22cc Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Jan 14 15:05:29 2016 +0100 Fixes #6116 Merge branch 'feature/6116' into develop .../java/fr/ifremer/tutti/TuttiConfiguration.java | 4 + .../fr/ifremer/tutti/TuttiConfigurationOption.java | 8 + .../protocol/CaracteristicMappingRows.java | 27 ++ .../entities/protocol/SpeciesProtocols.java | 34 +++ .../entities/protocol/TuttiProtocols.java | 37 +-- .../i18n/tutti-persistence_en_GB.properties | 1 + .../i18n/tutti-persistence_fr_FR.properties | 1 + .../pupitri/CarrouselImportRequestResult.java | 8 +- .../service/pupitri/PupitriImportService.java | 148 +++++++++-- .../service/pupitri/PupitriSpeciesContext.java | 34 ++- .../pupitri/PupitriImportServiceAno5079Test.java | 2 +- .../pupitri/PupitriImportServiceEvo6116Test.java | 293 +++++++++++++++++++++ .../pupitri/PupitriImportServiceEvo6592Test.java | 4 +- .../service/pupitri/PupitriImportServiceTest.java | 2 +- .../src/test/resources/pupitri/evo-6116.car | 7 + .../src/test/resources/pupitri/evo-6116.tnk | 32 +++ .../test/resources/pupitri/evo-6116.tuttiProtocol | 198 ++++++++++++++ .../swing/content/config/TuttiConfigUIHandler.java | 4 + .../catches/species/ImportPupitriPopupUI.css | 9 + .../catches/species/ImportPupitriPopupUI.jaxx | 24 +- .../species/ImportPupitriPopupUIHandler.java | 82 +++--- .../catches/species/ImportPupitriPopupUIModel.java | 54 ++++ .../species/actions/ImportPupitriAction.java | 22 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 4 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 4 + 25 files changed, 945 insertions(+), 98 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.