Changeset 1636 in josm for trunk/src/org/openstreetmap/josm/data/conflict

Timestamp:

2009-06-06T13:38:32+02:00 (16 years ago)

Author:

stoecker

Message:

fix #2302 - patch by jttt - some code cleanup for better encapsulation

File:

• trunk/src/org/openstreetmap/josm/data/conflict/PositionConflict.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/conflict/PositionConflict.java

@@ -23 +23 @@
     @Override public void apply(OsmPrimitive target, OsmPrimitive other) {
         if (target instanceof Node) {
-            ((Node)target).coor = ((Node)other).coor;
-            ((Node)target).eastNorth = ((Node)other).eastNorth;
+            ((Node)target).setEastNorth(((Node)other).eastNorth);
             int newversion = Math.max(target.version, other.version);
             // set version on "other" as well in case user decides to keep local