Ticket #17040: ChangesetDetail-v2.patch

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

@@ -64 +64 @@
 import org.openstreetmap.josm.io.ChangesetQuery;
 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;
 import org.openstreetmap.josm.tools.Logging;
@@ -103 +104 @@
         if (instance != null) {
             instance.setVisible(true);
             instance.dispose();
+            for (Component c : instance.pnlChangesetDetailTabs.getComponents()) {
+                if (c instanceof Destroyable) {
+                    ((Destroyable) c).destroy();
+                }
+            }
             instance = null;
         }
     }

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

@@ -10 +10 @@
 import java.awt.GridBagLayout;
 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;
 import java.text.DateFormat;
@@ -45 +43 @@
 import org.openstreetmap.josm.gui.widgets.JosmTextField;
 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;
 import org.openstreetmap.josm.tools.date.DateUtils;
@@ -54 +53 @@
  * {@link ChangesetCacheManager}.
  * @since 2689
  */
-public class ChangesetDetailPanel extends JPanel implements PropertyChangeListener, ChangesetAware {
+public class ChangesetDetailPanel extends JPanel implements PropertyChangeListener, ChangesetAware, Destroyable {
 
     // CHECKSTYLE.OFF: SingleSpaceSeparator
     private final JosmTextField tfID        = new JosmTextField(10);
@@ -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);
         return pnl;
     }
@@ -476 +458 @@
     public Changeset getCurrentChangeset() {
         return currentChangeset;
     }
+
+    @Override
+    public void destroy() {
+        MainApplication.getLayerManager().removeActiveLayerChangeListener(actSelectInCurrentLayer);
+        MainApplication.getLayerManager().removeActiveLayerChangeListener(actZoomInCurrentLayerAction);
+    }
 }