Changeset 10691 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2016-07-31T17:58:31+02:00 (8 years ago)

Author:

Don-vip

Message:

see #11390, fix #12890 - finish transition to Java 8 predicates/functions

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/DataSet.java (modified) (2 diffs)
• gui/dialogs/properties/PropertiesDialog.java (modified) (1 diff)
• gui/mappaint/mapcss/ExpressionFactory.java (modified) (1 diff)
• tools/FilteredCollection.java (modified) (2 diffs)
• tools/Geometry.java (modified) (3 diffs)
• tools/Predicate.java (deleted)
• tools/Predicates.java (modified) (2 diffs)
• tools/SubclassFilteredCollection.java (modified) (4 diffs)
• tools/Utils.java (modified) (7 diffs)

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

@@ -21 +21 @@
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
+import java.util.function.Predicate;
 
 import org.openstreetmap.josm.Main;
@@ -319 +320 @@
      * @since 10590
      */
-    public <T extends OsmPrimitive> Collection<T> getPrimitives(java.util.function.Predicate<? super OsmPrimitive> predicate) {
+    public <T extends OsmPrimitive> Collection<T> getPrimitives(Predicate<? super OsmPrimitive> predicate) {
         return new SubclassFilteredCollection<>(allPrimitives, predicate);
     }

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

@@ -896 +896 @@
                 positionString = Utils.getPositionListString(position);
                 // if not all objects from the selection are member of this relation
-                if (selection.stream().anyMatch(Predicates.not(Predicates.inCollection(members)))) {
+                if (selection.stream().anyMatch(Predicates.inCollection(members).negate())) {
                     positionString += ",\u2717";
                 }

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

@@ -1135 +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 = SubclassFilteredCollection.filter(floats, Predicates.not(Predicates.isNull()));
+            final Collection<Float> nonNullList = SubclassFilteredCollection.filter(floats, Predicates.<Float>isNull().negate());
             return nonNullList.isEmpty() ? (Float) Float.NaN : computeMax ? Collections.max(nonNullList) : Collections.min(nonNullList);
         }

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

@@ -3 +3 @@
 
 import java.util.Collection;
+import java.util.function.Predicate;
 
 /**
@@ -17 +18 @@
      * @param predicate The predicate to use as filter
      */
-    public FilteredCollection(Collection<? extends T> collection, java.util.function.Predicate<? super T> predicate) {
+    public FilteredCollection(Collection<? extends T> collection, Predicate<? super T> predicate) {
         super(collection, predicate);
     }

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

@@ -16 +16 @@
 import java.util.List;
 import java.util.Set;
+import java.util.function.Predicate;
 
 import org.openstreetmap.josm.Main;
@@ -887 +888 @@
      * @return {@code true} if the node is inside the multipolygon
      */
-    public static boolean isNodeInsideMultiPolygon(Node node, Relation multiPolygon, java.util.function.Predicate<Way> isOuterWayAMatch) {
+    public static boolean isNodeInsideMultiPolygon(Node node, Relation multiPolygon, Predicate<Way> isOuterWayAMatch) {
         return isPolygonInsideMultiPolygon(Collections.singletonList(node), multiPolygon, isOuterWayAMatch);
     }
@@ -901 +902 @@
      * @return {@code true} if the polygon formed by nodes is inside the multipolygon
      */
-    public static boolean isPolygonInsideMultiPolygon(List<Node> nodes, Relation multiPolygon,
-            java.util.function.Predicate<Way> isOuterWayAMatch) {
+    public static boolean isPolygonInsideMultiPolygon(List<Node> nodes, Relation multiPolygon, Predicate<Way> isOuterWayAMatch) {
         // Extract outer/inner members from multipolygon
         final MultiPolygonMembers mpm = new MultiPolygonMembers(multiPolygon);

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

@@ -4 +4 @@
 import java.util.Collection;
 import java.util.Objects;
+import java.util.function.Predicate;
 import java.util.regex.Pattern;
 
@@ -34 +35 @@
     public static <T> Predicate<T> alwaysFalse() {
         return o -> false;
-    }
-
-    /**
-     * Returns the negation of {@code predicate}.
-     * @param <T> type of items
-     * @param predicate the predicate to negate
-     * @return the negation of {@code predicate}
-     * @deprecated Use {@link java.util.function.Predicate#negate()}
-     */
-    @Deprecated
-    public static <T> Predicate<T> not(final Predicate<T> predicate) {
-        return obj -> !predicate.evaluate(obj);
     }
 

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

@@ -6 +6 @@
 import java.util.Iterator;
 import java.util.NoSuchElementException;
+import java.util.function.Predicate;
 
 /**
@@ -22 +23 @@
 
     private final Collection<? extends S> collection;
-    private final java.util.function.Predicate<? super S> predicate;
+    private final Predicate<? super S> predicate;
     private int size = -1;
 
@@ -72 +73 @@
      * @param collection The base collection to filter
      * @param predicate The predicate to use as filter
-     * @deprecated Use java predicates instead.
+     * @see #filter(Collection, Predicate) for an alternative way to construct this.
      */
-    @Deprecated
     public SubclassFilteredCollection(Collection<? extends S> collection, Predicate<? super S> predicate) {
-        this(collection, (java.util.function.Predicate<? super S>) predicate);
-    }
-
-    /**
-     * Constructs a new {@code SubclassFilteredCollection}.
-     * @param collection The base collection to filter
-     * @param predicate The predicate to use as filter
-     * @see #filter(Collection, java.util.function.Predicate) for an alternative way to construct this.
-     */
-    public SubclassFilteredCollection(Collection<? extends S> collection, java.util.function.Predicate<? super S> predicate) {
         this.collection = collection;
         this.predicate = predicate;
@@ -120 +110 @@
      * @return The filtered collection. It is a {@code Collection<T>}.
      */
-    public static <T> SubclassFilteredCollection<T, T> filter(Collection<? extends T> collection, java.util.function.Predicate<T> predicate) {
+    public static <T> SubclassFilteredCollection<T, T> filter(Collection<? extends T> collection, Predicate<T> predicate) {
         return new SubclassFilteredCollection<>(collection, predicate);
     }

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

@@ -50 +50 @@
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.Predicate;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -106 +107 @@
      * @param predicate the predicate
      * @return {@code true} if {@code predicate} applies to at least one element from {@code collection}
-     * @deprecated use {@link Stream#anyMatch(java.util.function.Predicate)} instead.
+     * @deprecated use {@link Stream#anyMatch(Predicate)} instead.
      */
     @Deprecated
     public static <T> boolean exists(Iterable<? extends T> collection, Predicate<? super T> predicate) {
         for (T item : collection) {
-            if (predicate.evaluate(item)) {
+            if (predicate.test(item)) {
                 return true;
             }
@@ -125 +126 @@
      * @param predicate the predicate
      * @return {@code true} if {@code predicate} applies to all elements from {@code collection}
-     * @deprecated use {@link Stream#allMatch(java.util.function.Predicate)} instead.
+     * @deprecated use {@link Stream#allMatch(Predicate)} instead.
      */
     @Deprecated
     public static <T> boolean forAll(Iterable<? extends T> collection, Predicate<? super T> predicate) {
-        return !exists(collection, Predicates.not(predicate));
+        return !exists(collection, predicate.negate());
     }
 
@@ -152 +153 @@
     public static <T> T find(Iterable<? extends T> collection, Predicate<? super T> predicate) {
         for (T item : collection) {
-            if (predicate.evaluate(item)) {
+            if (predicate.test(item)) {
                 return item;
             }
@@ -169 +170 @@
     public static <T> T find(Iterable<? extends Object> collection, Class<? extends T> clazz) {
         return (T) find(collection, Predicates.<Object>isInstanceOf(clazz));
-    }
-
-    /**
-     * Creates a new {@link FilteredCollection}.
-     * @param <T> The collection type.
-     * @param collection The collection to filter.
-     * @param predicate The predicate to filter for.
-     * @return The new {@link FilteredCollection}
-     * @deprecated Use java predicates and {@link SubclassFilteredCollection#filter(Collection, java.util.function.Predicate)} instead.
-     */
-    @Deprecated
-    @SuppressWarnings("unused")
-    public static <T> Collection<T> filter(Collection<? extends T> collection, Predicate<? super T> predicate) {
-        // Diamond operator does not work with Java 9 here
-        return new FilteredCollection<T>(collection, predicate);
     }
 
@@ -225 +211 @@
         int i = 0;
         for (T item : collection) {
-            if (predicate.evaluate(item))
+            if (predicate.test(item))
                 return i;
             i++;
@@ -758 +744 @@
     public static String escapeReservedCharactersHTML(String s) {
         return s == null ? "" : s.replace("&", "&amp;").replace("<", "&lt;").replace(">", "&gt;");
-    }
-
-    /**
-     * Represents a function that can be applied to objects of {@code A} and
-     * returns objects of {@code B}.
-     * @param <A> class of input objects
-     * @param <B> class of transformed objects
-     *
-     * @deprecated Use java.util.function.Function instead.
-     */
-    @Deprecated
-    @FunctionalInterface
-    public interface Function<A, B> extends java.util.function.Function<A, B> {
-
-        /**
-         * Applies the function on {@code x}.
-         * @param x an object of
-         * @return the transformed object
-         */
-        @Override
-        B apply(A x);
     }