Changeset 11731 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/TextLabel.java

Timestamp:

2017-03-13T20:29:33+01:00 (8 years ago)

Author:

michael2402

Message:

Clean icon drawing code style.

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/TextLabel.java (modified) (7 diffs)

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

@@ -59 +59 @@
      * The position strategy for this text label.
      */
-    private final PositionForAreaStrategy labelPositionSteategy;
+    private final PositionForAreaStrategy labelPositionStrategy;
 
     /**
@@ -90 +90 @@
      * @param haloRadius halo radius
      * @param haloColor halo color
-     * @param labelPositionSteategy The position in the area.
-     */
-    protected TextLabel(LabelCompositionStrategy strategy, Font font, int xOffset, int yOffset, Color color, Float haloRadius, Color haloColor, PositionForAreaStrategy labelPositionSteategy) {
+     * @param labelPositionStrategy The position in the area.
+     */
+    protected TextLabel(LabelCompositionStrategy strategy, Font font, int xOffset, int yOffset, Color color, Float haloRadius,
+            Color haloColor, PositionForAreaStrategy labelPositionStrategy) {
         this.labelCompositionStrategy = strategy;
         this.font = Objects.requireNonNull(font, "font");
@@ -100 +101 @@
         this.haloRadius = haloRadius;
         this.haloColor = haloColor;
-        this.labelPositionSteategy = Objects.requireNonNull(labelPositionSteategy, "labelPositionSteategy");
+        this.labelPositionStrategy = Objects.requireNonNull(labelPositionStrategy, "labelPositionStrategy");
     }
 
@@ -116 +117 @@
         this.haloColor = other.haloColor;
         this.haloRadius = other.haloRadius;
-        this.labelPositionSteategy = other.labelPositionSteategy;
+        this.labelPositionStrategy = other.labelPositionStrategy;
     }
 
@@ -123 +124 @@
      *
      * @param other the other element.
-     * @param labelPositionSteategy the position
-     */
-    private TextLabel(TextLabel other, PositionForAreaStrategy labelPositionSteategy) {
+     * @param labelPositionStrategy the position
+     */
+    private TextLabel(TextLabel other, PositionForAreaStrategy labelPositionStrategy) {
         this.labelCompositionStrategy = other.labelCompositionStrategy;
         this.font = other.font;
@@ -133 +134 @@
         this.haloColor = other.haloColor;
         this.haloRadius = other.haloRadius;
-        this.labelPositionSteategy = labelPositionSteategy;
+        this.labelPositionStrategy = labelPositionStrategy;
     }
 
@@ -242 +243 @@
      * @since 11722
      */
-    public PositionForAreaStrategy getLabelPositionSteategy() {
-        return labelPositionSteategy;
-    }
-
-    public TextLabel withPosition(PositionForAreaStrategy labelPositionSteategy) {
-        return new TextLabel(this, labelPositionSteategy);
+    public PositionForAreaStrategy getLabelPositionStrategy() {
+        return labelPositionStrategy;
+    }
+
+    public TextLabel withPosition(PositionForAreaStrategy labelPositionStrategy) {
+        return new TextLabel(this, labelPositionStrategy);
     }