Changeset 14546 in josm for trunk/src/org

Timestamp:

2018-12-10T13:13:38+01:00 (6 years ago)

Author:

GerdP

Message:

see #17040 implement Destroyable in ChangesetDetailPanel and use it

Removes listeners added with each use of ChangesetManager (Ctrl+Alt+C)

Location:

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

Files:

• ChangesetCacheManager.java (modified) (2 diffs)
• ChangesetDetailPanel.java (modified) (3 diffs)

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

@@ -65 +65 @@
 import org.openstreetmap.josm.io.NetworkManager;
 import org.openstreetmap.josm.io.OnlineResource;
+import org.openstreetmap.josm.tools.Destroyable;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.InputMapUtils;
@@ -104 +105 @@
             instance.setVisible(true);
             instance.dispose();
+            for (Component c : instance.pnlChangesetDetailTabs.getComponents()) {
+                if (c instanceof Destroyable) {
+                    ((Destroyable) c).destroy();
+                }
+            }
             instance = null;
         }

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

@@ -46 +46 @@
 import org.openstreetmap.josm.io.NetworkManager;
 import org.openstreetmap.josm.io.OnlineResource;
+import org.openstreetmap.josm.tools.Destroyable;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Utils;
@@ -55 +56 @@
  * @since 2689
  */
-public class ChangesetDetailPanel extends JPanel implements PropertyChangeListener, ChangesetAware {
+public class ChangesetDetailPanel extends JPanel implements PropertyChangeListener, ChangesetAware, Destroyable {
 
     // CHECKSTYLE.OFF: SingleSpaceSeparator
@@ -477 +478 @@
         return currentChangeset;
     }
+
+    @Override
+    public void destroy() {
+        MainApplication.getLayerManager().removeActiveLayerChangeListener(actSelectInCurrentLayer);
+        MainApplication.getLayerManager().removeActiveLayerChangeListener(actZoomInCurrentLayerAction);
+    }
 }