This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 5868576a294d4f93da4c9cc4805c5258ba1a0b7c Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 16 17:34:44 2016 +0100 Utilisation des arrondis de poids (see #8128) + utilisation des nouvelles méthodes sur les poids --- .../catches/species/frequency/SpeciesFrequencyRowModel.java | 2 +- .../catches/species/frequency/SpeciesFrequencyUIModel.java | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyRowModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyRowModel.java index 51976ae..004e70d 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyRowModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyRowModel.java @@ -230,7 +230,7 @@ public class SpeciesFrequencyRowModel extends AbstractTuttiBeanUIModel<SpeciesBa public boolean withWeight() { Float weight = getWeight(); - return weight != null && weight > 0; + return Weights.isNotNullNorZero(weight); } /** diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java index 08a16e2..41995d7 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java @@ -571,7 +571,7 @@ public class SpeciesFrequencyUIModel extends AbstractTuttiTableUIModel<SpeciesBa public void setTotalWeight(Float totalWeight) { Object oldValue = getTotalWeight(); - this.totalComputedOrNotWeight.setData(totalWeight); + this.totalComputedOrNotWeight.setData(weightUnit.round(totalWeight)); firePropertyChange(PROPERTY_TOTAL_WEIGHT, oldValue, totalWeight); } @@ -581,16 +581,16 @@ public class SpeciesFrequencyUIModel extends AbstractTuttiTableUIModel<SpeciesBa public void setTotalComputedWeight(Float totalComputedWeight) { Object oldValue = getTotalComputedWeight(); - this.totalComputedOrNotWeight.setComputedData(totalComputedWeight); + this.totalComputedOrNotWeight.setComputedData(weightUnit.round(totalComputedWeight)); firePropertyChange(PROPERTY_TOTAL_COMPUTED_WEIGHT, oldValue, totalComputedWeight); } // Utilisé dans un validateur, ne pas supprimer public boolean isTotalWeightSameAsComputedWeight() { Float totalWeight = getTotalWeight(); - Float computedWeight = getTotalComputedWeight(); - return totalWeight != null && computedWeight != null - && Weights.isEqualWeight(totalWeight, computedWeight); + Float totalComputedWeight = getTotalComputedWeight(); + return totalWeight != null && totalComputedWeight != null + && Weights.isEqualWeight(totalWeight, totalComputedWeight); } public Rtp getRtp() { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.