Changeset 2930 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
- Timestamp:
- 2010-02-03T09:07:36+01:00 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
r2880 r2930 165 165 conflicts = editLayer == null?new ConflictCollection():editLayer.getConflicts(); 166 166 model.fireContentChanged(); 167 updateTitle(conflicts.size()); 168 } 169 170 private void updateTitle(int conflictsCount) { 171 if (conflictsCount > 0) { 172 setTitle(tr("Conflicts: {0} unresolved", conflicts.size())); 173 } else { 174 setTitle(tr("Conflict")); 175 } 167 176 } 168 177
Note:
See TracChangeset
for help on using the changeset viewer.