Changeset 14547 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2018-12-10T15:34:13+01:00 (5 years ago)

Author:

GerdP

Message:

see #17040 revert r14546 Sometimes tries to remove listener twice

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;
@@ -105 +104 @@
             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;
@@ -56 +55 @@
  * @since 2689
  */
-public class ChangesetDetailPanel extends JPanel implements PropertyChangeListener, ChangesetAware, Destroyable {
+public class ChangesetDetailPanel extends JPanel implements PropertyChangeListener, ChangesetAware {
 
     // CHECKSTYLE.OFF: SingleSpaceSeparator
@@ -478 +477 @@
         return currentChangeset;
     }
-
-    @Override
-    public void destroy() {
-        MainApplication.getLayerManager().removeActiveLayerChangeListener(actSelectInCurrentLayer);
-        MainApplication.getLayerManager().removeActiveLayerChangeListener(actZoomInCurrentLayerAction);
-    }
 }