Changeset 10286 in josm for trunk

Timestamp:

2016-05-27T19:12:49+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #12880 - Add instanceOf predicate and predicate tests (patch by michael2402)

Location:

trunk

Files:

• src/org/openstreetmap/josm/tools/Predicates.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/tools/PredicatesTest.java (added)

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

@@ -80 +80 @@
      * @param <T> The predicate type.
      * @param clazz The class the elements must have.
-     * @return A predicate.
+     * @return The new predicate.
+     * @throws IllegalArgumentException if clazz is null
      */
     public static <T> Predicate<T> isOfClass(final Class<? extends T> clazz) {
+        CheckParameterUtil.ensureParameterNotNull(clazz, "clazz");
         return new Predicate<T>() {
             @Override
             public boolean evaluate(T obj) {
                 return obj != null && obj.getClass() == clazz;
+            }
+        };
+    }
+
+    /**
+     * Creates a new predicate that checks if the object is of a given class.
+     * @param <T> The predicate type.
+     * @param clazz The class objects need to be of.
+     * @return The new predicate.
+     * @throws IllegalArgumentException if clazz is null
+     * @since 10286
+     */
+    public static <T> Predicate<T> isInstanceOf(final Class<? extends T> clazz) {
+        CheckParameterUtil.ensureParameterNotNull(clazz, "clazz");
+        return new Predicate<T>() {
+            @Override
+            public boolean evaluate(T o) {
+                return clazz.isInstance(o);
             }
         };
@@ -190 +210 @@
         };
     }
+
 }