branch develop updated (33c2d43 -> ec70ee5)
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@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@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@codelutin.com>.
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 34b22cc6307a12479fc831620514f96e1763f2e0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Jan 14 14:35:09 2016 +0100 Ajout javadoc + mettre en final ce qui est possible --- .../ifremer/tutti/service/pupitri/PupitriSpeciesContext.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriSpeciesContext.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriSpeciesContext.java index 54aabaf..a208d7e 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriSpeciesContext.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriSpeciesContext.java @@ -63,12 +63,12 @@ public class PupitriSpeciesContext implements Serializable { /** * Espece du lot. */ - protected Species species; + protected final Species species; /** * Is the species is a sorted (VRAC) or unsorted (HORS-VRAC)? */ - protected boolean sorted; + protected final boolean sorted; /** * If the species was involved in the melag, fill this flag. @@ -87,7 +87,11 @@ public class PupitriSpeciesContext implements Serializable { */ protected final TreeMap<Signs, PupitriSignContext> signs; - protected boolean createMissingSigns; + /** + * Pour créer les lots fils manquants (see http://forge.codelutin.com/issues/6116) + * @since 4.3 + */ + protected final boolean createMissingSigns; public PupitriSpeciesContext(Species species, boolean createMissingSigns, boolean sorted) { this.species = species; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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>.
participants (1)
-
codelutin.com scm