Changeset 10657 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss

Timestamp:

2016-07-27T02:08:34+02:00 (8 years ago)

Author:

Don-vip

Message:

see #11390, see #12890 - use Java 8 Predicates

Location:

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss

Files:

• Condition.java (modified) (5 diffs)
• ExpressionFactory.java (modified) (2 diffs)
• Selector.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java

@@ -11 +11 @@
 import java.util.Objects;
 import java.util.Set;
+import java.util.function.Predicate;
 import java.util.regex.Pattern;
 
@@ -26 +27 @@
 import org.openstreetmap.josm.gui.mappaint.Environment;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
-import org.openstreetmap.josm.tools.Predicate;
 import org.openstreetmap.josm.tools.Predicates;
+import org.openstreetmap.josm.tools.SubclassFilteredCollection;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -463 +464 @@
                     return e.osm.isKeyFalse(label) ^ negateResult;
                 case REGEX:
-                    return Utils.exists(e.osm.keySet(), containsPattern) ^ negateResult;
+                    return e.osm.keySet().stream().anyMatch(containsPattern) ^ negateResult;
                 default:
                     return e.osm.hasKey(label) ^ negateResult;
@@ -486 +487 @@
             String key = label;
             if (KeyMatchType.REGEX.equals(matchType)) {
-                final Collection<String> matchingKeys = Utils.filter(p.keySet(), containsPattern);
+                final Collection<String> matchingKeys = SubclassFilteredCollection.filter(p.keySet(), containsPattern);
                 if (!matchingKeys.isEmpty()) {
                     key = matchingKeys.iterator().next();
@@ -666 +667 @@
          */
         static boolean inDownloadedArea(Environment e) { // NO_UCD (unused code)
-            return IN_DOWNLOADED_AREA.evaluate(e.osm);
+            return IN_DOWNLOADED_AREA.test(e.osm);
         }
 

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java

@@ -38 +38 @@
 import org.openstreetmap.josm.tools.Predicates;
 import org.openstreetmap.josm.tools.RightAndLefthandTraffic;
+import org.openstreetmap.josm.tools.SubclassFilteredCollection;
 import org.openstreetmap.josm.tools.Utils;
 import org.openstreetmap.josm.tools.Utils.Function;
@@ -1134 +1135 @@
         public Float aggregateList(List<?> lst) {
             final List<Float> floats = Utils.transform(lst, (Function<Object, Float>) x -> Cascade.convertTo(x, float.class));
-            final Collection<Float> nonNullList = Utils.filter(floats, Predicates.not(Predicates.isNull()));
+            final Collection<Float> nonNullList = SubclassFilteredCollection.filter(floats, Predicates.not(Predicates.isNull()));
             return nonNullList.isEmpty() ? (Float) Float.NaN : computeMax ? Collections.max(nonNullList) : Collections.min(nonNullList);
         }

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java

@@ -25 +25 @@
 import org.openstreetmap.josm.tools.Pair;
 import org.openstreetmap.josm.tools.Predicates;
+import org.openstreetmap.josm.tools.SubclassFilteredCollection;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -320 +321 @@
                         throw new NoSuchElementException();
                     }
-                    final Collection<Relation> multipolygons = Utils.filteredCollection(Utils.filter(
+                    final Collection<Relation> multipolygons = Utils.filteredCollection(SubclassFilteredCollection.filter(
                             e.osm.getReferrers(), Predicates.hasTag("type", "multipolygon")), Relation.class);
                     final Relation multipolygon = multipolygons.iterator().next();