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 ccaa408b44b591c5b19e8db2c92db9ab1be4bc24 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Mar 7 09:10:14 2016 +0100 Retirer l'ancien code dans la décoration d'une espèce (See #7995) (report version 5) --- .../src/main/java/fr/ird/observe/ui/DecoratorService.java | 7 +++---- .../java/fr/ird/observe/ui/util/decorator/SpeciesDecorator.java | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/DecoratorService.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/DecoratorService.java index c5e06b7..7467f9f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/DecoratorService.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/DecoratorService.java @@ -426,10 +426,9 @@ public class DecoratorService extends DecoratorProvider { registerReferentialAndReferentialReferenceDecorator(SensorBrandDto.class, "${code}$s##${brandName}$s"); registerReferentialAndReferentialReferenceDecorator(HarbourDto.class, "${code}$s##${name}$s##${locode}$s"); // Species decorator - String oldCode = l(locale, "observe.common.oldCode3L"); - registerDecorator(new SpeciesDecorator(oldCode)); - registerReferentialReferenceDecorator(SpeciesDto.class, - "${faoCode}$s##${scientificLabel}$s##" + oldCode + " ${homeId}$s"); + registerDecorator(new SpeciesDecorator()); + registerReferentialReferenceDecorator(SpeciesDto.class, "${faoCode}$s##${scientificLabel}$s"); + // LengthWeightParameter decorator registerDecorator(new LengthWeightParameterDecorator()); registerReferentialReferenceDecorator(LengthWeightParameterDto.class, diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/decorator/SpeciesDecorator.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/decorator/SpeciesDecorator.java index deaa492..6b7716a 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/util/decorator/SpeciesDecorator.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/util/decorator/SpeciesDecorator.java @@ -47,9 +47,9 @@ public class SpeciesDecorator extends ObserveDecorator<SpeciesDto> { } - public SpeciesDecorator(String oldCode) { + public SpeciesDecorator() { super(SpeciesDto.class, - "${faoCode}$s##${scientificLabel}$s##" + oldCode + " ${homeId}$s" + "${faoCode}$s##${scientificLabel}$s" ); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.