Changeset 10300 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2016-05-30T01:17:28+02:00 (9 years ago)

Author:

Don-vip

Message:

sonar - Performance - Method passes constant String of length 1 to character overridden method + add unit tests/javadoc

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• HttpClient.java (modified) (1 diff)
• ImageProvider.java (modified) (1 diff)
• Pair.java (modified) (2 diffs)
• bugreport/BugReport.java (modified) (1 diff)
• bugreport/ReportedException.java (modified) (4 diffs)

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

@@ -122 +122 @@
                 final boolean hasReason = reasonForRequest != null && !reasonForRequest.isEmpty();
                 Main.info("{0} {1}{2} -> {3}{4}",
-                        requestMethod, url, hasReason ? " (" + reasonForRequest + ")" : "",
+                        requestMethod, url, hasReason ? (" (" + reasonForRequest + ')') : "",
                         connection.getResponseCode(),
                         connection.getContentLengthLong() > 0
-                                ? " (" + Utils.getSizeString(connection.getContentLengthLong(), Locale.getDefault()) + ")"
+                                ? (" (" + Utils.getSizeString(connection.getContentLengthLong(), Locale.getDefault()) + ')')
                                 : ""
                 );

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

@@ -928 +928 @@
             } else {
                 final String fnMD5 = Utils.md5Hex(fn);
-                url = b + fnMD5.substring(0, 1) + '/' + fnMD5.substring(0, 2) + "/" + fn;
+                url = b + fnMD5.substring(0, 1) + '/' + fnMD5.substring(0, 2) + '/' + fn;
             }
             result = getIfAvailableHttp(url, type);

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

@@ -42 +42 @@
         Pair<?, ?> pair = (Pair<?, ?>) other;
         return Objects.equals(a, pair.a) &&
-                Objects.equals(b, pair.b);
+               Objects.equals(b, pair.b);
     }
 
@@ -62 +62 @@
     @Override
     public String toString() {
-        return "<"+a+','+b+'>';
+        return '<'+a.toString()+','+b.toString()+'>';
     }
 

trunk/src/org/openstreetmap/josm/tools/bugreport/BugReport.java

@@ -70 +70 @@
             if (className.equals(element.getClassName()) && "getCallingMethod".equals(element.getMethodName())) {
                 StackTraceElement toReturn = stackTrace[i + offset];
-                return toReturn.getClassName().replaceFirst(".*\\.", "") + "#" + toReturn.getMethodName();
+                return toReturn.getClassName().replaceFirst(".*\\.", "") + '#' + toReturn.getMethodName();
             }
         }

trunk/src/org/openstreetmap/josm/tools/bugreport/ReportedException.java

@@ -124 +124 @@
 
     private static String niceThreadName(Thread thread) {
-        String name = "Thread: " + thread.getName() + " (" + thread.getId() + ")";
+        String name = "Thread: " + thread.getName() + " (" + thread.getId() + ')';
         ThreadGroup threadGroup = thread.getThreadGroup();
         if (threadGroup != null) {
@@ -221 +221 @@
     @Override
     public String toString() {
-        StringBuilder builder = new StringBuilder();
-        builder.append("CrashReportedException [on thread ");
-        builder.append(caughtOnThread);
-        builder.append("]");
-        return builder.toString();
+        return new StringBuilder(48)
+            .append("CrashReportedException [on thread ")
+            .append(caughtOnThread)
+            .append(']')
+            .toString();
     }
 
@@ -235 +235 @@
             this.key = key;
             this.value = value;
-
         }
 
@@ -273 +272 @@
          */
         public void printSection(PrintWriter out) {
-            out.println(sectionName + ":");
+            out.println(sectionName + ':');
             if (entries.isEmpty()) {
                 out.println("No data collected.");