Changeset 8742 in josm for trunk/src/org

Timestamp:

2015-09-10T08:54:25+02:00 (9 years ago)

Author:

simon04

Message:

fix #11834 - KeyValueVisitor: also provide primitive to the visitor

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/AbstractPrimitive.java (modified) (4 diffs)
• gui/mappaint/mapcss/MapCSSStyleSource.java (modified) (2 diffs)

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

@@ -31 +31 @@
      *
      * @author Michael Zangl
-     * @since 8740
+     * @since 8742
      */
     public interface KeyValueVisitor {
@@ -38 +38 @@
          * This method gets called for every tag received.
          *
+         * @param primitive This primitive
          * @param key   The key
          * @param value The value
          */
-        void visitKeyValue(String key, String value);
+        void visitKeyValue(AbstractPrimitive primitive, String key, String value);
     }
 
@@ -514 +515 @@
      * @param visitor The visitor to call.
      * @see #getKeys()
-     * @since 8740
+     * @since 8742
      */
     public void visitKeys(KeyValueVisitor visitor) {
@@ -520 +521 @@
         if (keys != null) {
             for (int i = 0; i < keys.length; i += 2) {
-                visitor.visitKeyValue(keys[i], keys[i + 1]);
+                visitor.visitKeyValue(this, keys[i], keys[i + 1]);
             }
         }

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java

@@ -30 +30 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Version;
+import org.openstreetmap.josm.data.osm.AbstractPrimitive;
 import org.openstreetmap.josm.data.osm.AbstractPrimitive.KeyValueVisitor;
 import org.openstreetmap.josm.data.osm.Node;
@@ -172 +173 @@
 
             @Override
-            public void visitKeyValue(String key, String value) {
+            public void visitKeyValue(AbstractPrimitive p, String key, String value) {
                 MapCSSKeyRules v = index.get(key);
                 if (v != null) {