- Tutti-commits - mailman.cloud.codelutin.com

branch develop-3.x deleted (was 953d002)
by codelutin.com scm 14 Jan '16

14 Jan '16

This is an automated email from the git hooks/post-receive script. New change to branch develop-3.x in repository tutti. See http://git.codelutin.com/tutti.git was 953d002 [jgitflow-maven-plugin]Updating develop poms back to pre merge state This change permanently discards the following revisions: discards 953d002 [jgitflow-maven-plugin]Updating develop poms back to pre merge state discards d6e69c6 Merge branch 'master-3.x' into develop-3.x discards 797321c [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts discards 872de0a [jgitflow-maven-plugin]updating poms for 3.13.13-SNAPSHOT development -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch master-3.x deleted (was 9087285)
by codelutin.com scm 14 Jan '16

14 Jan '16

This is an automated email from the git hooks/post-receive script. New change to branch master-3.x in repository tutti. See http://git.codelutin.com/tutti.git was 9087285 Merge branch 'release/3.13.12' into master-3.x The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop updated (33c2d43 -> ec70ee5)
by codelutin.com scm 14 Jan '16

14 Jan '16

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 33c2d43 Fixes #6061. Merge branch 'feature/6061' into develop adds 7480cb5 ajout des catégories meme si elles ne sont pas dans le fichier (refs #6116) adds 33751b3 ajout des lots manquants lors de l'import (refs #6116) adds bbe9477 ajout de la conf dans l'ui (fixes #6116) adds 3218e37 ajout des catégories meme si elles ne sont pas dans le fichier (refs #6116) adds 05f0b86 ajout des lots manquants lors de l'import (refs #6116) adds ce0e1fb ajout de la conf dans l'ui (fixes #6116) adds 25d7a75 ajout de test + création des lots manquants avec des poids nuls (fixes #6116) adds 4a07303 merge with develop adds fa84c0d ne pas mettre les lignes créées dans le rapport (fixes #6116) adds ff4b4dd fix test adds 54e10a1 fix tests adds 72cb7b0 Ne pas utiliser l'annotation @Nullable (elle vient de finbugs). adds 2a51826 Ne pas instancier des inner classes quand cela n'est pas nécessaire adds d782989 fix i18n new 34b22cc Ajout javadoc + mettre en final ce qui est possible new ec70ee5 Fixes #6116 Merge branch 'feature/6116' into develop The 2 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 ec70ee55fdb3b0a99b6e70162e964c46a1bfc2c1 Merge: 33c2d43 34b22cc Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Jan 14 15:05:29 2016 +0100 Fixes #6116 Merge branch 'feature/6116' into develop commit 34b22cc6307a12479fc831620514f96e1763f2e0 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Jan 14 14:35:09 2016 +0100 Ajout javadoc + mettre en final ce qui est possible Summary of changes: .../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 + .../pupitri/{evo-6592.tnk => evo-6116.tnk} | 0 .../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, 913 insertions(+), 98 deletions(-) create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/CaracteristicMappingRows.java create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/SpeciesProtocols.java create mode 100644 tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo6116Test.java create mode 100644 tutti-service/src/test/resources/pupitri/evo-6116.car copy tutti-service/src/test/resources/pupitri/{evo-6592.tnk => evo-6116.tnk} (100%) create mode 100644 tutti-service/src/test/resources/pupitri/evo-6116.tuttiProtocol 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(a)codelutin.com>.

1 2

branch feature/6116 deleted (was d782989)
by codelutin.com scm 14 Jan '16

14 Jan '16

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 was d782989 fix i18n The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/6116 updated (2a51826 -> d782989)
by codelutin.com scm 14 Jan '16

14 Jan '16

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 2a51826 Ne pas instancier des inner classes quand cela n'est pas nécessaire adds d782989 fix i18n No new revisions were added by this update. Summary of changes: tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties | 3 --- tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties | 3 --- 2 files changed, 6 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/6116 updated (744c975 -> 2a51826)
by codelutin.com scm 14 Jan '16

