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

Timestamp:

2011-01-22T14:36:36+01:00 (13 years ago)

Author:

bastiK

Message:

generalize DatasetCollection.java (make OsmPrimitive a generic type parameter)

File:

• trunk/src/org/openstreetmap/josm/data/osm/DataSet.java (modified) (6 diffs)

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

@@ -34 +34 @@
 import org.openstreetmap.josm.data.osm.event.WayNodesChangedEvent;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager;
+import org.openstreetmap.josm.tools.FilteredCollection;
 import org.openstreetmap.josm.tools.Predicate;
+import org.openstreetmap.josm.tools.SubclassFilteredCollection;
 
 /**
@@ -174 +176 @@
 
     private <T extends OsmPrimitive> Collection<T> getPrimitives(Predicate<OsmPrimitive> predicate) {
-        return new DatasetCollection<T>(allPrimitives, predicate);
+        return new SubclassFilteredCollection<OsmPrimitive, T>(allPrimitives, predicate);
     }
 
@@ -386 +388 @@
 
     public Collection<OsmPrimitive> getSelectedNodesAndWays() {
-        return new DatasetCollection<OsmPrimitive>(getSelected(), new Predicate<OsmPrimitive>() {
+        return new FilteredCollection<OsmPrimitive>(getSelected(), new Predicate<OsmPrimitive>() {
             @Override
             public boolean evaluate(OsmPrimitive primitive) {
@@ -415 +417 @@
      */
     public Collection<Node> getSelectedNodes() {
-        return new DatasetCollection<Node>(getSelected(), OsmPrimitive.nodePredicate);
+        return new SubclassFilteredCollection<OsmPrimitive, Node>(getSelected(), OsmPrimitive.nodePredicate);
     }
 
@@ -422 +424 @@
      */
     public Collection<Way> getSelectedWays() {
-        return new DatasetCollection<Way>(getSelected(), OsmPrimitive.wayPredicate);
+        return new SubclassFilteredCollection<OsmPrimitive, Way>(getSelected(), OsmPrimitive.wayPredicate);
     }
 
@@ -429 +431 @@
      */
     public Collection<Relation> getSelectedRelations() {
-        return new DatasetCollection<Relation>(getSelected(), OsmPrimitive.relationPredicate);
+        return new SubclassFilteredCollection<OsmPrimitive, Relation>(getSelected(), OsmPrimitive.relationPredicate);
     }