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 392ec1ca118d23170ee9e8e364a648d2e7885d91 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu May 28 01:32:55 2015 +0200 ajout dans le context de validation des entités du modèle LL (refs #7155) --- .../validation/ValidationMessageDetector.java | 32 ++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/observe-business/src/main/java/fr/ird/observe/validation/ValidationMessageDetector.java b/observe-business/src/main/java/fr/ird/observe/validation/ValidationMessageDetector.java index f9490c2..9cdbe6c 100644 --- a/observe-business/src/main/java/fr/ird/observe/validation/ValidationMessageDetector.java +++ b/observe-business/src/main/java/fr/ird/observe/validation/ValidationMessageDetector.java @@ -25,6 +25,7 @@ import fr.ird.observe.ObserveDAOHelper; import fr.ird.observe.ObserveEntityEnum; import fr.ird.observe.ObserveServiceHelper; import fr.ird.observe.db.DataContext; +import fr.ird.observe.entities.longline.TripLongline; import fr.ird.observe.entities.referentiel.Program; import fr.ird.observe.entities.seine.TripSeine; import org.apache.commons.logging.Log; @@ -170,7 +171,7 @@ public class ValidationMessageDetector implements EntityVisitor, case Route: context.setSelectedRouteId(e.getTopiaId()); break; - case TripSeine: + case TripSeine: { context.setSelectedTripId(e.getTopiaId()); Program program = ((TripSeine) e).getProgram(); if (program != null) { @@ -178,13 +179,30 @@ public class ValidationMessageDetector implements EntityVisitor, } else { context.setSelectedProgramId(null); } - break; + } + break; case ActivitySeine: context.setSelectedActivityId(e.getTopiaId()); break; case SetSeine: context.setSelectedSetId(e.getTopiaId()); break; + case TripLongline: { + context.setSelectedTripId(e.getTopiaId()); + Program program = ((TripLongline) e).getProgram(); + if (program != null) { + context.setSelectedProgramId(program.getTopiaId()); + } else { + context.setSelectedProgramId(null); + } + } + break; + case ActivityLongline: + context.setSelectedActivityId(e.getTopiaId()); + break; + case SetLongline: + context.setSelectedSetId(e.getTopiaId()); + break; case FloatingObject: context.setSelectedFloatingObjectId(e.getTopiaId()); break; @@ -284,6 +302,16 @@ public class ValidationMessageDetector implements EntityVisitor, case SetSeine: context.setSelectedSetId(null); break; + case TripLongline: + context.setSelectedTripId(null); + context.setSelectedProgramId(null); + break; + case ActivityLongline: + context.setSelectedActivityId(null); + break; + case SetLongline: + context.setSelectedSetId(null); + break; case FloatingObject: context.setSelectedFloatingObjectId(null); break; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.