Changeset 8846 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java

Timestamp:

2015-10-10T01:40:42+02:00 (9 years ago)

Author:

Don-vip

Message:

sonar - fb-contrib - minor performance improvements:

• Method passes constant String of length 1 to character overridden method
• Method needlessly boxes a boolean constant
• Method uses iterator().next() on a List to get the first item
• Method converts String to boxed primitive using excessive boxing
• Method converts String to primitive using excessive boxing
• Method creates array using constants
• Class defines List based fields but uses them like Sets

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java

@@ -162 +162 @@
             String val = primitive.get(key);
             IconPrototype p;
-            if ((p = icons.get("n" + key + "=" + val)) != null) {
+            if ((p = icons.get('n' + key + '=' + val)) != null) {
                 icon = update(icon, p, scale, mc);
             }
-            if ((p = icons.get("b" + key + "=" + OsmUtils.getNamedOsmBoolean(val))) != null) {
+            if ((p = icons.get('b' + key + '=' + OsmUtils.getNamedOsmBoolean(val))) != null) {
                 icon = update(icon, p, scale, mc);
             }
-            if ((p = icons.get("x" + key)) != null) {
+            if ((p = icons.get('x' + key)) != null) {
                 icon = update(icon, p, scale, mc);
             }
@@ -194 +194 @@
             LinePrototype styleLine;
             LinemodPrototype styleLinemod;
-            String idx = "n" + key + "=" + val;
+            String idx = 'n' + key + '=' + val;
             if ((styleArea = areas.get(idx)) != null && (closed || !styleArea.closed) && !isNotArea) {
                 p.area = update(p.area, styleArea, scale, mc);
@@ -209 +209 @@
                 }
             }
-            idx = "b" + key + "=" + OsmUtils.getNamedOsmBoolean(val);
+            idx = 'b' + key + '=' + OsmUtils.getNamedOsmBoolean(val);
             if ((styleArea = areas.get(idx)) != null && (closed || !styleArea.closed) && !isNotArea) {
                 p.area = update(p.area, styleArea, scale, mc);
@@ -224 +224 @@
                 }
             }
-            idx = "x" + key;
+            idx = 'x' + key;
             if ((styleArea = areas.get(idx)) != null && (closed || !styleArea.closed) && !isNotArea) {
                 p.area = update(p.area, styleArea, scale, mc);