Changeset 2077 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2009-09-07T23:06:19+02:00 (17 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.

Location:

trunk/src/org/openstreetmap/josm/data/osm

Files:

• DataSet.java (modified) (2 diffs)
• OsmPrimitiveType.java (modified) (1 diff)
• Relation.java (modified) (1 diff)
• Way.java (modified) (5 diffs)

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

@@ -313 +313 @@
      *
      * @param id  the id, > 0 required
+     * @param type the type of  the primitive. Must not be null.
      * @return the primitive
      * @exception IllegalArgumentException thrown, if id <= 0
-     */
-    public OsmPrimitive getPrimitiveById(long id) {
+     * @exception IllegalArgumentException thrown, if type is null
+     * @exception IllegalArgumentException thrown, if type is neither NODE, or WAY or RELATION
+     */
+    public OsmPrimitive getPrimitiveById(long id, OsmPrimitiveType type) {
         if (id <= 0)
             throw new IllegalArgumentException(tr("parameter {0} > 0 required. Got {1}.", "id", id));
-        for (OsmPrimitive primitive : nodes) {
-            if (primitive.getId() == id) return primitive;
-        }
-        for (OsmPrimitive primitive : ways) {
-            if (primitive.getId() == id) return primitive;
-        }
-        for (OsmPrimitive primitive : relations) {
+        if (id <= 0)
+            throw new IllegalArgumentException(tr("paramete''{0}'' must not be null", "type"));
+        Collection<? extends OsmPrimitive> primitives = null;
+        switch(type) {
+        case NODE: primitives = nodes; break;
+        case WAY: primitives = ways; break;
+        case RELATION: primitives = relations; break;
+        case CHANGESET: throw new IllegalArgumentException(tr("unsupported value ''{0}'' or parameter ''{1}''", type, "type"));
+        }
+        for (OsmPrimitive primitive : primitives) {
             if (primitive.getId() == id) return primitive;
         }
@@ -341 +347 @@
         for (OsmPrimitive primitive : relations) {
             ret.add(primitive.getId());
-        }
-        return ret;
-    }
-
-    /**
-     * Replies the set of ids of all complete primitives (i.e. those with
-     * ! primitive.incomplete)
-     *
-     * @return the set of ids of all complete primitives
-     */
-    public Set<Long> getCompletePrimitiveIds() {
-        HashSet<Long> ret = new HashSet<Long>();
-        for (OsmPrimitive primitive : nodes) {
-            if (!primitive.incomplete) {
-                ret.add(primitive.getId());
-            }
-        }
-        for (OsmPrimitive primitive : ways) {
-            if (! primitive.incomplete) {
-                ret.add(primitive.getId());
-            }
-        }
-        for (OsmPrimitive primitive : relations) {
-            if (! primitive.incomplete) {
-                ret.add(primitive.getId());
-            }
         }
         return ret;

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

@@ -39 +39 @@
     }
 
+    public static OsmPrimitiveType from(String value) {
+        if (value == null) return null;
+        for (OsmPrimitiveType type: values()){
+            if (type.getAPIName().equalsIgnoreCase(value))
+                return type;
+        }
+        return null;
+    }
+
 }

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

@@ -112 +112 @@
      */
     public Relation() {
-
+        super(0);
     }
 

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);