Changeset 3805 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/xml

Timestamp:

2011-01-23T13:17:10+01:00 (13 years ago)

Author:

bastiK

Message:

some renaming (to make future commits easier to read)

Location:

trunk/src/org/openstreetmap/josm/gui/mappaint/xml

Files:

• . (added)
• XmlCondition.java (moved) (moved from trunk/src/org/openstreetmap/josm/gui/mappaint/Rule.java ) (1 diff)
• XmlStyleSourceHandler.java (moved) (moved from trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java ) (8 diffs)

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui.mappaint;
+package org.openstreetmap.josm.gui.mappaint.xml;
 
 import org.openstreetmap.josm.data.osm.OsmUtils;
 
-public class Rule
+public class XmlCondition
 {
-    String key;
-    String value;
-    String boolValue;
+    public String key;
+    public String value;
+    public String boolValue;
 
-    public Rule()
+    public XmlCondition()
     {
       init();
     }
-    public Rule(Rule r)
+    public XmlCondition(XmlCondition c)
     {
-      key = r.key;
-      value = r.value;
-      boolValue = r.boolValue;
+      key = c.key;
+      value = c.value;
+      boolValue = c.boolValue;
     }
     public String getKey()

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui.mappaint;
+package org.openstreetmap.josm.gui.mappaint.xml;
 
 import java.awt.Color;
@@ -9 +9 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.mappaint.AreaElemStyle;
+import org.openstreetmap.josm.gui.mappaint.IconElemStyle;
+import org.openstreetmap.josm.gui.mappaint.LineElemStyle;
+import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
+import org.openstreetmap.josm.gui.mappaint.StyleSource;
 import org.openstreetmap.josm.tools.ColorHelper;
 import org.xml.sax.Attributes;
 import org.xml.sax.helpers.DefaultHandler;
 
-public class ElemStyleHandler extends DefaultHandler
+public class XmlStyleSourceHandler extends DefaultHandler
 {
     private boolean inDoc, inRule, inCondition, inLine, inLineMod, inIcon, inArea, inScaleMax, inScaleMin;
@@ -22 +27 @@
 
     static class RuleElem {
-        Rule rule = new Rule();
-        Collection<Rule> rules;
+        XmlCondition cond = new XmlCondition();
+        Collection<XmlCondition> conditions;
         long scaleMax;
         long scaleMin;
@@ -32 +37 @@
         public void init()
         {
-            rules = null;
+            conditions = null;
             scaleMax = 1000000000;
             scaleMin = 0;
             line.init();
-            rule.init();
+            cond.init();
             linemod.init();
             area.init();
@@ -43 +48 @@
     }
 
-    public ElemStyleHandler(StyleSource style) {
+    public XmlStyleSourceHandler(StyleSource style) {
         this.style = style;
         inDoc=inRule=inCondition=inLine=inIcon=inArea=false;
@@ -73 +78 @@
 
     private void error(String message) {
-        System.out.println(style.getDisplayString() + " (" + rule.rule.key + "=" + rule.rule.value + "): " + message);
+        System.out.println(style.getDisplayString() + " (" + rule.cond.key + "=" + rule.cond.value + "): " + message);
     }
 
@@ -154 +159 @@
             {
                 inCondition=true;
-                Rule r = rule.rule;
-                if(r.key != null)
-                {
-                    if(rule.rules == null) {
-                        rule.rules = new LinkedList<Rule>();
-                    }
-                    rule.rules.add(new Rule(rule.rule));
-                    r = new Rule();
-                    rule.rules.add(r);
+                XmlCondition c = rule.cond;
+                if(c.key != null)
+                {
+                    if(rule.conditions == null) {
+                        rule.conditions = new LinkedList<XmlCondition>();
+                    }
+                    rule.conditions.add(new XmlCondition(rule.cond));
+                    c = new XmlCondition();
+                    rule.conditions.add(c);
                 }
                 for (int count=0; count<atts.getLength(); count++)
                 {
                     if(atts.getQName(count).equals("k")) {
-                        r.key = atts.getValue(count);
+                        c.key = atts.getValue(count);
                     } else if(atts.getQName(count).equals("v")) {
-                        r.value = atts.getValue(count);
+                        c.value = atts.getValue(count);
                     } else if(atts.getQName(count).equals("b")) {
-                        r.boolValue = atts.getValue(count);
+                        c.boolValue = atts.getValue(count);
                     } else {
                         error("The element \"" + qName + "\" has unknown attribute \"" + atts.getQName(count) + "\"!");
                     }
                 }
-                if(r.key == null) {
+                if(c.key == null) {
                     error("The condition has no key!");
                 }
@@ -239 +244 @@
             if(hadLine)
             {
-                style.add(rule.rule, rule.rules,
+                style.add(rule.cond, rule.conditions,
                         new LineElemStyle(rule.line, rule.scaleMax, rule.scaleMin));
             }
             if(hadLineMod)
             {
-                style.addModifier(rule.rule, rule.rules,
+                style.addModifier(rule.cond, rule.conditions,
                         new LineElemStyle(rule.linemod, rule.scaleMax, rule.scaleMin));
             }
             if(hadIcon)
             {
-                style.add(rule.rule, rule.rules,
+                style.add(rule.cond, rule.conditions,
                         new IconElemStyle(rule.icon, rule.scaleMax, rule.scaleMin));
             }
             if(hadArea)
             {
-                style.add(rule.rule, rule.rules,
+                style.add(rule.cond, rule.conditions,
                         new AreaElemStyle(rule.area, rule.scaleMax, rule.scaleMin));
             }