Repository: incubator-freemarker Updated Branches: refs/heads/3 ac6626753 -> 4b680d205
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/test/java/org/apache/freemarker/test/templatesuite/models/BooleanAndScalarModel.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/test/templatesuite/models/BooleanAndScalarModel.java b/src/test/java/org/apache/freemarker/test/templatesuite/models/BooleanAndScalarModel.java index 2b482f5..9249b4f 100644 --- a/src/test/java/org/apache/freemarker/test/templatesuite/models/BooleanAndScalarModel.java +++ b/src/test/java/org/apache/freemarker/test/templatesuite/models/BooleanAndScalarModel.java @@ -27,10 +27,12 @@ public class BooleanAndScalarModel implements TemplateBooleanModel, TemplateScal public static final BooleanAndScalarModel INSTANCE = new BooleanAndScalarModel(); + @Override public String getAsString() throws TemplateModelException { return "s"; } + @Override public boolean getAsBoolean() throws TemplateModelException { return true; } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/test/java/org/apache/freemarker/test/templatesuite/models/BooleanAndStringTemplateModel.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/test/templatesuite/models/BooleanAndStringTemplateModel.java b/src/test/java/org/apache/freemarker/test/templatesuite/models/BooleanAndStringTemplateModel.java index 6e539fe..3bf4733 100644 --- a/src/test/java/org/apache/freemarker/test/templatesuite/models/BooleanAndStringTemplateModel.java +++ b/src/test/java/org/apache/freemarker/test/templatesuite/models/BooleanAndStringTemplateModel.java @@ -25,10 +25,12 @@ import org.apache.freemarker.core.model.TemplateScalarModel; public class BooleanAndStringTemplateModel implements TemplateBooleanModel, TemplateScalarModel { + @Override public String getAsString() throws TemplateModelException { return "theStringValue"; } + @Override public boolean getAsBoolean() throws TemplateModelException { return true; } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/test/java/org/apache/freemarker/test/templatesuite/models/BooleanHash1.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/test/templatesuite/models/BooleanHash1.java b/src/test/java/org/apache/freemarker/test/templatesuite/models/BooleanHash1.java index 7b5872d..f51ff81 100644 --- a/src/test/java/org/apache/freemarker/test/templatesuite/models/BooleanHash1.java +++ b/src/test/java/org/apache/freemarker/test/templatesuite/models/BooleanHash1.java @@ -37,6 +37,7 @@ public class BooleanHash1 implements TemplateHashModel { * @return the <tt>TemplateModel</tt> referred to by the key, * or null if not found. */ + @Override public TemplateModel get(String key) { if ( key.equals( "temp" )) { return new SimpleScalar( "Hello, world." ); @@ -50,6 +51,7 @@ public class BooleanHash1 implements TemplateHashModel { /** * @return true if this object is empty. */ + @Override public boolean isEmpty() { return true; } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/test/java/org/apache/freemarker/test/templatesuite/models/BooleanHash2.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/test/templatesuite/models/BooleanHash2.java b/src/test/java/org/apache/freemarker/test/templatesuite/models/BooleanHash2.java index 66c17d5..a49f073 100644 --- a/src/test/java/org/apache/freemarker/test/templatesuite/models/BooleanHash2.java +++ b/src/test/java/org/apache/freemarker/test/templatesuite/models/BooleanHash2.java @@ -35,6 +35,7 @@ public class BooleanHash2 implements TemplateHashModel { * @return the <tt>TemplateModel</tt> referred to by the key, * or null if not found. */ + @Override public TemplateModel get(String key) { return null; } @@ -42,6 +43,7 @@ public class BooleanHash2 implements TemplateHashModel { /** * @return true if this object is empty. */ + @Override public boolean isEmpty() { return false; } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/test/java/org/apache/freemarker/test/templatesuite/models/BooleanList1.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/test/templatesuite/models/BooleanList1.java b/src/test/java/org/apache/freemarker/test/templatesuite/models/BooleanList1.java index 067b265..048a9d7 100644 --- a/src/test/java/org/apache/freemarker/test/templatesuite/models/BooleanList1.java +++ b/src/test/java/org/apache/freemarker/test/templatesuite/models/BooleanList1.java @@ -68,6 +68,7 @@ public class BooleanList1 implements TemplateSequenceModel { /** * @return the specified index in the list */ + @Override public TemplateModel get(int i) throws TemplateModelException { return cList.get(i); } @@ -79,6 +80,7 @@ public class BooleanList1 implements TemplateSequenceModel { cList.rewind(); } + @Override public int size() { return cList.size(); } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/test/java/org/apache/freemarker/test/templatesuite/models/BooleanList2.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/test/templatesuite/models/BooleanList2.java b/src/test/java/org/apache/freemarker/test/templatesuite/models/BooleanList2.java index a4b8891..b68bb9f 100644 --- a/src/test/java/org/apache/freemarker/test/templatesuite/models/BooleanList2.java +++ b/src/test/java/org/apache/freemarker/test/templatesuite/models/BooleanList2.java @@ -39,10 +39,12 @@ public class BooleanList2 implements TemplateSequenceModel { /** * @return the specified index in the list */ + @Override public TemplateModel get(int i) throws TemplateModelException { return cList.get(i); } + @Override public int size() { return cList.size(); } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/test/java/org/apache/freemarker/test/templatesuite/models/ExceptionModel.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/test/templatesuite/models/ExceptionModel.java b/src/test/java/org/apache/freemarker/test/templatesuite/models/ExceptionModel.java index bcb5645..d75e968 100644 --- a/src/test/java/org/apache/freemarker/test/templatesuite/models/ExceptionModel.java +++ b/src/test/java/org/apache/freemarker/test/templatesuite/models/ExceptionModel.java @@ -32,6 +32,7 @@ public class ExceptionModel implements TemplateScalarModel { * * @return the String value of this scalar. */ + @Override public String getAsString () throws TemplateModelException { throw new TemplateModelException( "Throwing from ExceptionModel!" ); } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/test/java/org/apache/freemarker/test/templatesuite/models/HashAndScalarModel.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/test/templatesuite/models/HashAndScalarModel.java b/src/test/java/org/apache/freemarker/test/templatesuite/models/HashAndScalarModel.java index e9b1cbb..c4559a3 100644 --- a/src/test/java/org/apache/freemarker/test/templatesuite/models/HashAndScalarModel.java +++ b/src/test/java/org/apache/freemarker/test/templatesuite/models/HashAndScalarModel.java @@ -33,13 +33,16 @@ public class HashAndScalarModel implements TemplateHashModelEx, TemplateScalarMo private final TemplateCollectionModel EMPTY_COLLECTION = new TemplateCollectionModel() { + @Override public TemplateModelIterator iterator() throws TemplateModelException { return new TemplateModelIterator() { + @Override public TemplateModel next() throws TemplateModelException { return null; } + @Override public boolean hasNext() throws TemplateModelException { return false; } @@ -48,26 +51,32 @@ public class HashAndScalarModel implements TemplateHashModelEx, TemplateScalarMo } }; + @Override public String getAsString() throws TemplateModelException { return "scalarValue"; } + @Override public TemplateModel get(String key) throws TemplateModelException { return new SimpleScalar("mapValue for " + key); } + @Override public boolean isEmpty() throws TemplateModelException { return true; } + @Override public int size() throws TemplateModelException { return 0; } + @Override public TemplateCollectionModel keys() throws TemplateModelException { return EMPTY_COLLECTION; } + @Override public TemplateCollectionModel values() throws TemplateModelException { return EMPTY_COLLECTION; } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/test/java/org/apache/freemarker/test/templatesuite/models/Listables.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/test/templatesuite/models/Listables.java b/src/test/java/org/apache/freemarker/test/templatesuite/models/Listables.java index 9d7aec1..6e4ffbf 100644 --- a/src/test/java/org/apache/freemarker/test/templatesuite/models/Listables.java +++ b/src/test/java/org/apache/freemarker/test/templatesuite/models/Listables.java @@ -164,22 +164,27 @@ public class Listables { this.map = map; } + @Override public TemplateModel get(String key) throws TemplateModelException { return wrap(map.get(key)); } + @Override public boolean isEmpty() { return map.isEmpty(); } + @Override public int size() { return map.size(); } + @Override public TemplateCollectionModel keys() { return new SimpleCollection(map.keySet(), getObjectWrapper()); } + @Override public TemplateCollectionModel values() { return new SimpleCollection(map.values(), getObjectWrapper()); } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/test/java/org/apache/freemarker/test/templatesuite/models/MultiModel1.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/test/templatesuite/models/MultiModel1.java b/src/test/java/org/apache/freemarker/test/templatesuite/models/MultiModel1.java index d7d72d4..8b7517a 100644 --- a/src/test/java/org/apache/freemarker/test/templatesuite/models/MultiModel1.java +++ b/src/test/java/org/apache/freemarker/test/templatesuite/models/MultiModel1.java @@ -57,6 +57,7 @@ public class MultiModel1 implements TemplateHashModel, * @return the <tt>TemplateModel</tt> referred to by the key, * or null if not found. */ + @Override public TemplateModel get(String key) { if ( key.equals( "model2" )) { return m_cSubModel; @@ -80,6 +81,7 @@ public class MultiModel1 implements TemplateHashModel, /** * @return true if this object is empty. */ + @Override public boolean isEmpty() { return false; } @@ -87,6 +89,7 @@ public class MultiModel1 implements TemplateHashModel, /** * @return the specified index in the list */ + @Override public TemplateModel get(int i) throws TemplateModelException { return m_cListModel.get( i ); } @@ -96,10 +99,12 @@ public class MultiModel1 implements TemplateHashModel, * * @return the String value of this scalar. */ + @Override public String getAsString() { return "MultiModel1 as a string!"; } + @Override public int size() throws TemplateModelException { return m_cListModel.size(); } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/test/java/org/apache/freemarker/test/templatesuite/models/MultiModel2.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/test/templatesuite/models/MultiModel2.java b/src/test/java/org/apache/freemarker/test/templatesuite/models/MultiModel2.java index 5f5b936..bb4ef1c 100644 --- a/src/test/java/org/apache/freemarker/test/templatesuite/models/MultiModel2.java +++ b/src/test/java/org/apache/freemarker/test/templatesuite/models/MultiModel2.java @@ -36,6 +36,7 @@ public class MultiModel2 implements TemplateScalarModel, TemplateMethodModel { * * @return the String value of this scalar. */ + @Override public String getAsString() { return "Model2 is alive!"; } @@ -47,6 +48,7 @@ public class MultiModel2 implements TemplateScalarModel, TemplateMethodModel { * of the arguments passed to the method. * @return the <tt>TemplateModel</tt> produced by the method, or null. */ + @Override public Object exec(List arguments) { StringBuilder aResults = new StringBuilder( "Arguments are:<br />" ); Iterator iList = arguments.iterator(); http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/test/java/org/apache/freemarker/test/templatesuite/models/MultiModel3.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/test/templatesuite/models/MultiModel3.java b/src/test/java/org/apache/freemarker/test/templatesuite/models/MultiModel3.java index 98b55d9..ac882c6 100644 --- a/src/test/java/org/apache/freemarker/test/templatesuite/models/MultiModel3.java +++ b/src/test/java/org/apache/freemarker/test/templatesuite/models/MultiModel3.java @@ -34,6 +34,7 @@ public class MultiModel3 implements TemplateScalarModel, TemplateHashModel { * * @return the String value of this scalar. */ + @Override public String getAsString() { return "Model3 is alive!"; } @@ -41,6 +42,7 @@ public class MultiModel3 implements TemplateScalarModel, TemplateHashModel { /** * @return true if this object is empty. */ + @Override public boolean isEmpty() { return false; } @@ -53,6 +55,7 @@ public class MultiModel3 implements TemplateScalarModel, TemplateHashModel { * @return the <tt>TemplateModel</tt> referred to by the key, * or null if not found. */ + @Override public TemplateModel get(String key) { if ( key.equals( "selftest" )) { return new SimpleScalar( "Selftest from MultiModel3!" ); http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/test/java/org/apache/freemarker/test/templatesuite/models/MultiModel4.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/test/templatesuite/models/MultiModel4.java b/src/test/java/org/apache/freemarker/test/templatesuite/models/MultiModel4.java index 64cee4f..fd5968c 100644 --- a/src/test/java/org/apache/freemarker/test/templatesuite/models/MultiModel4.java +++ b/src/test/java/org/apache/freemarker/test/templatesuite/models/MultiModel4.java @@ -35,6 +35,7 @@ public class MultiModel4 implements TemplateSequenceModel, TemplateHashModel { /** * @return the specified index in the list */ + @Override public TemplateModel get(int i) throws TemplateModelException { return m_cList.get( i ); } @@ -47,6 +48,7 @@ public class MultiModel4 implements TemplateSequenceModel, TemplateHashModel { * @return the <tt>TemplateModel</tt> referred to by the key, * or null if not found. */ + @Override public TemplateModel get(String key) { if ( key.equals( "size" )) { return new SimpleScalar( "Key size, not the listSize method." ); @@ -56,10 +58,12 @@ public class MultiModel4 implements TemplateSequenceModel, TemplateHashModel { } + @Override public int size() { return m_cList.size(); } + @Override public boolean isEmpty() { return size() == 0; } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/test/java/org/apache/freemarker/test/templatesuite/models/MultiModel5.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/test/templatesuite/models/MultiModel5.java b/src/test/java/org/apache/freemarker/test/templatesuite/models/MultiModel5.java index 8b2e7fe..c71f843 100644 --- a/src/test/java/org/apache/freemarker/test/templatesuite/models/MultiModel5.java +++ b/src/test/java/org/apache/freemarker/test/templatesuite/models/MultiModel5.java @@ -40,6 +40,7 @@ public class MultiModel5 implements TemplateSequenceModel, TemplateHashModel { /** * @return the specified index in the list */ + @Override public TemplateModel get(int i) throws TemplateModelException { return m_cList.get( i ); } @@ -47,10 +48,12 @@ public class MultiModel5 implements TemplateSequenceModel, TemplateHashModel { /** * @return true if this object is empty. */ + @Override public boolean isEmpty() { return false; } + @Override public int size() { return m_cList.size(); } @@ -63,6 +66,7 @@ public class MultiModel5 implements TemplateSequenceModel, TemplateHashModel { * @return the <tt>TemplateModel</tt> referred to by the key, * or null if not found. */ + @Override public TemplateModel get(String key) { if ( key.equals( "empty" )) { return new SimpleScalar( "Dummy hash value, for test purposes." ); http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/test/java/org/apache/freemarker/test/templatesuite/models/NewTestModel.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/test/templatesuite/models/NewTestModel.java b/src/test/java/org/apache/freemarker/test/templatesuite/models/NewTestModel.java index 4d0e6b5..ec3c34e 100644 --- a/src/test/java/org/apache/freemarker/test/templatesuite/models/NewTestModel.java +++ b/src/test/java/org/apache/freemarker/test/templatesuite/models/NewTestModel.java @@ -45,6 +45,7 @@ implements string = o1 + ":" + o2; } + @Override public String getAsString() { return string; } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/test/java/org/apache/freemarker/test/templatesuite/models/NewTestModel2.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/test/templatesuite/models/NewTestModel2.java b/src/test/java/org/apache/freemarker/test/templatesuite/models/NewTestModel2.java index 663fca7..e8a6c32 100644 --- a/src/test/java/org/apache/freemarker/test/templatesuite/models/NewTestModel2.java +++ b/src/test/java/org/apache/freemarker/test/templatesuite/models/NewTestModel2.java @@ -45,6 +45,7 @@ implements string = o1 + ":" + o2; } + @Override public String getAsString() { return string; } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/test/java/org/apache/freemarker/test/templatesuite/models/NumberAndStringModel.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/test/templatesuite/models/NumberAndStringModel.java b/src/test/java/org/apache/freemarker/test/templatesuite/models/NumberAndStringModel.java index 52bd888..e329aea 100644 --- a/src/test/java/org/apache/freemarker/test/templatesuite/models/NumberAndStringModel.java +++ b/src/test/java/org/apache/freemarker/test/templatesuite/models/NumberAndStringModel.java @@ -33,11 +33,13 @@ public class NumberAndStringModel implements TemplateNumberModel, this.s = s; } - public String getAsString() throws TemplateModelException { + @Override + public String getAsString() throws TemplateModelException { return s; } - @SuppressWarnings("boxing") + @Override + @SuppressWarnings("boxing") public Number getAsNumber() throws TemplateModelException { return s.length(); } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/test/java/org/apache/freemarker/test/templatesuite/models/OverloadedConstructor.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/test/templatesuite/models/OverloadedConstructor.java b/src/test/java/org/apache/freemarker/test/templatesuite/models/OverloadedConstructor.java index be6a826..08af655 100644 --- a/src/test/java/org/apache/freemarker/test/templatesuite/models/OverloadedConstructor.java +++ b/src/test/java/org/apache/freemarker/test/templatesuite/models/OverloadedConstructor.java @@ -38,6 +38,7 @@ public class OverloadedConstructor implements TemplateScalarModel { value = "CharSequence " + s; } + @Override public String getAsString() throws TemplateModelException { return value; } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/test/java/org/apache/freemarker/test/templatesuite/models/OverloadedMethods2.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/test/templatesuite/models/OverloadedMethods2.java b/src/test/java/org/apache/freemarker/test/templatesuite/models/OverloadedMethods2.java index c89e54a..b023e6b 100644 --- a/src/test/java/org/apache/freemarker/test/templatesuite/models/OverloadedMethods2.java +++ b/src/test/java/org/apache/freemarker/test/templatesuite/models/OverloadedMethods2.java @@ -1015,6 +1015,7 @@ public class OverloadedMethods2 { private static class MyAdapterNumberModel implements TemplateNumberModel, AdapterTemplateModel { + @Override public Object getAdaptedObject(Class hint) { if (hint == double.class) { return Double.valueOf(123.0001); @@ -1025,6 +1026,7 @@ public class OverloadedMethods2 { } } + @Override public Number getAsNumber() throws TemplateModelException { return Integer.valueOf(122); } @@ -1033,10 +1035,12 @@ public class OverloadedMethods2 { private static class MyWrapperNumberModel implements TemplateNumberModel, WrapperTemplateModel { + @Override public Number getAsNumber() throws TemplateModelException { return Integer.valueOf(122); } + @Override public Object getWrappedObject() { return Double.valueOf(123.0001); } @@ -1045,10 +1049,12 @@ public class OverloadedMethods2 { private static class MyStringWrapperAsBooleanModel implements TemplateBooleanModel, WrapperTemplateModel { + @Override public Object getWrappedObject() { return "yes"; } + @Override public boolean getAsBoolean() throws TemplateModelException { return true; } @@ -1057,10 +1063,12 @@ public class OverloadedMethods2 { private static class MyBooleanWrapperAsAnotherBooleanModel implements TemplateBooleanModel, WrapperTemplateModel { + @Override public Object getWrappedObject() { return Boolean.TRUE; } + @Override public boolean getAsBoolean() throws TemplateModelException { return false; } @@ -1069,6 +1077,7 @@ public class OverloadedMethods2 { private static class MyStringAdaptedToBooleanModel implements TemplateBooleanModel, AdapterTemplateModel { + @Override public Object getAdaptedObject(Class hint) { if (hint != Boolean.class && hint != boolean.class) { return "yes"; @@ -1077,6 +1086,7 @@ public class OverloadedMethods2 { } } + @Override public boolean getAsBoolean() throws TemplateModelException { return false; } @@ -1085,10 +1095,12 @@ public class OverloadedMethods2 { private static class MyStringAdaptedToBooleanModel2 implements TemplateBooleanModel, AdapterTemplateModel { + @Override public Object getAdaptedObject(Class hint) { return "yes"; } + @Override public boolean getAsBoolean() throws TemplateModelException { return true; } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/test/java/org/apache/freemarker/test/templatesuite/models/SimpleTestMethod.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/test/templatesuite/models/SimpleTestMethod.java b/src/test/java/org/apache/freemarker/test/templatesuite/models/SimpleTestMethod.java index 289350f..e6ea9f0 100644 --- a/src/test/java/org/apache/freemarker/test/templatesuite/models/SimpleTestMethod.java +++ b/src/test/java/org/apache/freemarker/test/templatesuite/models/SimpleTestMethod.java @@ -36,6 +36,7 @@ public class SimpleTestMethod implements TemplateMethodModel { * the values of the arguments passed to the method. * @return the <tt>TemplateModel</tt> produced by the method, or null. */ + @Override public Object exec(List arguments) { if ( arguments.size() == 0 ) { return new SimpleScalar( "Empty list provided" ); http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/test/java/org/apache/freemarker/test/templatesuite/models/TransformHashWrapper.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/test/templatesuite/models/TransformHashWrapper.java b/src/test/java/org/apache/freemarker/test/templatesuite/models/TransformHashWrapper.java index 038d3c5..fbea7cf 100644 --- a/src/test/java/org/apache/freemarker/test/templatesuite/models/TransformHashWrapper.java +++ b/src/test/java/org/apache/freemarker/test/templatesuite/models/TransformHashWrapper.java @@ -51,6 +51,7 @@ public class TransformHashWrapper implements TemplateHashModel, * @return the <tt>TemplateModel</tt> referred to by the key, * or null if not found. */ + @Override public TemplateModel get(String key) throws TemplateModelException { return m_cHashModel.get( key ); } @@ -58,6 +59,7 @@ public class TransformHashWrapper implements TemplateHashModel, /** * @return true if this object is empty. */ + @Override public boolean isEmpty() { return false; } @@ -66,6 +68,7 @@ public class TransformHashWrapper implements TemplateHashModel, * Returns the scalar's value as a String. * @return the String value of this scalar. */ + @Override public String getAsString() { return "Utility transformations"; } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/test/java/org/apache/freemarker/test/templatesuite/models/TransformMethodWrapper1.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/test/templatesuite/models/TransformMethodWrapper1.java b/src/test/java/org/apache/freemarker/test/templatesuite/models/TransformMethodWrapper1.java index a77f245..a18f83a 100644 --- a/src/test/java/org/apache/freemarker/test/templatesuite/models/TransformMethodWrapper1.java +++ b/src/test/java/org/apache/freemarker/test/templatesuite/models/TransformMethodWrapper1.java @@ -37,6 +37,7 @@ public class TransformMethodWrapper1 extends Object implements TemplateMethodMod * the values of the arguments passed to the method. * @return the <tt>TemplateModel</tt> produced by the method, or null. */ + @Override public Object exec(List arguments) { if (( arguments.size() > 0 ) && ( arguments.get( 0 ).toString().equals( "xml" ))) { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/test/java/org/apache/freemarker/test/templatesuite/models/TransformMethodWrapper2.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/test/templatesuite/models/TransformMethodWrapper2.java b/src/test/java/org/apache/freemarker/test/templatesuite/models/TransformMethodWrapper2.java index 6da5dd7..7fae781 100644 --- a/src/test/java/org/apache/freemarker/test/templatesuite/models/TransformMethodWrapper2.java +++ b/src/test/java/org/apache/freemarker/test/templatesuite/models/TransformMethodWrapper2.java @@ -36,6 +36,7 @@ public class TransformMethodWrapper2 implements TemplateMethodModel { * the values of the arguments passed to the method. * @return the <tt>TemplateModel</tt> produced by the method, or null. */ + @Override public Object exec(List arguments) { TransformModel1 cTransformer = new TransformModel1(); Iterator iArgument = arguments.iterator(); http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/test/java/org/apache/freemarker/test/templatesuite/models/TransformModel1.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/test/templatesuite/models/TransformModel1.java b/src/test/java/org/apache/freemarker/test/templatesuite/models/TransformModel1.java index 585dd15..0a7c2c5 100644 --- a/src/test/java/org/apache/freemarker/test/templatesuite/models/TransformModel1.java +++ b/src/test/java/org/apache/freemarker/test/templatesuite/models/TransformModel1.java @@ -42,7 +42,8 @@ public class TransformModel1 implements TemplateTransformModel { private static final int READER_BUFFER_SIZE = 4096; - public Writer getWriter(final Writer out, + @Override + public Writer getWriter(final Writer out, final Map args) { final StringBuilder buf = new StringBuilder(); return new Writer(out) { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/test/java/org/apache/freemarker/test/util/AssertDirective.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/test/util/AssertDirective.java b/src/test/java/org/apache/freemarker/test/util/AssertDirective.java index 21eae28..9c9ded3 100644 --- a/src/test/java/org/apache/freemarker/test/util/AssertDirective.java +++ b/src/test/java/org/apache/freemarker/test/util/AssertDirective.java @@ -39,6 +39,7 @@ public class AssertDirective implements TemplateDirectiveModel { private AssertDirective() { } + @Override public void execute(Environment env, Map params, TemplateModel[] loopVars, TemplateDirectiveBody body) throws TemplateException, IOException { TemplateModel test = null; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/test/java/org/apache/freemarker/test/util/AssertEqualsDirective.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/test/util/AssertEqualsDirective.java b/src/test/java/org/apache/freemarker/test/util/AssertEqualsDirective.java index 6db7315..3f2d0ed 100644 --- a/src/test/java/org/apache/freemarker/test/util/AssertEqualsDirective.java +++ b/src/test/java/org/apache/freemarker/test/util/AssertEqualsDirective.java @@ -44,6 +44,7 @@ public class AssertEqualsDirective implements TemplateDirectiveModel { private AssertEqualsDirective() { } + @Override public void execute(Environment env, Map params, TemplateModel[] loopVars, TemplateDirectiveBody body) throws TemplateException, IOException { TemplateModel actual = null; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/test/java/org/apache/freemarker/test/util/AssertFailsDirective.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/test/util/AssertFailsDirective.java b/src/test/java/org/apache/freemarker/test/util/AssertFailsDirective.java index 6fba620..0565d4c 100644 --- a/src/test/java/org/apache/freemarker/test/util/AssertFailsDirective.java +++ b/src/test/java/org/apache/freemarker/test/util/AssertFailsDirective.java @@ -45,6 +45,7 @@ public class AssertFailsDirective implements TemplateDirectiveModel { private AssertFailsDirective() { } + @Override public void execute(Environment env, Map params, TemplateModel[] loopVars, TemplateDirectiveBody body) throws TemplateException, IOException { String message = null; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/test/java/org/apache/freemarker/test/util/NoOutputDirective.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/freemarker/test/util/NoOutputDirective.java b/src/test/java/org/apache/freemarker/test/util/NoOutputDirective.java index 9e047ab..7eacc1f 100644 --- a/src/test/java/org/apache/freemarker/test/util/NoOutputDirective.java +++ b/src/test/java/org/apache/freemarker/test/util/NoOutputDirective.java @@ -38,6 +38,7 @@ public class NoOutputDirective implements TemplateDirectiveModel { // } + @Override public void execute(Environment env, Map params, TemplateModel[] loopVars, TemplateDirectiveBody body) throws TemplateException, IOException { if (!params.isEmpty()) {
