Changeset 2869 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java

Timestamp:

17.01.2010 11:56:07 (2 years ago)

Author:

jttt

Message:

Removed ToggleDialog.tearDown(). All listeners should be unregistered in hideNotify()

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java

@@ -47 +47 @@
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
+import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Shortcut;
 import org.openstreetmap.josm.tools.ImageProvider.OverlayPosition;
-import org.openstreetmap.josm.tools.CheckParameterUtil;
 
 /**
@@ -70 +70 @@
      */
     static public void createInstance(MapFrame mapFrame) {
+        if (instance != null)
+            throw new IllegalStateException("Dialog was already created");
         instance = new LayerListDialog(mapFrame);
     }
@@ -115 +117 @@
         activateLayerAction = new ActivateLayerAction();
         adaptTo(activateLayerAction, selectionModel);
-        MapView.addLayerChangeListener(activateLayerAction);
         buttonPanel.add(new SideButton(activateLayerAction));
 
@@ -153 +154 @@
         selectionModel.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
         model = new LayerListModel(selectionModel);
-        MapView.addLayerChangeListener(model);
 
         // create the list control
@@ -185 +185 @@
 
     @Override
-    public void tearDown() {
+    public void showNotify() {
+        MapView.addLayerChangeListener(activateLayerAction);
+        MapView.addLayerChangeListener(model);
+    }
+
+    @Override
+    public void hideNotify() {
         MapView.removeLayerChangeListener(model);
         MapView.removeLayerChangeListener(activateLayerAction);
@@ -240 +246 @@
                 }
         );
+    }
+
+    @Override
+    public void destroy() {
+        super.destroy();
+        instance = null;
     }