Index: /trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java	(revision 8741)
+++ /trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java	(revision 8742)
@@ -31,5 +31,5 @@
      *
      * @author Michael Zangl
-     * @since 8740
+     * @since 8742
      */
     public interface KeyValueVisitor {
@@ -38,8 +38,9 @@
          * 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,5 +515,5 @@
      * @param visitor The visitor to call.
      * @see #getKeys()
-     * @since 8740
+     * @since 8742
      */
     public void visitKeys(KeyValueVisitor visitor) {
@@ -520,5 +521,5 @@
         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]);
             }
         }
Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java	(revision 8741)
+++ /trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java	(revision 8742)
@@ -30,4 +30,5 @@
 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,5 +173,5 @@
 
             @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) {