Changeset 3206 in josm for trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java

Timestamp:

2010-04-25T10:51:06+02:00 (16 years ago)

Author:

jttt

Message:

Remove obsoleted methods from Dataset, replace some calls of getNodes()/getWays()/getRelations() with allPrimitives()

File:

• trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java

@@ -106 +106 @@
     protected Set<OsmPrimitive> getCompletePrimitives(DataSet ds) {
         HashSet<OsmPrimitive> ret = new HashSet<OsmPrimitive>();
-        for (OsmPrimitive primitive : ds.getNodes()) {
-            if (!primitive.isIncomplete() && !primitive.isNew()) {
-                ret.add(primitive);
-            }
-        }
-        for (OsmPrimitive primitive : ds.getWays()) {
-            if (!primitive.isIncomplete() && !primitive.isNew()) {
-                ret.add(primitive);
-            }
-        }
-        for (OsmPrimitive primitive : ds.getRelations()) {
+        for (OsmPrimitive primitive : ds.allPrimitives()) {
             if (!primitive.isIncomplete() && !primitive.isNew()) {
                 ret.add(primitive);
@@ -205 +195 @@
                 DataSet ds = ((DownloadOsmTask) task).getDownloadedData();
                 if (ds != null) {
-                    ret.addAll(ds.getNodes());
-                    ret.addAll(ds.getWays());
-                    ret.addAll(ds.getRelations());
+                    ret.addAll(ds.allPrimitives());
                 }
             }
@@ -272 +260 @@
                         DataSet ds = ((DownloadOsmTask) task).getDownloadedData();
                         if (ds != null) {
-                            myPrimitives.removeAll(ds.getNodes());
-                            myPrimitives.removeAll(ds.getWays());
-                            myPrimitives.removeAll(ds.getRelations());
+                            myPrimitives.removeAll(ds.allPrimitives());
                         }
                     }