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

Timestamp:

2009-06-06T14:30:21+02:00 (16 years ago)

Author:

stoecker

Message:

little bit more refactoring of coordinate access - patch by jttt

File:

• trunk/src/org/openstreetmap/josm/data/conflict/PositionConflict.java (modified) (2 diffs)

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

@@ -10 +10 @@
 
     @Override public boolean hasConflict(OsmPrimitive key, OsmPrimitive value) {
-        return key instanceof Node && !((Node)key).coor.equals(((Node)value).coor);
+        return key instanceof Node && !((Node)key).getCoor().equals(((Node)value).getCoor());
     }
 
     @Override protected String str(OsmPrimitive osm) {
-        return osm instanceof Node ? ((Node)osm).coor.lat()+", "+((Node)osm).coor.lon() : null;
+        return osm instanceof Node ? ((Node)osm).getCoor().lat()+", "+((Node)osm).getCoor().lon() : null;
     }
 
@@ -23 +23 @@
     @Override public void apply(OsmPrimitive target, OsmPrimitive other) {
         if (target instanceof Node) {
-            ((Node)target).setEastNorth(((Node)other).eastNorth);
+            ((Node)target).setEastNorth(((Node)other).getEastNorth());
             int newversion = Math.max(target.version, other.version);
             // set version on "other" as well in case user decides to keep local