Changeset 8849 in josm for trunk/src

Timestamp:

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

Author:

Don-vip

Message:

sonar - squid:S1643 - Strings should not be concatenated using '+' in a loop
sonar - squid:S1640 - Maps with keys that are enum values should be replaced with EnumMap

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/validation/tests/TagChecker.java (modified) (2 diffs)
• gui/conflict/tags/PasteTagsConflictResolverDialog.java (modified) (1 diff)
• gui/mappaint/LabelCompositionStrategy.java (modified) (2 diffs)
• io/GpxExporter.java (modified) (1 diff)
• tools/WikiReader.java (modified) (3 diffs)

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

@@ -162 +162 @@
         harmonizedKeys.clear();
 
-        String errorSources = "";
+        StringBuilder errorSources = new StringBuilder();
         for (String source : Main.pref.getCollection(PREF_SOURCES, DEFAULT_SOURCES)) {
             try (
@@ -239 +239 @@
                 }
             } catch (IOException e) {
-                errorSources += source + '\n';
-            }
-        }
-
-        if (!errorSources.isEmpty())
+                errorSources.append(source).append('\n');
+            }
+        }
+
+        if (errorSources.length() > 0)
             throw new IOException(tr("Could not access data file(s):\n{0}", errorSources));
     }

trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java

@@ -363 +363 @@
     private static final class StatisticsInfo {
         public int numTags;
-        public Map<OsmPrimitiveType, Integer> sourceInfo;
-        public Map<OsmPrimitiveType, Integer> targetInfo;
+        public final Map<OsmPrimitiveType, Integer> sourceInfo;
+        public final Map<OsmPrimitiveType, Integer> targetInfo;
 
         private StatisticsInfo() {
-            sourceInfo = new HashMap<>();
-            targetInfo = new HashMap<>();
+            sourceInfo = new EnumMap<>(OsmPrimitiveType.class);
+            targetInfo = new EnumMap<>(OsmPrimitiveType.class);
         }
     }

trunk/src/org/openstreetmap/josm/gui/mappaint/LabelCompositionStrategy.java

@@ -263 +263 @@
 
         private String getPrimitiveName(OsmPrimitive n) {
-            String name = null;
+            StringBuilder name = new StringBuilder();
             if (!n.hasKeys()) return null;
             for (String rn : nameTags) {
-                name = n.get(rn);
-                if (name != null) {
+                String val = n.get(rn);
+                if (val != null) {
+                    name.append(val);
                     break;
                 }
@@ -274 +275 @@
                 String comp = n.get(rn);
                 if (comp != null) {
-                    if (name == null) {
-                        name = comp;
+                    if (name.length() == 0) {
+                        name.append(comp);
                     } else {
-                        name += " (" + comp + ')';
+                        name.append(" (").append(comp).append(')');
                     }
                     break;
                 }
             }
-            return name;
+            return name.toString();
         }
 

trunk/src/org/openstreetmap/josm/io/GpxExporter.java

@@ -318 +318 @@
                 if (answer != JOptionPane.OK_OPTION || l.getSelectedIndex() == -1)
                     return;
-                String license = "";
+                StringBuilder license = new StringBuilder();
                 for (int i : l.getSelectedIndices()) {
                     if (i == 2) {
-                        license = "public domain";
+                        license = new StringBuilder("public domain");
                         break;
                     }
-                    license += license.isEmpty() ? URLS[i] : ", "+URLS[i];
+                    if (license.length() > 0) {
+                        license.append(", ");
+                    }
+                    license.append(URLS[i]);
                 }
-                copyright.setText(license);
+                copyright.setText(license.toString());
                 copyright.setCaretPosition(0);
             }

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

@@ -120 +120 @@
         boolean transl = false;
         boolean skip = false;
-        String b = "";
-        String full = "";
+        StringBuilder b = new StringBuilder();
+        StringBuilder full = new StringBuilder();
         for (String line = in.readLine(); line != null; line = in.readLine()) {
-            full += line;
+            full.append(line);
             if (line.contains("<div id=\"searchable\">")) {
                 inside = true;
@@ -142 +142 @@
                 // add a border="0" attribute to images, otherwise the internal help browser
                 // will render a thick  border around images inside an <a> element
-                b += line.replaceAll("<img ", "<img border=\"0\" ")
+                b.append(line.replaceAll("<img ", "<img border=\"0\" ")
                          .replaceAll("<span class=\"icon\">.</span>", "")
                          .replaceAll("href=\"/", "href=\"" + baseurl + '/')
-                         .replaceAll(" />", ">")
-                         + '\n';
+                         .replaceAll(" />", ">"))
+                         .append('\n');
             } else if (transl && line.contains("</div>")) {
                 transl = false;
@@ -157 +157 @@
         || b.indexOf(" does not exist. You can create it here.</p>") >= 0)
             return "";
-        if (b.isEmpty())
+        if (b.length() == 0)
             b = full;
         return "<html><base href=\""+url.toExternalForm() +"\"> " + b + "</html>";