This is an automated email from the git hooks/post-receive script. New commit to branch feature/8212 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit f28dc6cc15b1d91fe6c4269dfa857350cc3c76bb Author: Kevin Morin <morin@codelutin.com> Date: Mon Apr 4 17:40:34 2016 +0200 on met d'abord le poids à jour, puis la taille (la modif de la taille peut supprimer la ligne de mensuration si le nombre est à 0) (fixes #8212) --- .../operation/catches/species/frequency/SpeciesFrequencyUI.jaxx | 6 +++--- .../catches/species/frequency/actions/RemoveObservationAction.java | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx index 8993320..340709f 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx @@ -297,9 +297,9 @@ protected int getLengthStepPanelPreferedWidth() { <JScrollPane id='logsScrollPane'> <JXTable id='logsTable'/> </JScrollPane> - <JScrollPane id='tableScrollPane'> - <JXTable id='table'/> - </JScrollPane> + <JScrollPane id='tableScrollPane'> + <JXTable id='table'/> + </JScrollPane> </JSplitPane> </JPanel> </JXTitledPanel> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/RemoveObservationAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/RemoveObservationAction.java index 0a39e57..4839a19 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/RemoveObservationAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/RemoveObservationAction.java @@ -84,14 +84,15 @@ public class RemoveObservationAction extends SimpleActionSupport<SpeciesFrequenc rowsToDelete.forEach(row -> { if (row.withSize()) { - if (model.mustCopyIndividualObservationSize()) { - handler.updateFrequencyRowsNumbers(row.getSize(), null); - } if (model.mustCopyIndividualObservationWeight() && row.withWeight()) { handler.updateFrequencyRowsWeights(row.getSize(), -row.getWeight()); } + if (model.mustCopyIndividualObservationSize()) { + handler.updateFrequencyRowsNumbers(row.getSize(), null); + } + individualObservationUICache.decrements(row); } model.removeIndividualObservationRowInError(row); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.