Index: trunk/test/unit/org/openstreetmap/josm/gui/mappaint/LabelCompositionStrategyTest.groovy
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/mappaint/LabelCompositionStrategyTest.groovy	(revision 9274)
+++ trunk/test/unit/org/openstreetmap/josm/gui/mappaint/LabelCompositionStrategyTest.groovy	(revision 9279)
@@ -3,12 +3,12 @@
 
 import org.junit.*
-import org.openstreetmap.josm.JOSMFixture;
-import org.openstreetmap.josm.gui.mappaint.LabelCompositionStrategy.DeriveLabelFromNameTagsCompositionStrategy 
-import org.openstreetmap.josm.gui.mappaint.LabelCompositionStrategy.StaticLabelCompositionStrategy;
-import org.openstreetmap.josm.gui.mappaint.LabelCompositionStrategy.TagLookupCompositionStrategy 
-import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.JOSMFixture
+import org.openstreetmap.josm.data.osm.Node
+import org.openstreetmap.josm.gui.mappaint.styleelement.LabelCompositionStrategy.DeriveLabelFromNameTagsCompositionStrategy
+import org.openstreetmap.josm.gui.mappaint.styleelement.LabelCompositionStrategy.StaticLabelCompositionStrategy
+import org.openstreetmap.josm.gui.mappaint.styleelement.LabelCompositionStrategy.TagLookupCompositionStrategy
 
 class LabelCompositionStrategyTest {
-    
+
     @BeforeClass
     public static void createJOSMFixture(){
@@ -19,48 +19,48 @@
     public void createStaticLabelCompositionStrategy() {
         def n = new Node()
-        
+
         def strat = new StaticLabelCompositionStrategy(null)
         assert strat.compose(n) == null
-        
+
         strat = new StaticLabelCompositionStrategy("a label")
-        assert strat.compose(n) == "a label"        
+        assert strat.compose(n) == "a label"
     }
-    
+
     @Test
     public void createTagLookupCompositionStrategy() {
         def n = new Node()
         n.put("my-tag", "my-value")
-        
+
         def strat = new TagLookupCompositionStrategy(null)
         assert strat.compose(n) == null
-        
+
         strat = new TagLookupCompositionStrategy("name")
         assert strat.compose(n) == null
-        
+
         strat = new TagLookupCompositionStrategy("my-tag")
         assert strat.compose(n) == "my-value"
     }
-    
+
     @Test
     public void createDeriveLabelFromNameTagsCompositionStrategy() {
-        def n 
+        def n
         def strat
-        
+
         strat = new DeriveLabelFromNameTagsCompositionStrategy()
         strat.setNameTags(null)
         assert strat.getNameTags() == []
-        
+
         strat = new DeriveLabelFromNameTagsCompositionStrategy()
         strat.setNameTags(["name", "brand"])
         assert strat.getNameTags() == ["name", "brand"]
-        
+
         n = new Node()
-        n.put("brand", "my brand")        
+        n.put("brand", "my brand")
         assert strat.compose(n) == "my brand"
-        
+
         n = new Node()
         n.put("name", "my name")
         n.put("brand", "my brand")
-        assert strat.compose(n) == "my name"        
+        assert strat.compose(n) == "my name"
     }
 }
Index: trunk/test/unit/org/openstreetmap/josm/gui/mappaint/MapCSSWithExtendedTextDirectivesTest.groovy
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/mappaint/MapCSSWithExtendedTextDirectivesTest.groovy	(revision 9274)
+++ trunk/test/unit/org/openstreetmap/josm/gui/mappaint/MapCSSWithExtendedTextDirectivesTest.groovy	(revision 9279)
@@ -6,7 +6,8 @@
 import org.openstreetmap.josm.JOSMFixture
 import org.openstreetmap.josm.data.osm.Node
-import org.openstreetmap.josm.gui.mappaint.LabelCompositionStrategy.DeriveLabelFromNameTagsCompositionStrategy
-import org.openstreetmap.josm.gui.mappaint.LabelCompositionStrategy.TagLookupCompositionStrategy
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles.TagKeyReference
+import org.openstreetmap.josm.gui.mappaint.styleelement.TextLabel
+import org.openstreetmap.josm.gui.mappaint.styleelement.LabelCompositionStrategy.DeriveLabelFromNameTagsCompositionStrategy
+import org.openstreetmap.josm.gui.mappaint.styleelement.LabelCompositionStrategy.TagLookupCompositionStrategy
 
 class MapCSSWithExtendedTextDirectivesTest {
@@ -26,5 +27,5 @@
         Environment env = new Environment(osm, mc, "default", null)
 
-        TextElement te = TextElement.create(env, Color.WHITE, false /* no default annotate */)
+        TextLabel te = TextLabel.create(env, Color.WHITE, false /* no default annotate */)
         assert te.labelCompositionStrategy != null
         assert te.labelCompositionStrategy instanceof DeriveLabelFromNameTagsCompositionStrategy
@@ -40,5 +41,5 @@
         Environment env = new Environment(osm, mc, "default", null)
 
-        TextElement te = TextElement.create(env, Color.WHITE, false /* no default annotate */)
+        TextLabel te = TextLabel.create(env, Color.WHITE, false /* no default annotate */)
         assert te.labelCompositionStrategy != null
         assert te.labelCompositionStrategy instanceof TagLookupCompositionStrategy
@@ -52,5 +53,5 @@
         Environment env = new Environment(osm, mc, "default", null)
 
-        TextElement te = TextElement.create(env, Color.WHITE, false /* no default annotate */)
+        TextLabel te = TextLabel.create(env, Color.WHITE, false /* no default annotate */)
         assert te == null
     }