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 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 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 7138094 ajout des catégories meme si elles ne sont pas dans le fichier (refs #6116) new aaa14fe ajout des lots manquants lors de l'import (refs #6116) new ae09213 ajout de la conf dans l'ui (fixes #6116) new ef240ad ajout de test + création des lots manquants avec des poids nuls (fixes #6116) new a0916bf merge with develop new eaa28b6 ne pas mettre les lignes créées dans le rapport (fixes #6116) 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 (9989c2e) \ N -- N -- N refs/heads/feature/6116 (eaa28b6) 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 6 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 eaa28b632060c4aa40d45410afb79960030058ae Author: Kevin Morin <morin@codelutin.com> Date: Wed Jan 13 11:03:09 2016 +0100 ne pas mettre les lignes créées dans le rapport (fixes #6116) commit a0916bffb802d19478a65c0fecd3f44eaa0de104 Author: Kevin Morin <morin@codelutin.com> Date: Wed Jan 13 10:58:08 2016 +0100 merge with develop commit ef240adc1b1e0d9d3931f0aa675b09ab5af160f3 Author: Kevin Morin <morin@codelutin.com> Date: Wed Jan 13 10:38:26 2016 +0100 ajout de test + création des lots manquants avec des poids nuls (fixes #6116) commit ae09213e820564a4e68e51b6fa95b9e3b4267843 Author: Kevin Morin <morin@codelutin.com> Date: Tue Jan 12 18:24:04 2016 +0100 ajout de la conf dans l'ui (fixes #6116) commit aaa14fe16955a3e89dc30008cd30175785889226 Author: Kevin Morin <morin@codelutin.com> Date: Tue Jan 12 17:28:39 2016 +0100 ajout des lots manquants lors de l'import (refs #6116) commit 7138094370a41953447ac9c3113b3182d798172b Author: Kevin Morin <morin@codelutin.com> Date: Mon Jan 11 18:11:30 2016 +0100 ajout des catégories meme si elles ne sont pas dans le fichier (refs #6116) Summary of changes: pom.xml | 2 +- .../tutti/service/pupitri/PupitriImportResult.java | 4 + .../service/pupitri/PupitriImportService.java | 53 +++- .../service/pupitri/PupitriSpeciesContext.java | 17 +- .../fr/ifremer/tutti/service/pupitri/Signs.java | 128 ++------- .../pupitri/PupitriImportServiceEvo6116Test.java | 293 +++++++++++++++++++++ .../pupitri/PupitriImportServiceEvo6149Test.java | 4 +- ...t.java => PupitriImportServiceEvo6592Test.java} | 39 +-- .../src/test/resources/pupitri/evo-6116.car | 7 + .../pupitri/{evo-6149.tnk => evo-6116.tnk} | 0 .../test/resources/pupitri/evo-6116.tuttiProtocol | 198 ++++++++++++++ .../pupitri/{evo-6149.car => evo-6592.car} | 0 .../pupitri/{evo-6149.tnk => evo-6592.tnk} | 0 ...o-6149.tuttiProtocol => evo-6592.tuttiProtocol} | 0 .../species/ImportPupitriMelagWeightPopupUI.css} | 43 ++- .../species/ImportPupitriMelagWeightPopupUI.jaxx} | 46 ++-- .../ImportPupitriMelagWeightPopupUIHandler.java | 79 ++++++ .../ImportPupitriMelagWeightPopupUIModel.java | 35 +++ .../species/actions/ImportPupitriAction.java | 60 +++-- ...mportPupitriMelagWeightPopupValidateAction.java | 20 ++ .../resources/i18n/tutti-ui-swing_en_GB.properties | 6 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 3 + 22 files changed, 829 insertions(+), 208 deletions(-) create mode 100644 tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo6116Test.java copy tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/{PupitriImportServiceEvo6149Test.java => PupitriImportServiceEvo6592Test.java} (86%) create mode 100644 tutti-service/src/test/resources/pupitri/evo-6116.car copy tutti-service/src/test/resources/pupitri/{evo-6149.tnk => evo-6116.tnk} (100%) create mode 100644 tutti-service/src/test/resources/pupitri/evo-6116.tuttiProtocol 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/{util/auth/LoginUI.jaxx => content/operation/catches/species/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>.