Changeset 3453 in josm for trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java

Timestamp:

2010-08-21T14:59:31+02:00 (14 years ago)

Author:

bastiK

Message:

suppress some trivial warnings

File:

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

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

@@ -575 +575 @@
         return true;
     }
-    // If anyone has suggestions for how to fix
-    // this properly, I'm listening :)
-    @SuppressWarnings("unchecked")
-    private T convert(Object raw)
-    {
-        return (T)raw;
-    }
     public boolean remove(Object o) {
-        return this.remove(convert(o));
-    }
-    public boolean remove(T o) {
+        @SuppressWarnings("unchecked") T t = (T) o;
         synchronized (split_lock) {
             search_cache = null; // Search cache might point to one of removed buckets
-            QBLevel bucket = root.findBucket(o.getBBox());
-            if (bucket.remove_content(o)) {
+            QBLevel bucket = root.findBucket(t.getBBox());
+            if (bucket.remove_content(t)) {
                 size--;
                 return true;
@@ -597 +588 @@
     }
     public boolean contains(Object o) {
-        QBLevel bucket = root.findBucket(convert(o).getBBox());
-        return bucket != null && bucket.content != null && bucket.content.contains(o);
+        @SuppressWarnings("unchecked") T t = (T) o;
+        QBLevel bucket = root.findBucket(t.getBBox());
+        return bucket != null && bucket.content != null && bucket.content.contains(t);
     }