Changeset 8846 in josm for trunk/src/org/openstreetmap/josm/tools/ImageProvider.java

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

File:

• trunk/src/org/openstreetmap/josm/tools/ImageProvider.java (modified) (6 diffs)

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

@@ -720 +720 @@
                 subdir = "";
             } else if (!subdir.isEmpty() && !subdir.endsWith("/")) {
-                subdir += "/";
+                subdir += '/';
             }
             String[] extensions;
@@ -742 +742 @@
                     /* cache separately */
                     if (dirs != null && !dirs.isEmpty()) {
-                        cacheName = "id:" + id + ":" + fullName;
+                        cacheName = "id:" + id + ':' + fullName;
                         if (archive != null) {
-                            cacheName += ":" + archive.getName();
+                            cacheName += ':' + archive.getName();
                         }
                     }
@@ -838 +838 @@
                     bytes = Utils.decodeUrl(data).getBytes(StandardCharsets.UTF_8);
                 } catch (IllegalArgumentException ex) {
-                    Main.warn("Unable to decode URL data part: "+ex.getMessage() + " (" + data + ")");
+                    Main.warn("Unable to decode URL data part: "+ex.getMessage() + " (" + data + ')');
                     return null;
                 }
@@ -898 +898 @@
             } else {
                 final String fn_md5 = Utils.md5Hex(fn);
-                url = b + fn_md5.substring(0, 1) + "/" + fn_md5.substring(0, 2) + "/" + fn;
+                url = b + fn_md5.substring(0, 1) + '/' + fn_md5.substring(0, 2) + "/" + fn;
             }
             result = getIfAvailableHttp(url, type);
@@ -922 +922 @@
                 inArchiveDir = "";
             } else if (!inArchiveDir.isEmpty()) {
-                inArchiveDir += "/";
+                inArchiveDir += '/';
             }
             String entryName = inArchiveDir + fullName;
@@ -1142 +1142 @@
         }
         if (GraphicsEnvironment.isHeadless()) {
-            Main.warn("Cursors are not available in headless mode. Returning null for '"+name+"'");
+            Main.warn("Cursors are not available in headless mode. Returning null for '"+name+'\'');
             return null;
         }