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

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/tools

Files:

• FilteredCollection.java (modified) (1 diff)
• SubclassFilteredCollection.java (modified) (1 diff)
• Utils.java (modified) (2 diffs)

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

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

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

@@ -120 +120 @@
      * @return The filtered collection. It is a {@code Collection<T>}.
      */
-    public static <T> SubclassFilteredCollection<T, T> filter(Collection<T> collection, java.util.function.Predicate<T> predicate) {
+    public static <T> SubclassFilteredCollection<T, T> filter(Collection<? extends T> collection, java.util.function.Predicate<T> predicate) {
         return new SubclassFilteredCollection<>(collection, predicate);
     }

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

@@ -102 +102 @@
      * Tests whether {@code predicate} applies to at least one element from {@code collection}.
      * <p>
-     * Note: you can use {@link Stream#anyMatch(java.util.function.Predicate)} instead.
      * @param <T> type of items
      * @param collection the collection
      * @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
     public static <T> boolean exists(Iterable<? extends T> collection, Predicate<? super T> predicate) {
         for (T item : collection) {
@@ -120 +121 @@
      * Tests whether {@code predicate} applies to all elements from {@code collection}.
      * <p>
-     * Note: you can use {@link Stream#allMatch(java.util.function.Predicate)} instead.
      * @param <T> type of items
      * @param collection the collection
      * @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
     public static <T> boolean forAll(Iterable<? extends T> collection, Predicate<? super T> predicate) {
         return !exists(collection, Predicates.not(predicate));