Changeset 1117 in josm for trunk/src/org

Timestamp:

2008-12-13T01:13:32+01:00 (16 years ago)

Author:

framm

Message:

• list relation conflicts in conflict list. this is one issue relating to bug #1726 but not yet a full fix.

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (modified) (1 diff)

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

@@ -127 +127 @@
                         if (osm instanceof Way)
                                 model.addElement(osm);
-        }
+        for (OsmPrimitive osm : this.conflicts.keySet())
+            if (osm instanceof Relation)
+                model.addElement(osm);
+    }
 
         public final void add(Map<OsmPrimitive, OsmPrimitive> conflicts) {