Changeset 2869 in josm

Timestamp:

Jan 17, 2010 11:56:07 AM (3 years ago)

Author:

jttt

Message:

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

Location:

trunk/src/org/openstreetmap/josm

Files:

• Main.java (modified) (2 diffs)
• gui/MapFrame.java (modified) (2 diffs)
• gui/MapStatus.java (modified) (2 diffs)
• gui/dialogs/ChangesetDialog.java (modified) (1 diff)
• gui/dialogs/ConflictDialog.java (modified) (1 diff)
• gui/dialogs/DialogsPanel.java (modified) (1 diff)
• gui/dialogs/FilterDialog.java (modified) (4 diffs)
• gui/dialogs/LayerListDialog.java (modified) (6 diffs)
• gui/dialogs/SelectionListDialog.java (modified) (3 diffs)
• gui/dialogs/ToggleDialog.java (modified) (2 diffs)
• gui/dialogs/UserListDialog.java (modified) (2 diffs)
• gui/dialogs/properties/PropertiesDialog.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/Main.java

@@ -111 +111 @@
     public static MapFrame map;
     /**
-     * The dialog that gets displayed during background task execution.
-     */
-    //public static PleaseWaitDialog pleaseWaitDlg;
-
-    /**
      * True, when in applet mode
      */
@@ -184 +179 @@
             map.mapView.removeLayer(layer);
             if (map.mapView.getAllLayers().isEmpty()) {
-                map.tearDownDialogsPane();
                 setMapFrame(null);
             }

trunk/src/org/openstreetmap/josm/gui/MapFrame.java

@@ -199 +199 @@
         // MapFrame gets destroyed when the last layer is removed, but the status line background
         // thread that collects the information doesn't get destroyed automatically.
-        if(statusLine.thread == null) return;
-        try {
-            statusLine.thread.interrupt();
-        } catch (Exception e) {}
+        if(statusLine.thread != null) {
+            try {
+                statusLine.thread.interrupt();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
     }
 
@@ -214 +217 @@
     public void initializeDialogsPane() {
         dialogsPanel.initialize(allDialogs);
-    }
-
-    /**
-     *
-     */
-    public void tearDownDialogsPane() {
-        dialogsPanel.tearDown();
     }
 

trunk/src/org/openstreetmap/josm/gui/MapStatus.java

@@ -144 +144 @@
         public void run() {
             for (;;) {
+
                 MouseState ms = new MouseState();
                 synchronized (this) {
@@ -595 +596 @@
 
     @Override
-    public void addMouseListener(MouseListener ml) {
+    public synchronized void addMouseListener(MouseListener ml) {
         //super.addMouseListener(ml);
         lonText.addMouseListener(ml);

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

@@ -142 +142 @@
         MapView.removeEditLayerChangeListener(inSelectionModel);
         DataSet.selListeners.remove(inSelectionModel);
-    }
-
-    @Override
-    public void tearDown() {
-        unregisterAsListener();
     }
 

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

@@ -119 +119 @@
 
         build();
+        refreshView();
+    }
+
+    @Override
+    public void showNotify() {
         DataSet.selListeners.add(this);
         MapView.addLayerChangeListener(this);
-        refreshView();
     }
 
     @Override
-    public void tearDown() {
+    public void hideNotify() {
         MapView.removeLayerChangeListener(this);
         DataSet.selListeners.remove(this);

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

@@ -46 +46 @@
         this.add(mSpltPane);
         reconstruct(Action.ELEMENT_SHRINKS, null);
-    }
-
-    /**
-     * Invoke before the panel is discarded. This will in turn call {@see ToggleDialog#tearDown()}
-     * on every dialog.
-     *
-     */
-    public void tearDown() {
-        for(ToggleDialog dialog: allDialogs) {
-            dialog.tearDown();
-        }
     }
 

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

@@ -7 +7 @@
 import java.awt.BorderLayout;
 import java.awt.Component;
-import java.awt.GridLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -15 +14 @@
 import javax.swing.JCheckBox;
 import javax.swing.JPanel;
-import javax.swing.JPopupMenu;
 import javax.swing.JScrollPane;
 import javax.swing.JTable;
@@ -47 +45 @@
     private SideButton upButton;
     private SideButton downButton;
-    private JPopupMenu popupMenu;
 
     public FilterDialog(){
         super(tr("Filter"), "filter", tr("Filter objects and hide/disable them."),
                 Shortcut.registerShortcut("subwindow:filter", tr("Toggle: {0}", tr("Filter")), KeyEvent.VK_F, Shortcut.GROUP_LAYER, Shortcut.SHIFT_DEFAULT), 162);
-
+        build();
+    }
+
+    @Override
+    public void showNotify() {
         MapView.addLayerChangeListener(this);
-        build();
     }
 
     @Override
-    public void tearDown() {
+    public void hideNotify() {
         MapView.removeLayerChangeListener(this);
     }
@@ -144 +144 @@
                     @Override
                     public String getToolTipText(MouseEvent e) {
-                        String tip = null;
                         java.awt.Point p = e.getPoint();
                         int index = columnModel.getColumnIndexAtX(p.x);

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;
     }
 

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

@@ -159 +159 @@
         }
 
-        MapView.addEditLayerChangeListener(this);
-    }
-
-    @Override
-    public void tearDown() {
-        MapView.removeEditLayerChangeListener(this);
     }
 
@@ -170 +164 @@
     public void showNotify() {
         DataSet.selListeners.add(this);
+        MapView.addEditLayerChangeListener(this);
         updateSelection();
     }
@@ -176 +171 @@
     public void hideNotify() {
         DataSet.selListeners.remove(this);
+        MapView.removeEditLayerChangeListener(this);
     }
 

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

@@ -7 +7 @@
 import java.awt.Component;
 import java.awt.Dimension;
+import java.awt.FlowLayout;
 import java.awt.Graphics;
-import java.awt.FlowLayout;
+import java.awt.GridBagLayout;
 import java.awt.GridLayout;
-import java.awt.GridBagLayout;
 import java.awt.Image;
 import java.awt.Rectangle;
@@ -560 +560 @@
     }
 
-    /**
-     * This method is called by hosting panel before the panel with the toggle dialogs
-     * and the toggle dialogs themself are discared, for instance because no layer is
-     * left in JOSM and  the main screen turns from the map editor to the MOTD panel.
-     *
-     * Override in subclasses to unregister as listener. After tearDown() is invoked
-     * the dialog should be registered as listener.
-     *
-     * The default implementation is empty.
-     */
-    public void tearDown() {}
-
     protected JPanel getButtonPanel(int columns) {
         JPanel pnl = new JPanel();
         pnl.setLayout(Main.pref.getBoolean("dialog.align.left", false)
-        ? new FlowLayout(FlowLayout.LEFT) : new GridLayout(1,columns));
+                ? new FlowLayout(FlowLayout.LEFT) : new GridLayout(1,columns));
         return pnl;
     }

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

@@ -67 +67 @@
 
         build();
+    }
+
+    @Override
+    public void showNotify() {
         DataSet.selListeners.add(this);
         MapView.addLayerChangeListener(this);
@@ -72 +76 @@
 
     @Override
-    public void tearDown() {
+    public void hideNotify() {
         MapView.removeLayerChangeListener(this);
         DataSet.selListeners.remove(this);

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

@@ -155 +155 @@
         listOfUsedTags.rebuildNecessary();
         DataSet.selListeners.add(this);
+        MapView.addEditLayerChangeListener(this);
         updateSelection();
     }
@@ -163 +164 @@
         DatasetEventManager.getInstance().removeDatasetListener(dataChangedAdapter);
         DataSet.selListeners.remove(this);
+        MapView.removeEditLayerChangeListener(this);
     }
 
@@ -587 +589 @@
         buttonPanel.add(this.btnDel);
         add(buttonPanel, BorderLayout.SOUTH);
-
-        MapView.addEditLayerChangeListener(this);
-    }
-
-    @Override
-    public void tearDown() {
-        MapView.removeEditLayerChangeListener(this);
     }