Index: trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/LineElement.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/LineElement.java	(revision 12080)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/LineElement.java	(revision 12082)
@@ -31,5 +31,5 @@
     public static final LineElement UNTAGGED_WAY = createSimpleLineStyle(null, false);
 
-    private BasicStroke line;
+    private final BasicStroke line;
     public Color color;
     public Color dashesBackground;
@@ -38,5 +38,5 @@
     public boolean wayDirectionArrows;
 
-    private BasicStroke dashesLine;
+    private final BasicStroke dashesLine;
 
     public enum LineType {
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/TextLabel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/TextLabel.java	(revision 12080)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/TextLabel.java	(revision 12082)
@@ -77,5 +77,5 @@
     @Deprecated
     public TextLabel(LabelCompositionStrategy strategy, Font font, int xOffset, int yOffset, Color color, Float haloRadius, Color haloColor) {
-        this(strategy, font, xOffset, yOffset, color, haloRadius, haloColor, new CompletelyInsideAreaStrategy());
+        this(strategy, font, xOffset, yOffset, color, haloRadius, haloColor, CompletelyInsideAreaStrategy.INSTANCE);
     }
 
@@ -254,5 +254,5 @@
     @Override
     public String toString() {
-        return "TextElement{" + toStringImpl() + '}';
+        return "TextLabel{" + toStringImpl() + '}';
     }
 
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/placement/CompletelyInsideAreaStrategy.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/placement/CompletelyInsideAreaStrategy.java	(revision 12080)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/placement/CompletelyInsideAreaStrategy.java	(revision 12082)
@@ -21,4 +21,7 @@
      */
     public static final CompletelyInsideAreaStrategy INSTANCE = new CompletelyInsideAreaStrategy();
+
+    protected CompletelyInsideAreaStrategy() {
+    }
 
     @Override
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/placement/PartiallyInsideAreaStrategy.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/placement/PartiallyInsideAreaStrategy.java	(revision 12080)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/placement/PartiallyInsideAreaStrategy.java	(revision 12082)
@@ -22,4 +22,7 @@
     public static final PartiallyInsideAreaStrategy INSTANCE = new PartiallyInsideAreaStrategy();
 
+    private PartiallyInsideAreaStrategy() {
+    }
+
     @Override
     public MapViewPositionAndRotation findLabelPlacement(MapViewPath path, Rectangle2D nb) {