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

Timestamp:

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

Author:

Gubaer

Message:

Had to replace DataSet:getPrimitiveById(id) with DataSet:getPrimitiveById(id,type). Primitive ids are not globally unique, only per type of primitive.
Fixed problems in unit test, available unit tests passing again.

File:

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

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

@@ -3 +3 @@
 
 import java.util.ArrayList;
+
 import java.util.Arrays;
 import java.util.Collection;
@@ -10 +11 @@
 import org.openstreetmap.josm.tools.CopyList;
 import org.openstreetmap.josm.tools.Pair;
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 /**
@@ -123 +125 @@
      */
     public Way(){
+        super(0);
     }
 
@@ -197 +200 @@
     }
 
-    public void addNode(Node n) {
+    /**
+     * Adds a node to the end of the list of nodes. Ignored, if n is null.
+     * 
+     * @param n the node. Ignored, if null.
+     * @throws IllegalStateException thrown, if this way is marked as incomplete. We can't add a node
+     * to an incomplete way
+     */
+    public void addNode(Node n) throws IllegalStateException {
+        if (n==null) return;
+        if (incomplete)
+            throw new IllegalStateException(tr("can't add node {0} to incomplete way {1}", n.getId(), getId()));
         if (incomplete) return;
         clearCached();
@@ -203 +216 @@
     }
 
-    public void addNode(int offs, Node n) {
-        if (incomplete) return;
+    /**
+     * Adds a node at position offs.
+     * 
+     * @param int offs the offset
+     * @param n the node. Ignored, if null.
+     * @throws IllegalStateException thrown, if this way is marked as incomplete. We can't add a node
+     * to an incomplete way
+     * @throws IndexOutOfBoundsException thrown if offs is out of bounds
+     */
+    public void addNode(int offs, Node n) throws IllegalStateException, IndexOutOfBoundsException {
+        if (n==null) return;
+        if (incomplete)
+            throw new IllegalStateException(tr("can't add node {0} to incomplete way {1}", n.getId(), getId()));
         clearCached();
         nodes.add(offs, n);