Changeset 2930 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.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/ConflictDialog.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"));
+        }
     }