branch feature/7676 updated (ee17139 -> 42cfc22)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7676 in repository observe. See http://git.codelutin.com/observe.git from ee17139 migration de l'action de validation (refs #7676) new 834865d correction des decorateur pour l'utilisation des references (refs #7676) new 42cfc22 deplacement du pakages GPS pour eviter un conflit avec les mêmes classes pour les DTO (refs #7676) The 2 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 42cfc22205ccea9655ba55b2d7af4cc5e40d1b7d Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Nov 4 11:15:45 2015 +0100 deplacement du pakages GPS pour eviter un conflit avec les mêmes classes pour les DTO (refs #7676) 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) Summary of changes: .../main/java/fr/ird/observe/ui/DecoratorService.java | 16 ++++------------ .../validator/entities/ActivitySimpleSpeedValidator.java | 4 ++-- .../validator/entities/ActivitySpeedValidator.java | 4 ++-- .../ird/observe/{business => entities}/gps/GPSPoint.java | 2 +- .../observe/{business => entities}/gps/GPSPointImpl.java | 2 +- .../{business => entities}/gps/GPSPointInterval.java | 2 +- .../{business => entities}/gps/GPSPointIntervalImpl.java | 2 +- .../ird/observe/{business => entities}/gps/GPSRoute.java | 2 +- .../observe/{business => entities}/gps/GPSRouteImpl.java | 2 +- .../observe/{business => entities}/gps/GpsPoints.java | 2 +- 10 files changed, 15 insertions(+), 23 deletions(-) rename observe-entities/src/main/java/fr/ird/observe/{business => entities}/gps/GPSPoint.java (98%) rename observe-entities/src/main/java/fr/ird/observe/{business => entities}/gps/GPSPointImpl.java (98%) rename observe-entities/src/main/java/fr/ird/observe/{business => entities}/gps/GPSPointInterval.java (99%) rename observe-entities/src/main/java/fr/ird/observe/{business => entities}/gps/GPSPointIntervalImpl.java (98%) rename observe-entities/src/main/java/fr/ird/observe/{business => entities}/gps/GPSRoute.java (99%) rename observe-entities/src/main/java/fr/ird/observe/{business => entities}/gps/GPSRouteImpl.java (99%) rename observe-entities/src/main/java/fr/ird/observe/{business => entities}/gps/GpsPoints.java (99%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
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>.
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 42cfc22205ccea9655ba55b2d7af4cc5e40d1b7d Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Nov 4 11:15:45 2015 +0100 deplacement du pakages GPS pour eviter un conflit avec les mêmes classes pour les DTO (refs #7676) --- .../validation/validator/entities/ActivitySimpleSpeedValidator.java | 4 ++-- .../observe/validation/validator/entities/ActivitySpeedValidator.java | 4 ++-- .../main/java/fr/ird/observe/{business => entities}/gps/GPSPoint.java | 2 +- .../java/fr/ird/observe/{business => entities}/gps/GPSPointImpl.java | 2 +- .../fr/ird/observe/{business => entities}/gps/GPSPointInterval.java | 2 +- .../ird/observe/{business => entities}/gps/GPSPointIntervalImpl.java | 2 +- .../main/java/fr/ird/observe/{business => entities}/gps/GPSRoute.java | 2 +- .../java/fr/ird/observe/{business => entities}/gps/GPSRouteImpl.java | 2 +- .../java/fr/ird/observe/{business => entities}/gps/GpsPoints.java | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/observe-entities-validation/src/main/java/fr/ird/observe/validation/validator/entities/ActivitySimpleSpeedValidator.java b/observe-entities-validation/src/main/java/fr/ird/observe/validation/validator/entities/ActivitySimpleSpeedValidator.java index ea0eeca..0dbfe0c 100644 --- a/observe-entities-validation/src/main/java/fr/ird/observe/validation/validator/entities/ActivitySimpleSpeedValidator.java +++ b/observe-entities-validation/src/main/java/fr/ird/observe/validation/validator/entities/ActivitySimpleSpeedValidator.java @@ -25,11 +25,11 @@ package fr.ird.observe.validation.validator.entities; import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.validator.ValidationException; import com.opensymphony.xwork2.validator.validators.FieldValidatorSupport; +import fr.ird.observe.entities.gps.GPSPoint; +import fr.ird.observe.entities.gps.GpsPoints; import fr.ird.observe.entities.seine.ActivitySeine; import fr.ird.observe.entities.seine.ActivitySeines; import fr.ird.observe.entities.seine.Route; -import fr.ird.observe.business.gps.GPSPoint; -import fr.ird.observe.business.gps.GpsPoints; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/observe-entities-validation/src/main/java/fr/ird/observe/validation/validator/entities/ActivitySpeedValidator.java b/observe-entities-validation/src/main/java/fr/ird/observe/validation/validator/entities/ActivitySpeedValidator.java index ed430e5..bfb68d2 100644 --- a/observe-entities-validation/src/main/java/fr/ird/observe/validation/validator/entities/ActivitySpeedValidator.java +++ b/observe-entities-validation/src/main/java/fr/ird/observe/validation/validator/entities/ActivitySpeedValidator.java @@ -25,10 +25,10 @@ package fr.ird.observe.validation.validator.entities; import com.opensymphony.xwork2.util.ValueStack; import com.opensymphony.xwork2.validator.ValidationException; import com.opensymphony.xwork2.validator.validators.FieldValidatorSupport; +import fr.ird.observe.entities.gps.GPSPoint; +import fr.ird.observe.entities.gps.GpsPoints; import fr.ird.observe.entities.seine.ActivitySeine; import fr.ird.observe.entities.seine.Route; -import fr.ird.observe.business.gps.GPSPoint; -import fr.ird.observe.business.gps.GpsPoints; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.validator.xwork2.field.CollectionFieldExpressionValidator; diff --git a/observe-entities/src/main/java/fr/ird/observe/business/gps/GPSPoint.java b/observe-entities/src/main/java/fr/ird/observe/entities/gps/GPSPoint.java similarity index 98% rename from observe-entities/src/main/java/fr/ird/observe/business/gps/GPSPoint.java rename to observe-entities/src/main/java/fr/ird/observe/entities/gps/GPSPoint.java index f7f88fc..47cd525 100644 --- a/observe-entities/src/main/java/fr/ird/observe/business/gps/GPSPoint.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/gps/GPSPoint.java @@ -1,4 +1,4 @@ -package fr.ird.observe.business.gps; +package fr.ird.observe.entities.gps; /* * #%L diff --git a/observe-entities/src/main/java/fr/ird/observe/business/gps/GPSPointImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/gps/GPSPointImpl.java similarity index 98% rename from observe-entities/src/main/java/fr/ird/observe/business/gps/GPSPointImpl.java rename to observe-entities/src/main/java/fr/ird/observe/entities/gps/GPSPointImpl.java index 9638bc7..1bd45a4 100644 --- a/observe-entities/src/main/java/fr/ird/observe/business/gps/GPSPointImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/gps/GPSPointImpl.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package fr.ird.observe.business.gps; +package fr.ird.observe.entities.gps; import fr.ird.observe.entities.GPSAble; import fr.ird.type.CoordinateHelper; diff --git a/observe-entities/src/main/java/fr/ird/observe/business/gps/GPSPointInterval.java b/observe-entities/src/main/java/fr/ird/observe/entities/gps/GPSPointInterval.java similarity index 99% rename from observe-entities/src/main/java/fr/ird/observe/business/gps/GPSPointInterval.java rename to observe-entities/src/main/java/fr/ird/observe/entities/gps/GPSPointInterval.java index f1f92d2..e6e6529 100644 --- a/observe-entities/src/main/java/fr/ird/observe/business/gps/GPSPointInterval.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/gps/GPSPointInterval.java @@ -1,4 +1,4 @@ -package fr.ird.observe.business.gps; +package fr.ird.observe.entities.gps; /* * #%L diff --git a/observe-entities/src/main/java/fr/ird/observe/business/gps/GPSPointIntervalImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/gps/GPSPointIntervalImpl.java similarity index 98% rename from observe-entities/src/main/java/fr/ird/observe/business/gps/GPSPointIntervalImpl.java rename to observe-entities/src/main/java/fr/ird/observe/entities/gps/GPSPointIntervalImpl.java index a1c22c7..b2bba23 100644 --- a/observe-entities/src/main/java/fr/ird/observe/business/gps/GPSPointIntervalImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/gps/GPSPointIntervalImpl.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package fr.ird.observe.business.gps; +package fr.ird.observe.entities.gps; import java.util.Date; diff --git a/observe-entities/src/main/java/fr/ird/observe/business/gps/GPSRoute.java b/observe-entities/src/main/java/fr/ird/observe/entities/gps/GPSRoute.java similarity index 99% rename from observe-entities/src/main/java/fr/ird/observe/business/gps/GPSRoute.java rename to observe-entities/src/main/java/fr/ird/observe/entities/gps/GPSRoute.java index 166ebd4..11aace9 100644 --- a/observe-entities/src/main/java/fr/ird/observe/business/gps/GPSRoute.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/gps/GPSRoute.java @@ -1,4 +1,4 @@ -package fr.ird.observe.business.gps; +package fr.ird.observe.entities.gps; /* * #%L diff --git a/observe-entities/src/main/java/fr/ird/observe/business/gps/GPSRouteImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/gps/GPSRouteImpl.java similarity index 99% rename from observe-entities/src/main/java/fr/ird/observe/business/gps/GPSRouteImpl.java rename to observe-entities/src/main/java/fr/ird/observe/entities/gps/GPSRouteImpl.java index 485c4e1..2e00f47 100644 --- a/observe-entities/src/main/java/fr/ird/observe/business/gps/GPSRouteImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/gps/GPSRouteImpl.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package fr.ird.observe.business.gps; +package fr.ird.observe.entities.gps; import java.util.Date; import java.util.List; diff --git a/observe-entities/src/main/java/fr/ird/observe/business/gps/GpsPoints.java b/observe-entities/src/main/java/fr/ird/observe/entities/gps/GpsPoints.java similarity index 99% rename from observe-entities/src/main/java/fr/ird/observe/business/gps/GpsPoints.java rename to observe-entities/src/main/java/fr/ird/observe/entities/gps/GpsPoints.java index cf55641..c957e00 100644 --- a/observe-entities/src/main/java/fr/ird/observe/business/gps/GpsPoints.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/gps/GpsPoints.java @@ -1,4 +1,4 @@ -package fr.ird.observe.business.gps; +package fr.ird.observe.entities.gps; /* * #%L -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm