Changeset 2930 in josm

Timestamp:

03.02.2010 09:07:36 (2 years ago)

Author:

jttt

Message:

Make sure ConflictResolutionDialog is disposed when closed

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/dialogs/ConflictDialog.java (modified) (1 diff)
• gui/dialogs/ConflictResolutionDialog.java (modified) (10 diffs)
• gui/dialogs/SelectionListDialog.java (modified) (3 diffs)
• tools/CopyList.java (modified) (1 diff)

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

@@ -165 +165 @@
         conflicts = editLayer == null?new ConflictCollection():editLayer.getConflicts();
         model.fireContentChanged();
+        updateTitle(conflicts.size());
+    }
+
+    private void updateTitle(int conflictsCount) {
+        if (conflictsCount > 0) {
+            setTitle(tr("Conflicts: {0} unresolved", conflicts.size()));
+        } else {
+            setTitle(tr("Conflict"));
+        }
     }
 

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

@@ -21 +21 @@
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
+import javax.swing.WindowConstants;
 
 import org.openstreetmap.josm.Main;
@@ -43 +44 @@
     private ConflictResolver resolver;
 
+    private ApplyResolutionAction applyResolutionAction;
+
     /**
      * restore position and size on screen from preference settings
@@ -95 +98 @@
         Main.pref.put("conflictresolutiondialog.width", Integer.toString(d.width));
         Main.pref.put("conflictresolutiondialog.height", Integer.toString(d.height));
+    }
+
+    @Override
+    public void removeNotify() {
+        super.removeNotify();
+        unregisterListeners();
     }
 
@@ -104 +113 @@
         } else {
             rememberPositionAndDimension();
+            unregisterListeners();
         }
         super.setVisible(isVisible);
+    }
+
+    private void closeDialog() {
+        setVisible(false);
+        dispose();
     }
 
@@ -117 +132 @@
         pnl.setLayout(new FlowLayout(FlowLayout.CENTER));
 
-        ApplyResolutionAction applyResolutionAction = new ApplyResolutionAction();
-        resolver.addPropertyChangeListener(applyResolutionAction);
+        applyResolutionAction = new ApplyResolutionAction();
         JButton btn = new JButton(applyResolutionAction);
         btn.setName("button.apply");
@@ -135 +149 @@
     }
 
+    private void registerListeners() {
+        resolver.addPropertyChangeListener(applyResolutionAction);
+    }
+
+    private void unregisterListeners() {
+        resolver.removePropertyChangeListener(applyResolutionAction);
+    }
+
     /**
      * builds the GUI
      */
     protected void build() {
+        setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
         updateTitle();
         getContentPane().setLayout(new BorderLayout());
@@ -149 +172 @@
         resolver.addPropertyChangeListener(this);
         HelpUtil.setHelpContext(this.getRootPane(), "Dialog/ConflictDialog");
+
+        registerListeners();
     }
 
@@ -172 +197 @@
 
         public void actionPerformed(ActionEvent arg0) {
-            setVisible(false);
+            closeDialog();
         }
     }
@@ -231 +256 @@
                 switch(ret) {
                 case JOptionPane.YES_OPTION:
-                    setVisible(false);
+                    closeDialog();
                     break;
                 default:
@@ -240 +265 @@
                 Command cmd = resolver.buildResolveCommand();
                 Main.main.undoRedo.add(cmd);
-                setVisible(false);
+                closeDialog();
             } catch(OperationCancelledException e) {
                 // do nothing. Exception already reported

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

@@ -174 +174 @@
         SelectionEventManager.getInstance().removeSelectionListener(this);
         MapView.removeEditLayerChangeListener(this);
+        updateTitle(0, 0, 0);
     }
 
@@ -274 +275 @@
         }
 
-        if( (nodes+ways+relations) != 0) {
-            setTitle(tr("Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}", relations, ways, nodes));
-        } else {
-            setTitle(tr("Selection"));
-        }
+        updateTitle(nodes, ways, relations);
 
         if (selectionHistory != null && newSelection.size() > 0 && !newSelection.equals(historyIgnoreSelection)) {
@@ -293 +290 @@
                 selectionHistory.removeLast();
             }
+        }
+    }
+
+    private void updateTitle(int nodes, int ways, int relations) {
+        if( (nodes+ways+relations) != 0) {
+            setTitle(tr("Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}", relations, ways, nodes));
+        } else {
+            setTitle(tr("Selection"));
         }
     }

trunk/src/org/openstreetmap/josm/tools/CopyList.java

@@ -130 +130 @@
 
     private void rangeCheck(int index) {
-        if (index >= size || index < 0) throw new IndexOutOfBoundsException();
+        if (index >= size || index < 0) throw new IndexOutOfBoundsException("Index:" + index + " Size:" + size);
     }