Author: kmorin Date: 2013-05-30 10:38:30 +0200 (Thu, 30 May 2013) New Revision: 1035 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1035 Log: fixes #2524 [MENSURATION] - Erreur si on supprime la valeur dans une cellule Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2013-05-30 08:28:18 UTC (rev 1034) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2013-05-30 08:38:30 UTC (rev 1035) @@ -148,7 +148,10 @@ recomputeRowValidState(r); } if (r.isValid()) { - totalNumber += r.getNumber(); + Integer number = r.getNumber(); + if (number != null) { + totalNumber += number; + } Float weight = r.getWeight(); if (weight != null) { totalWeight += weight; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-05-30 08:28:18 UTC (rev 1034) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-05-30 08:38:30 UTC (rev 1035) @@ -148,7 +148,10 @@ recomputeRowValidState(r); } if (r.isValid()) { - totalNumber += r.getNumber(); + Integer number = r.getNumber(); + if (number != null) { + totalNumber += number; + } Float weight = r.getWeight(); if (weight != null) { totalWeight += weight;