This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 930bdeea8b8189933a4284cb03731a4e28a4b4db Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Nov 3 11:36:18 2016 +0100 [PS] Améliorer le contrôle des tailles/poids min/max d'espèces (doubler le warning d'une erreur) (Fixes #7008) --- ...NonTargetCatchDto-ui-update-error-validation.xml | 14 ++++++++++++++ ...nTargetCatchDto-ui-update-warning-validation.xml | 12 ------------ .../AbstractSpeciesFieldDtoValidator.java | 21 +-------------------- 3 files changed, 15 insertions(+), 32 deletions(-) diff --git a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetCatchDto-ui-update-error-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetCatchDto-ui-update-error-validation.xml index ba781f7..da964ad 100644 --- a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetCatchDto-ui-update-error-validation.xml +++ b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetCatchDto-ui-update-error-validation.xml @@ -133,6 +133,13 @@ <message>validator.ui.nonTargetCatch.positive.meanWeight</message> </field-validator> + <!-- validation du weight par borne --> + <field-validator type="species_weightDto"> + <param name="ratio">1.0</param> + <param name="expression">meanWeoight != null</param> + <message>validator.ui.nonTargetCatch.bound.meanWeight##${min}##${max}</message> + </field-validator> + </field> <field name="meanLength"> @@ -145,6 +152,13 @@ <message>validator.ui.nonTargetCatch.positive.meanLength</message> </field-validator> + <!-- validation de la taille par borne --> + <field-validator type="species_lengthDto"> + <param name="ratio">1.0</param> + <param name="expression">meanLength != null</param> + <message>validator.ui.nonTargetCatch.bound.meanLength##${min}##${max}</message> + </field-validator> + </field> </validators> diff --git a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetCatchDto-ui-update-warning-validation.xml b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetCatchDto-ui-update-warning-validation.xml index 17c225b..34d72da 100644 --- a/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetCatchDto-ui-update-warning-validation.xml +++ b/application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/NonTargetCatchDto-ui-update-warning-validation.xml @@ -62,12 +62,6 @@ <message>validator.ui.nonTargetCatch.required.weightOrTailleMoyen</message> </field-validator> - <!-- validation du weight par borne --> - <field-validator type="species_weightDto"> - <param name="ratio">1.0</param> - <message>validator.ui.nonTargetCatch.bound.meanWeight##${min}##${max}</message> - </field-validator> - </field> <field name="meanLength"> @@ -80,12 +74,6 @@ <message>validator.ui.nonTargetCatch.required.weightOrTailleMoyen</message> </field-validator> - <!-- validation de la taille par borne --> - <field-validator type="species_lengthDto"> - <param name="ratio">1.0</param> - <message>validator.ui.nonTargetCatch.bound.meanLength##${min}##${max}</message> - </field-validator> - </field> </validators> diff --git a/application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/AbstractSpeciesFieldDtoValidator.java b/application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/AbstractSpeciesFieldDtoValidator.java index 8ab6081..0d4abe9 100644 --- a/application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/AbstractSpeciesFieldDtoValidator.java +++ b/application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/AbstractSpeciesFieldDtoValidator.java @@ -97,13 +97,6 @@ public abstract class AbstractSpeciesFieldDtoValidator extends FieldValidatorSup } } -// /** -// * la stack de validation interceptée lors de la création du validateur. -// * -// * Utilisée pour pousser des données dans le context. -// */ -// protected ValueStack valueStack; - /** le ratio a appliquer sur les bornes définies dans le référentiel */ protected Float ratio; @@ -118,20 +111,10 @@ public abstract class AbstractSpeciesFieldDtoValidator extends FieldValidatorSup protected String speciesField = "species"; -// public ValueStack getValueStack() { -// return valueStack; -// } - public String getSpeciesField() { return speciesField; } -// @Override -// public void setValueStack(ValueStack valueStack) { -// this.valueStack = valueStack; -// super.setValueStack(valueStack); -// } - public void setSpeciesField(String speciesField) { this.speciesField = speciesField; } @@ -165,9 +148,7 @@ public abstract class AbstractSpeciesFieldDtoValidator extends FieldValidatorSup } else { answer = false; if (log.isWarnEnabled()) { - log.warn("Got result of " + obj + - " when trying to get Boolean with expression [" + - expression + "]."); + log.warn("Got result of " + obj + " when trying to get Boolean with expression [" + expression + "]."); } } } else { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.