Changeset 3805 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/StyleSource.java

Timestamp:

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

Author:

bastiK

Message:

some renaming (to make future commits easier to read)

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/StyleSource.java (modified) (5 diffs)

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

@@ -10 +10 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmUtils;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.gui.mappaint.xml.XmlCondition;
 import org.openstreetmap.josm.gui.preferences.SourceEntry;
 
@@ -172 +174 @@
     }
 
-    public void add(Rule r, Collection<Rule> rules, LineElemStyle style) {
-        if(rules != null)
-        {
-            style.rules = rules;
+    public void add(XmlCondition c, Collection<XmlCondition> conditions, LineElemStyle style) {
+        if(conditions != null)
+        {
+            style.conditions = conditions;
             linesList.add(style);
         }
         else {
-            String key = r.getKey();
+            String key = c.getKey();
             style.code = key;
             lines.put(key, style);
@@ -185 +187 @@
     }
 
-    public void addModifier(Rule r, Collection<Rule> rules, LineElemStyle style) {
-        if(rules != null)
-        {
-            style.rules = rules;
+    public void addModifier(XmlCondition c, Collection<XmlCondition> conditions, LineElemStyle style) {
+        if(conditions != null)
+        {
+            style.conditions = conditions;
             modifiersList.add(style);
         }
         else
         {
-            String key = r.getKey();
+            String key = c.getKey();
             style.code = key;
             modifiers.put(key, style);
@@ -199 +201 @@
     }
 
-    public void add(Rule r, Collection<Rule> rules, AreaElemStyle style) {
-        if(rules != null)
-        {
-            style.rules = rules;
+    public void add(XmlCondition c, Collection<XmlCondition> conditions, AreaElemStyle style) {
+        if(conditions != null)
+        {
+            style.conditions = conditions;
             areasList.add(style);
         }
         else
         {
-            String key = r.getKey();
+            String key = c.getKey();
             style.code = key;
             areas.put(key, style);
@@ -213 +215 @@
     }
 
-    public void add(Rule r, Collection<Rule> rules, IconElemStyle style) {
-        if(rules != null)
-        {
-            style.rules = rules;
+    public void add(XmlCondition c, Collection<XmlCondition> conditions, IconElemStyle style) {
+        if(conditions != null)
+        {
+            style.conditions = conditions;
             iconsList.add(style);
         }
         else
         {
-            String key = r.getKey();
+            String key = c.getKey();
             style.code = key;
             icons.put(key, style);