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

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/io/MultiFetchServerObjectReader.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java

@@ -110 +110 @@
      *   id=<code>id</code>
      */
-    protected void remember(DataSet ds, long id) throws IllegalArgumentException, NoSuchElementException{
+    protected void remember(DataSet ds, long id, OsmPrimitiveType type) throws IllegalArgumentException, NoSuchElementException{
         if (ds == null)
             throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "ds"));
         if (id <= 0) return;
-        OsmPrimitive primitive = ds.getPrimitiveById(id);
+        OsmPrimitive primitive = ds.getPrimitiveById(id, type);
         if (primitive == null)
             throw new NoSuchElementException(tr("no primitive with id {0} in local dataset. Can't infer primitive type", id));
@@ -122 +122 @@
 
     /**
-     * appends a list of  ids to the list of ids which will be fetched from the server. ds must
-     * include an {@see OsmPrimitive} for each id in ids.
-     *
-     * id is ignored if id <= 0.
-     *
-     * @param ds  the dataset
-     * @param ids  the list of ids
+     * appends a {@see Node}s id to the list of ids which will be fetched from the server.
+     *
+     * @param node  the node (ignored, if null)
      * @return this
      *
      */
-    public MultiFetchServerObjectReader append(DataSet ds, long ... ids)  {
-        if (ids == null) return this;
-        for (int i=0; i < ids.length; i++) {
-            remember(ds, ids[i]);
-        }
-        return this;
-    }
-
-    /**
-     * appends a collection of  ids to the list of ids which will be fetched from the server. ds must
-     * include an {@see OsmPrimitive} for each id in ids.
-     *
-     * id is ignored if id <= 0.
-     *
-     * @param ds  the dataset
-     * @param ids  the collection of ids
-     * @return this
-     *
-     */
-    public MultiFetchServerObjectReader append(DataSet ds, Collection<Long> ids) {
-        if (ids == null) return null;
-        for (long id: ids) {
-            append(ds,id);
+    public MultiFetchServerObjectReader append(DataSet ds, long id, OsmPrimitiveType type) {
+        switch(type) {
+        case NODE:
+            Node n = (Node)ds.getPrimitiveById(id,type);
+            append(n);
+            break;
+        case WAY:
+            Way w= (Way)ds.getPrimitiveById(id,type);
+            append(w);
+            break;
+        case RELATION:
+            Relation r = (Relation)ds.getPrimitiveById(id,type);
+            append(r);
+            break;
         }
         return this;
@@ -376 +363 @@
                 String msg = "";
                 switch(type) {
-                    case NODE: msg = tr("Fetching node with id {0} from ''{1}''", id, OsmApi.getOsmApi().getBaseUrl()); break;
-                    case WAY: msg = tr("Fetching way with id {0} from ''{1}''", id, OsmApi.getOsmApi().getBaseUrl()); break;
-                    case RELATION: msg = tr("Fetching relation with id {0} from ''{1}''", id, OsmApi.getOsmApi().getBaseUrl()); break;
+                case NODE: msg = tr("Fetching node with id {0} from ''{1}''", id, OsmApi.getOsmApi().getBaseUrl()); break;
+                case WAY: msg = tr("Fetching way with id {0} from ''{1}''", id, OsmApi.getOsmApi().getBaseUrl()); break;
+                case RELATION: msg = tr("Fetching relation with id {0} from ''{1}''", id, OsmApi.getOsmApi().getBaseUrl()); break;
                 }
                 progressMonitor.setCustomText(msg);
@@ -414 +401 @@
         String msg = "";
         switch(type) {
-            case NODE: msg = tr("Fetching a package of nodes from ''{0}''", OsmApi.getOsmApi().getBaseUrl()); break;
-            case WAY:  msg = tr("Fetching a package of ways from ''{0}''", OsmApi.getOsmApi().getBaseUrl()); break;
-            case RELATION:  msg = tr("Fetching a package of relations from ''{0}''", OsmApi.getOsmApi().getBaseUrl()); break;
+        case NODE: msg = tr("Fetching a package of nodes from ''{0}''", OsmApi.getOsmApi().getBaseUrl()); break;
+        case WAY:  msg = tr("Fetching a package of ways from ''{0}''", OsmApi.getOsmApi().getBaseUrl()); break;
+        case RELATION:  msg = tr("Fetching a package of relations from ''{0}''", OsmApi.getOsmApi().getBaseUrl()); break;
         }
         progressMonitor.setCustomText(msg);