This is an automated email from the git hooks/post-receive script. New commit to branch feature/7943 in repository tutti. See http://git.codelutin.com/tutti.git commit 786bd8bc0e6fa5b8167a7e7d66a431e4d7890eb2 Author: Kevin Morin <morin@codelutin.com> Date: Tue Jan 26 17:26:46 2016 +0100 close UI des ecrans de mensurations quan don quitte les captures + reset des listeners de l'ichtyometre pour etre sur qu'il n'y en a qu'un (fixes #7943) --- .../src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReader.java | 6 ++++++ .../ui/swing/content/operation/catches/EditCatchesUIHandler.java | 2 ++ .../catches/species/frequency/SpeciesFrequencyUIHandler.java | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReader.java b/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReader.java index d86619f..19ce998 100644 --- a/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReader.java +++ b/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/feed/FeedReader.java @@ -129,6 +129,12 @@ public class FeedReader implements Closeable { listenerList.remove(FeedReaderListener.class, listener); } + public void removeAllFeedModeReaderListeners() { + for (FeedReaderListener listener : listenerList.getListeners(FeedReaderListener.class)) { + listenerList.remove(FeedReaderListener.class, listener); + } + } + protected class ReadingRunnable implements Runnable { /** diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java index bcdc02e..5242a0b 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java @@ -247,7 +247,9 @@ public class EditCatchesUIHandler extends AbstractTuttiTabContainerUIHandler<Edi // close batches tabs, then general tab closeUI(ui.getSpeciesTabContent()); + closeUI(ui.getSpeciesTabFrequencyEditor()); closeUI(ui.getBenthosTabContent()); + closeUI(ui.getBenthosTabFrequencyEditor()); closeUI(ui.getMarineLitterTabContent()); closeUI(ui.getAccidentalTabContent()); closeUI(ui.getIndividualObservationTabContent()); 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 b4643fc..383bbdd 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 @@ -684,7 +684,7 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci protected void listenItchtyometer() { // always remove the listener before adding it to be sure it will not be there twice - getContext().getIchtyometerReader().removeFeedModeReaderListener(feedReaderListener); + getContext().getIchtyometerReader().removeAllFeedModeReaderListeners(); if (log.isInfoEnabled()) { log.info("Start listen ichtyometer"); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.