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 85744752230d699df9a971a1b0647060264dedf0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 25 16:56:36 2016 +0200 Meilleure gestion du tableau des mensurations lors de la génération depuis les observations individuelles --- .../species/frequency/SpeciesFrequencyTableModel.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java index a993a60..1aeb3d3 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java @@ -471,8 +471,14 @@ public class SpeciesFrequencyTableModel extends AbstractApplicationTableModel<Sp if (uiModel.mustCopyIndividualObservationSize()) { + if (log.isInfoEnabled()) { + log.info("Generate frequencies from individual observations (mode: " + uiModel.getCopyIndividualObservationMode() + ")"); + } + boolean copyWeights = uiModel.isCopyIndividualObservationAll(); + rows.clear(); + uiModel.getValidIndividualObservations().stream() .filter(IndividualObservationBatchRowModel::withSize) .forEachOrdered(individualObservation -> { @@ -487,14 +493,14 @@ public class SpeciesFrequencyTableModel extends AbstractApplicationTableModel<Sp }); - } - - if (rows.isEmpty()) { - addNewRow(); } else { - Collections.sort(rows); + if (rows.isEmpty()) { + addNewRow(); + } } + Collections.sort(rows); + uiModel.reloadRows(); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.