Changeset 10040 in josm for trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

Timestamp:

2016-03-26T11:30:54+01:00 (10 years ago)

Author:

Don-vip

Message:

fix #12680 - Documentation and cleanup on predicates (patch by michael2402, modified)

File:

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

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

@@ -48 +48 @@
 import org.openstreetmap.josm.tools.FilteredCollection;
 import org.openstreetmap.josm.tools.Predicate;
+import org.openstreetmap.josm.tools.Predicates;
 import org.openstreetmap.josm.tools.SubclassFilteredCollection;
 import org.openstreetmap.josm.tools.Utils;
@@ -264 +265 @@
     private final QuadBuckets<Node> nodes = new QuadBuckets<>();
 
-    private <T extends OsmPrimitive> Collection<T> getPrimitives(Predicate<OsmPrimitive> predicate) {
+    private <T extends OsmPrimitive> Collection<T> getPrimitives(Predicate<? super OsmPrimitive> predicate) {
         return new SubclassFilteredCollection<>(allPrimitives, predicate);
     }
@@ -402 +403 @@
      */
     public Collection<OsmPrimitive> allPrimitives() {
-        return getPrimitives(OsmPrimitive.allPredicate);
+        return getPrimitives(Predicates.alwaysTrue());
     }