Changeset 8849 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/LabelCompositionStrategy.java

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

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/LabelCompositionStrategy.java (modified) (2 diffs)

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();
         }