Changeset 3034 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMerger.java

Timestamp:

2010-02-23T08:58:12+01:00 (14 years ago)

Author:

jttt

Message:

Fix #4467 Don't silently drop locally deleted member primitives from downloaded ways and relation (fix the issue when deleted primitive is referenced)

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.conflict.Conflict;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
@@ -54 +55 @@
     }
 
-    public void populate(OsmPrimitive my, OsmPrimitive their) {
+    public void populate(Conflict<? extends OsmPrimitive> conflict) {
         RelationMemberListMergeModel model = (RelationMemberListMergeModel)getModel();
-        model.populate((Relation)my, (Relation)their);
+        model.populate((Relation)conflict.getMy(), (Relation)conflict.getTheir());
     }