Changeset 4003 in josm

Timestamp:

Mar 25, 2011 9:08:07 PM (2 years ago)

Author:

bastiK

Message:

toString() improvements

Location:

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

Files:

• NodeElemStyle.java (modified) (2 diffs)
• TextElement.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/mappaint/NodeElemStyle.java

@@ -122 +122 @@
         }
 
+        @Override
+        public String toString() {
+            return "NodeTextElement{" + toStringImpl() + '}';
+        }
+
+        protected String toStringImpl() {
+            return super.toStringImpl() + " hAlign=" + hAlign + " vAlign=" + vAlign;
+        }
     }
 
@@ -452 +460 @@
     @Override
     public String toString() {
-        return "NodeElemStyle{" + super.toString() +
-                (icon != null ? ("icon=" + icon + " iconAlpha=" + iconAlpha) : "") +
-                (symbol != null ? (" symbol=[" + symbol + "]") : "") + '}';
+        StringBuilder s = new StringBuilder("NodeElemStyle{");
+        s.append(super.toString());
+        if (icon != null) {
+            s.append(" icon=" + icon + " iconAlpha=" + iconAlpha);
+        }
+        if (symbol != null) {
+            s.append(" symbol=[" + symbol + "]");
+        }
+        if (text != null) {
+            s.append(" text=[" + text.toStringImpl() + "]");
+        }
+        s.append('}');
+        return s.toString();
     }
 

trunk/src/org/openstreetmap/josm/gui/mappaint/TextElement.java

@@ -157 +157 @@
     @Override
     public String toString() {
+        return "TextElement{" + toStringImpl() + '}';
+    }
+
+    protected String toStringImpl() {
         StringBuilder sb = new StringBuilder();
-        sb.append("{TextElement ");
-        sb.append("strategy=");
-        sb.append(labelCompositionStrategy == null ? "null" : labelCompositionStrategy.toString());
-        sb.append("}");
+        sb.append("labelCompositionStrategy=" + labelCompositionStrategy);
+        sb.append(" font=" + font);
+        if (xOffset != 0) {
+            sb.append(" xOffset=" + xOffset);
+        }
+        if (yOffset != 0) {
+            sb.append(" yOffset=" + yOffset);
+        }
+        sb.append(" color=" + Utils.toString(color));
+        if (haloRadius != null) {
+            sb.append(" haloRadius=" + haloRadius);
+            sb.append(" haloColor=" + haloColor);
+        }
         return sb.toString();
     }