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

Timestamp:

2011-01-31T14:18:47+01:00 (13 years ago)

Author:

bastiK

Message:

mappaint restructuring aimed at mapcss support:

• area- and line style of multipolygon outer & inner ways are no longer determined by MapPaintVisitor, but the information is calculated in advance and cached
• cache is aware of zoom level
• z_index property to allow more fancy styles in future

Performance: when the style cache is filled, painting is the same or ~5% faster. The first painting, which includes style generation, takes ~30% longer than before. (There is potential for optimization, though.) Memory usage unchanged.

File:

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

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

@@ -4 +4 @@
 public class Utils {
 
-    public static <T> boolean exists(Iterable<? extends T> coll, Predicate<? super T> pred) {
-        for (T el : coll) {
-            if (pred.evaluate(el))
+    public static <T> boolean exists(Iterable<? extends T> collection, Predicate<? super T> predicate) {
+        for (T item : collection) {
+            if (predicate.evaluate(item))
                 return true;
         }
         return false;
+    }
+
+    public static <T> boolean exists(Iterable collection, Class<? extends T> klass) {
+        for (Object item : collection) {
+            if (klass.isInstance(item))
+                return true;
+        }
+        return false;
+    }
+
+    public static <T> T find(Iterable<? extends T> collection, Predicate<? super T> predicate) {
+        for (T item : collection) {
+            if (predicate.evaluate(item))
+                return item;
+        }
+        return null;
+    }
+
+    public static <T> T find(Iterable collection, Class<? extends T> klass) {
+        for (Object item : collection) {
+            if (klass.isInstance(item)) {
+                @SuppressWarnings("unchecked") T res = (T) item;
+                return res;
+            }
+        }
+        return null;
     }
 
@@ -28 +54 @@
     }
 
+    public static int max(int a, int b, int c, int d) {
+        return Math.max(Math.max(a, b), Math.max(c, d));
+    }
+
     /**
      * for convenience: test whether 2 objects are either both null or a.equals(b)
      */
     public static <T> boolean equal(T a, T b) {
-        if (a == null && b == null)
+        if (a == b)
             return true;
         return (a != null && a.equals(b));