Changeset 10715 in josm for trunk/src/org/openstreetmap/josm/data/osm

Timestamp:

2016-08-03T15:01:43+02:00 (8 years ago)

Author:

simon04

Message:

see #11390, see #12890 - Deprecate Predicates class

Location:

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

Files:

• DataSet.java (modified) (2 diffs)
• OsmPrimitive.java (modified) (2 diffs)

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

@@ -48 +48 @@
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager;
 import org.openstreetmap.josm.tools.FilteredCollection;
-import org.openstreetmap.josm.tools.Predicates;
 import org.openstreetmap.josm.tools.SubclassFilteredCollection;
 import org.openstreetmap.josm.tools.Utils;
@@ -458 +457 @@
      */
     public Collection<OsmPrimitive> allPrimitives() {
-        return getPrimitives(Predicates.alwaysTrue());
+        return getPrimitives(o -> true);
     }
 

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

@@ -28 +28 @@
 import org.openstreetmap.josm.gui.mappaint.StyleCache;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
-import org.openstreetmap.josm.tools.Predicates;
 import org.openstreetmap.josm.tools.Utils;
 import org.openstreetmap.josm.tools.template_engine.TemplateEngineDataProvider;
@@ -234 +233 @@
      * A predicate filtering nodes.
      */
-    public static final Predicate<OsmPrimitive> nodePredicate = Predicates.<OsmPrimitive>isOfClass(Node.class);
+    public static final Predicate<OsmPrimitive> nodePredicate = Node.class::isInstance;
 
     /**
      * A predicate filtering ways.
      */
-    public static final Predicate<OsmPrimitive> wayPredicate = Predicates.<OsmPrimitive>isOfClass(Way.class);
+    public static final Predicate<OsmPrimitive> wayPredicate = Way.class::isInstance;
 
     /**
      * A predicate filtering relations.
      */
-    public static final Predicate<OsmPrimitive> relationPredicate = Predicates.<OsmPrimitive>isOfClass(Relation.class);
+    public static final Predicate<OsmPrimitive> relationPredicate = Relation.class::isInstance;
 
     /**