Changeset 10001 in josm for trunk/src/org/openstreetmap/josm/gui/bbox

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

Location:

trunk/src/org/openstreetmap/josm/gui/bbox

Files:

• SlippyMapBBoxChooser.java (modified) (1 diff)
• TileSelectionBBoxChooser.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java

@@ -240 +240 @@
             return;
 
-        Point p_max = new Point(Math.max(aEnd.x, aStart.x), Math.max(aEnd.y, aStart.y));
-        Point p_min = new Point(Math.min(aEnd.x, aStart.x), Math.min(aEnd.y, aStart.y));
-
-        iSelectionRectStart = getPosition(p_min);
-        iSelectionRectEnd =   getPosition(p_max);
+        Point pMax = new Point(Math.max(aEnd.x, aStart.x), Math.max(aEnd.y, aStart.y));
+        Point pMin = new Point(Math.min(aEnd.x, aStart.x), Math.min(aEnd.y, aStart.y));
+
+        iSelectionRectStart = getPosition(pMin);
+        iSelectionRectEnd =   getPosition(pMax);
 
         Bounds b = new Bounds(

trunk/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java

@@ -154 +154 @@
 
         // calc the screen coordinates for the new selection rectangle
-        MapMarkerDot xmin_ymin = new MapMarkerDot(bbox.getMinLat(), bbox.getMinLon());
-        MapMarkerDot xmax_ymax = new MapMarkerDot(bbox.getMaxLat(), bbox.getMaxLon());
-
         List<MapMarker> marker = new ArrayList<>(2);
-        marker.add(xmin_ymin);
-        marker.add(xmax_ymax);
+        marker.add(new MapMarkerDot(bbox.getMinLat(), bbox.getMinLon()));
+        marker.add(new MapMarkerDot(bbox.getMaxLat(), bbox.getMaxLon()));
         mapViewer.setBoundingBox(bbox);
         mapViewer.setMapMarkerList(marker);
@@ -704 +701 @@
                 int zoomDiff = MAX_ZOOM - zoom;
                 Point tlc = getTopLeftCoordinates();
-                int x_min = (min.x >> zoomDiff) - tlc.x;
-                int y_min = (min.y >> zoomDiff) - tlc.y;
-                int x_max = (max.x >> zoomDiff) - tlc.x;
-                int y_max = (max.y >> zoomDiff) - tlc.y;
-
-                int w = x_max - x_min;
-                int h = y_max - y_min;
+                int xMin = (min.x >> zoomDiff) - tlc.x;
+                int yMin = (min.y >> zoomDiff) - tlc.y;
+                int xMax = (max.x >> zoomDiff) - tlc.x;
+                int yMax = (max.y >> zoomDiff) - tlc.y;
+
+                int w = xMax - xMin;
+                int h = yMax - yMin;
                 g.setColor(new Color(0.9f, 0.7f, 0.7f, 0.6f));
-                g.fillRect(x_min, y_min, w, h);
+                g.fillRect(xMin, yMin, w, h);
 
                 g.setColor(Color.BLACK);
-                g.drawRect(x_min, y_min, w, h);
+                g.drawRect(xMin, yMin, w, h);
             } catch (Exception e) {
                 Main.error(e);