This is an automated email from the git hooks/post-receive script. New change to branch feature/6116 in repository tutti. See http://git.codelutin.com/tutti.git from 799b75f ajout des catégories meme si elles ne sont pas dans le fichier (refs #6116) adds 144713e ajout des lots manquants lors de l'import (refs #6116) adds 9989c2e ajout de la conf dans l'ui (fixes #6116) No new revisions were added by this update. Summary of changes: .../java/fr/ifremer/tutti/TuttiConfiguration.java | 4 + .../fr/ifremer/tutti/TuttiConfigurationOption.java | 8 ++ .../entities/protocol/TuttiProtocols.java | 31 ++++++ .../i18n/tutti-persistence_en_GB.properties | 1 + .../i18n/tutti-persistence_fr_FR.properties | 1 + .../pupitri/CarrouselImportRequestResult.java | 8 +- .../service/pupitri/PupitriImportService.java | 109 ++++++++++++++++++--- .../service/pupitri/PupitriSpeciesContext.java | 55 ++++++----- .../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 | 17 +++- .../resources/i18n/tutti-ui-swing_en_GB.properties | 4 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 4 + 16 files changed, 330 insertions(+), 85 deletions(-) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriPopupUIModel.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.