Changeset 10658 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

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

Author:

Don-vip

Message:

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

File:

• trunk/src/org/openstreetmap/josm/tools/Geometry.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/tools/Geometry.java

@@ -888 +888 @@
      * @return {@code true} if the node is inside the multipolygon
      */
-    public static boolean isNodeInsideMultiPolygon(Node node, Relation multiPolygon, Predicate<Way> isOuterWayAMatch) {
+    public static boolean isNodeInsideMultiPolygon(Node node, Relation multiPolygon, java.util.function.Predicate<Way> isOuterWayAMatch) {
         return isPolygonInsideMultiPolygon(Collections.singletonList(node), multiPolygon, isOuterWayAMatch);
     }
@@ -902 +902 @@
      * @return {@code true} if the polygon formed by nodes is inside the multipolygon
      */
-    public static boolean isPolygonInsideMultiPolygon(List<Node> nodes, Relation multiPolygon, Predicate<Way> isOuterWayAMatch) {
+    public static boolean isPolygonInsideMultiPolygon(List<Node> nodes, Relation multiPolygon,
+            java.util.function.Predicate<Way> isOuterWayAMatch) {
         // Extract outer/inner members from multipolygon
         final MultiPolygonMembers mpm = new MultiPolygonMembers(multiPolygon);
@@ -936 +937 @@
                 if (!insideInner) {
                     // Final check using predicate
-                    if (isOuterWayAMatch == null || isOuterWayAMatch.evaluate(out.ways.get(0)
+                    if (isOuterWayAMatch == null || isOuterWayAMatch.test(out.ways.get(0)
                             /* TODO give a better representation of the outer ring to the predicate */)) {
                         return true;