Index: trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/ConditionTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/ConditionTest.java	(revision 17619)
+++ trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/ConditionTest.java	(revision 17642)
@@ -13,5 +13,5 @@
 import org.openstreetmap.josm.gui.mappaint.Environment;
 import org.openstreetmap.josm.gui.mappaint.mapcss.Condition.Context;
-import org.openstreetmap.josm.gui.mappaint.mapcss.Condition.ToTagConvertable;
+import org.openstreetmap.josm.gui.mappaint.mapcss.Condition.TagCondition;
 import org.openstreetmap.josm.gui.mappaint.mapcss.ConditionFactory.Op;
 import org.openstreetmap.josm.gui.mappaint.mapcss.ConditionFactory.SimpleKeyValueCondition;
@@ -63,6 +63,6 @@
         assertTrue(op instanceof SimpleKeyValueCondition);
         assertEquals("[k1=v1]", op.toString());
-        assertEquals("k1", ((ToTagConvertable) op).asTag(null).getKey());
-        assertEquals("v1", ((ToTagConvertable) op).asTag(null).getValue());
+        assertEquals("k1", ((TagCondition) op).asTag(null).getKey());
+        assertEquals("v1", ((TagCondition) op).asTag(null).getValue());
     }
 
@@ -79,6 +79,6 @@
         assertFalse(op.applies(genEnv(node4)));
 
-        assertEquals("k1", ((ToTagConvertable) op).asTag(null).getKey());
-        assertEquals("k2", ((ToTagConvertable) op).asTag(null).getValue());
+        assertEquals("k1", ((TagCondition) op).asTag(null).getKey());
+        assertEquals("k2", ((TagCondition) op).asTag(null).getValue());
     }