Changeset 8510 in josm for trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/properties
- Timestamp:
- 2015-06-20T23:42:21+02:00 (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/test/functional/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergerTest.java
r7937 r8510 28 28 protected void populate() { 29 29 Node my = new Node(1); 30 my.setCoor(new LatLon(1,1)); 30 my.setCoor(new LatLon(1, 1)); 31 31 my.setDeleted(true); 32 32 33 33 Node their = new Node(2); 34 their.setCoor(new LatLon(10,10)); 34 their.setCoor(new LatLon(10, 10)); 35 35 36 36 merger.getModel().populate(new Conflict<OsmPrimitive>(my, their));
Note:
See TracChangeset
for help on using the changeset viewer.
