Changeset 2930 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java

Timestamp:

03.02.2010 09:07:36 (2 years ago)

Author:

jttt

Message:

Make sure ConflictResolutionDialog is disposed when closed

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java (modified) (3 diffs)

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