Changeset 10715 in josm for trunk/src/org/openstreetmap/josm/tools/Utils.java

Timestamp:

2016-08-03T15:01:43+02:00 (8 years ago)

Author:

simon04

Message:

see #11390, see #12890 - Deprecate Predicates class

File:

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

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

@@ -142 +142 @@
      */
     public static <T> boolean exists(Iterable<T> collection, Class<? extends T> clazz) {
-        return exists(collection, Predicates.<T>isInstanceOf(clazz));
+        CheckParameterUtil.ensureParameterNotNull(clazz, "clazz");
+        return exists(collection, clazz::isInstance);
     }
 
@@ -170 +171 @@
     @SuppressWarnings("unchecked")
     public static <T> T find(Iterable<? extends Object> collection, Class<? extends T> clazz) {
-        return (T) find(collection, Predicates.<Object>isInstanceOf(clazz));
+        CheckParameterUtil.ensureParameterNotNull(clazz, "clazz");
+        return (T) find(collection, clazz::isInstance);
     }
 
@@ -199 +201 @@
      */
     public static <S, T extends S> SubclassFilteredCollection<S, T> filteredCollection(Collection<S> collection, final Class<T> clazz) {
-        return new SubclassFilteredCollection<>(collection, Predicates.<S>isInstanceOf(clazz));
+        CheckParameterUtil.ensureParameterNotNull(clazz, "clazz");
+        return new SubclassFilteredCollection<>(collection, clazz::isInstance);
     }