Changeset 86 in josm for src/org/openstreetmap/josm/data/osm/Way.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/Way.java (modified) (2 diffs)

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

@@ -2 +2 @@
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
@@ -16 +17 @@
          * All way segments in this way
          */
-        public final List<LineSegment> segments = new ArrayList<LineSegment>();
+        public final List<Segment> segments = new ArrayList<Segment>();
 
-        @Override
-        public void visit(Visitor visitor) {
+        @Override public void visit(Visitor visitor) {
                 visitor.visit(this);
         }
 
-        @Override
-        public void cloneFrom(OsmPrimitive osm) {
+        /**
+         * Create an identical clone of the argument (including the id)
+         */
+        public Way(Way clone) {
+                cloneFrom(clone);
+        }
+        
+        public Way() {
+        }
+        
+        @Override public void cloneFrom(OsmPrimitive osm) {
                 super.cloneFrom(osm);
                 segments.clear();
                 segments.addAll(((Way)osm).segments);
         }
+
+    @Override public String toString() {
+        return "{Way id="+id+" segments="+Arrays.toString(segments.toArray())+"}";
+    }
+
+        @Override public boolean realEqual(OsmPrimitive osm) {
+                return osm instanceof Way ? super.realEqual(osm) && segments.equals(((Way)osm).segments) : false;
+    }
 }