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

Timestamp:

2014-04-26T17:39:23+02:00 (10 years ago)

Author:

Don-vip

Message:

see #8465 - use diamond operator where applicable

File:

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

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

@@ -50 +50 @@
             case NE_INDEX:
                 if (ne == null) {
-                    ne = new QBLevel<T>(this, index, buckets);
+                    ne = new QBLevel<>(this, index, buckets);
                 }
                 return ne;
             case NW_INDEX:
                 if (nw == null) {
-                    nw = new QBLevel<T>(this, index, buckets);
+                    nw = new QBLevel<>(this, index, buckets);
                 }
                 return nw;
             case SE_INDEX:
                 if (se == null) {
-                    se = new QBLevel<T>(this, index, buckets);
+                    se = new QBLevel<>(this, index, buckets);
                 }
                 return se;
             case SW_INDEX:
                 if (sw == null) {
-                    sw = new QBLevel<T>(this, index, buckets);
+                    sw = new QBLevel<>(this, index, buckets);
                 }
                 return sw;
@@ -174 +174 @@
             // The split_lock will keep two concurrent calls from overwriting content
             if (content == null) {
-                content = new ArrayList<T>();
+                content = new ArrayList<>();
             }
             ret = content.add(o);
@@ -405 +405 @@
     @Override
     public final void clear() {
-        root = new QBLevel<T>(this);
+        root = new QBLevel<>(this);
         search_cache = null;
         size = 0;
@@ -478 +478 @@
 
     public ArrayList<T> toArrayList() {
-        ArrayList<T> a = new ArrayList<T>();
+        ArrayList<T> a = new ArrayList<>();
         for (T n : this) {
             a.add(n);
@@ -581 +581 @@
 
     public List<T> search(BBox search_bbox) {
-        List<T> ret = new ArrayList<T>();
+        List<T> ret = new ArrayList<>();
         // Doing this cuts down search cost on a real-life data set by about 25%
         boolean cache_searches = true;