Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/LabelCompositionStrategy.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/LabelCompositionStrategy.java	(revision 13660)
+++ /trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/LabelCompositionStrategy.java	(revision 13661)
@@ -8,5 +8,5 @@
 import java.util.Objects;
 
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.IPrimitive;
 import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.spi.preferences.PreferenceChangeEvent;
@@ -46,5 +46,5 @@
      * if no suitable value could be composed
      */
-    String compose(OsmPrimitive primitive);
+    String compose(IPrimitive primitive);
 
     /**
@@ -59,5 +59,5 @@
 
         @Override
-        public String compose(OsmPrimitive primitive) {
+        public String compose(IPrimitive primitive) {
             return defaultLabel;
         }
@@ -104,5 +104,5 @@
 
         @Override
-        public String compose(OsmPrimitive primitive) {
+        public String compose(IPrimitive primitive) {
             if (defaultLabelTag == null) return null;
             if (primitive == null) return null;
@@ -246,5 +246,5 @@
         }
 
-        private String getPrimitiveName(OsmPrimitive n) {
+        private String getPrimitiveName(IPrimitive n) {
             StringBuilder name = new StringBuilder();
             if (!n.hasKeys()) return null;
@@ -271,5 +271,5 @@
 
         @Override
-        public String compose(OsmPrimitive primitive) {
+        public String compose(IPrimitive primitive) {
             if (primitive == null) return null;
             return getPrimitiveName(primitive);