Changeset 2070 in josm for trunk/src/org/openstreetmap/josm/data/osm/Way.java

Timestamp:

2009-09-06T23:07:33+02:00 (15 years ago)

Author:

Gubaer

Message:

new: rewrite of CombineWay action
new: conflict resolution dialog for CombineWay, including conflicts for different relation memberships
cleanup: cleanup in OsmReader, reduces memory footprint and reduces parsing time
cleanup: made most of the public fields in OsmPrimitive @deprecated, added accessors and changed the code
cleanup: replaced usages of @deprecated constructors for ExtendedDialog
fixed #3208: Combine ways brokes relation order

WARNING: this changeset touches a lot of code all over the code base. "latest" might become slightly unstable in the next days. Also experience incompatibility issues with plugins in the next few days.

File:

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

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

@@ -119 +119 @@
 
     /**
+     * Creates a new way with id 0.
+     * 
+     */
+    public Way(){
+    }
+
+    /**
      * Create an identical clone of the argument (including the id).
      * 
@@ -124 +131 @@
      */
     public Way(Way original) {
+        super(original.getId());
         cloneFrom(original);
     }
 
     /**
-     * Create an empty way without id. Use this only if you set meaningful
-     * values yourself.
-     */
-    public Way() {
-    }
-
-    /**
-     * Create an incomplete Way with a given id.
-     * 
-     * @param id  the id. id > 0 required.
-     */
-    public Way(long id) {
-        // FIXME: shouldn't we check for id > 0?
-        //
-        this.id = id;
-        incomplete = true;
+     * Creates a new way for the given id. If the id > 0, the way is marked
+     * as incomplete.
+     * 
+     * @param id the id. > 0 required
+     * @throws IllegalArgumentException thrown if id < 0
+     */
+    public Way(long id) throws IllegalArgumentException {
+        super(id);
     }
 
@@ -153 +153 @@
 
     @Override public String toString() {
-        if (incomplete) return "{Way id="+id+" version="+version+" (incomplete)}";
-        return "{Way id="+id+" version="+version+" nodes="+Arrays.toString(nodes.toArray())+"}";
+        if (incomplete) return "{Way id="+getId()+" version="+getVersion()+" (incomplete)}";
+        return "{Way id="+getId()+" version="+getVersion()+" nodes="+Arrays.toString(nodes.toArray())+"}";
     }
 
@@ -170 +170 @@
         if (o instanceof Relation)
             return 1;
-        return o instanceof Way ? Long.valueOf(id).compareTo(o.id) : -1;
+        return o instanceof Way ? Long.valueOf(getId()).compareTo(o.getId()) : -1;
     }