This is an automated email from the git hooks/post-receive script. New commit to branch feature/7493_corrige_action_validation_serveur_distant in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit c6ae8f1d81e3174d39ddc34815d9eead583c47c5 Author: Samuel Maisonneuve <maisonneuve@codelutin.com> Date: Fri Aug 19 14:30:20 2016 +0200 Corrige l'enregistrement de decorateur de type DataDto On a besoin d'un DataReferenceDecorateur pour l'interface de validation des données refs #7493 --- .../observe/application/swing/decoration/DecoratorService.java | 8 ++++---- .../services/dto/reference/DataReferenceSetDefinitions.java | 3 +++ .../ird/observe/services/binder/data/TransmittingBuoyBinder.java | 8 ++++++-- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java b/observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java index 0706a18..75c343f 100644 --- a/observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java +++ b/observe-application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java @@ -515,8 +515,8 @@ public class DecoratorService extends DecoratorProvider { "${species/scientificLabel}$s##${length}$f##${count}$d", "${species}$s##${length}$f##${count}$d"); - registerObserveDecorator(TransmittingBuoyDto.class, - "${transmittingBuoyType/label}$s##${transmittingBuoyOperation/label}$s##${code}$s"); + registerDataAndDataReferenceDecorator(TransmittingBuoyDto.class, + "${transmittingBuoyType/label}$s##${transmittingBuoyOperation/label}$s##${code}$s"); registerDataAndDataReferenceDecorator(FloatingObjectDto.class, "DCP ${objectType/" + libelle + "}$s", "DCP ${objectType}$s", " - "); @@ -569,7 +569,7 @@ public class DecoratorService extends DecoratorProvider { registerDataAndDataReferenceDecorator(TdrDto.class, "${homeId}$s"); //FIXME how to decorate ? - registerObserveDecorator(GearUseFeaturesMeasurementSeineDto.class, "${id}$s"); + registerDataAndDataReferenceDecorator(GearUseFeaturesMeasurementSeineDto.class, "${id}$s"); registerDataAndDataReferenceDecorator(EncounterDto.class, "${encounterType/label}$s##${species/label}$s", @@ -648,7 +648,7 @@ public class DecoratorService extends DecoratorProvider { protected <T extends IdDto> void registerDataAndDataReferenceDecorator(Class<T> referenceType, String expression, String referenceExpression) { registerDataReferenceDecorator(referenceType, referenceExpression); - registerObserveDecorator(referenceType, referenceExpression, " "); + registerObserveDecorator(referenceType, expression, " "); } protected <T extends IdDto> void registerDataAndDataReferenceDecorator(Class<T> referenceType, String expression, String referenceExpression, String separator) { diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java index 5817d7e..ff07bc4 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java @@ -33,6 +33,7 @@ import fr.ird.observe.services.dto.longline.EncounterDto; import fr.ird.observe.services.dto.longline.SectionDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; +import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.FloatingObjectDto; import fr.ird.observe.services.dto.seine.NonTargetCatchDto; @@ -106,6 +107,8 @@ public enum DataReferenceSetDefinitions { TRANSMITTING_BUYO(newDefinitionBuilder(TransmittingBuoyDto.class) .addProperty(String.class, TransmittingBuoyDto.PROPERTY_CODE) .addProperty(String.class, TransmittingBuoyDto.PROPERTY_BRAND) + .addProperty(ReferentialReference.class, TransmittingBuoyDto.PROPERTY_TRANSMITTING_BUOY_TYPE) + .addProperty(ReferentialReference.class, TransmittingBuoyDto.PROPERTY_TRANSMITTING_BUOY_OPERATION) ), diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TransmittingBuoyBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TransmittingBuoyBinder.java index b2ccc3b..678c1d5 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TransmittingBuoyBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/TransmittingBuoyBinder.java @@ -74,12 +74,16 @@ public class TransmittingBuoyBinder extends DataBinderSupport<TransmittingBuoy, @Override public DataReference<TransmittingBuoyDto> toDataReference(ReferentialLocale referentialLocale, TransmittingBuoy entity) { - return toDataReference(entity, entity.getCode(), entity.getBrand()); + return toDataReference(entity, + entity.getCode(), + entity.getBrand(), + toReferentialReference(referentialLocale, entity.getTransmittingBuoyType(), TransmittingBuoyTypeDto.class), + toReferentialReference(referentialLocale, entity.getTransmittingBuoyOperation(), TransmittingBuoyOperationDto.class)); } @Override public DataReference<TransmittingBuoyDto> toDataReference(ReferentialLocale referentialLocale, TransmittingBuoyDto dto) { - return toDataReference(dto, dto.getCode(), dto.getBrand()); + return toDataReference(dto, dto.getCode(), dto.getBrand(), dto.getTransmittingBuoyType(), dto.getTransmittingBuoyOperation()); } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.