Index: trunk/src/org/openstreetmap/josm/tools/template_engine/Variable.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/template_engine/Variable.java	(revision 13003)
+++ trunk/src/org/openstreetmap/josm/tools/template_engine/Variable.java	(revision 13004)
@@ -25,5 +25,5 @@
      * Constructs a new {@code Variable}.
      * @param variableName the variable name (i.e. the key in the data provider key-value mapping);
-     * will be considered "special" if the variable name starts with {@link SPECIAL_VARIABLE_PREFIX}
+     * will be considered "special" if the variable name starts with {@link #SPECIAL_VARIABLE_PREFIX}
      */
     public Variable(String variableName) {
Index: trunk/test/unit/org/openstreetmap/josm/tools/template_engine/TemplateParserTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/tools/template_engine/TemplateParserTest.java	(revision 13003)
+++ trunk/test/unit/org/openstreetmap/josm/tools/template_engine/TemplateParserTest.java	(revision 13004)
@@ -59,8 +59,8 @@
     public void testConditionWhitespace() throws ParseError {
         TemplateParser parser = new TemplateParser("?{ '{name} {desc}' | '{name}' | '{desc}'    }");
-        Condition condition = new Condition();
-        condition.getEntries().add(CompoundTemplateEntry.fromArray(new Variable("name"), new StaticText(" "), new Variable("desc")));
-        condition.getEntries().add(new Variable("name"));
-        condition.getEntries().add(new Variable("desc"));
+        Condition condition = new Condition(Arrays.asList(
+            CompoundTemplateEntry.fromArray(new Variable("name"), new StaticText(" "), new Variable("desc")),
+            new Variable("name"),
+            new Variable("desc")));
         ReflectionAssert.assertReflectionEquals(condition, parser.parse());
     }
@@ -73,8 +73,8 @@
     public void testConditionNoWhitespace() throws ParseError {
         TemplateParser parser = new TemplateParser("?{'{name} {desc}'|'{name}'|'{desc}'}");
-        Condition condition = new Condition();
-        condition.getEntries().add(CompoundTemplateEntry.fromArray(new Variable("name"), new StaticText(" "), new Variable("desc")));
-        condition.getEntries().add(new Variable("name"));
-        condition.getEntries().add(new Variable("desc"));
+        Condition condition = new Condition(Arrays.asList(
+                CompoundTemplateEntry.fromArray(new Variable("name"), new StaticText(" "), new Variable("desc")),
+                new Variable("name"),
+                new Variable("desc")));
         ReflectionAssert.assertReflectionEquals(condition, parser.parse());
     }
@@ -92,8 +92,8 @@
     public void testConditionSearchExpression() throws ParseError, SearchParseError {
         TemplateParser parser = new TemplateParser("?{ admin_level = 2 'NUTS 1' | admin_level = 4 'NUTS 2' |  '{admin_level}'}");
-        Condition condition = new Condition();
-        condition.getEntries().add(new SearchExpressionCondition(compile("admin_level = 2"), new StaticText("NUTS 1")));
-        condition.getEntries().add(new SearchExpressionCondition(compile("admin_level = 4"), new StaticText("NUTS 2")));
-        condition.getEntries().add(new Variable("admin_level"));
+        Condition condition = new Condition(Arrays.asList(
+                new SearchExpressionCondition(compile("admin_level = 2"), new StaticText("NUTS 1")),
+                new SearchExpressionCondition(compile("admin_level = 4"), new StaticText("NUTS 2")),
+                new Variable("admin_level")));
         ReflectionAssert.assertReflectionEquals(condition, parser.parse());
     }