Changeset 10462 in josm for trunk

Timestamp:

2016-06-23T02:12:21+02:00 (8 years ago)

Author:

Don-vip

Message:

sonar - Performance - Method passes constant String of length 1 to character overridden method

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/imagery/ImageryInfo.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/MapViewState.java (modified) (3 diffs)
• src/org/openstreetmap/josm/gui/preferences/imagery/CacheContentsPanel.java (modified) (1 diff)
• src/org/openstreetmap/josm/io/OsmHistoryReader.java (modified) (1 diff)
• src/org/openstreetmap/josm/tools/ImageProvider.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/gui/MapViewStateTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java

@@ -863 +863 @@
     public String getExtendedUrl() {
         return imageryType.getTypeString() + (defaultMaxZoom != 0
-            ? ('['+(defaultMinZoom != 0 ? (Integer.toString(defaultMinZoom) + ',') : "")+defaultMaxZoom+"]") : "") + ':' + url;
+            ? ('['+(defaultMinZoom != 0 ? (Integer.toString(defaultMinZoom) + ',') : "")+defaultMaxZoom+']') : "") + ':' + url;
     }
 

trunk/src/org/openstreetmap/josm/gui/MapViewState.java

@@ -344 +344 @@
         @Override
         public String toString() {
-            return "MapViewViewPoint [x=" + x + ", y=" + y + "]";
+            return "MapViewViewPoint [x=" + x + ", y=" + y + ']';
         }
     }
@@ -373 +373 @@
         @Override
         public String toString() {
-            return "MapViewEastNorthPoint [eastNorth=" + eastNorth + "]";
+            return "MapViewEastNorthPoint [eastNorth=" + eastNorth + ']';
         }
     }
@@ -417 +417 @@
 
         /**
-         * Gets the real bounds that enclose this rectangle. 
+         * Gets the real bounds that enclose this rectangle.
          * This is computed respecting that the borders of this rectangle may not be a straignt line in latlon coordinates.
          * @return The bounds.

trunk/src/org/openstreetmap/josm/gui/preferences/imagery/CacheContentsPanel.java

@@ -237 +237 @@
                         int row = ret.convertRowIndexToModel(ret.getEditingRow());
                         tableModel.setValueAt("0", row, 1);
-                        cache.remove(ret.getValueAt(row, 0) + ":");
+                        cache.remove(ret.getValueAt(row, 0).toString() + ':');
                     }
                 });

trunk/src/org/openstreetmap/josm/io/OsmHistoryReader.java

@@ -40 +40 @@
             if (locator == null)
                 return "";
-            return "(" + locator.getLineNumber() + ',' + locator.getColumnNumber() + ')';
+            return new StringBuilder().append('(').append(locator.getLineNumber())
+                                      .append(',').append(locator.getColumnNumber()).append(')').toString();
         }
 

trunk/src/org/openstreetmap/josm/tools/ImageProvider.java

@@ -893 +893 @@
                     case typeArchive:
                         if (archive != null) {
-                            cacheName = "zip:"+archive.hashCode()+":"+cacheName;
+                            cacheName = "zip:"+archive.hashCode()+':'+cacheName;
                             ImageResource ir = cache.get(cacheName);
                             if (ir != null) return ir;

trunk/test/unit/org/openstreetmap/josm/gui/MapViewStateTest.java

@@ -136 +136 @@
         }
     }
+
+    /**
+     * Test {@link MapViewState.MapViewViewPoint#toString()} and {@link MapViewState.MapViewEastNorthPoint#toString()}
+     */
+    @Test
+    public void testToString() {
+        assertEquals("MapViewViewPoint [x=1.0, y=2.0]",
+                state.getForView(1, 2).toString());
+        assertEquals("MapViewEastNorthPoint [eastNorth=EastNorth[e=0.0, n=0.0]]",
+                state.getPointFor(new EastNorth(0, 0)).toString());
+    }
 }