Changeset 2945 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMerger.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/relation/RelationMemberMerger.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMerger.java

@@ -5 +5 @@
 import javax.swing.JTable;
 
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
@@ -53 +54 @@
     }
 
-    public void populate(Relation my, Relation their) {
+    public void populate(OsmPrimitive my, OsmPrimitive their) {
         RelationMemberListMergeModel model = (RelationMemberListMergeModel)getModel();
-        model.populate(my,their);
+        model.populate((Relation)my, (Relation)their);
     }