Changeset 2420 in josm for trunk/src/org/openstreetmap

Timestamp:

2009-11-09T09:08:05+01:00 (14 years ago)

Author:

jttt

Message:

Fix warnings in QuadBuckets

File:

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

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

@@ -2 +2 @@
 import java.lang.reflect.Array;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
@@ -20 +21 @@
     static void abort(String s)
     {
-        out(s);
-        Object o = null;
-        o.hashCode();
+        throw new AssertionError(s);
     }
     static void out(String s)
@@ -82 +81 @@
                     (xmax >  180.0) ||
                     (ymin <  -90.0) ||
-                    (ymax >   90.0)) {
-                out("bad BBox: " + this);
-                Object o = null;
-                o.hashCode();
-            }
+                    (ymax >   90.0))
+                throw new IllegalArgumentException("bad BBox: " + this);
         }
         @Override
@@ -253 +249 @@
             return ret;
         }
-        @SuppressWarnings("unchecked")
         QBLevel[] newChildren()
         {
@@ -272 +267 @@
             }
             if (o instanceof Node) {
-                Node n = (Node)o;
                 LatLon coor = ((Node)o).getCoor();
                 if (coor == null)
@@ -365 +359 @@
         void add_to_leaf(T o)
         {
-            QBLevel ret = this;
             add_content(o);
             if (content.size() > MAX_OBJECTS_PER_LEVEL) {
@@ -545 +538 @@
             if (content == null) {
                 if (debug) {
-                    out("["+level+"] leaf size: null content, children? " + children);
+                    out("["+level+"] leaf size: null content, children? " + Arrays.toString(children));
                 }
                 return 0;
@@ -580 +573 @@
         QBLevel find_exact(T n)
         {
-            QBLevel ret = null;
             if (content != null && content.contains(n))
                 return this;
@@ -855 +847 @@
         throw new UnsupportedOperationException();
     }
-    public boolean retainAll(Collection objects)
+    public boolean retainAll(Collection<?> objects)
     {
         for (T o : this) {
@@ -874 +866 @@
         return false;
     }
-    public boolean removeAll(Collection objects)
+    public boolean removeAll(Collection<?> objects)
     {
         for (Object o : objects) {
@@ -884 +876 @@
         return true;
     }
-    public boolean addAll(Collection objects)
+    public boolean addAll(Collection<? extends T> objects)
     {
         for (Object o : objects) {
@@ -894 +886 @@
         return true;
     }
-    public boolean containsAll(Collection objects)
-    {
-        boolean ret = true;
+    public boolean containsAll(Collection<?> objects)
+    {
         for (Object o : objects) {
             if (!canStore(o))
@@ -987 +978 @@
         return this.toArrayList().toArray();
     }
-    public <T> T[] toArray(T[] template)
+    public <A> A[] toArray(A[] template)
     {
         return this.toArrayList().toArray(template);
@@ -1082 +1073 @@
             //    an element
             content_index--;
-            T object = peek();
+            peek(); //TODO Is the call to peek() necessary?
             current_node.content.remove(content_index);
         }
@@ -1196 +1187 @@
             tmp = tmp.parent;
         }
-        if (ret == null || ret.size() == 0)
-            return Collections.emptyList();
         if (debug) {
             out("search of QuadBuckets for " + search_bbox + " ret len: " + ret.size());