This is an automated email from the git hooks/post-receive script. New commit to branch feature/8203 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 985fc5350de81a652c482336f898dcd68712df1f Author: Kevin Morin <morin@codelutin.com> Date: Wed Apr 6 16:20:47 2016 +0200 - on cache le message de prélèvement avant de créer une ligen en rafale - on cache le résumé quand aucune ligne n'est sélectionnée refs #8203 --- .../species/frequency/IndividualObservationUICache.java | 6 ++++-- .../catches/species/frequency/SpeciesFrequencyUIHandler.java | 11 ++++++++--- .../frequency/actions/ApplySpeciesFrequencyRafaleAction.java | 3 +++ 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/IndividualObservationUICache.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/IndividualObservationUICache.java index 06b07c0..0dddb40 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/IndividualObservationUICache.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/IndividualObservationUICache.java @@ -455,10 +455,12 @@ public class IndividualObservationUICache implements Closeable { } - public void updateSelectedRow(IndividualObservationBatchRowModel selectedRow) { + public void updateSelectedRow(Optional<IndividualObservationBatchRowModel> optSelectedRow) { Optional<SamplingEvent> event; - if (samplingCache.isPresent() && selectedRow.withSize()) { + if (samplingCache.isPresent() && optSelectedRow.isPresent() && optSelectedRow.get().withSize()) { + + IndividualObservationBatchRowModel selectedRow = optSelectedRow.get(); Boolean maturity = samplingCache.get().getMaturity(uiModel.getBatch().getSpecies().getReferenceTaxonId(), selectedRow.getMaturityState()); int lengthstep = uiModel.getLengthStepInMm(selectedRow.getSize()); 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 f382c47..9437e3b 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 @@ -1420,14 +1420,19 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci if (!getModel().isInRafaleRowCreation()) { resetSamplingLabel(); } + + Optional<IndividualObservationBatchRowModel> selectedRow; if (obsTable.getSelectedRowCount() == 1) { - IndividualObservationBatchRowModel selectedRow = getObsTableModel().getRows().get(obsTable.getSelectedRow()); - individualObservationUICache.updateSelectedRow(selectedRow); + selectedRow = Optional.of(getObsTableModel().getRows().get(obsTable.getSelectedRow())); + + } else { + selectedRow = Optional.empty(); } + individualObservationUICache.updateSelectedRow(selectedRow); }); } - protected void resetSamplingLabel() { + public void resetSamplingLabel() { if (log.isDebugEnabled()) { log.debug("reset smapling panel"); } 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 7d86e40..299af42 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 @@ -74,6 +74,9 @@ public class ApplySpeciesFrequencyRafaleAction { SpeciesFrequencyUIModel model = ui.getModel(); SpeciesFrequencyUIHandler handler = ui.getHandler(); + + handler.resetSamplingLabel(); + float aroundLengthStep = model.getLengthStep(step); model.setInRafaleRowCreation(true); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.