Changeset 11057 in josm for trunk/src/org/openstreetmap

Timestamp:

2016-09-27T09:25:46+02:00 (8 years ago)

Author:

simon04

Message:

Template engine: fix string representations

Location:

trunk/src/org/openstreetmap/josm/tools/template_engine

Files:

• Condition.java (modified) (2 diffs)
• Variable.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/tools/template_engine/Condition.java

@@ -41 +41 @@
     public String toString() {
         StringBuilder sb = new StringBuilder();
-        sb.append("?{");
+        sb.append("?{ ");
         for (TemplateEntry entry: entries) {
             if (entry instanceof SearchExpressionCondition) {
@@ -48 +48 @@
                 sb.append('\'').append(entry).append('\'');
             }
-            sb.append('|');
+            sb.append(" | ");
         }
+        sb.setLength(sb.length() - 3);
+        sb.append(" }");
         return sb.toString();
     }

trunk/src/org/openstreetmap/josm/tools/template_engine/Variable.java

@@ -56 +56 @@
     @Override
     public String toString() {
-        return '{' + variableName + '}';
+        return '{' + (special ? SPECIAL_VARIABLE_PREFIX : "") + variableName + '}';
     }