Changeset 2945 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMerger.java

Timestamp:

06.02.2010 09:37:48 (2 years ago)

Author:

jttt

Message:

Improvements in conflicts gui

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMerger.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMerger.java

@@ -5 +5 @@
 
 import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.conflict.pair.IConflictResolver;
@@ -62 +63 @@
     }
 
-    public void populate(Way my, Way their) {
-        ((NodeListMergeModel)model).populate(my, their);
+    public void populate(OsmPrimitive my, OsmPrimitive their) {
+        ((NodeListMergeModel)model).populate((Way)my, (Way)their);
     }