branch develop-5.x updated (b08bf92 -> da2cd13)
This is an automated email from the git hooks/post-receive script. New change to branch develop-5.x in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from b08bf92 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 3817bcf Exception si tentative de suppression d'une espèce (Fixes #8878) new d390496 Problèmes d'affichage des formulaires depuis la 5.1.3 (Fixes #8877) new da2cd13 Erreur sur suppression d'une espèce (avec remplacement) (fixes #8880) The 3 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 da2cd13908db1628c82b1420e16d0fad880a7157 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Dec 14 17:19:59 2016 +0100 Erreur sur suppression d'une espèce (avec remplacement) (fixes #8880) commit d39049681f7d30fe877010dd9c3fa2ab5d4cee9c Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Dec 14 16:50:18 2016 +0100 Problèmes d'affichage des formulaires depuis la 5.1.3 (Fixes #8877) commit 3817bcfa98352665aed013434eda1e6df7668151 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Dec 14 16:35:28 2016 +0100 Exception si tentative de suppression d'une espèce (Fixes #8878) Summary of changes: .../fr/ird/observe/application/swing/decoration/DecoratorService.java | 4 +++- .../fr/ird/observe/application/swing/ui/content/ContentUIManager.java | 1 + pom.xml | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) -- 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-5.x in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 3817bcfa98352665aed013434eda1e6df7668151 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Dec 14 16:35:28 2016 +0100 Exception si tentative de suppression d'une espèce (Fixes #8878) --- .../fr/ird/observe/application/swing/decoration/DecoratorService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java b/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java index 638550f..2844bd6 100644 --- a/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java +++ b/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java @@ -118,6 +118,7 @@ import fr.ird.observe.services.dto.seine.FloatingObjectTransmittingBuoyDto; import fr.ird.observe.services.dto.seine.GearUseFeaturesMeasurementSeineDto; import fr.ird.observe.services.dto.seine.NonTargetCatchDto; import fr.ird.observe.services.dto.seine.NonTargetSampleDto; +import fr.ird.observe.services.dto.seine.ObjectObservedSpeciesDto; import fr.ird.observe.services.dto.seine.ObjectSchoolEstimateDto; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.RouteStubDto; @@ -462,7 +463,6 @@ public class DecoratorService extends DecoratorProvider { registerDataAndDataReferenceDecorator(FloatingObjectTransmittingBuoyDto.class, t("observe.type.floatingObjectTransmittingBuoy")); registerDataAndDataReferenceDecorator(FloatingObjectSchoolEstimateDto.class, t("observe.type.floatingObjectSchoolEstimate")); registerDataAndDataReferenceDecorator(FloatingObjectObservedSpeciesDto.class, t("observe.type.floatingObjectObservedSpecies")); - registerDataAndDataReferenceDecorator(ObjectSchoolEstimateDto.class, "${species/scientificLabel}$s##${weight}$d", "${species}$s##${weight}$d"); @@ -512,6 +512,8 @@ public class DecoratorService extends DecoratorProvider { // ObjectObservedSpecies decorator registerDecorator(new ObjectObservedSpeciesDecorator()); + registerDataReferenceDecorator(ObjectObservedSpeciesDto.class, "${species}$s##${count}$d"); + // TargetLength decorator registerDecorator(new TargetCatchDecorator()); -- 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-5.x in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit d39049681f7d30fe877010dd9c3fa2ab5d4cee9c Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Dec 14 16:50:18 2016 +0100 Problèmes d'affichage des formulaires depuis la 5.1.3 (Fixes #8877) --- .../fr/ird/observe/application/swing/ui/content/ContentUIManager.java | 1 + 1 file changed, 1 insertion(+) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIManager.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIManager.java index 4f96d55..e2a6212 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIManager.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIManager.java @@ -351,6 +351,7 @@ public class ContentUIManager { ContentUI<?> selectedContentUI = getSelectedContentUI(); if (selectedContentUI != null) { getLayout().removeLayoutComponent(selectedContentUI, selectedContentUI.getClass().getName()); + getLayoutContent().remove(selectedContentUI); selectedContentUI.destroy(); } } -- 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-5.x in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit da2cd13908db1628c82b1420e16d0fad880a7157 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Dec 14 17:19:59 2016 +0100 Erreur sur suppression d'une espèce (avec remplacement) (fixes #8880) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9fca3a6..2e8f2d2 100644 --- a/pom.xml +++ b/pom.xml @@ -161,7 +161,7 @@ <eugenePluginVersion>3.0-alpha-9</eugenePluginVersion> <processorPluginVersion>1.3</processorPluginVersion> - <topiaVersion>3.1.4</topiaVersion> + <topiaVersion>3.2-SNAPSHOT</topiaVersion> <jaxxVersion>2.36</jaxxVersion> <nuitonI18nVersion>3.6.2</nuitonI18nVersion> <nuitonValidatorVersion>3.0.1</nuitonValidatorVersion> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm