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

Timestamp:

2016-07-27T02:16:37+02:00 (8 years ago)

Author:

Don-vip

Message:

see #11390, see #12890 - use Java 8 Predicates (forgot some)

File:

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

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

@@ -5 +5 @@
 import java.util.Set;
 import java.util.TreeSet;
+import java.util.function.Predicate;
 
 import org.openstreetmap.josm.Main;
@@ -13 +14 @@
 import org.openstreetmap.josm.data.projection.Projections;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
-import org.openstreetmap.josm.tools.Predicate;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -381 +381 @@
                     final boolean containsN = visited.contains(n);
                     visited.add(n);
-                    if (!containsN && (predicate == null || predicate.evaluate(n))
+                    if (!containsN && (predicate == null || predicate.test(n))
                             && n.isConnectedTo(otherNodes, hops - 1, predicate, visited)) {
                         return true;