Index: trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ConditionFactory.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ConditionFactory.java	(revision 13810)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ConditionFactory.java	(revision 13811)
@@ -632,5 +632,5 @@
          * @param e MapCSS environment
          * @return {@code true} if the object has been modified
-         * @see OsmPrimitive#isModified()
+         * @see IPrimitive#isModified()
          */
         static boolean modified(Environment e) { // NO_UCD (unused code)
@@ -642,5 +642,5 @@
          * @param e MapCSS environment
          * @return {@code true} if the object is new
-         * @see OsmPrimitive#isNew()
+         * @see IPrimitive#isNew()
          */
         static boolean _new(Environment e) { // NO_UCD (unused code)
@@ -662,5 +662,5 @@
          * @param e MapCSS environment
          * @return {@code true} if the object is tagged
-         * @see OsmPrimitive#isTagged()
+         * @see IPrimitive#isTagged()
          */
         static boolean tagged(Environment e) { // NO_UCD (unused code)
@@ -672,5 +672,5 @@
          * @param e MapCSS environment
          * @return {@code true} if the object has the same tags as its child/parent
-         * @see OsmPrimitive#hasSameInterestingTags(OsmPrimitive)
+         * @see IPrimitive#hasSameInterestingTags(IPrimitive)
          */
         static boolean sameTags(Environment e) { // NO_UCD (unused code)
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java	(revision 13810)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java	(revision 13811)
@@ -27,5 +27,4 @@
 import org.openstreetmap.josm.data.osm.IPrimitive;
 import org.openstreetmap.josm.data.osm.Node;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.search.SearchCompiler;
@@ -514,5 +513,5 @@
          * @param env the environment
          * @return the OSM id of the object's parent, if available, or {@code null}
-         * @see OsmPrimitive#getUniqueId()
+         * @see IPrimitive#getUniqueId()
          */
         public static Long parent_osm_id(final Environment env) { // NO_UCD (unused code)
@@ -789,5 +788,5 @@
          * @param env the environment
          * @return the OSM id of the current object
-         * @see OsmPrimitive#getUniqueId()
+         * @see IPrimitive#getUniqueId()
          */
         public static long osm_id(final Environment env) { // NO_UCD (unused code)
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java	(revision 13810)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java	(revision 13811)
@@ -33,5 +33,4 @@
 import org.openstreetmap.josm.data.osm.KeyValueVisitor;
 import org.openstreetmap.josm.data.osm.Node;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmUtils;
 import org.openstreetmap.josm.data.osm.Relation;
@@ -164,5 +163,5 @@
      *
      * To use this index, you need to {@link #add(MapCSSRule)} all rules to it. You then need to call
-     * {@link #initIndex()}. Afterwards, you can use {@link #getRuleCandidates(OsmPrimitive)} to get an iterator over
+     * {@link #initIndex()}. Afterwards, you can use {@link #getRuleCandidates(IPrimitive)} to get an iterator over
      * all rules that might be applied to that primitive.
      */