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

Timestamp:

2016-03-17T01:50:12+01:00 (8 years ago)

Author:

Don-vip

Message:

sonar - Local variable and method parameter names should comply with a naming convention

File:

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

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

@@ -98 +98 @@
         }
 
-        QBLevel(QBLevel<T> parent, int parent_index, final QuadBuckets<T> buckets) {
+        QBLevel(QBLevel<T> parent, int parentIndex, final QuadBuckets<T> buckets) {
             this.parent = parent;
             this.level = parent.level + 1;
-            this.index = parent_index;
+            this.index = parentIndex;
             this.buckets = buckets;
 
@@ -111 +111 @@
                 mult = 1 << 30;
             }
-            long this_quadpart = mult * (parent_index << shift);
-            this.quad = parent.quad | this_quadpart;
+            long quadpart = mult * (parentIndex << shift);
+            this.quad = parent.quad | quadpart;
             this.bbox = calculateBBox(); // calculateBBox reference quad
         }
 
         private BBox calculateBBox() {
-            LatLon bottom_left = this.coor();
-            double lat = bottom_left.lat() + parent.height() / 2;
-            double lon = bottom_left.lon() + parent.width() / 2;
-            return new BBox(bottom_left.lon(), bottom_left.lat(), lon, lat);
+            LatLon bottomLeft = this.coor();
+            double lat = bottomLeft.lat() + parent.height() / 2;
+            double lon = bottomLeft.lon() + parent.width() / 2;
+            return new BBox(bottomLeft.lon(), bottomLeft.lat(), lon, lat);
         }
 
@@ -181 +181 @@
         }
 
-        boolean matches(final T o, final BBox search_bbox) {
+        boolean matches(final T o, final BBox searchBbox) {
             if (o instanceof Node) {
                 final LatLon latLon = ((Node) o).getCoor();
                 // node without coords -> bbox[0,0,0,0]
-                return search_bbox.bounds(latLon != null ? latLon : LatLon.ZERO);
-            }
-            return o.getBBox().intersects(search_bbox);
-        }
-
-        private void search_contents(BBox search_bbox, List<T> result) {
+                return searchBbox.bounds(latLon != null ? latLon : LatLon.ZERO);
+            }
+            return o.getBBox().intersects(searchBbox);
+        }
+
+        private void search_contents(BBox searchBbox, List<T> result) {
             /*
              * It is possible that this was created in a split
@@ -199 +199 @@
 
             for (T o : content) {
-                if (matches(o, search_bbox)) {
+                if (matches(o, searchBbox)) {
                     result.add(o);
                 }
@@ -299 +299 @@
         }
 
-        private void search(BBox search_bbox, List<T> result) {
-            if (!this.bbox().intersects(search_bbox))
+        private void search(BBox searchBbox, List<T> result) {
+            if (!this.bbox().intersects(searchBbox))
                 return;
-            else if (bbox().bounds(search_bbox)) {
+            else if (bbox().bounds(searchBbox)) {
                 buckets.searchCache = this;
             }
 
             if (this.hasContent()) {
-                search_contents(search_bbox, result);
+                search_contents(searchBbox, result);
             }
 
@@ -313 +313 @@
 
             if (nw != null) {
-                nw.search(search_bbox, result);
+                nw.search(searchBbox, result);
             }
             if (ne != null) {
-                ne.search(search_bbox, result);
+                ne.search(searchBbox, result);
             }
             if (se != null) {
-                se.search(search_bbox, result);
+                se.search(searchBbox, result);
             }
             if (sw != null) {
-                sw.search(search_bbox, result);
+                sw.search(searchBbox, result);
             }
         }
@@ -330 +330 @@
         }
 
-        int index_of(QBLevel<T> find_this) {
+        int index_of(QBLevel<T> findThis) {
             QBLevel<T>[] children = getChildren();
             for (int i = 0; i < QuadTiling.TILES_PER_LEVEL; i++) {
-                if (children[i] == find_this)
+                if (children[i] == findThis)
                     return i;
             }