Changeset 343 in josm for trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

Timestamp:

2007-10-07T13:20:27+02:00 (17 years ago)

Author:

gebner

Message:

Merge 0.5.

File:

• trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

@@ -3 +3 @@
 
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -90 +91 @@
 
         /**
+         * If set to true, this object is incomplete, which means only the id
+         * and type is known (type is the objects instance class)
+         */
+        public boolean incomplete = false; 
+
+        /**
          * Implementation of the visitor scheme. Subclases have to call the correct
          * visitor function.
@@ -125 +132 @@
                 Visitor v = new Visitor(){
                         public void visit(Node n) { ret[0] = 1; }
-                        public void visit(Segment s) { ret[0] = 2; }
-                        public void visit(Way w) { ret[0] = 3; }
+                        public void visit(Way w) { ret[0] = 2; }
+                        public void visit(Relation e) { ret[0] = 3; }
                 };
                 visit(v);
-                return id == 0 ? super.hashCode() : (int)(id<<3)+ret[0];
+                return id == 0 ? super.hashCode() : (int)(id<<2)+ret[0];
         }
 
@@ -205 +212 @@
                 return timestamp == null ? null : new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(timestamp);
         }
+        
+        
 }