Changeset 1924 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2009-08-07T23:22:31+02:00 (15 years ago)

Author:

jttt

Message:

Made OsmPrimitive.keys deprecated, removed remaining references in JOSM

Location:

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

Files:

• ElemStyle.java (modified) (3 diffs)
• ElemStyles.java (modified) (10 diffs)

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

@@ -2 +2 @@
 
 import java.util.Collection;
-import java.util.Map;
 
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -31 +30 @@
         return code;
     }
-    public boolean check(Map<String, String> keys)
+    public boolean check(OsmPrimitive primitive)
     {
         if(rules == null)
@@ -37 +36 @@
         for(Rule r : rules)
         {
-            String k = keys.get(r.key);
+            String k = primitive.get(r.key);
             String bv = OsmUtils.getNamedOsmBoolean(r.boolValue);
             if(k == null || (r.value != null && !k.equals(r.value))

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

@@ -7 +7 @@
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Map;
+import java.util.Map.Entry;
 
 import org.openstreetmap.josm.Main;
@@ -37 +37 @@
             areasList = new LinkedList<AreaElemStyle>();
         }
-        private IconElemStyle getNode(Map<String, String> keys)
+        private IconElemStyle getNode(OsmPrimitive primitive)
         {
             IconElemStyle ret = null;
-            Iterator<String> iterator = keys.keySet().iterator();
-            while(iterator.hasNext())
-            {
-                String key = iterator.next();
-                String val = keys.get(key);
+            for (Entry<String, String> entry:primitive.entrySet()) {
+                String key = entry.getKey();
+                String val = entry.getValue();
                 IconElemStyle style;
                 if((style = icons.get("n" + key + "=" + val)) != null)
@@ -64 +62 @@
             for(IconElemStyle s : iconsList)
             {
-                if((ret == null || s.priority > ret.priority) && s.check(keys))
+                if((ret == null || s.priority > ret.priority) && s.check(primitive))
                     ret = s;
             }
             return ret;
         }
-        private ElemStyle get(Map<String, String> keys, boolean noclosed)
+        private ElemStyle get(OsmPrimitive primitive, boolean noclosed)
         {
             AreaElemStyle retArea = null;
@@ -75 +73 @@
             String linestring = null;
             HashMap<String, LineElemStyle> over = new HashMap<String, LineElemStyle>();
-            Iterator<String> iterator = keys.keySet().iterator();
-            while(iterator.hasNext())
-            {
-                String key = iterator.next();
-                String val = keys.get(key);
+            for (Entry<String, String> entry:primitive.entrySet()) {
+                String key = entry.getKey();
+                String val = entry.getValue();
                 AreaElemStyle styleArea;
                 LineElemStyle styleLine;
@@ -125 +121 @@
             {
                 if((retArea == null || s.priority > retArea.priority)
-                && (!noclosed || !s.closed) && s.check(keys))
+                && (!noclosed || !s.closed) && s.check(primitive))
                     retArea = s;
             }
@@ -131 +127 @@
             {
                 if((retLine == null || s.priority > retLine.priority)
-                && s.check(keys))
+                && s.check(primitive))
                     retLine = s;
             }
             for(LineElemStyle s : modifiersList)
             {
-                if(s.check(keys))
+                if(s.check(primitive))
                     over.put(s.getCode(), s);
             }
@@ -158 +154 @@
         public ElemStyle get(OsmPrimitive osm)
         {
-            return (osm.keys == null) ? null :
-            ((osm instanceof Node) ? getNode(osm.keys) : get(osm.keys,
+            return (!osm.hasKeys()) ? null :
+            ((osm instanceof Node) ? getNode(osm) : get(osm,
             osm instanceof Way && !((Way)osm).isClosed()));
         }
@@ -165 +161 @@
         public ElemStyle getArea(Way osm)
         {
-            if(osm.keys != null)
+            if(osm.hasKeys())
             {
                 /* force area mode also for unclosed ways */
-                ElemStyle style = get(osm.keys, false);
+                ElemStyle style = get(osm, false);
                 if(style != null && style instanceof AreaElemStyle)
                     return style;
@@ -177 +173 @@
         public IconElemStyle getIcon(OsmPrimitive osm)
         {
-            return (osm.keys == null) ? null : getNode(osm.keys);
+            return osm.hasKeys() ? getNode(osm): null;
         }
 
         public boolean isArea(OsmPrimitive o)
         {
-            if(o.keys != null && !(o instanceof Node))
+            if(o.hasKeys() && !(o instanceof Node))
             {
                 boolean noclosed = o instanceof Way && !((Way)o).isClosed();
@@ -200 +196 @@
                 for(AreaElemStyle s : areasList)
                 {
-                    if(!(s.closed && noclosed) && s.check(o.keys))
+                    if(!(s.closed && noclosed) && s.check(o))
                         return true;
                 }