This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 250042d93ed6c9d2a75d68d994bcac5e225a5e2c Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Sep 8 12:08:01 2015 +0200 renommer les propriétées dans le context de validation (refs #7463) --- .../field/ActivityDebutDePecheSaneValidator.java | 4 +- .../field/ActivityFinDePecheSaneValidator.java | 4 +- .../field/ActivityFinDeVeilleExistsValidator.java | 4 +- .../field/ActivitySimpleSpeedValidator.java | 2 +- .../field/RouteActivitysFieldValidator.java | 4 +- .../field/SetLonglineUniqueHomeIdValidator.java | 2 +- .../field/SetLonglineUniqueNumberValidator.java | 2 +- .../field/VesselActivityFieldValidator.java | 8 +- ...ActivityLongline-n1-create-error-validation.xml | 12 +- ...ActivityLongline-n1-update-error-validation.xml | 10 +- .../SetLongline-n1-create-error-validation.xml | 40 +++---- .../SetLongline-n1-update-error-validation.xml | 40 +++---- .../ActivitySeine-n1-create-error-validation.xml | 12 +- .../ActivitySeine-n1-update-error-validation.xml | 12 +- .../seine/Route-n1-create-error-validation.xml | 6 +- .../seine/Route-n1-create-warning-validation.xml | 2 +- .../seine/Route-n1-update-error-validation.xml | 16 +-- .../seine/Route-n1-update-warning-validation.xml | 2 +- .../seine/SetSeine-n1-create-error-validation.xml | 6 +- .../seine/SetSeine-n1-update-error-validation.xml | 8 +- .../actions/validate/ValidationDataContext.java | 124 ++++++++++----------- .../validate/ValidationMessageDetector.java | 32 +++--- 22 files changed, 176 insertions(+), 176 deletions(-) diff --git a/observe-entities-validation/src/main/java/fr/ird/observe/validation/field/ActivityDebutDePecheSaneValidator.java b/observe-entities-validation/src/main/java/fr/ird/observe/validation/field/ActivityDebutDePecheSaneValidator.java index db12299..2fe6270 100644 --- a/observe-entities-validation/src/main/java/fr/ird/observe/validation/field/ActivityDebutDePecheSaneValidator.java +++ b/observe-entities-validation/src/main/java/fr/ird/observe/validation/field/ActivityDebutDePecheSaneValidator.java @@ -118,11 +118,11 @@ public class ActivityDebutDePecheSaneValidator extends FieldValidatorSupport { // activité (de caléé positive) qui n'est pas suivi d'une activité // de fin de pêche - Route route = (Route) stack.findValue("currentRoute"); + Route route = (Route) stack.findValue("routeEntity"); if (route == null) { if (log.isWarnEnabled()) { - log.warn("COULD NOT FIND DATA CONTEXT! [currentRoute]"); + log.warn("COULD NOT FIND DATA CONTEXT! [routeEntity]"); } return; } diff --git a/observe-entities-validation/src/main/java/fr/ird/observe/validation/field/ActivityFinDePecheSaneValidator.java b/observe-entities-validation/src/main/java/fr/ird/observe/validation/field/ActivityFinDePecheSaneValidator.java index 93d77c6..3bfc206 100644 --- a/observe-entities-validation/src/main/java/fr/ird/observe/validation/field/ActivityFinDePecheSaneValidator.java +++ b/observe-entities-validation/src/main/java/fr/ird/observe/validation/field/ActivityFinDePecheSaneValidator.java @@ -119,11 +119,11 @@ public class ActivityFinDePecheSaneValidator extends FieldValidatorSupport { // activité (de caléé positive) qui n'est pas suivi d'une activité // de fin de pêche - Route route = (Route) stack.findValue("currentRoute"); + Route route = (Route) stack.findValue("routeEntity"); if (route == null) { if (log.isWarnEnabled()) { - log.warn("COULD NOT FIND DATA CONTEXT! [currentRoute]"); + log.warn("COULD NOT FIND DATA CONTEXT! [routeEntity]"); } return; } diff --git a/observe-entities-validation/src/main/java/fr/ird/observe/validation/field/ActivityFinDeVeilleExistsValidator.java b/observe-entities-validation/src/main/java/fr/ird/observe/validation/field/ActivityFinDeVeilleExistsValidator.java index 43b1ad2..aa6c017 100644 --- a/observe-entities-validation/src/main/java/fr/ird/observe/validation/field/ActivityFinDeVeilleExistsValidator.java +++ b/observe-entities-validation/src/main/java/fr/ird/observe/validation/field/ActivityFinDeVeilleExistsValidator.java @@ -142,11 +142,11 @@ public class ActivityFinDeVeilleExistsValidator extends FieldValidatorSupport { // on doit vérifier qu'il n'existe pas déjà une autre activité de // fin de veille - Route route = (Route) stack.findValue("currentRoute"); + Route route = (Route) stack.findValue("routeEntity"); if (route == null) { if (log.isWarnEnabled()) { - log.warn("COULD NOT FIND DATA CONTEXT! [currentRoute]"); + log.warn("COULD NOT FIND DATA CONTEXT! [routeEntity]"); } return; } diff --git a/observe-entities-validation/src/main/java/fr/ird/observe/validation/field/ActivitySimpleSpeedValidator.java b/observe-entities-validation/src/main/java/fr/ird/observe/validation/field/ActivitySimpleSpeedValidator.java index 8750114..349dcf2 100644 --- a/observe-entities-validation/src/main/java/fr/ird/observe/validation/field/ActivitySimpleSpeedValidator.java +++ b/observe-entities-validation/src/main/java/fr/ird/observe/validation/field/ActivitySimpleSpeedValidator.java @@ -123,7 +123,7 @@ public class ActivitySimpleSpeedValidator extends FieldValidatorSupport { return; } - Route route = (Route) stack.findValue("currentRoute"); + Route route = (Route) stack.findValue("routeEntity"); ActivitySeine previousActivity = ActivitySeines.getPreviousActivity(route, activity); diff --git a/observe-entities-validation/src/main/java/fr/ird/observe/validation/field/RouteActivitysFieldValidator.java b/observe-entities-validation/src/main/java/fr/ird/observe/validation/field/RouteActivitysFieldValidator.java index 7a78f02..d7d77b9 100644 --- a/observe-entities-validation/src/main/java/fr/ird/observe/validation/field/RouteActivitysFieldValidator.java +++ b/observe-entities-validation/src/main/java/fr/ird/observe/validation/field/RouteActivitysFieldValidator.java @@ -102,11 +102,11 @@ public class RouteActivitysFieldValidator extends FieldValidatorSupport { // en profondeur (alors que celle offerte par l 'objet est celle de l'ui // et qu'elle est déconnectée de la base ). - Route route = (Route) stack.findValue("currentRoute"); + Route route = (Route) stack.findValue("routeEntity"); if (route == null) { if (log.isWarnEnabled()) { - log.warn("COULD NOT FIND DATA CONTEXT! [currentRoute]"); + log.warn("COULD NOT FIND DATA CONTEXT! [routeEntity]"); } return; } diff --git a/observe-entities-validation/src/main/java/fr/ird/observe/validation/field/SetLonglineUniqueHomeIdValidator.java b/observe-entities-validation/src/main/java/fr/ird/observe/validation/field/SetLonglineUniqueHomeIdValidator.java index 18b4244..6079072 100644 --- a/observe-entities-validation/src/main/java/fr/ird/observe/validation/field/SetLonglineUniqueHomeIdValidator.java +++ b/observe-entities-validation/src/main/java/fr/ird/observe/validation/field/SetLonglineUniqueHomeIdValidator.java @@ -56,7 +56,7 @@ public class SetLonglineUniqueHomeIdValidator extends FieldValidatorSupport { String setLonglineTopiaId = setLongline.getTopiaId(); - TripLongline tripLongline = (TripLongline) stack.findValue("currentTrip"); + TripLongline tripLongline = (TripLongline) stack.findValue("TripEntity"); Set<ActivityLongline> activityLonglines = tripLongline.getActivityLongline(); diff --git a/observe-entities-validation/src/main/java/fr/ird/observe/validation/field/SetLonglineUniqueNumberValidator.java b/observe-entities-validation/src/main/java/fr/ird/observe/validation/field/SetLonglineUniqueNumberValidator.java index 90005bd..2eb83f4 100644 --- a/observe-entities-validation/src/main/java/fr/ird/observe/validation/field/SetLonglineUniqueNumberValidator.java +++ b/observe-entities-validation/src/main/java/fr/ird/observe/validation/field/SetLonglineUniqueNumberValidator.java @@ -56,7 +56,7 @@ public class SetLonglineUniqueNumberValidator extends FieldValidatorSupport { String setLonglineTopiaId = setLongline.getTopiaId(); - TripLongline tripLongline = (TripLongline) stack.findValue("currentTrip"); + TripLongline tripLongline = (TripLongline) stack.findValue("tripEntity"); Set<ActivityLongline> activityLonglines = tripLongline.getActivityLongline(); diff --git a/observe-entities-validation/src/main/java/fr/ird/observe/validation/field/VesselActivityFieldValidator.java b/observe-entities-validation/src/main/java/fr/ird/observe/validation/field/VesselActivityFieldValidator.java index 1aa0c90..de01693 100644 --- a/observe-entities-validation/src/main/java/fr/ird/observe/validation/field/VesselActivityFieldValidator.java +++ b/observe-entities-validation/src/main/java/fr/ird/observe/validation/field/VesselActivityFieldValidator.java @@ -125,20 +125,20 @@ public class VesselActivityFieldValidator extends FieldValidatorSupport { boolean valid = true; - TripSeine maree = (TripSeine) stack.findValue("currentMaree"); + TripSeine maree = (TripSeine) stack.findValue("tripEntity"); if (maree == null) { - log.warn("COULD NOT FIND DATA CONTEXT! [currentTrip]"); + log.warn("COULD NOT FIND DATA CONTEXT! [tripEntity]"); return; } if (log.isDebugEnabled()) { log.debug("maree : " + maree); } - Route route = (Route) stack.findValue("currentRoute"); + Route route = (Route) stack.findValue("routeEntity"); if (route == null) { - log.warn("COULD NOT FIND DATA CONTEXT! [currentRoute]"); + log.warn("COULD NOT FIND DATA CONTEXT! [routeEntity]"); return; } if (log.isDebugEnabled()) { diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-n1-create-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-n1-create-error-validation.xml index 7e9d99e..59ea2d5 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-n1-create-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-n1-create-error-validation.xml @@ -63,7 +63,7 @@ <!--field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> <![CDATA[ - currentRoute.isTimeAvailable(topiaId, time) + routeEntity.isTimeAvailable(topiaId, time) ]]> </param> <message>validator.activity.duplicated.time</message> @@ -86,14 +86,14 @@ <!-- coherence quadrant par rapport a l'ocean de la maree --> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"><![CDATA[ - currentTripLongline.ocean == null || quadrant == null || quadrant == 0 - || (currentTripLongline.ocean.code == 3) - || (currentTripLongline.ocean.code == 1 && ( quadrant == 1 || quadrant == 2 || quadrant == 3 || quadrant == 4)) - || (currentTripLongline.ocean.code == 2 && ( quadrant == 1 || quadrant == 2)) + tripLonglineEntity.ocean == null || quadrant == null || quadrant == 0 + || (tripLonglineEntity.ocean.code == 3) + || (tripLonglineEntity.ocean.code == 1 && ( quadrant == 1 || quadrant == 2 || quadrant == 3 || quadrant == 4)) + || (tripLonglineEntity.ocean.code == 2 && ( quadrant == 1 || quadrant == 2)) ]]> </param> <message> - validator.activity.invalid.quadrant##${currentTripLongline.ocean.libelle} + validator.activity.invalid.quadrant##${tripLonglineEntity.ocean.libelle} </message> </field-validator> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-n1-update-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-n1-update-error-validation.xml index f5a164b..c199ffb 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-n1-update-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-n1-update-error-validation.xml @@ -71,14 +71,14 @@ <!-- coherence quadrant par rapport a l'ocean de la maree --> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"><![CDATA[ - currentTripLongline.ocean == null || quadrant == null || quadrant == 0 - || (currentTripLongline.ocean.code == 3) - || (currentTripLongline.ocean.code == 1 && ( quadrant == 1 || quadrant == 2 || quadrant == 3 || quadrant == 4)) - || (currentTripLongline.ocean.code == 2 && ( quadrant == 1 || quadrant == 2)) + tripLonglineEntity.ocean == null || quadrant == null || quadrant == 0 + || (tripLonglineEntity.ocean.code == 3) + || (tripLonglineEntity.ocean.code == 1 && ( quadrant == 1 || quadrant == 2 || quadrant == 3 || quadrant == 4)) + || (tripLonglineEntity.ocean.code == 2 && ( quadrant == 1 || quadrant == 2)) ]]> </param> <message> - validator.activity.invalid.quadrant##${currentTripLongline.ocean.libelle} + validator.activity.invalid.quadrant##${tripLonglineEntity.ocean.libelle} </message> </field-validator> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-create-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-create-error-validation.xml index 81721e9..19fb1fd 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-create-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-create-error-validation.xml @@ -227,14 +227,14 @@ <!-- coherence quadrant par rapport a l'ocean de la maree --> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"><![CDATA[ - currentTripLongline.ocean == null || settingStartQuadrant == null || settingStartQuadrant == 0 - || (currentTripLongline.ocean.code == 3) - || (currentTripLongline.ocean.code == 1 && ( settingStartQuadrant == 1 || settingStartQuadrant == 2 || settingStartQuadrant == 3 || settingStartQuadrant == 4)) - || (currentTripLongline.ocean.code == 2 && ( settingStartQuadrant == 1 || settingStartQuadrant == 2)) + tripLonglineEntity.ocean == null || settingStartQuadrant == null || settingStartQuadrant == 0 + || (tripLonglineEntity.ocean.code == 3) + || (tripLonglineEntity.ocean.code == 1 && ( settingStartQuadrant == 1 || settingStartQuadrant == 2 || settingStartQuadrant == 3 || settingStartQuadrant == 4)) + || (tripLonglineEntity.ocean.code == 2 && ( settingStartQuadrant == 1 || settingStartQuadrant == 2)) ]]> </param> <message> - validator.setLongline.invalid.settingStartQuadrant##${currentTripLongline.ocean.libelle} + validator.setLongline.invalid.settingStartQuadrant##${tripLonglineEntity.ocean.libelle} </message> </field-validator> @@ -249,14 +249,14 @@ <!-- coherence quadrant par rapport a l'ocean de la maree --> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"><![CDATA[ - currentTripLongline.ocean == null || settingEndQuadrant == null || settingEndQuadrant == 0 - || (currentTripLongline.ocean.code == 3) - || (currentTripLongline.ocean.code == 1 && ( settingEndQuadrant == 1 || settingEndQuadrant == 2 || settingEndQuadrant == 3 || settingEndQuadrant == 4)) - || (currentTripLongline.ocean.code == 2 && ( settingEndQuadrant == 1 || settingEndQuadrant == 2)) + tripLonglineEntity.ocean == null || settingEndQuadrant == null || settingEndQuadrant == 0 + || (tripLonglineEntity.ocean.code == 3) + || (tripLonglineEntity.ocean.code == 1 && ( settingEndQuadrant == 1 || settingEndQuadrant == 2 || settingEndQuadrant == 3 || settingEndQuadrant == 4)) + || (tripLonglineEntity.ocean.code == 2 && ( settingEndQuadrant == 1 || settingEndQuadrant == 2)) ]]> </param> <message> - validator.setLongline.invalid.settingEndQuadrant##${currentTripLongline.ocean.libelle} + validator.setLongline.invalid.settingEndQuadrant##${tripLonglineEntity.ocean.libelle} </message> </field-validator> @@ -272,14 +272,14 @@ <!-- coherence quadrant par rapport a l'ocean de la maree --> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"><![CDATA[ - currentTripLongline.ocean == null || haulingStartQuadrant == null || haulingStartQuadrant == 0 - || (currentTripLongline.ocean.code == 3) - || (currentTripLongline.ocean.code == 1 && ( haulingStartQuadrant == 1 || haulingStartQuadrant == 2 || haulingStartQuadrant == 3 || haulingStartQuadrant == 4)) - || (currentTripLongline.ocean.code == 2 && ( haulingStartQuadrant == 1 || haulingStartQuadrant == 2)) + tripLonglineEntity.ocean == null || haulingStartQuadrant == null || haulingStartQuadrant == 0 + || (tripLonglineEntity.ocean.code == 3) + || (tripLonglineEntity.ocean.code == 1 && ( haulingStartQuadrant == 1 || haulingStartQuadrant == 2 || haulingStartQuadrant == 3 || haulingStartQuadrant == 4)) + || (tripLonglineEntity.ocean.code == 2 && ( haulingStartQuadrant == 1 || haulingStartQuadrant == 2)) ]]> </param> <message> - validator.setLongline.invalid.haulingStartQuadrant##${currentTripLongline.ocean.libelle} + validator.setLongline.invalid.haulingStartQuadrant##${tripLonglineEntity.ocean.libelle} </message> </field-validator> @@ -294,14 +294,14 @@ <!-- coherence quadrant par rapport a l'ocean de la maree --> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"><![CDATA[ - currentTripLongline.ocean == null || haulingEndQuadrant == null || haulingEndQuadrant == 0 - || (currentTripLongline.ocean.code == 3) - || (currentTripLongline.ocean.code == 1 && ( haulingEndQuadrant == 1 || haulingEndQuadrant == 2 || haulingEndQuadrant == 3 || haulingEndQuadrant == 4)) - || (currentTripLongline.ocean.code == 2 && ( haulingEndQuadrant == 1 || haulingEndQuadrant == 2)) + tripLonglineEntity.ocean == null || haulingEndQuadrant == null || haulingEndQuadrant == 0 + || (tripLonglineEntity.ocean.code == 3) + || (tripLonglineEntity.ocean.code == 1 && ( haulingEndQuadrant == 1 || haulingEndQuadrant == 2 || haulingEndQuadrant == 3 || haulingEndQuadrant == 4)) + || (tripLonglineEntity.ocean.code == 2 && ( haulingEndQuadrant == 1 || haulingEndQuadrant == 2)) ]]> </param> <message> - validator.setLongline.invalid.haulingEndQuadrant##${currentTripLongline.ocean.libelle} + validator.setLongline.invalid.haulingEndQuadrant##${tripLonglineEntity.ocean.libelle} </message> </field-validator> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-update-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-update-error-validation.xml index 66ce39d..81d0220 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-update-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-update-error-validation.xml @@ -227,14 +227,14 @@ <!-- coherence quadrant par rapport a l'ocean de la maree --> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"><![CDATA[ - currentTripLongline.ocean == null || settingStartQuadrant == null || settingStartQuadrant == 0 - || (currentTripLongline.ocean.code == 3) - || (currentTripLongline.ocean.code == 1 && ( settingStartQuadrant == 1 || settingStartQuadrant == 2 || settingStartQuadrant == 3 || settingStartQuadrant == 4)) - || (currentTripLongline.ocean.code == 2 && ( settingStartQuadrant == 1 || settingStartQuadrant == 2)) + tripLonglineEntity.ocean == null || settingStartQuadrant == null || settingStartQuadrant == 0 + || (tripLonglineEntity.ocean.code == 3) + || (tripLonglineEntity.ocean.code == 1 && ( settingStartQuadrant == 1 || settingStartQuadrant == 2 || settingStartQuadrant == 3 || settingStartQuadrant == 4)) + || (tripLonglineEntity.ocean.code == 2 && ( settingStartQuadrant == 1 || settingStartQuadrant == 2)) ]]> </param> <message> - validator.setLongline.invalid.settingStartQuadrant##${currentTripLongline.ocean.libelle} + validator.setLongline.invalid.settingStartQuadrant##${tripLonglineEntity.ocean.libelle} </message> </field-validator> @@ -249,14 +249,14 @@ <!-- coherence quadrant par rapport a l'ocean de la maree --> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"><![CDATA[ - currentTripLongline.ocean == null || settingEndQuadrant == null || settingEndQuadrant == 0 - || (currentTripLongline.ocean.code == 3) - || (currentTripLongline.ocean.code == 1 && ( settingEndQuadrant == 1 || settingEndQuadrant == 2 || settingEndQuadrant == 3 || settingEndQuadrant == 4)) - || (currentTripLongline.ocean.code == 2 && ( settingEndQuadrant == 1 || settingEndQuadrant == 2)) + tripLonglineEntity.ocean == null || settingEndQuadrant == null || settingEndQuadrant == 0 + || (tripLonglineEntity.ocean.code == 3) + || (tripLonglineEntity.ocean.code == 1 && ( settingEndQuadrant == 1 || settingEndQuadrant == 2 || settingEndQuadrant == 3 || settingEndQuadrant == 4)) + || (tripLonglineEntity.ocean.code == 2 && ( settingEndQuadrant == 1 || settingEndQuadrant == 2)) ]]> </param> <message> - validator.setLongline.invalid.settingEndQuadrant##${currentTripLongline.ocean.libelle} + validator.setLongline.invalid.settingEndQuadrant##${tripLonglineEntity.ocean.libelle} </message> </field-validator> @@ -272,14 +272,14 @@ <!-- coherence quadrant par rapport a l'ocean de la maree --> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"><![CDATA[ - currentTripLongline.ocean == null || haulingStartQuadrant == null || haulingStartQuadrant == 0 - || (currentTripLongline.ocean.code == 3) - || (currentTripLongline.ocean.code == 1 && ( haulingStartQuadrant == 1 || haulingStartQuadrant == 2 || haulingStartQuadrant == 3 || haulingStartQuadrant == 4)) - || (currentTripLongline.ocean.code == 2 && ( haulingStartQuadrant == 1 || haulingStartQuadrant == 2)) + tripLonglineEntity.ocean == null || haulingStartQuadrant == null || haulingStartQuadrant == 0 + || (tripLonglineEntity.ocean.code == 3) + || (tripLonglineEntity.ocean.code == 1 && ( haulingStartQuadrant == 1 || haulingStartQuadrant == 2 || haulingStartQuadrant == 3 || haulingStartQuadrant == 4)) + || (tripLonglineEntity.ocean.code == 2 && ( haulingStartQuadrant == 1 || haulingStartQuadrant == 2)) ]]> </param> <message> - validator.setLongline.invalid.haulingStartQuadrant##${currentTripLongline.ocean.libelle} + validator.setLongline.invalid.haulingStartQuadrant##${tripLonglineEntity.ocean.libelle} </message> </field-validator> @@ -294,14 +294,14 @@ <!-- coherence quadrant par rapport a l'ocean de la maree --> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"><![CDATA[ - currentTripLongline.ocean == null || haulingEndQuadrant == null || haulingEndQuadrant == 0 - || (currentTripLongline.ocean.code == 3) - || (currentTripLongline.ocean.code == 1 && ( haulingEndQuadrant == 1 || haulingEndQuadrant == 2 || haulingEndQuadrant == 3 || haulingEndQuadrant == 4)) - || (currentTripLongline.ocean.code == 2 && ( haulingEndQuadrant == 1 || haulingEndQuadrant == 2)) + tripLonglineEntity.ocean == null || haulingEndQuadrant == null || haulingEndQuadrant == 0 + || (tripLonglineEntity.ocean.code == 3) + || (tripLonglineEntity.ocean.code == 1 && ( haulingEndQuadrant == 1 || haulingEndQuadrant == 2 || haulingEndQuadrant == 3 || haulingEndQuadrant == 4)) + || (tripLonglineEntity.ocean.code == 2 && ( haulingEndQuadrant == 1 || haulingEndQuadrant == 2)) ]]> </param> <message> - validator.setLongline.invalid.haulingEndQuadrant##${currentTripLongline.ocean.libelle} + validator.setLongline.invalid.haulingEndQuadrant##${tripLonglineEntity.ocean.libelle} </message> </field-validator> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-n1-create-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-n1-create-error-validation.xml index eaab4b5..f62c9e9 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-n1-create-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-n1-create-error-validation.xml @@ -155,7 +155,7 @@ <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> <![CDATA[ - currentRoute.isTimeAvailable(topiaId, time) + routeEntity.isTimeAvailable(topiaId, time) ]]> </param> <message>validator.activity.duplicated.time</message> @@ -173,14 +173,14 @@ <!-- coherence quadrant par rapport a l'ocean de la maree --> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"><![CDATA[ - currentTripSeine.ocean == null || quadrant == null || quadrant == 0 - || (currentTripSeine.ocean.code == 3) - || (currentTripSeine.ocean.code == 1 && ( quadrant == 1 || quadrant == 2 || quadrant == 3 || quadrant == 4)) - || (currentTripSeine.ocean.code == 2 && ( quadrant == 1 || quadrant == 2)) + tripSeineEntity.ocean == null || quadrant == null || quadrant == 0 + || (tripSeineEntity.ocean.code == 3) + || (tripSeineEntity.ocean.code == 1 && ( quadrant == 1 || quadrant == 2 || quadrant == 3 || quadrant == 4)) + || (tripSeineEntity.ocean.code == 2 && ( quadrant == 1 || quadrant == 2)) ]]> </param> <message> - validator.activity.invalid.quadrant##${currentTripSeine.ocean.libelle} + validator.activity.invalid.quadrant##${tripSeineEntity.ocean.libelle} </message> </field-validator> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-n1-update-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-n1-update-error-validation.xml index c7517d2..05c051e 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-n1-update-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-n1-update-error-validation.xml @@ -36,14 +36,14 @@ <!-- coherence quadrant par rapport a l'ocean de la maree --> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"><![CDATA[ - quadrant == null || quadrant == 0 || currentTripSeine.ocean == null - || (currentTripSeine.ocean.code == 3) - || (currentTripSeine.ocean.code == 1 && ( quadrant == 1 || quadrant == 2 || quadrant == 3 || quadrant == 4)) - || (currentTripSeine.ocean.code == 2 && ( quadrant == 1 || quadrant == 2)) + quadrant == null || quadrant == 0 || tripSeineEntity.ocean == null + || (tripSeineEntity.ocean.code == 3) + || (tripSeineEntity.ocean.code == 1 && ( quadrant == 1 || quadrant == 2 || quadrant == 3 || quadrant == 4)) + || (tripSeineEntity.ocean.code == 2 && ( quadrant == 1 || quadrant == 2)) ]]> </param> <message> - validator.activity.invalid.quadrant##${currentTripSeine.ocean.label2} + validator.activity.invalid.quadrant##${tripSeineEntity.ocean.label2} </message> </field-validator> @@ -101,7 +101,7 @@ <!-- heure observation non duplique --> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ currentRoute.isTimeAvailable(topiaId, time) ]]> + <![CDATA[ routeEntity.isTimeAvailable(topiaId, time) ]]> </param> <message>validator.activity.duplicated.time</message> </field-validator> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/Route-n1-create-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/Route-n1-create-error-validation.xml index 4890f67..660f43f 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/Route-n1-create-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/Route-n1-create-error-validation.xml @@ -36,16 +36,16 @@ <!-- coherence jour observation < trip.startDate --> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"><![CDATA[ - currentTripSeine.startDate.time <= date.time + tripSeineEntity.startDate.time <= date.time ]]> </param> - <message>validator.route.invalid.date##${currentTripSeine.startDate}</message> + <message>validator.route.invalid.date##${tripSeineEntity.startDate}</message> </field-validator> <!-- jour observation non duplique --> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"><![CDATA[ - currentTripSeine.isDateAvailable(topiaId, date) + tripSeineEntity.isDateAvailable(topiaId, date) ]]> </param> <message>validator.route.duplicated.date</message> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/Route-n1-create-warning-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/Route-n1-create-warning-validation.xml index ef27e87..171e1cc 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/Route-n1-create-warning-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/Route-n1-create-warning-validation.xml @@ -38,7 +38,7 @@ <field-validator type="collectionFieldExpression"> <param name="mode">ALL</param> <param name="useSensitiveContext">true</param> - <param name="collectionFieldName">currentTripSeine.route</param> + <param name="collectionFieldName">tripSeineEntity.route</param> <!--param name="expressionForFirst"><![CDATA[ current.startLogValue == null || current.startLogValue == 0 ]]></param--> <param name="expression"> <![CDATA[ startLogValue == null || current.endLogValue == null || current.date.time > date.time || current.endLogValue <= startLogValue ]]> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/Route-n1-update-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/Route-n1-update-error-validation.xml index 8f3d6c1..3b38176 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/Route-n1-update-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/Route-n1-update-error-validation.xml @@ -36,16 +36,16 @@ <!-- coherence jour observation < maree.startDate --> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"><![CDATA[ - currentTripSeine.startDate.time <= date.time + tripSeineEntity.startDate.time <= date.time ]]> </param> - <message>validator.route.invalid.date##${currentTripSeine.startDate}</message> + <message>validator.route.invalid.date##${tripSeineEntity.startDate}</message> </field-validator> <!-- jour observation non duplique --> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"><![CDATA[ - currentTripSeine.isDateAvailable(topiaId, date) + tripSeineEntity.isDateAvailable(topiaId, date) ]]> </param> <message>validator.route.duplicated.date</message> @@ -86,13 +86,13 @@ <param name="mode">ALL</param> <param name="useSensitiveContext">true</param> <param name="expression"><![CDATA[ - currentTripSeine.ocean == null || current.quadrant == null || current.quadrant == 0 - || (currentTripSeine.ocean.code == 3) - || (currentTripSeine.ocean.code == 1 && ( current.quadrant == 1 || current.quadrant == 2 || current.quadrant == 3 || current.quadrant == 4)) - || (currentTripSeine.ocean.code == 2 && ( current.quadrant == 1 || current.quadrant == 2)) + tripSeineEntity.ocean == null || current.quadrant == null || current.quadrant == 0 + || (tripSeineEntity.ocean.code == 3) + || (tripSeineEntity.ocean.code == 1 && ( current.quadrant == 1 || current.quadrant == 2 || current.quadrant == 3 || current.quadrant == 4)) + || (tripSeineEntity.ocean.code == 2 && ( current.quadrant == 1 || current.quadrant == 2)) ]]> </param> - <message>validator.route.invalid.quadrant##${index}##${currentTripSeine.ocean.libelle}</message> + <message>validator.route.invalid.quadrant##${index}##${tripSeineEntity.ocean.libelle}</message> </field-validator> </field> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/Route-n1-update-warning-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/Route-n1-update-warning-validation.xml index e982526..0252268 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/Route-n1-update-warning-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/Route-n1-update-warning-validation.xml @@ -45,7 +45,7 @@ <field-validator type="collectionFieldExpression"> <param name="mode">ALL</param> <param name="useSensitiveContext">true</param> - <param name="collectionFieldName">currentTripSeine.route</param> + <param name="collectionFieldName">tripSeineEntity.route</param> <param name="expression"> <![CDATA[ startLogValue == null || current.endLogValue == null || current.topiaId == topiaId || current.date.time > date.time || current.endLogValue <= startLogValue ]]> </param> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/SetSeine-n1-create-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/SetSeine-n1-create-error-validation.xml index 75d1b56..bc0303b 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/SetSeine-n1-create-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/SetSeine-n1-create-error-validation.xml @@ -98,11 +98,11 @@ <field name="endPursingDate"> - <!-- currentRoute.date <= endPursingDate --> + <!-- routeEntity.date <= endPursingDate --> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> <![CDATA[ endPursingDate == null || - @org.nuiton.util.DateUtil@getDay(currentRoute.date).time <= endPursingDate.time + @org.nuiton.util.DateUtil@getDay(routeEntity.date).time <= endPursingDate.time ]]> </param> <message>validator.set.endPursingDate.after.date</message> @@ -115,7 +115,7 @@ <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> <![CDATA[ endPursingTimeStamp == null || - @org.nuiton.util.DateUtil@getDateAndTime(currentRoute.date, startTime, true, false).time <= endPursingTimeStamp.time ]]> + @org.nuiton.util.DateUtil@getDateAndTime(routeEntity.date, startTime, true, false).time <= endPursingTimeStamp.time ]]> </param> <message>validator.set.endPursingTimeStamp.after.startTime</message> </field-validator> diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/SetSeine-n1-update-error-validation.xml b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/SetSeine-n1-update-error-validation.xml index 947ff6e..871afbd 100644 --- a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/SetSeine-n1-update-error-validation.xml +++ b/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/SetSeine-n1-update-error-validation.xml @@ -102,7 +102,7 @@ <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> <![CDATA[ startTime == null || - @org.nuiton.util.DateUtil@getTime(currentActivity.time, false, false).time <= @org.nuiton.util.DateUtil@getTime(startTime, false, false).time ]]> + @org.nuiton.util.DateUtil@getTime(activityEntity.time, false, false).time <= @org.nuiton.util.DateUtil@getTime(startTime, false, false).time ]]> </param> <message>validator.set.startTime.after.time</message> </field-validator> @@ -111,10 +111,10 @@ <field name="endPursingDate"> - <!-- currentRoute.date <= endPursingDate --> + <!-- routeEntity.date <= endPursingDate --> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ endPursingDate == null || @org.nuiton.util.DateUtil@getDay(currentRoute.date).time <= endPursingDate.time + <![CDATA[ endPursingDate == null || @org.nuiton.util.DateUtil@getDay(routeEntity.date).time <= endPursingDate.time ]]> </param> <message>validator.set.endPursingDate.after.date</message> @@ -127,7 +127,7 @@ <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> <![CDATA[ endPursingTimeStamp == null || - @org.nuiton.util.DateUtil@getDateAndTime(currentRoute.date, startTime, true, false).time <= endPursingTimeStamp.time ]]> + @org.nuiton.util.DateUtil@getDateAndTime(routeEntity.date, startTime, true, false).time <= endPursingTimeStamp.time ]]> </param> <message>validator.set.endPursingTimeStamp.after.startTime</message> </field-validator> diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationDataContext.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationDataContext.java index 341bec2..beae8ac 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationDataContext.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationDataContext.java @@ -46,132 +46,132 @@ public class ValidationDataContext { protected List<?> editingReferentielList; - protected Program currentProgram; + protected Program programEntity; - protected TripSeine currentTripSeine; + protected TripSeine tripSeineEntity; - protected TripLongline currentTripLongline; + protected TripLongline tripLonglineEntity; - protected Route currentRoute; + protected Route routeEntity; - protected ActivitySeine currentActivitySeine; + protected ActivitySeine activitySeineEntity; - protected ActivityLongline currentActivityLongline; + protected ActivityLongline activityLonglineEntity; - protected SetSeine currentSetSeine; + protected SetSeine setSeineEntity; - protected SetLongline currentSetLongline; + protected SetLongline setLonglineEntity; - protected FloatingObject currentFloatingObject; + protected FloatingObject floatingObjectEntity; public void clear() { editingReferentielList = null; - currentProgram = null; - currentTripSeine = null; - currentRoute = null; - currentActivitySeine = null; - currentActivityLongline = null; - currentSetSeine = null; - currentSetLongline = null; - currentFloatingObject = null; + programEntity = null; + tripSeineEntity = null; + routeEntity = null; + activitySeineEntity = null; + activityLonglineEntity = null; + setSeineEntity = null; + setLonglineEntity = null; + floatingObjectEntity = null; } - public Program getCurrentProgram() { - return currentProgram; + public Program getProgramEntity() { + return programEntity; } - public Trip getCurrentTrip() { - Trip result = getCurrentTripSeine(); + public Trip getTripEntity() { + Trip result = getTripSeineEntity(); if (result == null) { - result = getCurrentTripLongline(); + result = getTripLonglineEntity(); } return result; } - public TripSeine getCurrentTripSeine() { - return currentTripSeine; + public TripSeine getTripSeineEntity() { + return tripSeineEntity; } - public TripLongline getCurrentTripLongline() { - return currentTripLongline; + public TripLongline getTripLonglineEntity() { + return tripLonglineEntity; } - public Route getCurrentRoute() { - return currentRoute; + public Route getRouteEntity() { + return routeEntity; } - public Activity getCurrentActivity() { - Activity result = getCurrentActivitySeine(); + public Activity getActivityEntity() { + Activity result = getActivitySeineEntity(); if (result == null) { - result = getCurrentActivityLongline(); + result = getActivityLonglineEntity(); } return result; } - public ActivitySeine getCurrentActivitySeine() { - return currentActivitySeine; + public ActivitySeine getActivitySeineEntity() { + return activitySeineEntity; } - public ActivityLongline getCurrentActivityLongline() { - return currentActivityLongline; + public ActivityLongline getActivityLonglineEntity() { + return activityLonglineEntity; } - public ObserveSet getCurrentSet() { - ObserveSet result = getCurrentSetSeine(); + public ObserveSet getSetEntity() { + ObserveSet result = getSetSeineEntity(); if (result == null) { - result = getCurrentSetLongline(); + result = getSetLonglineEntity(); } return result; } - public SetSeine getCurrentSetSeine() { - return currentSetSeine; + public SetSeine getSetSeineEntity() { + return setSeineEntity; } - public SetLongline getCurrentSetLongline() { - return currentSetLongline; + public SetLongline getSetLonglineEntity() { + return setLonglineEntity; } - public FloatingObject getCurrentFloatingObject() { - return currentFloatingObject; + public FloatingObject getFloatingObjectEntity() { + return floatingObjectEntity; } public List<?> getEditingReferentielList() { return editingReferentielList; } - void setCurrentTripSeine(TripSeine currentTripSeine) { - this.currentTripSeine = currentTripSeine; - this.currentProgram = currentTripSeine == null ? null : currentTripSeine.getProgram(); + void setTripSeineEntity(TripSeine tripSeineEntity) { + this.tripSeineEntity = tripSeineEntity; + this.programEntity = tripSeineEntity == null ? null : tripSeineEntity.getProgram(); } - void setCurrentTripLongline(TripLongline currentTripLongline) { - this.currentTripLongline = currentTripLongline; - this.currentProgram = currentTripLongline == null ? null : currentTripLongline.getProgram(); + void setTripLonglineEntity(TripLongline tripLonglineEntity) { + this.tripLonglineEntity = tripLonglineEntity; + this.programEntity = tripLonglineEntity == null ? null : tripLonglineEntity.getProgram(); } - void setCurrentRoute(Route currentRoute) { - this.currentRoute = currentRoute; + void setRouteEntity(Route routeEntity) { + this.routeEntity = routeEntity; } - void setCurrentActivitySeine(ActivitySeine currentActivitySeine) { - this.currentActivitySeine = currentActivitySeine; + void setActivitySeineEntity(ActivitySeine activitySeineEntity) { + this.activitySeineEntity = activitySeineEntity; } - void setCurrentActivityLongline(ActivityLongline currentActivityLongline) { - this.currentActivityLongline = currentActivityLongline; + void setActivityLonglineEntity(ActivityLongline activityLonglineEntity) { + this.activityLonglineEntity = activityLonglineEntity; } - void setCurrentSetSeine(SetSeine currentSetSeine) { - this.currentSetSeine = currentSetSeine; + void setSetSeineEntity(SetSeine setSeineEntity) { + this.setSeineEntity = setSeineEntity; } - void setCurrentSetLongline(SetLongline currentSetLongline) { - this.currentSetLongline = currentSetLongline; + void setSetLonglineEntity(SetLongline setLonglineEntity) { + this.setLonglineEntity = setLonglineEntity; } - void setCurrentFloatingObject(FloatingObject currentFloatingObject) { - this.currentFloatingObject = currentFloatingObject; + void setFloatingObjectEntity(FloatingObject floatingObjectEntity) { + this.floatingObjectEntity = floatingObjectEntity; } void setEditingReferentielList(List<?> editingReferentielList) { diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationMessageDetector.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationMessageDetector.java index aeef8ef..c437ed9 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationMessageDetector.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/validate/ValidationMessageDetector.java @@ -278,28 +278,28 @@ public class ValidationMessageDetector { ObserveEntityEnum anEnum = ObserveEntityEnum.valueOf(entity); switch (anEnum) { case Route: - validationDataContext.setCurrentRoute((Route) entity); + validationDataContext.setRouteEntity((Route) entity); break; case TripSeine: - validationDataContext.setCurrentTripSeine((TripSeine) entity); + validationDataContext.setTripSeineEntity((TripSeine) entity); break; case ActivitySeine: - validationDataContext.setCurrentActivitySeine((ActivitySeine) entity); + validationDataContext.setActivitySeineEntity((ActivitySeine) entity); break; case SetSeine: - validationDataContext.setCurrentSetSeine((SetSeine) entity); + validationDataContext.setSetSeineEntity((SetSeine) entity); break; case TripLongline: - validationDataContext.setCurrentTripSeine((TripSeine) entity); + validationDataContext.setTripSeineEntity((TripSeine) entity); break; case ActivityLongline: - validationDataContext.setCurrentActivityLongline((ActivityLongline) entity); + validationDataContext.setActivityLonglineEntity((ActivityLongline) entity); break; case SetLongline: - validationDataContext.setCurrentSetLongline((SetLongline) entity); + validationDataContext.setSetLonglineEntity((SetLongline) entity); break; case FloatingObject: - validationDataContext.setCurrentFloatingObject((FloatingObject) entity); + validationDataContext.setFloatingObjectEntity((FloatingObject) entity); break; case NonTargetLength: break; @@ -384,28 +384,28 @@ public class ValidationMessageDetector { ObserveEntityEnum anEnum = ObserveEntityEnum.valueOf(entity); switch (anEnum) { case Route: - validationDataContext.setCurrentRoute(null); + validationDataContext.setRouteEntity(null); break; case TripSeine: - validationDataContext.setCurrentTripSeine(null); + validationDataContext.setTripSeineEntity(null); break; case ActivitySeine: - validationDataContext.setCurrentActivitySeine(null); + validationDataContext.setActivitySeineEntity(null); break; case SetSeine: - validationDataContext.setCurrentSetSeine(null); + validationDataContext.setSetSeineEntity(null); break; case TripLongline: - validationDataContext.setCurrentTripLongline(null); + validationDataContext.setTripLonglineEntity(null); break; case ActivityLongline: - validationDataContext.setCurrentActivityLongline(null); + validationDataContext.setActivityLonglineEntity(null); break; case SetLongline: - validationDataContext.setCurrentSetLongline(null); + validationDataContext.setSetLonglineEntity(null); break; case FloatingObject: - validationDataContext.setCurrentFloatingObject(null); + validationDataContext.setFloatingObjectEntity(null); break; case NonTargetLength: break; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.