Author: chatellier Date: 2011-02-24 16:18:16 +0000 (Thu, 24 Feb 2011) New Revision: 761 Log: Add positive check on surface Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/validators/CoserDoubleValidator.java trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Haul-error-validation.xml trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Strata-error-validation.xml Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/validators/CoserDoubleValidator.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/validators/CoserDoubleValidator.java 2011-02-23 09:30:33 UTC (rev 760) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/validators/CoserDoubleValidator.java 2011-02-24 16:18:16 UTC (rev 761) @@ -69,12 +69,12 @@ try { double doubleValue = Double.parseDouble(value); - + // only check for a minimum value if the min parameter is set if (min != null && doubleValue < min) { addFieldError(getFieldName(), object); } - + // only check for a maximum value if the max parameter is set if (max != null && doubleValue > max) { addFieldError(getFieldName(), object); Modified: trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties =================================================================== --- trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties 2011-02-23 09:30:33 UTC (rev 760) +++ trunk/coser-business/src/main/resources/i18n/coser-business_en_GB.properties 2011-02-24 16:18:16 UTC (rev 761) @@ -156,7 +156,9 @@ month\ is\ not\ valid\ (2\ digits)= number\ attribute\ is\ not\ a\ valid\ double= surface\ attribute\ is\ not\ a\ valid\ double= +surface\ attribute\ must\ be\ positive= sweptSurface\ attribute\ is\ not\ a\ valid\ double= +sweptSurface\ attribute\ must\ be\ positive= sweptSurface\ must\ contain\ at\ least\ 3\ decimals= weight\ attribute\ is\ not\ a\ valid\ double= year\ is\ not\ valid\ (4\ digits.2\ digits)= Modified: trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties =================================================================== --- trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties 2011-02-23 09:30:33 UTC (rev 760) +++ trunk/coser-business/src/main/resources/i18n/coser-business_fr_FR.properties 2011-02-24 16:18:16 UTC (rev 761) @@ -156,7 +156,9 @@ month\ is\ not\ valid\ (2\ digits)=L'attribut Mois n'est pas valide (2 chiffres) number\ attribute\ is\ not\ a\ valid\ double=L'attribut Nombre n'est pas un r\u00E9el valide surface\ attribute\ is\ not\ a\ valid\ double=L'attribut Surface n'est pas un r\u00E9el valide +surface\ attribute\ must\ be\ positive=L'attribut Surface n'est pas positif sweptSurface\ attribute\ is\ not\ a\ valid\ double=L'attribut SurfaceBalayee n'est pas un r\u00E9el valide +sweptSurface\ attribute\ must\ be\ positive=L'attribut SurfaceBalayee n'est pas positif sweptSurface\ must\ contain\ at\ least\ 3\ decimals=L'attribut SurfaceBalayee doit contenir au moins 3 decimales weight\ attribute\ is\ not\ a\ valid\ double=L'attribut Poids n'est pas un r\u00E9el valide year\ is\ not\ valid\ (4\ digits.2\ digits)=L'attribut Ann\u00E9e n'est pas valide (4 chiffres.2 chiffres) Modified: trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Haul-error-validation.xml =================================================================== --- trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Haul-error-validation.xml 2011-02-23 09:30:33 UTC (rev 760) +++ trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Haul-error-validation.xml 2011-02-24 16:18:16 UTC (rev 761) @@ -65,7 +65,17 @@ <param name="notAvailable">NA</param> <message>sweptSurface attribute is not a valid double</message> </field-validator> + <field-validator type="coserDouble"> + <param name="min">0</param> + <message>sweptSurface attribute must be positive</message> + </field-validator> </field> + <field name="sweptSurface"> + <field-validator type="coserDouble"> + <param name="min">0</param> + <message>sweptSurface attribute must be positive</message> + </field-validator> + </field> <field name="latAsString"> <field-validator type="checkDouble"> <param name="notAvailable">NA</param> Modified: trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Strata-error-validation.xml =================================================================== --- trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Strata-error-validation.xml 2011-02-23 09:30:33 UTC (rev 760) +++ trunk/coser-business/src/main/resources/validators/fr/ifremer/coser/data/Strata-error-validation.xml 2011-02-24 16:18:16 UTC (rev 761) @@ -44,4 +44,10 @@ <message>surface attribute is not a valid double</message> </field-validator> </field> + <field name="surface"> + <field-validator type="coserDouble"> + <param name="min">0</param> + <message>surface attribute must be positive</message> + </field-validator> + </field> </validators> \ No newline at end of file