This is an automated email from the git hooks/post-receive script. New commit to branch feature/7706 in repository observe. See http://git.codelutin.com/observe.git commit 8b4b0cd15f932cb812963b80f641a16fc19a448f Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Nov 9 17:14:45 2015 +0100 utilisation des decorateur pour les validateur vitesse d'activité (refs 7706) --- .../src/main/java/fr/ird/observe/ui/DecoratorService.java | 3 +++ .../validator/dto/ActivitySimpleSpeedDtoValidator.java | 10 ++++------ .../validation/validator/dto/ActivitySpeedDtoValidator.java | 7 +++---- 3 files changed, 10 insertions(+), 10 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 3b2ffcb..5d60408 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 @@ -100,6 +100,7 @@ import fr.ird.observe.services.dto.referential.seine.VesselActivitySeineDto; import fr.ird.observe.services.dto.referential.seine.WeightCategoryDto; import fr.ird.observe.services.dto.referential.seine.WindDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; +import fr.ird.observe.services.dto.seine.ActivitySeineStubDto; import fr.ird.observe.services.dto.seine.FloatingObjectDto; import fr.ird.observe.services.dto.seine.GearUseFeaturesMeasurementSeineDto; import fr.ird.observe.services.dto.seine.NonTargetCatchDto; @@ -428,6 +429,8 @@ public class DecoratorService extends DecoratorProvider { "${time}$tH:%1$tM##${vesselActivitySeine/label}$s", "${time}$tH:%1$tM##${vesselActivitySeine}$s", " - "); + registerObserveDecorator(ActivitySeineStubDto.class, "${time}$tH:%1$tM"); + registerReferenceDtoDecorator(ActivityLonglineDto.class, "${timeStamp}$td/%1$tm/%1$tY %1$tH:%1$tM##${vesselActivityLongline/label}$s", "${timeStamp}$td/%1$tm/%1$tY %1$tH:%1$tM##${vesselActivityLongline}$s", diff --git a/observe-application-swing/src/main/java/fr/ird/observe/validation/validator/dto/ActivitySimpleSpeedDtoValidator.java b/observe-application-swing/src/main/java/fr/ird/observe/validation/validator/dto/ActivitySimpleSpeedDtoValidator.java index 6dc48f7..b8e0e9e 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/validation/validator/dto/ActivitySimpleSpeedDtoValidator.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/validation/validator/dto/ActivitySimpleSpeedDtoValidator.java @@ -25,6 +25,7 @@ package fr.ird.observe.validation.validator.dto; import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.validator.ValidationException; import com.opensymphony.xwork2.validator.validators.FieldValidatorSupport; +import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.gps.GPSPoint; import fr.ird.observe.business.gps.GpsPoints; import fr.ird.observe.services.dto.seine.ActivitySeineDto; @@ -170,19 +171,16 @@ public class ActivitySimpleSpeedDtoValidator extends FieldValidatorSupport { return "activitySimpleSpeed"; } - //FIXME protected String decorate(ActivitySeineDto activitySeine) { - return activitySeine.toString(); + return ObserveSwingApplicationContext.get().getDecorator(ActivitySeineDto.class).toString(activitySeine); } - //FIXME protected String decorate(ActivitySeineStubDto activitySeine) { - return activitySeine.toString(); + return ObserveSwingApplicationContext.get().getDecorator(ActivitySeineStubDto.class).toString(activitySeine); } - //FIXME protected String decorate(GPSPoint currentPoint) { - return currentPoint.toString(); + return ObserveSwingApplicationContext.get().getDecorator(GPSPoint.class).toString(currentPoint); } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/validation/validator/dto/ActivitySpeedDtoValidator.java b/observe-application-swing/src/main/java/fr/ird/observe/validation/validator/dto/ActivitySpeedDtoValidator.java index 0b0149e..7347e57 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/validation/validator/dto/ActivitySpeedDtoValidator.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/validation/validator/dto/ActivitySpeedDtoValidator.java @@ -25,6 +25,7 @@ package fr.ird.observe.validation.validator.dto; import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.validator.ValidationException; import com.opensymphony.xwork2.validator.validators.FieldValidatorSupport; +import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.gps.GPSPoint; import fr.ird.observe.business.gps.GpsPoints; import fr.ird.observe.services.dto.seine.ActivitySeineStubDto; @@ -96,14 +97,12 @@ public class ActivitySpeedDtoValidator extends FieldValidatorSupport { return invalidActivity; } - //FIXME protected String decorate(ActivitySeineStubDto activitySeine) { - return activitySeine.toString(); + return ObserveSwingApplicationContext.get().getDecorator(ActivitySeineStubDto.class).toString(activitySeine); } - //FIXME protected String decorate(GPSPoint currentPoint) { - return currentPoint.toString(); + return ObserveSwingApplicationContext.get().getDecorator(GPSPoint.class).toString(currentPoint); } public CollectionFieldExpressionValidator getDelegate(final RouteDto route) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.