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

Timestamp:

2013-09-27T01:16:28+02:00 (12 years ago)

Author:

Don-vip

Message:

Sonar/FindBugs - Performance - Method concatenates strings using + in a loop

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• imagery/ImageryInfo.java (modified) (1 diff)
• osm/TigerUtils.java (modified) (1 diff)
• osm/history/History.java (modified) (1 diff)
• validation/TestError.java (modified) (2 diffs)
• validation/tests/TagChecker.java (modified) (1 diff)
• validation/util/MultipleNameVisitor.java (modified) (3 diffs)

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

@@ -144 +144 @@
             if (i.bounds != null) {
                 bounds = i.bounds.encodeAsString(",");
-                String shapesString = "";
+                StringBuilder shapesString = new StringBuilder();
                 for (Shape s : i.bounds.getShapes()) {
-                    if (!shapesString.isEmpty()) {
-                        shapesString += ";";
+                    if (shapesString.length() > 0) {
+                        shapesString.append(";");
                     }
-                    shapesString += s.encodeAsString(",");
-                }
-                if (!shapesString.isEmpty()) {
-                    shapes = shapesString;
+                    shapesString.append(s.encodeAsString(","));
+                }
+                if (shapesString.length() > 0) {
+                    shapes = shapesString.toString();
                 }
             }

trunk/src/org/openstreetmap/josm/data/osm/TigerUtils.java

@@ -44 +44 @@
             }
         }
-        String combined = "";
+        StringBuilder combined = new StringBuilder();
         for (Object part : resultSet) {
-            if (combined.length() > 0)
-                combined += ":";
-            combined += part;
+            if (combined.length() > 0) {
+                combined.append(":");
+            }
+            combined.append(part);
         }
-        return combined;
+        return combined.toString();
     }
 

trunk/src/org/openstreetmap/josm/data/osm/history/History.java

@@ -241 +241 @@
     @Override
     public String toString() {
-        String result = "History ["
-                + (type != null ? "type=" + type + ", " : "") + "id=" + id;
+        StringBuilder result = new StringBuilder("History ["
+                + (type != null ? "type=" + type + ", " : "") + "id=" + id);
         if (versions != null) {
-            result += ", versions=\n";
+            result.append(", versions=\n");
             for (HistoryOsmPrimitive v : versions) {
-                result += "\t" + v + ",\n";
+                result.append("\t").append(v).append(",\n");
             }
         }
-        result += "]";
-        return result;
+        result.append("]");
+        return result.toString();
     }
 }

trunk/src/org/openstreetmap/josm/data/validation/TestError.java

@@ -170 +170 @@
     public String getIgnoreState() {
         Collection<String> strings = new TreeSet<String>();
-        String ignorestring = getIgnoreSubGroup();
+        StringBuilder ignorestring = new StringBuilder(getIgnoreSubGroup());
         for (OsmPrimitive o : primitives) {
             // ignore data not yet uploaded
@@ -186 +186 @@
         }
         for (String o : strings) {
-            ignorestring += ":" + o;
-        }
-        return ignorestring;
+            ignorestring.append(":").append(o);
+        }
+        return ignorestring.toString();
     }
 

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

@@ -686 +686 @@
         Main.pref.put(PREF_USE_IGNORE_FILE, prefUseIgnoreFile.isSelected());
         Main.pref.put(PREF_USE_SPELL_FILE, prefUseSpellFile.isSelected());
-        String sources = "";
+        StringBuilder sources = new StringBuilder();
         if (sourcesList.getModel().getSize() > 0) {
-            String sb = "";
             for (int i = 0; i < sourcesList.getModel().getSize(); ++i) {
-                sb += ";"+sourcesList.getModel().getElementAt(i);
-            }
-            sources = sb.substring(1);
-        }
-        if (sources.length() == 0) {
-            sources = null;
-        }
-        return Main.pref.put(PREF_SOURCES, sources);
+                if (sources.length() > 0) {
+                    sources.append(";");
+                }
+                sources.append(sourcesList.getModel().getElementAt(i));
+            }
+        }
+        return Main.pref.put(PREF_SOURCES, sources.length() > 0 ? sources.toString() : null);
     }
 

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

@@ -33 +33 @@
      */
     public void visit(Collection<? extends OsmPrimitive> data) {
-        String multipleName = "";
+        StringBuilder multipleName = new StringBuilder();
         String multiplePluralClassname = null;
         size = data.size();
@@ -44 +44 @@
             }
             if (name != null && !name.isEmpty() && multipleName.length() <= MULTIPLE_NAME_MAX_LENGTH) {
-                if (!multipleName.isEmpty()) {
-                    multipleName += ", ";
+                if (multipleName.length() > 0) {
+                    multipleName.append(", ");
                 }
-                multipleName += name;
+                multipleName.append(name);
             }
 
@@ -64 +64 @@
         } else {
             displayName = size + " " + trn(multipleClassname, multiplePluralClassname, size);
-            if (!multipleName.isEmpty()) {
+            if (multipleName.length() > 0) {
                 if (multipleName.length() <= MULTIPLE_NAME_MAX_LENGTH) {
                     displayName += ": " + multipleName;