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 72ccffb99dc48e2ac8adacbf8cc19c1b22b1952f Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Apr 16 12:20:11 2016 +0200 Amélioration code : on arrête de faire dix milles trucs en même temps : j'en ai maaaaaaaaaaare --- .../species/frequency/SpeciesFrequencyUIModel.java | 26 ++++++++++------------ .../actions/ApplySpeciesFrequencyRafaleAction.java | 3 +-- 2 files changed, 13 insertions(+), 16 deletions(-) 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 9e4ef6f..41f5e37 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 @@ -340,7 +340,8 @@ public class SpeciesFrequencyUIModel extends AbstractTuttiTableUIModel<SpeciesBa frequenciesHistogramModel.reloadRows(rows); averageWeightsHistogramModel.reloadRows(rows); - recomputeTotalNumberAndWeight(); + recomputeTotalNumber(); + recomputeTotalWeight(); } @@ -734,31 +735,27 @@ public class SpeciesFrequencyUIModel extends AbstractTuttiTableUIModel<SpeciesBa firePropertyChange(PROPERTY_EMPTY_ROWS, null, emptyRows); } - public boolean isNonEmptyRows() { - return getRowCount() - emptyRows.size() - rowsInError.size() > 0; + public void recomputeTotalWeight() { + + Float computeTotalWeight = cache.computeTotalWeight(); + setTotalComputedWeight(computeTotalWeight); + } - public int computeTotalNumber() { - int result = 0; + public void recomputeTotalNumber() { + + int computeTotalNumber = 0; if (rows != null) { for (SpeciesFrequencyRowModel row : rows) { if (!row.isValid()) { continue; } if (row.getNumber() != null) { - result += row.getNumber(); + computeTotalNumber += row.getNumber(); } } } - return result; - } - - public void recomputeTotalNumberAndWeight() { - - int computeTotalNumber = computeTotalNumber(); - Float computeTotalWeight = cache.computeTotalWeight(); setTotalNumber(computeTotalNumber); - setTotalComputedWeight(computeTotalWeight); } @@ -790,6 +787,7 @@ public class SpeciesFrequencyUIModel extends AbstractTuttiTableUIModel<SpeciesBa } setCanEditLengthStep(result); + } public void computeRowWeightWithRtp() { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ApplySpeciesFrequencyRafaleAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ApplySpeciesFrequencyRafaleAction.java index 32ab9ae..95c61d1 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ApplySpeciesFrequencyRafaleAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/ApplySpeciesFrequencyRafaleAction.java @@ -115,8 +115,7 @@ public class ApplySpeciesFrequencyRafaleAction { // tableModel.addNewRow(rowIndex, row); // } - int totalNumber = model.computeTotalNumber(); - model.setTotalNumber(totalNumber); + model.recomputeTotalNumber(); SwingUtilities.invokeLater(() -> selectRow(ui.getTable(), rowIndex)); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.