Changeset 3147 in josm

Timestamp:

Mar 19, 2010 10:21:52 PM (3 years ago)

Author:

jttt

Message:

Use virtual collections for Dataset.all... methods

Location:

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

Files:

• DataSet.java (modified) (3 diffs)
• DatasetCollection.java (added)

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

@@ -163 +163 @@
 
     /**
-     * @return A collection containing all primitives of the dataset. The data is ordered after:
-     * first come nodes, then ways, then relations. Ordering in between the categories is not
-     * guaranteed.
-     */
-    public List<OsmPrimitive> allPrimitives() {
-        List<OsmPrimitive> o = new LinkedList<OsmPrimitive>();
-        o.addAll(nodes);
-        o.addAll(ways);
-        o.addAll(relations);
-        return o;
+     * @return A collection containing all primitives of the dataset. Data are not ordered
+     */
+    public Collection<OsmPrimitive> allPrimitives() {
+        return Collections.unmodifiableCollection(allPrimitives);
     }
 
@@ -179 +173 @@
      */
     public Collection<OsmPrimitive> allNonDeletedPrimitives() {
-        Collection<OsmPrimitive> o = new LinkedList<OsmPrimitive>();
-        for (OsmPrimitive osm : allPrimitives())
-            if (osm.isVisible() && !osm.isDeleted()) {
-                o.add(osm);
-            }
-        return o;
+        return new DatasetCollection.AllNonDeleted(allPrimitives);
     }
 
     public Collection<OsmPrimitive> allNonDeletedCompletePrimitives() {
-        Collection<OsmPrimitive> o = new LinkedList<OsmPrimitive>();
-        for (OsmPrimitive osm : allPrimitives())
-            if (osm.isVisible() && !osm.isDeleted() && !osm.isIncomplete()) {
-                o.add(osm);
-            }
-        return o;
+        return new DatasetCollection.AllNonDeletedComplete(allPrimitives);
     }
 
     public Collection<OsmPrimitive> allNonDeletedPhysicalPrimitives() {
-        Collection<OsmPrimitive> o = new LinkedList<OsmPrimitive>();
-        for (OsmPrimitive osm : allPrimitives())
-            if (osm.isVisible() && !osm.isDeleted() && !osm.isIncomplete() && !(osm instanceof Relation)) {
-                o.add(osm);
-            }
-        return o;
+        return new DatasetCollection.AllNonDeletedPhysical(allPrimitives);
     }
 
@@ -209 +188 @@
      */
     public Collection<OsmPrimitive> allModifiedPrimitives() {
-        Collection<OsmPrimitive> o = new LinkedList<OsmPrimitive>();
-        for (OsmPrimitive osm : allPrimitives()) {
-            if (osm.isVisible() && osm.isModified()) {
-                o.add(osm);
-            }
-        }
-        return o;
+        return new DatasetCollection.AllModified(allPrimitives);
     }