Changeset 86 in josm for src/org/openstreetmap/josm/data/osm/Node.java

Timestamp:

2006-04-21T14:31:51+02:00 (18 years ago)

Author:

imi

Message:

• added conflicts and resolve conflict dialog

This is one of those "changed everything" checkpoint.

File:

• src/org/openstreetmap/josm/data/osm/Node.java (modified) (2 diffs)

src/org/openstreetmap/josm/data/osm/Node.java

@@ -15 +15 @@
         
         public LatLon coor;
-        public EastNorth eastNorth;
+        public volatile EastNorth eastNorth;
+
+        /**
+         * Create an identical clone of the argument (including the id)
+         */
+        public Node(Node clone) {
+                cloneFrom(clone);
+        }
 
         public Node(LatLon latlon) {
@@ -22 +29 @@
         }
 
-        @Override
-        public void visit(Visitor visitor) {
+        @Override public void visit(Visitor visitor) {
                 visitor.visit(this);
         }
         
-        @Override
-        public String toString() {
-                return "{Node id="+id+",lat="+coor.lat()+",lon="+coor.lon()+"}";
-        }
-
-        @Override
-        public void cloneFrom(OsmPrimitive osm) {
+        @Override public void cloneFrom(OsmPrimitive osm) {
                 super.cloneFrom(osm);
                 coor = ((Node)osm).coor;
                 eastNorth = ((Node)osm).eastNorth;
         }
+
+        @Override public String toString() {
+                return "{Node id="+id+",lat="+coor.lat()+",lon="+coor.lon()+"}";
+        }
+
+        @Override public boolean realEqual(OsmPrimitive osm) {
+                return osm instanceof Node ? super.realEqual(osm) && coor.equals(((Node)osm).coor) : false;
+    }
 }