This is an automated email from the git hooks/post-receive script. New commit to branch feature/8228 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit acf08b39a69c8b984634c48c771782e3df363839 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 12 06:11:03 2016 +0200 Fix npe quand recopie poids + suppression méthode inutile --- .../catches/species/frequency/SpeciesFrequencyUIHandler.java | 8 ++++---- .../catches/species/frequency/SpeciesFrequencyUIModel.java | 4 ---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java index 0e4d39c..7d925f0 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java @@ -242,8 +242,8 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci getTableModel().incrementFrequencyRowsNumbers(newValue); } - Float weight = row.getWeight(); - if (model.mustCopyIndividualObservationWeight() && weight != null) { + if (model.isCopyIndividualObservationAll() && row.withWeight()) { + float weight = row.getWeight(); if (oldValue != null) { getTableModel().removeWeightToFrequencyRow(oldValue, weight); } @@ -256,7 +256,7 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci break; case IndividualObservationBatchRowModel.PROPERTY_WEIGHT: - if (row.isValid() && model.mustCopyIndividualObservationWeight()) { + if (row.isValid() && model.isCopyIndividualObservationAll()) { Float oldValue = (Float) evt.getOldValue(); Float newValue = (Float) evt.getNewValue(); @@ -344,7 +344,7 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci if (model.mustCopyIndividualObservationSize()) { getTableModel().incrementFrequencyRowsNumbers(row); } - if (model.mustCopyIndividualObservationWeight()) { + if (model.isCopyIndividualObservationAll() && row.withWeight()) { getTableModel().addWeightToFrequencyRow(row, row.getWeight()); } } 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 377d728..da6a793 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 @@ -736,10 +736,6 @@ public class SpeciesFrequencyUIModel extends AbstractTuttiTableUIModel<SpeciesBa return isCopyIndividualObservationAll() || isCopyIndividualObservationSize(); } - public boolean mustCopyIndividualObservationWeight() { - return isCopyIndividualObservationAll(); - } - public boolean isCopyIndividualObservationAll() { return copyIndividualObservationMode == CopyIndividualObservationMode.ALL; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.