Changeset 2936 in josm for trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java

Timestamp:

04.02.2010 21:04:02 (2 years ago)

Author:

jttt

Message:

Fixed #4408 confict manager: do not have to solve tag- and element-conficts when deleting

File:

• trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java

@@ -109 +109 @@
 
     public void historyUpdated(HistoryDataSet source, PrimitiveId primitiveId) {
-        if (primitiveId == null) {
+        if (primitiveId == null || primitiveId.equals(browser.getHistory().getPrimitmiveId())) {
             browser.populate(source.getHistory(browser.getHistory().getPrimitmiveId()));
-        } else if (primitiveId.equals(browser.getHistory().getPrimitmiveId())) {
-            browser.populate(source.getHistory(primitiveId));
         }
     }