Changeset 8846 in josm for trunk/src/org/openstreetmap/josm/data/imagery

Timestamp:

2015-10-10T01:40:42+02:00 (9 years ago)

Author:

Don-vip

Message:

sonar - fb-contrib - minor performance improvements:

• Method passes constant String of length 1 to character overridden method
• Method needlessly boxes a boolean constant
• Method uses iterator().next() on a List to get the first item
• Method converts String to boxed primitive using excessive boxing
• Method converts String to primitive using excessive boxing
• Method creates array using constants
• Class defines List based fields but uses them like Sets

Location:

trunk/src/org/openstreetmap/josm/data/imagery

Files:

• ImageryInfo.java (modified) (3 diffs)
• OffsetBookmark.java (modified) (1 diff)
• TMSCachedTileLoader.java (modified) (1 diff)
• TMSCachedTileLoaderJob.java (modified) (1 diff)
• TemplatedWMSTileSource.java (modified) (1 diff)

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

@@ -300 +300 @@
                 s += " id=" + id;
             }
-            s += "]";
+            s += ']';
             return s;
         }
@@ -861 +861 @@
     public String getExtendedUrl() {
         return imageryType.getTypeString() + (defaultMaxZoom != 0
-            ? "["+(defaultMinZoom != 0 ? defaultMinZoom+"," : "")+defaultMaxZoom+"]" : "") + ":" + url;
+            ? "["+(defaultMinZoom != 0 ? defaultMinZoom+',' : "")+defaultMaxZoom+"]" : "") + ':' + url;
     }
 
@@ -875 +875 @@
         String res = name;
         if (pixelPerDegree != 0) {
-            res += " ("+pixelPerDegree+")";
+            res += " ("+pixelPerDegree+')';
         }
         return res;

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

@@ -49 +49 @@
         this.layerName = array.get(1);
         this.name = array.get(2);
-        this.dx = Double.valueOf(array.get(3));
-        this.dy = Double.valueOf(array.get(4));
+        this.dx = Double.parseDouble(array.get(3));
+        this.dy = Double.parseDouble(array.get(4));
         if (array.size() >= 7) {
-            this.centerX = Double.valueOf(array.get(5));
-            this.centerY = Double.valueOf(array.get(6));
+            this.centerX = Double.parseDouble(array.get(5));
+            this.centerY = Double.parseDouble(array.get(6));
         }
         if (projectionCode == null) {

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

@@ -105 +105 @@
     @Override
     public void clearCache(TileSource source) {
-        this.cache.remove(source.getName() + ":");
+        this.cache.remove(source.getName() + ':');
     }
 

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

@@ -91 +91 @@
                 tsName = "";
             }
-            return tsName.replace(":", "_") + ":" + tileSource.getTileId(tile.getZoom(), tile.getXtile(), tile.getYtile());
+            return tsName.replace(':', '_') + ':' + tileSource.getTileId(tile.getZoom(), tile.getXtile(), tile.getYtile());
         }
         return null;

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

@@ -211 +211 @@
                 break;
             default:
-                replacement = "{" + matcher.group(1) + "}";
+                replacement = '{' + matcher.group(1) + '}';
             }
             matcher.appendReplacement(url, replacement);