Changeset 6246 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint

Timestamp:

2013-09-22T18:36:07+02:00 (11 years ago)

Author:

Don-vip

Message:

Sonar/FindBugs - various bugfixes / violation fixes

File:

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

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

@@ -31 +31 @@
         AreaPrototype area = new AreaPrototype();
         IconPrototype icon = new IconPrototype();
-        public void init()
-        {
+        public void init() {
             conditions = null;
             scaleMax = Double.POSITIVE_INFINITY;
@@ -50 +49 @@
     }
 
-    Color convertColor(String colString)
-    {
+    Color convertColor(String colString) {
         int i = colString.indexOf('#');
         Color ret;
@@ -80 +78 @@
 
     private void startElementLine(String qName, Attributes atts, LinePrototype line) {
-        for (int count=0; count<atts.getLength(); count++)
-        {
-            if(atts.getQName(count).equals("width"))
-            {
+        for (int count=0; count<atts.getLength(); count++) {
+            if(atts.getQName(count).equals("width")) {
                 String val = atts.getValue(count);
                 if (! (val.startsWith("+") || val.startsWith("-") || val.endsWith("%"))) {
                     line.setWidth(Integer.parseInt(val));
                 }
-            }
-            else if (atts.getQName(count).equals("colour")) {
+            } else if (atts.getQName(count).equals("colour")) {
                 line.color=convertColor(atts.getValue(count));
             } else if (atts.getQName(count).equals("realwidth")) {
@@ -122 +117 @@
     private void startElementLinemod(String qName, Attributes atts, LinemodPrototype line) {
         startElementLine(qName, atts, line);
-        for (int count=0; count<atts.getLength(); count++)
-        {
-            if(atts.getQName(count).equals("width"))
-            {
+        for (int count=0; count<atts.getLength(); count++) {
+            if (atts.getQName(count).equals("width")) {
                 String val = atts.getValue(count);
-                if(val.startsWith("+"))
-                {
+                if (val.startsWith("+")) {
                     line.setWidth(Integer.parseInt(val.substring(1)));
                     line.widthMode = LinemodPrototype.WidthMode.OFFSET;
-                }
-                else if(val.startsWith("-"))
-                {
+                } else if(val.startsWith("-")) {
                     line.setWidth(Integer.parseInt(val));
                     line.widthMode = LinemodPrototype.WidthMode.OFFSET;
-                }
-                else if(val.endsWith("%"))
-                {
+                } else if(val.endsWith("%")) {
                     line.setWidth(Integer.parseInt(val.substring(0, val.length()-1)));
                     line.widthMode = LinemodPrototype.WidthMode.PERCENT;
@@ -151 +139 @@
 
     @Override public void startElement(String uri,String name, String qName, Attributes atts) {
-        if (inDoc==true)
-        {
+        if (inDoc) {
             if (qName.equals("rule")) {
                 inRule=true;
-            } else if (qName.equals("rules"))
-            {
+            } else if (qName.equals("rules")) {
                 if (style.name == null) {
                     style.name = atts.getValue("name");
@@ -166 +152 @@
                     style.icon = atts.getValue("icon");
                 }
-            }
-            else if (qName.equals("scale_max")) {
+            } else if (qName.equals("scale_max")) {
                 inScaleMax = true;
             } else if (qName.equals("scale_min")) {
                 inScaleMin = true;
-            } else if (qName.equals("condition") && inRule)
-            {
+            } else if (qName.equals("condition") && inRule) {
                 inCondition=true;
                 XmlCondition c = rule.cond;
-                if(c.key != null)
-                {
+                if (c.key != null) {
                     if(rule.conditions == null) {
                         rule.conditions = new LinkedList<XmlCondition>();
@@ -184 +167 @@
                     rule.conditions.add(c);
                 }
-                for (int count=0; count<atts.getLength(); count++)
-                {
-                    if(atts.getQName(count).equals("k")) {
+                for (int count=0; count<atts.getLength(); count++) {
+                    if (atts.getQName(count).equals("k")) {
                         c.key = atts.getValue(count);
-                    } else if(atts.getQName(count).equals("v")) {
+                    } else if (atts.getQName(count).equals("v")) {
                         c.value = atts.getValue(count);
                     } else if(atts.getQName(count).equals("b")) {
@@ -199 +181 @@
                     error("The condition has no key!");
                 }
-            }
-            else if (qName.equals("line"))
-            {
+            } else if (qName.equals("line")) {
                 hadLine = inLine = true;
                 startElementLine(qName, atts, rule.line);
-            }
-            else if (qName.equals("linemod"))
-            {
+            } else if (qName.equals("linemod")) {
                 hadLineMod = inLineMod = true;
                 startElementLinemod(qName, atts, rule.linemod);
-            }
-            else if (qName.equals("icon"))
-            {
+            } else if (qName.equals("icon")) {
                 inIcon = true;
-                for (int count=0; count<atts.getLength(); count++)
-                {
+                for (int count=0; count<atts.getLength(); count++) {
                     if (atts.getQName(count).equals("src")) {
                         IconReference icon = new IconReference(atts.getValue(count), style);
@@ -227 +202 @@
                     }
                 }
-            }
-            else if (qName.equals("area"))
-            {
+            } else if (qName.equals("area")) {
                 hadArea = inArea = true;
                 for (int count=0; count<atts.getLength(); count++)
@@ -251 +224 @@
     @Override public void endElement(String uri,String name, String qName)
     {
-        if (inRule && qName.equals("rule"))
-        {
-            if(hadLine)
+        if (inRule && qName.equals("rule")) {
+            if (hadLine) {
+                style.add(rule.cond, rule.conditions,
+                        new LinePrototype(rule.line, new Range(rule.scaleMin, rule.scaleMax)));
+            }
+            if (hadLineMod)
             {
                 style.add(rule.cond, rule.conditions,
-                        new LinePrototype(rule.line, new Range(rule.scaleMin, rule.scaleMax)));
-            }
-            if(hadLineMod)
+                        new LinemodPrototype(rule.linemod, new Range(rule.scaleMin, rule.scaleMax)));
+            }
+            if (hadIcon)
             {
                 style.add(rule.cond, rule.conditions,
-                        new LinemodPrototype(rule.linemod, new Range(rule.scaleMin, rule.scaleMax)));
-            }
-            if(hadIcon)
-            {
-                style.add(rule.cond, rule.conditions,
                         new IconPrototype(rule.icon, new Range(rule.scaleMin, rule.scaleMax)));
             }
-            if(hadArea)
+            if (hadArea)
             {
                 style.add(rule.cond, rule.conditions,
@@ -276 +247 @@
             hadLine = hadLineMod = hadIcon = hadArea = false;
             rule.init();
-        }
-        else if (inCondition && qName.equals("condition")) {
+        } else if (inCondition && qName.equals("condition")) {
             inCondition = false;
         } else if (inLine && qName.equals("line")) {
@@ -294 +264 @@
     }
 
-    @Override public void characters(char[] ch, int start, int length)
-    {
-        if (inScaleMax == true) {
+    @Override public void characters(char[] ch, int start, int length) {
+        if (inScaleMax) {
             rule.scaleMax = Long.parseLong(new String(ch, start, length));
-        } else if (inScaleMin == true) {
+        } else if (inScaleMin) {
             rule.scaleMin = Long.parseLong(new String(ch, start, length));
         }