Changeset 2353 in josm for trunk/src

Timestamp:

2009-10-30T22:27:57+01:00 (14 years ago)

Author:

Gubaer

Message:

applied #3818: patch by hansendc: suppress QuadBuckets warnings

File:

• trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java (modified) (3 diffs)

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

@@ -245 +245 @@
                 this.content = null;
             return ret;
+        }
+        @SuppressWarnings("unchecked")
+        QBLevel[] newChildren()
+        {
+            // This is ugly and hackish.  But, it seems to work,
+            // and using an ArrayList here seems to cost us
+            // a significant performance penalty -- 50% in my
+            // testing.  Child access is one of the single
+            // hottest code paths in this entire class.
+            return (QBLevel[])Array.newInstance(this.getClass(), QuadTiling.TILES_PER_LEVEL);
         }
         // Get the correct index for the given primitive
@@ -304 +314 @@
                 abort("overwrote children");
             }
-            // This is ugly and hackish.  But, it seems to work,
-            // and using an ArrayList here seems to cost us
-            // a significant performance penalty -- 50% in my
-            // testing.  Child access is one of the single
-            // hottest code paths in this entire class.
-            children = (QBLevel[])Array.newInstance(this.getClass(), QuadTiling.TILES_PER_LEVEL);
+            children = newChildren();
             // deferring allocation of children until use
             // seems a bit faster
@@ -878 +883 @@
     // If anyone has suggestions for how to fix
     // this properly, I'm listening :)
+    @SuppressWarnings("unchecked")
     private T convert(Object raw)
     {
-        //@SuppressWarnings("unchecked")
         return (T)raw;
     }