Changeset 10490 in josm for trunk/src/org

Timestamp:

2016-06-25T11:58:24+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #13003 - IllegalArgumentException: Attempted to remove listener that was not in list (patch by michael2402) - gsoc-core

Location:

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset

Files:

• ChangesetContentPanel.java (modified) (2 diffs)
• ChangesetDetailPanel.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java

@@ -54 +54 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Utils;
-import org.openstreetmap.josm.tools.bugreport.BugReport;
 import org.openstreetmap.josm.tools.bugreport.BugReportExceptionHandler;
 
@@ -100 +99 @@
                 new ComponentAdapter() {
                     @Override
+                    public void componentShown(ComponentEvent e) {
+                        Main.getLayerManager().addAndFireActiveLayerChangeListener(actSelectInCurrentLayerAction);
+                        Main.getLayerManager().addAndFireActiveLayerChangeListener(actZoomInCurrentLayerAction);
+                    }
+
+                    @Override
                     public void componentHidden(ComponentEvent e) {
-                        // make sure the listener is unregistered when the panel becomes
-                        // invisible
-                        try {
-                            Main.getLayerManager().removeActiveLayerChangeListener(actSelectInCurrentLayerAction);
-                            Main.getLayerManager().removeActiveLayerChangeListener(actZoomInCurrentLayerAction);
-                        } catch (IllegalArgumentException t) {
-                            throw BugReport.intercept(t).put("hint", "This Component can only be hidden once.");
-                        }
+                        // make sure the listener is unregistered when the panel becomes invisible
+                        Main.getLayerManager().removeActiveLayerChangeListener(actSelectInCurrentLayerAction);
+                        Main.getLayerManager().removeActiveLayerChangeListener(actZoomInCurrentLayerAction);
                     }
                 }

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java

@@ -96 +96 @@
                 new ComponentAdapter() {
                     @Override
+                    public void componentShown(ComponentEvent e) {
+                        Main.getLayerManager().addAndFireActiveLayerChangeListener(actSelectInCurrentLayer);
+                        Main.getLayerManager().addAndFireActiveLayerChangeListener(actZoomInCurrentLayerAction);
+                    }
+
+                    @Override
                     public void componentHidden(ComponentEvent e) {
-                        // make sure the listener is unregistered when the panel becomes
-                        // invisible
+                        // make sure the listener is unregistered when the panel becomes invisible
                         Main.getLayerManager().removeActiveLayerChangeListener(actSelectInCurrentLayer);
                         Main.getLayerManager().removeActiveLayerChangeListener(actZoomInCurrentLayerAction);