This is an automated email from the git hooks/post-receive script. New change to branch feature/7063 in repository tutti. See http://git.codelutin.com/tutti.git omits 29713dd génération et lecture de bips + ajout d'une option pour configurer la tonalité du bip à jouer (refs #7063) adds a26e58f desactivation du bouton [...] en même temps que la liste déroulante (fixes #7869) adds a536f35 Merge branch 'feature/7869' into 'develop' adds 1f190cf affichage des synonymes ou non dans la popup de sélection d'une espèce pour les lots espèces (refs #7089) adds cf72737 affichage des synonymes ou non dans la popup de sélection d'une espèce pour les lots benthos (refs #7089) adds f1aea25 suppression des especes deja utilisée et de leurs synonymes dans la liste de toutes les espèces (fixes #7089) adds e732429 La combobox doit remplir tout l'espace disponible. adds 9ff409f Use handler method to set data adds 52bc6ab show check box when it is possible to use it. adds b5c496e N'afficher que les espèces du protocole quand on veut renommer une espèce (fixes #7089) adds f4d8924 on n'affiche pas les especes du benthos dans la correction des especes des lots especes et vice versa (fixes #7089) adds 357fff7 fix visibility of the checkbox (fixes #7089) adds 6b69a7f Merge branch 'feature/7089' into 'develop' adds accaf10 Use nuiton-version and snapshots on nuiton adds d5c74b5 séparation du service d'import pupitri en 2 parties : - lecture des fichiers d'import - enregistrement des données importées cela permet de saisir un poids total de melag avant de faire l'élévation des poids (fixes #6592) adds 772a8ea Fix javadoc adds 55d4672 Fixes #6592 Merge branch 'feature/6592' into develop adds 6e150ec Passage en java 8u65 (Fixes #7898) adds 0f49e69 ordonnancement des lignes importées par rapport à l'ordinal du signe dans l'enum (fixes #6061) adds e842320 Simplification de l'énumération Signs adds 68f6265 Amélioration du code pour créer les ensemble immuables adds 33c2d43 Fixes #6061. Merge branch 'feature/6061' into develop new 098f8c3 génération et lecture de bips + ajout d'une option pour configurer la tonalité du bip à jouer (refs #7063) This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (29713dd) \ N -- N -- N refs/heads/feature/7063 (098f8c3) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 098f8c32bc44487b353e1b79ba9f6f55342ebc24 Author: Kevin Morin <morin@codelutin.com> Date: Thu Jan 7 12:32:46 2016 +0100 génération et lecture de bips + ajout d'une option pour configurer la tonalité du bip à jouer (refs #7063) Summary of changes: pom.xml | 13 ++- tutti-persistence/pom.xml | 4 + .../java/fr/ifremer/tutti/TuttiConfiguration.java | 2 +- .../fr/ifremer/tutti/TuttiConfigurationOption.java | 2 +- .../tutti/persistence/TuttiPersistenceImpl.java | 2 +- .../persistence/TuttiPersistenceNoDbImpl.java | 2 +- .../service/TechnicalPersistenceService.java | 2 +- .../service/TechnicalPersistenceServiceImpl.java | 10 +- .../service/UpdateSchemaContextSupport.java | 2 +- tutti-service/pom.xml | 4 + .../ifremer/tutti/service/PersistenceService.java | 2 +- .../tutti/service/pupitri/PupitriImportResult.java | 4 + .../service/pupitri/PupitriImportService.java | 40 ++++++- .../service/pupitri/PupitriSpeciesContext.java | 17 ++- .../fr/ifremer/tutti/service/pupitri/Signs.java | 128 ++++----------------- .../pupitri/PupitriImportServiceEvo6149Test.java | 4 +- ...t.java => PupitriImportServiceEvo6592Test.java} | 39 ++++--- .../pupitri/{evo-6149.car => evo-6592.car} | 0 .../pupitri/{evo-6149.tnk => evo-6592.tnk} | 0 ...o-6149.tuttiProtocol => evo-6592.tuttiProtocol} | 0 tutti-ui-swing/pom.xml | 4 + .../ui/swing/content/db/DbManagerUIHandler.java | 2 +- .../swing/content/db/actions/ImportDbAction.java | 2 +- .../ui/swing/content/db/actions/OpenDbAction.java | 2 +- .../benthos/actions/RenameBenthosBatchAction.java | 41 ++++++- .../benthos/frequency/BenthosFrequencyUI.css | 1 + .../species/ImportPupitriMelagWeightPopupUI.css} | 43 ++++--- ...I.jaxx => ImportPupitriMelagWeightPopupUI.jaxx} | 37 +++--- .../ImportPupitriMelagWeightPopupUIHandler.java | 79 +++++++++++++ .../ImportPupitriMelagWeightPopupUIModel.java | 35 ++++++ .../species/actions/ImportPupitriAction.java | 55 ++++++--- ...mportPupitriMelagWeightPopupValidateAction.java | 20 ++++ .../species/actions/RenameSpeciesBatchAction.java | 41 ++++++- .../species/frequency/SpeciesFrequencyUI.css | 1 + .../ui/swing/update/module/TuttiModuleUpdater.java | 4 +- .../ui/swing/util/actions/LongActionSupport.java | 7 ++ .../ui/swing/util/species/SelectSpeciesUI.css | 14 ++- .../ui/swing/util/species/SelectSpeciesUI.jaxx | 17 ++- .../swing/util/species/SelectSpeciesUIHandler.java | 14 --- .../swing/util/species/SelectSpeciesUIModel.java | 28 +++++ .../resources/i18n/tutti-ui-swing_en_GB.properties | 15 +++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 6 + 42 files changed, 500 insertions(+), 245 deletions(-) copy tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/{PupitriImportServiceEvo6149Test.java => PupitriImportServiceEvo6592Test.java} (86%) copy tutti-service/src/test/resources/pupitri/{evo-6149.car => evo-6592.car} (100%) copy tutti-service/src/test/resources/pupitri/{evo-6149.tnk => evo-6592.tnk} (100%) copy tutti-service/src/test/resources/pupitri/{evo-6149.tuttiProtocol => evo-6592.tuttiProtocol} (100%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/{util/auth/LoginUI.css => content/operation/catches/species/ImportPupitriMelagWeightPopupUI.css} (51%) copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/{ImportPupitriPopupUI.jaxx => ImportPupitriMelagWeightPopupUI.jaxx} (53%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriMelagWeightPopupUIHandler.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/ImportPupitriMelagWeightPopupUIModel.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportPupitriMelagWeightPopupValidateAction.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.