14 Jan '16

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 discards 744c975 Ne pas instancier des inner classes quand cela n'est pas nécessaire omits f89f91a Ne pas utiliser l'annotation @Nullable (elle vient de finbugs). omits 94a14d6 fix tests omits 23e483d fix test omits d348a15 Merge branch 'feature/6116' of gitlab.nuiton.org:codelutin/tutti into feature/6116 omits eaa28b6 ne pas mettre les lignes créées dans le rapport (fixes #6116) omits a0916bf merge with develop omits ef240ad ajout de test + création des lots manquants avec des poids nuls (fixes #6116) omits ae09213 ajout de la conf dans l'ui (fixes #6116) omits aaa14fe ajout des lots manquants lors de l'import (refs #6116) omits 7138094 ajout des catégories meme si elles ne sont pas dans le fichier (refs #6116) omits 9989c2e ajout de la conf dans l'ui (fixes #6116) omits 144713e ajout des lots manquants lors de l'import (refs #6116) omits 799b75f ajout des catégories meme si elles ne sont pas dans le fichier (refs #6116) adds 7480cb5 ajout des catégories meme si elles ne sont pas dans le fichier (refs #6116) adds 33751b3 ajout des lots manquants lors de l'import (refs #6116) adds bbe9477 ajout de la conf dans l'ui (fixes #6116) adds 3218e37 ajout des catégories meme si elles ne sont pas dans le fichier (refs #6116) adds 05f0b86 ajout des lots manquants lors de l'import (refs #6116) adds ce0e1fb ajout de la conf dans l'ui (fixes #6116) adds 25d7a75 ajout de test + création des lots manquants avec des poids nuls (fixes #6116) adds 4a07303 merge with develop adds fa84c0d ne pas mettre les lignes créées dans le rapport (fixes #6116) adds ff4b4dd fix test adds 54e10a1 fix tests adds 72cb7b0 Ne pas utiliser l'annotation @Nullable (elle vient de finbugs). adds 2a51826 Ne pas instancier des inner classes quand cela n'est pas nécessaire 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 (744c975) \ N -- N -- N refs/heads/feature/6116 (2a51826) 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. No new revisions were added by this update. Summary of changes: .../operation/catches/species/actions/ImportPupitriAction.java | 6 +++--- .../src/main/resources/i18n/tutti-ui-swing_en_GB.properties | 3 +++ .../src/main/resources/i18n/tutti-ui-swing_fr_FR.properties | 3 +++ 3 files changed, 9 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/6116 updated (f89f91a -> 744c975)
by codelutin.com scm 14 Jan '16

14 Jan '16

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 f89f91a Ne pas utiliser l'annotation @Nullable (elle vient de finbugs). adds 744c975 Ne pas instancier des inner classes quand cela n'est pas nécessaire No new revisions were added by this update. Summary of changes: .../protocol/CaracteristicMappingRows.java | 27 +++++++++++++++ .../entities/protocol/SpeciesProtocols.java | 34 +++++++++++++++++++ .../entities/protocol/TuttiProtocols.java | 38 ++++------------------ 3 files changed, 67 insertions(+), 32 deletions(-) create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/CaracteristicMappingRows.java create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/SpeciesProtocols.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/6116 updated (94a14d6 -> f89f91a)
by codelutin.com scm 14 Jan '16

14 Jan '16

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 94a14d6 fix tests adds f89f91a Ne pas utiliser l'annotation @Nullable (elle vient de finbugs). No new revisions were added by this update. Summary of changes: .../tutti/persistence/entities/protocol/TuttiProtocols.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/7063 updated (098f8c3 -> d6df1b4)
by codelutin.com scm 13 Jan '16

13 Jan '16

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 from 098f8c3 génération et lecture de bips + ajout d'une option pour configurer la tonalité du bip à jouer (refs #7063) adds 58ca78e joue un bip à la réception d'une donnée de l'ychtiomètre et 3 bips différents en cas d'erreur (refs #7063) adds d6df1b4 ajout de la tonalité nulle dans la conf (refs #7063) No new revisions were added by this update. Summary of changes: .../java/fr/ifremer/tutti/TuttiConfiguration.java | 8 +++++-- .../fr/ifremer/tutti/TuttiConfigurationOption.java | 15 +++++++++---- .../java/fr/ifremer/tutti/util/BeepFrequency.java | 4 ++-- .../i18n/tutti-persistence_en_GB.properties | 2 ++ .../i18n/tutti-persistence_fr_FR.properties | 3 ++- .../swing/content/config/TuttiConfigUIHandler.java | 16 ++++++++++--- .../frequency/SpeciesFrequencyUIHandler.java | 6 +++++ .../fr/ifremer/tutti/ui/swing/util/SoundUtil.java | 26 ++++++++++++++++++++-- .../resources/i18n/tutti-ui-swing_en_GB.properties | 2 ++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 2 ++ 10 files changed, 70 insertions(+), 14 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/7063 updated (29713dd -> 098f8c3)
by codelutin.com scm 13 Jan '16

13 Jan '16

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(a)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(a)codelutin.com>.

1 1