Changeset 1843 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2009-07-25T18:37:45+02:00 (17 years ago)

Author:

jttt

Message:

Use OsmPrimitive methods instead of direct access to keys field when possible

Location:

trunk/src/org/openstreetmap/josm/data/osm

Files:

• OsmPrimitive.java (modified) (4 diffs)
• visitor/MapPaintVisitor.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

@@ -29 +29 @@
  */
 abstract public class OsmPrimitive implements Comparable<OsmPrimitive> {
-
-    /**
-     * The key/value list for this primitive.
-     */
-    public Map<String, String> keys;
 
     /* mappaint data */
@@ -219 +214 @@
     }
 
+    /*------------
+     * Keys handling
+     ------------*/
+
+    /**
+     * The key/value list for this primitive.
+     */
+    public Map<String, String> keys;
+
     /**
      * Set the given value to the given key
@@ -248 +252 @@
     }
 
-    public String getName() {
-        return null;
+    /**
+     * Added in revision 1843
+     * Please do not use in plug-ins until this version becomes JOSM tested
+     */
+    public final void removeAll() {
+        keys = null;
+        mappaintStyle = null;
     }
 
@@ -266 +275 @@
             return Collections.emptyList();
         return keys.keySet();
+    }
+
+    /**
+     * Added in revision 1843
+     * Please do not use in plug-ins until this version becomes JOSM tested
+     */
+    public final boolean hasKeys() {
+        return keys != null && !keys.isEmpty();
+    }
+
+
+
+
+
+
+    public String getName() {
+        return null;
     }
 

trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java

@@ -495 +495 @@
             return;
         }
-        else if (drawMultipolygon && r.keys != null && "multipolygon".equals(r.keys.get("type")))
+        else if (drawMultipolygon && "multipolygon".equals(r.get("type")))
         {
             if(drawMultipolygon(r))
               return;
         }
-        else if (drawRestriction && r.keys != null && "restriction".equals(r.keys.get("type")))
+        else if (drawRestriction && "restriction".equals(r.get("type")))
         {
             drawRestriction(r);
@@ -751 +751 @@
 
         if (nodeStyle == null) {
-            r.putError(tr("Style for restriction {0} not found.", r.keys.get("restriction")), true);
+            r.putError(tr("Style for restriction {0} not found.", r.get("restriction")), true);
             return;
         }
@@ -1112 +1112 @@
     protected String getNodeName(Node n) {
         String name = null;
-        if (n.keys != null) {
+        if (n.hasKeys()) {
             for (String rn : regionalNameOrder) {
-                name = n.keys.get(rn);
+                name = n.get(rn);
                 if (name != null) break;
             }