Changeset 3034 in josm for trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/properties

Timestamp:

2010-02-23T08:58:12+01:00 (17 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/test/functional/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergerTest.java (modified) (2 diffs)

trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergerTest.java

@@ -7 +7 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.conflict.Conflict;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.projection.Epsg4326;
-import org.openstreetmap.josm.gui.conflict.pair.properties.PropertiesMerger;
 
 public class PropertiesMergerTest extends JFrame{
@@ -31 +32 @@
         their.setCoor(new LatLon(10,10));
 
-        merger.getModel().populate(my, their);
+        merger.getModel().populate(new Conflict<OsmPrimitive>(my, their));
     }