Ignore:
Timestamp:
2010-02-23T08:58:12+01:00 (15 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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/test/functional/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialogTest.java

    r1912 r3034  
    44import javax.swing.JFrame;
    55
     6import org.openstreetmap.josm.data.conflict.Conflict;
    67import org.openstreetmap.josm.data.osm.Node;
     8import org.openstreetmap.josm.data.osm.OsmPrimitive;
    79import org.openstreetmap.josm.data.osm.Way;
    810
     
    2729        w2.addNode(new Node(11));
    2830
    29         dialog.getConflictResolver().populate(w1, w2);
     31        dialog.getConflictResolver().populate(new Conflict<OsmPrimitive>(w1, w2));
    3032    }
    3133
Note: See TracChangeset for help on using the changeset viewer.