r283 - trunk/coser-business/src/main/java/fr/ifremer/coser/services
Author: chatellier Date: 2010-11-26 09:30:27 +0000 (Fri, 26 Nov 2010) New Revision: 283 Log: Inverse la condition de test (si c'est sup a 0) Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ValidationService.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/ValidationService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/ValidationService.java 2010-11-26 09:02:31 UTC (rev 282) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/ValidationService.java 2010-11-26 09:30:27 UTC (rev 283) @@ -60,6 +60,7 @@ import fr.ifremer.coser.CoserConstants.ValidationLevel; import fr.ifremer.coser.bean.Control; import fr.ifremer.coser.bean.Project; +import fr.ifremer.coser.control.DiffCatchLengthValidationError; import fr.ifremer.coser.control.ProgressMonitor; import fr.ifremer.coser.control.ValidationError; import fr.ifremer.coser.data.AbstractDataEntity; @@ -544,7 +545,7 @@ * Detecte des différences entre les nombres dans captures * et les nombres dand taille. * - * @see ChartService#getCompareCatchLengthGraph(Project, Control, String) for details + * @see PublicationService#getCompareCatchLengthGraph(Project, Control, String) for details * @see CoserBusinessConfig#getControlDiffCatchLength() for option * * @return errors @@ -653,12 +654,13 @@ // diff entre 4 et 5 = (5-4) * 100 / 5 double min = Math.min(catchNumber, lengthNumber); // si c'est 0, ou absence de catures, ce n'est pas une erreur - if (min <= 0) { + if (min > 0) { double max = Math.max(catchNumber, lengthNumber); double diff = (max - min) * 100 / max; if (diff > config.getControlDiffCatchLength()) { - ValidationError error = new ValidationError(); + DiffCatchLengthValidationError error = new DiffCatchLengthValidationError(); + error.setSpecies(species); error.setLevel(ValidationLevel.WARNING); error.setMessage(_("coser.business.control.error.diffCatchLength")); error.setDetailMessage(_("coser.business.control.error.diffCatchLengthDetail", species, year));
participants (1)
-
chatellier@users.labs.libre-entreprise.org