Changeset 3034 in josm for trunk/test/functional/org/openstreetmap/josm/gui/dialogs
- Timestamp:
- 2010-02-23T08:58:12+01:00 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/test/functional/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialogTest.java
r1912 r3034 4 4 import javax.swing.JFrame; 5 5 6 import org.openstreetmap.josm.data.conflict.Conflict; 6 7 import org.openstreetmap.josm.data.osm.Node; 8 import org.openstreetmap.josm.data.osm.OsmPrimitive; 7 9 import org.openstreetmap.josm.data.osm.Way; 8 10 … … 27 29 w2.addNode(new Node(11)); 28 30 29 dialog.getConflictResolver().populate( w1, w2);31 dialog.getConflictResolver().populate(new Conflict<OsmPrimitive>(w1, w2)); 30 32 } 31 33
Note:
See TracChangeset
for help on using the changeset viewer.