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

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/validation/tests

Files:

• ConditionalKeys.java (modified) (2 diffs)
• OverlappingWays.java (modified) (2 diffs)
• WayConnectedToArea.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/validation/tests/ConditionalKeys.java

@@ -19 +19 @@
 import org.openstreetmap.josm.data.validation.TestError;
 import org.openstreetmap.josm.tools.LanguageInfo;
-import org.openstreetmap.josm.tools.Predicates;
 import org.openstreetmap.josm.tools.SubclassFilteredCollection;
 
@@ -166 +165 @@
         final List<TestError> errors = new ArrayList<>();
         for (final String key : SubclassFilteredCollection.filter(p.keySet(),
-                Predicates.stringMatchesPattern(Pattern.compile(".*:conditional(:.*)?$")))) {
+                Pattern.compile(":conditional(:.*)?$").asPredicate())) {
             if (!isKeyValid(key)) {
                 errors.add(new TestError(this, Severity.WARNING, tr("Wrong syntax in {0} key", key), 3201, p));

trunk/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java

@@ -28 +28 @@
 import org.openstreetmap.josm.tools.MultiMap;
 import org.openstreetmap.josm.tools.Pair;
-import org.openstreetmap.josm.tools.Predicates;
 
 /**
@@ -156 +155 @@
                 boolean ignore = false;
                 for (String ignoredKey : IGNORED_KEYS.get()) {
-                    if (error.getPrimitives().stream().anyMatch(Predicates.hasKey(ignoredKey))) {
+                    if (error.getPrimitives().stream().anyMatch(p -> p.hasKey(ignoredKey))) {
                         ignore = true;
                         break;

trunk/src/org/openstreetmap/josm/data/validation/tests/WayConnectedToArea.java

@@ -15 +15 @@
 import org.openstreetmap.josm.data.validation.TestError;
 import org.openstreetmap.josm.gui.mappaint.ElemStyles;
-import org.openstreetmap.josm.tools.Predicates;
 
 /**
@@ -67 +66 @@
         if (wayNode.isOutsideDownloadArea()) {
             return;
-        } else if (wayNode.getReferrers().stream().anyMatch(Predicates.hasTag("route", "ferry"))) {
+        } else if (wayNode.getReferrers().stream().anyMatch(p1 -> p1.hasTag("route", "ferry"))) {
             return;
         } else if (isArea(p)) {