Changeset 12082 in josm for trunk/src

Timestamp:

2017-05-07T16:37:57+02:00 (7 years ago)

Author:

bastiK

Message:

minor fixes to ensure unmodifiable StyleElement classes

Location:

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement

Files:

• LineElement.java (modified) (2 diffs)
• TextLabel.java (modified) (2 diffs)
• placement/CompletelyInsideAreaStrategy.java (modified) (1 diff)
• placement/PartiallyInsideAreaStrategy.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/LineElement.java

@@ -31 +31 @@
     public static final LineElement UNTAGGED_WAY = createSimpleLineStyle(null, false);
 
-    private BasicStroke line;
+    private final BasicStroke line;
     public Color color;
     public Color dashesBackground;
@@ -38 +38 @@
     public boolean wayDirectionArrows;
 
-    private BasicStroke dashesLine;
+    private final BasicStroke dashesLine;
 
     public enum LineType {

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/TextLabel.java

@@ -77 +77 @@
     @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 +254 @@
     @Override
     public String toString() {
-        return "TextElement{" + toStringImpl() + '}';
+        return "TextLabel{" + toStringImpl() + '}';
     }
 

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/placement/CompletelyInsideAreaStrategy.java

@@ -21 +21 @@
      */
     public static final CompletelyInsideAreaStrategy INSTANCE = new CompletelyInsideAreaStrategy();
+
+    protected CompletelyInsideAreaStrategy() {
+    }
 
     @Override

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/placement/PartiallyInsideAreaStrategy.java

@@ -22 +22 @@
     public static final PartiallyInsideAreaStrategy INSTANCE = new PartiallyInsideAreaStrategy();
 
+    private PartiallyInsideAreaStrategy() {
+    }
+
     @Override
     public MapViewPositionAndRotation findLabelPlacement(MapViewPath path, Rectangle2D nb) {