Changeset 31791 in osm for applications

Timestamp:

2015-12-03T00:56:12+01:00 (9 years ago)

Author:

donvip

Message:

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

Location:

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer

Files:

• JMapViewer.java (modified) (4 diffs)
• MapMarkerCircle.java (modified) (2 diffs)
• tilesources/AbstractMapQuestTileSource.java (modified) (1 diff)
• tilesources/AbstractOsmTileSource.java (modified) (1 diff)
• tilesources/TileSourceInfo.java (modified) (1 diff)

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/JMapViewer.java

@@ -538 +538 @@
         int tilex = center.x / tilesize;
         int tiley = center.y / tilesize;
-        int off_x = center.x % tilesize;
-        int off_y = center.y % tilesize;
+        int offsx = center.x % tilesize;
+        int offsy = center.y % tilesize;
 
         int w2 = getWidth() / 2;
         int h2 = getHeight() / 2;
-        int posx = w2 - off_x;
-        int posy = h2 - off_y;
-
-        int diff_left = off_x;
-        int diff_right = tilesize - off_x;
-        int diff_top = off_y;
-        int diff_bottom = tilesize - off_y;
-
-        boolean start_left = diff_left < diff_right;
-        boolean start_top = diff_top < diff_bottom;
-
-        if (start_top) {
-            if (start_left) {
+        int posx = w2 - offsx;
+        int posy = h2 - offsy;
+
+        int diffLeft = offsx;
+        int diffRight = tilesize - offsx;
+        int diffTop = offsy;
+        int diffBottom = tilesize - offsy;
+
+        boolean startLeft = diffLeft < diffRight;
+        boolean startTop = diffTop < diffBottom;
+
+        if (startTop) {
+            if (startLeft) {
                 iMove = 2;
             } else {
@@ -561 +561 @@
             }
         } else {
-            if (start_left) {
+            if (startLeft) {
                 iMove = 1;
             } else {
@@ -567 +567 @@
             }
         } // calculate the visibility borders
-        int x_min = -tilesize;
-        int y_min = -tilesize;
-        int x_max = getWidth();
-        int y_max = getHeight();
+        int xMin = -tilesize;
+        int yMin = -tilesize;
+        int xMax = getWidth();
+        int yMax = getHeight();
 
         // calculate the length of the grid (number of squares per edge)
@@ -585 +585 @@
                 }
                 for (int j = 0; j < x; j++) {
-                    if (x_min <= posx && posx <= x_max && y_min <= posy && posy <= y_max) {
+                    if (xMin <= posx && posx <= xMax && yMin <= posy && posy <= yMax) {
                         // tile is visible
                         Tile tile;

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/MapMarkerCircle.java

@@ -129 +129 @@
     @Override
     public void paint(Graphics g, Point position, int radius) {
-        int size_h = radius;
-        int size = size_h * 2;
+        int sizeH = radius;
+        int size = sizeH * 2;
 
         if (g instanceof Graphics2D && getBackColor() != null) {
@@ -137 +137 @@
             g2.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER));
             g2.setPaint(getBackColor());
-            g.fillOval(position.x - size_h, position.y - size_h, size, size);
+            g.fillOval(position.x - sizeH, position.y - sizeH, size, size);
             g2.setComposite(oldComposite);
         }
         g.setColor(getColor());
-        g.drawOval(position.x - size_h, position.y - size_h, size, size);
+        g.drawOval(position.x - sizeH, position.y - sizeH, size, size);
 
         if (getLayer() == null || getLayer().isVisibleTexts()) paintText(g, position);

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractMapQuestTileSource.java

@@ -31 +31 @@
     private int SERVER_NUM = 1;
 
-    public AbstractMapQuestTileSource(String name, String base_url, String id) {
-        super(name, base_url, id);
+    public AbstractMapQuestTileSource(String name, String baseUrl, String id) {
+        super(name, baseUrl, id);
     }
 

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/AbstractOsmTileSource.java

@@ -20 +20 @@
      * Constructs a new OSM tile source
      * @param name Source name as displayed in GUI
-     * @param base_url Source URL
+     * @param baseUrl Source URL
      * @param id unique id for the tile source; contains only characters that
      * are safe for file names; can be null
      */
-    public AbstractOsmTileSource(String name, String base_url, String id) {
-        super(new TileSourceInfo(name, base_url, id));
+    public AbstractOsmTileSource(String name, String baseUrl, String id) {
+        super(new TileSourceInfo(name, baseUrl, id));
     }
 

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/TileSourceInfo.java

@@ -43 +43 @@
      *
      * @param name name
-     * @param base_url base URL
+     * @param baseUrl base URL
      * @param id unique id
      */
-    public TileSourceInfo(String name, String base_url, String id) {
+    public TileSourceInfo(String name, String baseUrl, String id) {
         this.name = name;
-        this.url = base_url;
+        this.url = baseUrl;
         this.id = id;
     }