Changeset 14555 in josm for trunk/src/org

Timestamp:

2018-12-12T15:12:36+01:00 (6 years ago)

Author:

GerdP

Message:

see #17040 commit ChangesetDetail-v2.patch

Location:

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

Files:

• ChangesetCacheManager.java (modified) (2 diffs)
• ChangesetDetailPanel.java (modified) (5 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

@@ -11 +11 @@
 import java.awt.Insets;
 import java.awt.event.ActionEvent;
-import java.awt.event.ComponentAdapter;
-import java.awt.event.ComponentEvent;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
@@ -46 +44 @@
 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 +54 @@
  * @since 2689
  */
-public class ChangesetDetailPanel extends JPanel implements PropertyChangeListener, ChangesetAware {
+public class ChangesetDetailPanel extends JPanel implements PropertyChangeListener, ChangesetAware, Destroyable {
 
     // CHECKSTYLE.OFF: SingleSpaceSeparator
@@ -104 +103 @@
         tb.add(actZoomInCurrentLayerAction);
         MainApplication.getLayerManager().addActiveLayerChangeListener(actZoomInCurrentLayerAction);
-
-        addComponentListener(
-                new ComponentAdapter() {
-                    @Override
-                    public void componentShown(ComponentEvent e) {
-                        MainApplication.getLayerManager().addAndFireActiveLayerChangeListener(actSelectInCurrentLayer);
-                        MainApplication.getLayerManager().addAndFireActiveLayerChangeListener(actZoomInCurrentLayerAction);
-                    }
-
-                    @Override
-                    public void componentHidden(ComponentEvent e) {
-                        // make sure the listener is unregistered when the panel becomes invisible
-                        MainApplication.getLayerManager().removeActiveLayerChangeListener(actSelectInCurrentLayer);
-                        MainApplication.getLayerManager().removeActiveLayerChangeListener(actZoomInCurrentLayerAction);
-                    }
-                }
-        );
 
         pnl.add(tb);
@@ -477 +459 @@
         return currentChangeset;
     }
+
+    @Override
+    public void destroy() {
+        MainApplication.getLayerManager().removeActiveLayerChangeListener(actSelectInCurrentLayer);
+        MainApplication.getLayerManager().removeActiveLayerChangeListener(actZoomInCurrentLayerAction);
+    }
 }