branch develop updated (92d3049 -> 08eb4dc)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from 92d3049 fixes #7153: [PS] Après migration, la senne de toutes les marées anciennes devrait être marquée comme "utilisée pendant la marée" Merge branch 'feature/7153' into develop new 3eb11b3 ajout de la value stack (refs #7155) new 392ec1c ajout dans le context de validation des entités du modèle LL (refs #7155) new 5cbfd5e fix class cast exception (refs #7155) new 08eb4dc fixes #7155: [PS/LL] La fonction Action/Valider les données plante Merge branch 'feature/7155' into develop The 4 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 08eb4dcaa0fcfc476b29ad80f3f252d3e5705dff Merge: 92d3049 5cbfd5e Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu May 28 01:34:49 2015 +0200 fixes #7155: [PS/LL] La fonction Action/Valider les données plante Merge branch 'feature/7155' into develop commit 5cbfd5e5ce006e7a5a74ae2da991fd41b198192a Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu May 28 01:33:14 2015 +0200 fix class cast exception (refs #7155) 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) commit 3eb11b37ada9ec973356ef638deeee15edf750f3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu May 28 01:32:31 2015 +0200 ajout de la value stack (refs #7155) Summary of changes: .../ird/observe/validation/ObserveValidator.java | 12 ++++++-- .../validation/ValidationMessageDetector.java | 32 ++++++++++++++++++++-- .../ui/admin/validate/ValidateUIHandler.java | 3 +- 3 files changed, 41 insertions(+), 6 deletions(-) -- 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 develop in repository observe. See http://git.codelutin.com/observe.git commit 3eb11b37ada9ec973356ef638deeee15edf750f3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu May 28 01:32:31 2015 +0200 ajout de la value stack (refs #7155) --- .../java/fr/ird/observe/validation/ObserveValidator.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/observe-business/src/main/java/fr/ird/observe/validation/ObserveValidator.java b/observe-business/src/main/java/fr/ird/observe/validation/ObserveValidator.java index 044e18d..ae6b33e 100644 --- a/observe-business/src/main/java/fr/ird/observe/validation/ObserveValidator.java +++ b/observe-business/src/main/java/fr/ird/observe/validation/ObserveValidator.java @@ -32,6 +32,7 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.validator.NuitonValidatorFactory; import org.nuiton.validator.NuitonValidatorProvider; import org.nuiton.validator.NuitonValidatorScope; +import org.nuiton.validator.xwork2.XWork2ValidatorUtil; /** * Une surcharge du validateur swing offert par jaxx pour pouvoir ajouter dans @@ -135,6 +136,7 @@ public class ObserveValidator<B> extends SwingValidator<B> { // keep this validation context setValidationContext(dataContext); } + ValueStack valueStack; ActionContext context = ActionContext.getContext(); if (context == null) { @@ -143,10 +145,14 @@ public class ObserveValidator<B> extends SwingValidator<B> { "pas de context xworks enregistré... utiliser la methode " + ActionContext.class.getName() + "#setContext(context)"); } - return; - } - ValueStack valueStack = context.getValueStack(); + valueStack = XWork2ValidatorUtil.getSharedValueStack(); + if (valueStack == null) { + return; + } + } else { + valueStack = context.getValueStack(); + } if (log.isDebugEnabled()) { log.debug("Enregistrement du context de validation [" + dataContext + "] dans la valueStack de " + -- 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 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>.
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 5cbfd5e5ce006e7a5a74ae2da991fd41b198192a Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu May 28 01:33:14 2015 +0200 fix class cast exception (refs #7155) --- .../main/java/fr/ird/observe/ui/admin/validate/ValidateUIHandler.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateUIHandler.java b/observe-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateUIHandler.java index 82005cb..799a043 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateUIHandler.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateUIHandler.java @@ -28,6 +28,7 @@ import fr.ird.observe.ObserveServiceHelper; import fr.ird.observe.db.DataSource; import fr.ird.observe.db.DataSourceException; import fr.ird.observe.db.model.DataSelectionModel; +import fr.ird.observe.entities.Trip; import fr.ird.observe.entities.referentiel.Program; import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.ui.UIHelper; @@ -436,7 +437,7 @@ public class ValidateUIHandler extends AdminTabUIHandler { Set<String> data = dataModel.getSelectedData(); for (String id : data) { - TripSeine e = (TripSeine) ctxt.findByTopiaId(id); + Trip e = (Trip) ctxt.findByTopiaId(id); Program p = e.getProgram(); sendMessage(t("observe.message.validation.start.maree", dTrip.toString(e), dProgram.toString(p))); detector.detectMessages(e); -- 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 develop in repository observe. See http://git.codelutin.com/observe.git commit 08eb4dcaa0fcfc476b29ad80f3f252d3e5705dff Merge: 92d3049 5cbfd5e Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu May 28 01:34:49 2015 +0200 fixes #7155: [PS/LL] La fonction Action/Valider les données plante Merge branch 'feature/7155' into develop .../ird/observe/validation/ObserveValidator.java | 12 ++++++-- .../validation/ValidationMessageDetector.java | 32 ++++++++++++++++++++-- .../ui/admin/validate/ValidateUIHandler.java | 3 +- 3 files changed, 41 insertions(+), 6 deletions(-) -- 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