This is an automated email from the git hooks/post-receive script. New commit to branch feature/7676 in repository observe. See http://git.codelutin.com/observe.git commit 834865d84f00818fd627fc1bbf4856ed38249b9d Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Nov 4 11:12:52 2015 +0100 correction des decorateur pour l'utilisation des references (refs #7676) --- .../main/java/fr/ird/observe/ui/DecoratorService.java | 16 ++++------------ 1 file changed, 4 insertions(+), 12 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 492f6c0..279a9f0 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 @@ -444,9 +444,9 @@ public class DecoratorService extends DecoratorProvider { registerReferenceDtoDecorator(WindDto.class, "${code}$s##${label}$s##${speedRange}$s"); registerReferenceDtoDecorator(FloatingObjectDto.class, "DCP ${objectType/" + libelle + "}$s", "DCP ${objectType}$s", " - "); //FIXME Remove this - registerObserveDecorator(SetSeineDto.class, t("observe.common.setSeine")); + registerReferenceDtoDecorator(SetSeineDto.class, t("observe.common.setSeine")); //FIXME Remove this - registerObserveDecorator(SetLonglineDto.class, t("observe.common.setLongline")); + registerReferenceDtoDecorator(SetLonglineDto.class, t("observe.common.setLongline")); registerReferentialReferenceDtoDecorator(ObjectFateDto.class, libelle); registerReferentialReferenceDtoDecorator(OrganismDto.class, libelle); registerReferentialReferenceDtoDecorator(ObjectTypeDto.class, libelle); @@ -581,11 +581,9 @@ public class DecoratorService extends DecoratorProvider { registerObserveDecorator(SectionTemplate.class, "${id}$s##${floatlineLengths}$s", " "); - registerObserveDecorator(CatchLonglineDto.class, "${homeId}$s"); - registerDecorator(CatchLonglineDto.class.getSimpleName(), - new ReferenceDecorator("${homeId}$s")); + registerReferenceDtoDecorator(CatchLonglineDto.class, "${homeId}$s"); - registerObserveDecorator(TdrDto.class, "${homeId}$s"); + registerReferenceDtoDecorator(TdrDto.class, "${homeId}$s"); //FIXME how to decorate ? registerObserveDecorator(GearUseFeaturesMeasurementSeineDto.class, "${id}$s"); @@ -595,12 +593,6 @@ public class DecoratorService extends DecoratorProvider { "${encounterType}$s##${species}$s", " - "); - registerDecorator(SetSeineDto.class.getSimpleName(), - new ReferenceDecorator(t("observe.common.setSeine"))); - - - registerDecorator(SetLonglineDto.class.getSimpleName(), - new ReferenceDecorator(t("observe.common.setLongline"))); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.