Changeset 8848 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2015-10-10T14:08:30+02:00 (9 years ago)

Author:

Don-vip

Message:

sonar - squid:S2131 - Primitives should not be boxed just for "String" conversion

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• imagery/ImageryInfo.java (modified) (1 diff)
• validation/tests/TagChecker.java (modified) (3 diffs)
• validation/util/Entities.java (modified) (5 diffs)

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

@@ -296 +296 @@
         @Override
         public String toString() {
-            String s = "ImageryPreferenceEntry [name=" + name;
+            StringBuilder s = new StringBuilder("ImageryPreferenceEntry [name=").append(name);
             if (id != null) {
-                s += " id=" + id;
-            }
-            s += ']';
-            return s;
+                s.append(" id=").append(id);
+            }
+            s.append(']');
+            return s.toString();
         }
     }

trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java

@@ -131 +131 @@
     protected EditableList sourcesList;
 
-    protected static final Entities entities = new Entities();
-
     private static final List<String> DEFAULT_SOURCES = Arrays.asList(/*DATA_FILE, */IGNORE_FILE, SPELL_FILE);
 
@@ -371 +369 @@
                 withErrors.put(p, "SPACE");
             }
-            if (checkValues && value != null && !value.equals(entities.unescape(value)) && !withErrors.contains(p, "HTML")) {
+            if (checkValues && value != null && !value.equals(Entities.unescape(value)) && !withErrors.contains(p, "HTML")) {
                 errors.add(new TestError(this, Severity.OTHER, tr("Property values contain HTML entity"),
                         tr(s, key), MessageFormat.format(s, key), INVALID_HTML, p));
@@ -620 +618 @@
                         commands.add(new ChangePropertyKeyCommand(p, key, Tag.removeWhiteSpaces(key)));
                     } else {
-                        String evalue = entities.unescape(value);
+                        String evalue = Entities.unescape(value);
                         if (!evalue.equals(value)) {
                             commands.add(new ChangePropertyCommand(p, key, evalue));

trunk/src/org/openstreetmap/josm/data/validation/util/Entities.java

@@ -31 +31 @@
  * @see <a href="http://www.w3.org/TR/html401/charset.html#code-position">HTML 4.01 Code positions</a>
  */
-public class Entities {
+public final class Entities {
     private static final String[][] ARRAY = {
         /* BASIC */
@@ -336 +336 @@
     private static volatile Map<String, String> mapNameToValue;
 
-    public String unescape(String str) {
+    private Entities() {
+        // Private constructor for utilities classes
+    }
+
+    public static String unescape(String str) {
         int firstAmp = str.indexOf('&');
         if (firstAmp < 0)
             return str;
-        String res = str.substring(0, firstAmp);
+        StringBuilder res = new StringBuilder(str.substring(0, firstAmp));
         int len = str.length();
         for (int i = firstAmp; i < len; i++) {
@@ -348 +352 @@
                 int semiColonIdx = str.indexOf(';', nextIdx);
                 if (semiColonIdx == -1) {
-                    res += c;
+                    res.append(c);
                     continue;
                 }
@@ -354 +358 @@
                 if (amphersandIdx != -1 && amphersandIdx < semiColonIdx) {
                     // Then the text looks like &...&...;
-                    res += c;
+                    res.append(c);
                     continue;
                 }
@@ -394 +398 @@
 
                 if (entityValue == -1) {
-                    res += '&' + entityContent + ';';
+                    res.append('&').append(entityContent).append(';');
                 } else {
-                    res += (char) entityValue;
+                    res.append((char) entityValue);
                 }
                 i = semiColonIdx; // move index up to the semi-colon
             } else {
-                res += c;
+                res.append(c);
             }
         }
-        return res;
+        return res.toString();
     }
 }