Changeset 11797 in josm for trunk

Timestamp:

2017-03-31T22:11:31+02:00 (8 years ago)

Author:

bastiK

Message:

see #14495 - fix immutable class non-constant field (by removing it)

Location:

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

Files:

• BoxTextElement.java (modified) (8 diffs)
• NodeElement.java (modified) (1 diff)

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

@@ -108 +108 @@
 
     /**
-     * A rectangle with size 0x0
-     */
-    public static final Rectangle ZERO_BOX = new Rectangle(0, 0, 0, 0);
-
-    /**
      * The default style a simple node should use for it's text
      */
@@ -138 +133 @@
      */
     public TextLabel text;
-    // Either boxProvider or box is not null. If boxProvider is different from
-    // null, this means, that the box can still change in future, otherwise
-    // it is fixed.
+    /**
+     * The {@link HorizontalTextAlignment} for this text.
+     */
+    public HorizontalTextAlignment hAlign;
+    /**
+     * The {@link VerticalTextAlignment} for this text.
+     */
+    public VerticalTextAlignment vAlign;
     protected BoxProvider boxProvider;
-    protected Rectangle box;
-    /**
-     * The {@link HorizontalTextAlignment} for this text.
-     */
-    public HorizontalTextAlignment hAlign;
-    /**
-     * The {@link VerticalTextAlignment} for this text.
-     */
-    public VerticalTextAlignment vAlign;
 
     /**
@@ -157 +148 @@
      * @param text The text to display
      * @param boxProvider The box provider to use
-     * @param box The initial box to use.
      * @param hAlign The {@link HorizontalTextAlignment}
      * @param vAlign The {@link VerticalTextAlignment}
      */
-    public BoxTextElement(Cascade c, TextLabel text, BoxProvider boxProvider, Rectangle box,
+    public BoxTextElement(Cascade c, TextLabel text, BoxProvider boxProvider,
             HorizontalTextAlignment hAlign, VerticalTextAlignment vAlign) {
         super(c, 5f);
@@ -169 +159 @@
         this.text = text;
         this.boxProvider = boxProvider;
-        this.box = box == null ? ZERO_BOX : box;
         this.hAlign = hAlign;
         this.vAlign = vAlign;
-    }
-
-    /**
-     * Create a new {@link BoxTextElement} with a dynamic box
-     * @param env The MapCSS environment
-     * @param boxProvider The box provider that computes the box.
-     * @return A new {@link BoxTextElement} or <code>null</code> if the creation failed.
-     */
-    public static BoxTextElement create(Environment env, BoxProvider boxProvider) {
-        return create(env, boxProvider, null);
-    }
-
-    /**
-     * Create a new {@link BoxTextElement} with a fixed box
-     * @param env The MapCSS environment
-     * @param box The box
-     * @return A new {@link BoxTextElement} or <code>null</code> if the creation failed.
-     */
-    public static BoxTextElement create(Environment env, Rectangle box) {
-        return create(env, null, box);
     }
 
@@ -198 +167 @@
      * @param env The MapCSS environment
      * @param boxProvider The box provider.
-     * @param box The box. Only considered if boxProvider is null.
      * @return A new {@link BoxTextElement} or <code>null</code> if the creation failed.
      */
-    public static BoxTextElement create(Environment env, BoxProvider boxProvider, Rectangle box) {
+    public static BoxTextElement create(Environment env, BoxProvider boxProvider) {
         initDefaultParameters();
 
@@ -244 +212 @@
         }
 
-        return new BoxTextElement(c, text, boxProvider, box, hAlign, vAlign);
+        return new BoxTextElement(c, text, boxProvider, hAlign, vAlign);
     }
 
@@ -252 +220 @@
      */
     public Rectangle getBox() {
-        if (boxProvider != null) {
-            BoxProviderResult result = boxProvider.get();
-            if (!result.isTemporary()) {
-                box = result.getBox();
-                boxProvider = null;
-            }
-            return result.getBox();
-        }
-        return box;
+        return boxProvider.get().getBox();
     }
 
@@ -285 +245 @@
                vAlign == that.vAlign &&
                Objects.equals(text, that.text) &&
-               Objects.equals(boxProvider, that.boxProvider) &&
-               Objects.equals(box, that.box);
+               Objects.equals(boxProvider, that.boxProvider);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(super.hashCode(), text, boxProvider, box, hAlign, vAlign);
+        return Objects.hash(super.hashCode(), text, boxProvider, hAlign, vAlign);
     }
 
     @Override
     public String toString() {
-        return "BoxTextElemStyle{" + super.toString() + ' ' + text.toStringImpl()
-                + " box=" + box + " hAlign=" + hAlign + " vAlign=" + vAlign + '}';
+        return "BoxTextElement{" + super.toString() + ' ' + text.toStringImpl()
+                + " box=" + getBox() + " hAlign=" + hAlign + " vAlign=" + vAlign + '}';
     }
 }

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

@@ -376 +376 @@
     @Override
     public String toString() {
-        StringBuilder s = new StringBuilder(64).append("NodeElemStyle{").append(super.toString());
+        StringBuilder s = new StringBuilder(64).append("NodeElement{").append(super.toString());
         if (mapImage != null) {
             s.append(" icon=[" + mapImage + ']');