Added missing @Override annotations (which were illegal on Java 5)
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/693a94c4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/693a94c4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/693a94c4 Branch: refs/heads/3 Commit: 693a94c45fc91d2cb1e2f45d0fdfa5bb8a09b997 Parents: ac66267 Author: ddekany <[email protected]> Authored: Fri Feb 17 15:21:17 2017 +0100 Committer: ddekany <[email protected]> Committed: Fri Feb 17 15:21:17 2017 +0100 ---------------------------------------------------------------------- .../freemarker/core/TemplateException.java | 8 +++++ .../core/TemplateExceptionHandler.java | 4 +++ .../core/ast/AddConcatExpression.java | 7 +++++ .../freemarker/core/ast/BlockAssignment.java | 1 + .../freemarker/core/ast/BodyInstruction.java | 2 ++ .../freemarker/core/ast/BoundedRangeModel.java | 1 + .../freemarker/core/ast/BuiltInsForDates.java | 1 + .../core/ast/BuiltInsForLoopVariables.java | 1 + .../freemarker/core/ast/BuiltInsForNodes.java | 1 + .../core/ast/BuiltInsForSequences.java | 16 ++++++++++ .../core/ast/BuiltInsForStringsRegexp.java | 13 ++++++++ .../freemarker/core/ast/BuiltinVariable.java | 2 ++ .../core/ast/CollectionAndSequence.java | 5 ++++ .../ast/CommonTemplateMarkupOutputModel.java | 1 + .../core/ast/DefaultToExpression.java | 21 ++++++++----- .../freemarker/core/ast/ExistenceBuiltins.java | 2 ++ .../freemarker/core/ast/FreeMarkerTree.java | 9 ++++++ .../apache/freemarker/core/ast/Interpret.java | 1 + .../ast/ListableRightUnboundedRangeModel.java | 4 +++ ...eleaserTemplateSpecifiedEncodingHandler.java | 1 + .../apache/freemarker/core/ast/MiscUtil.java | 1 + .../NonListableRightUnboundedRangeModel.java | 1 + .../freemarker/core/ast/NumberLiteral.java | 1 + .../apache/freemarker/core/ast/RangeModel.java | 1 + .../core/ast/StringArraySequence.java | 2 ++ .../freemarker/core/debug/Breakpoint.java | 1 + .../freemarker/core/debug/DebuggerClient.java | 11 ++++++- .../core/debug/impl/RmiDebugModelImpl.java | 13 ++++++++ .../core/debug/impl/RmiDebuggerImpl.java | 9 ++++++ .../apache/freemarker/core/model/Constants.java | 10 +++++++ .../core/model/FalseTemplateBooleanModel.java | 1 + .../core/model/TemplateMethodModelEx.java | 1 + .../core/model/TrueTemplateBooleanModel.java | 1 + .../core/model/impl/DefaultArrayAdapter.java | 31 ++++++++++++++++++++ .../core/model/impl/DefaultIterableAdapter.java | 4 +++ .../core/model/impl/DefaultIteratorAdapter.java | 5 ++++ .../core/model/impl/DefaultListAdapter.java | 6 ++++ .../core/model/impl/DefaultMapAdapter.java | 9 ++++++ .../impl/DefaultNonListCollectionAdapter.java | 7 +++++ .../model/impl/DefaultObjectWrapperBuilder.java | 1 + .../DefaultUnassignableIteratorAdapter.java | 2 ++ .../model/impl/MapKeyValuePairIterator.java | 4 +++ .../core/model/impl/SimpleCollection.java | 3 ++ .../freemarker/core/model/impl/SimpleDate.java | 2 ++ .../core/model/impl/SimpleNumber.java | 1 + .../core/model/impl/SimpleScalar.java | 1 + .../model/impl/TemplateModelListSequence.java | 2 ++ .../core/model/impl/beans/ArrayModel.java | 7 +++++ .../model/impl/beans/BeansWrapperBuilder.java | 1 + .../core/model/impl/beans/BooleanModel.java | 1 + .../impl/beans/ClassBasedModelFactory.java | 2 ++ .../model/impl/beans/CollectionAdapter.java | 4 +++ .../core/model/impl/beans/CollectionModel.java | 3 ++ .../core/model/impl/beans/DateModel.java | 3 ++ .../core/model/impl/beans/EnumerationModel.java | 3 ++ .../core/model/impl/beans/HashAdapter.java | 7 +++++ .../core/model/impl/beans/IteratorModel.java | 3 ++ .../impl/beans/JRebelClassChangeNotifier.java | 2 ++ .../core/model/impl/beans/MapModel.java | 2 ++ .../core/model/impl/beans/NumberModel.java | 2 ++ .../impl/beans/OverloadedMethodsModel.java | 3 ++ .../model/impl/beans/OverloadedNumberUtil.java | 1 + .../model/impl/beans/ResourceBundleModel.java | 2 ++ .../core/model/impl/beans/SequenceAdapter.java | 1 + .../core/model/impl/beans/SimpleMapModel.java | 11 +++++++ .../model/impl/beans/SimpleMethodModel.java | 4 +++ .../core/model/impl/beans/StringModel.java | 2 ++ .../core/model/impl/dom/AttributeNodeModel.java | 3 ++ .../model/impl/dom/CharacterDataNodeModel.java | 3 ++ .../core/model/impl/dom/DocumentModel.java | 2 ++ .../core/model/impl/dom/DocumentTypeModel.java | 2 ++ .../core/model/impl/dom/ElementModel.java | 3 ++ .../core/model/impl/dom/PINodeModel.java | 3 ++ .../impl/dom/SunInternalXalanXPathSupport.java | 5 ++++ .../core/model/impl/dom/XalanXPathSupport.java | 5 ++++ .../templateresolver/impl/MruCacheStorage.java | 5 ++++ .../templateresolver/impl/NullCacheStorage.java | 6 ++++ .../templateresolver/impl/SoftCacheStorage.java | 6 ++++ .../impl/StrongCacheStorage.java | 6 ++++ .../apache/freemarker/core/util/HtmlEscape.java | 1 + .../freemarker/core/util/NormalizeNewlines.java | 1 + .../freemarker/core/util/StandardCompress.java | 1 + .../apache/freemarker/core/util/XmlEscape.java | 1 + .../freemarker/core/util/_ArrayEnumeration.java | 2 ++ .../freemarker/core/util/_ArrayIterator.java | 3 ++ .../apache/freemarker/core/util/_DateUtil.java | 4 ++- .../core/util/_UnmodifiableCompositeSet.java | 3 ++ .../servlet/HttpRequestHashModel.java | 5 ++++ .../servlet/HttpRequestParametersHashModel.java | 8 +++++ .../servlet/HttpSessionHashModel.java | 2 ++ .../apache/freemarker/servlet/IncludePage.java | 5 ++-- .../servlet/ServletContextHashModel.java | 2 ++ .../jsp/CustomTagAndELFunctionCombiner.java | 14 +++++++++ .../servlet/jsp/FreeMarkerPageContext.java | 2 ++ .../freemarker/servlet/jsp/FreemarkerTag.java | 9 ++++++ .../servlet/jsp/SimpleTagDirectiveModel.java | 5 ++-- .../freemarker/core/MockServletContext.java | 25 ++++++++++++++++ .../ast/AppMetaTemplateDateFormatFactory.java | 2 ++ .../freemarker/core/ast/DateFormatTest.java | 2 ++ .../core/ast/DirectiveCallPlaceTest.java | 5 ++++ .../ast/EnvironmentGetTemplateVariantsTest.java | 1 + .../freemarker/core/ast/NumberFormatTest.java | 2 ++ .../core/ast/TheadInterruptingSupportTest.java | 3 ++ .../impl/beans/AlphabeticalMethodSorter.java | 2 ++ .../impl/beans/BeansWrapperCachesTest.java | 1 + .../GetlessMethodsAsPropertyGettersRule.java | 1 + .../beans/Java7MembersOnlyBeansWrapper.java | 1 + .../core/model/impl/beans/TypeFlagsTest.java | 13 ++++++++ .../UnitAwareTemplateNumberModel.java | 1 + .../servlet/jsp/RealServletContainertTest.java | 3 ++ .../freemarker/servlet/jsp/TLDParsingTest.java | 2 ++ .../servlet/jsp/taglibmembers/TestTag.java | 2 ++ .../test/servlet/DefaultModel2TesterAction.java | 1 + .../templatesuite/models/AllTemplateModels.java | 15 ++++++++++ .../models/BooleanAndScalarModel.java | 2 ++ .../models/BooleanAndStringTemplateModel.java | 2 ++ .../test/templatesuite/models/BooleanHash1.java | 2 ++ .../test/templatesuite/models/BooleanHash2.java | 2 ++ .../test/templatesuite/models/BooleanList1.java | 2 ++ .../test/templatesuite/models/BooleanList2.java | 2 ++ .../templatesuite/models/ExceptionModel.java | 1 + .../models/HashAndScalarModel.java | 9 ++++++ .../test/templatesuite/models/Listables.java | 5 ++++ .../test/templatesuite/models/MultiModel1.java | 5 ++++ .../test/templatesuite/models/MultiModel2.java | 2 ++ .../test/templatesuite/models/MultiModel3.java | 3 ++ .../test/templatesuite/models/MultiModel4.java | 4 +++ .../test/templatesuite/models/MultiModel5.java | 4 +++ .../test/templatesuite/models/NewTestModel.java | 1 + .../templatesuite/models/NewTestModel2.java | 1 + .../models/NumberAndStringModel.java | 6 ++-- .../models/OverloadedConstructor.java | 1 + .../models/OverloadedMethods2.java | 12 ++++++++ .../templatesuite/models/SimpleTestMethod.java | 1 + .../models/TransformHashWrapper.java | 3 ++ .../models/TransformMethodWrapper1.java | 1 + .../models/TransformMethodWrapper2.java | 1 + .../templatesuite/models/TransformModel1.java | 3 +- .../freemarker/test/util/AssertDirective.java | 1 + .../test/util/AssertEqualsDirective.java | 1 + .../test/util/AssertFailsDirective.java | 1 + .../freemarker/test/util/NoOutputDirective.java | 1 + 142 files changed, 558 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/TemplateException.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/TemplateException.java b/src/main/java/org/apache/freemarker/core/TemplateException.java index 543aa37..ddd8f62 100644 --- a/src/main/java/org/apache/freemarker/core/TemplateException.java +++ b/src/main/java/org/apache/freemarker/core/TemplateException.java @@ -606,18 +606,22 @@ public class TemplateException extends Exception { this.out = out; } + @Override public void print(Object obj) { out.print(obj); } + @Override public void println(Object obj) { out.println(obj); } + @Override public void println() { out.println(); } + @Override public void printStandardStackTrace(Throwable exception) { if (exception instanceof TemplateException) { ((TemplateException) exception).printStandardStackTrace(out); @@ -636,18 +640,22 @@ public class TemplateException extends Exception { this.out = out; } + @Override public void print(Object obj) { out.print(obj); } + @Override public void println(Object obj) { out.println(obj); } + @Override public void println() { out.println(); } + @Override public void printStandardStackTrace(Throwable exception) { if (exception instanceof TemplateException) { ((TemplateException) exception).printStandardStackTrace(out); http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/TemplateExceptionHandler.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/TemplateExceptionHandler.java b/src/main/java/org/apache/freemarker/core/TemplateExceptionHandler.java index 54a16b8..ef871c1 100644 --- a/src/main/java/org/apache/freemarker/core/TemplateExceptionHandler.java +++ b/src/main/java/org/apache/freemarker/core/TemplateExceptionHandler.java @@ -59,6 +59,7 @@ public interface TemplateExceptionHandler { * other {@link TemplateExceptionHandler}-s. */ TemplateExceptionHandler IGNORE_HANDLER = new TemplateExceptionHandler() { + @Override public void handleTemplateException(TemplateException te, Environment env, Writer out) { // Do nothing } @@ -69,6 +70,7 @@ public interface TemplateExceptionHandler { * systems. */ TemplateExceptionHandler RETHROW_HANDLER = new TemplateExceptionHandler() { + @Override public void handleTemplateException(TemplateException te, Environment env, Writer out) throws TemplateException { throw te; @@ -80,6 +82,7 @@ public interface TemplateExceptionHandler { * outputs the stack trace information to the client and then re-throws the exception. */ TemplateExceptionHandler DEBUG_HANDLER = new TemplateExceptionHandler() { + @Override public void handleTemplateException(TemplateException te, Environment env, Writer out) throws TemplateException { if (!env.isInAttemptBlock()) { @@ -99,6 +102,7 @@ public interface TemplateExceptionHandler { * in the browser, and then re-throws the exception. */ TemplateExceptionHandler HTML_DEBUG_HANDLER = new TemplateExceptionHandler() { + @Override public void handleTemplateException(TemplateException te, Environment env, Writer out) throws TemplateException { if (!env.isInAttemptBlock()) { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/ast/AddConcatExpression.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/ast/AddConcatExpression.java b/src/main/java/org/apache/freemarker/core/ast/AddConcatExpression.java index cc126e0..9e79643 100644 --- a/src/main/java/org/apache/freemarker/core/ast/AddConcatExpression.java +++ b/src/main/java/org/apache/freemarker/core/ast/AddConcatExpression.java @@ -201,11 +201,13 @@ final class AddConcatExpression extends Expression { this.right = right; } + @Override public int size() throws TemplateModelException { return left.size() + right.size(); } + @Override public TemplateModel get(int i) throws TemplateModelException { int ls = left.size(); @@ -223,12 +225,14 @@ final class AddConcatExpression extends Expression { this.right = right; } + @Override public TemplateModel get(String key) throws TemplateModelException { TemplateModel model = right.get(key); return (model != null) ? model : left.get(key); } + @Override public boolean isEmpty() throws TemplateModelException { return left.isEmpty() && right.isEmpty(); @@ -246,17 +250,20 @@ final class AddConcatExpression extends Expression { super(left, right); } + @Override public int size() throws TemplateModelException { initKeys(); return size; } + @Override public TemplateCollectionModel keys() throws TemplateModelException { initKeys(); return keys; } + @Override public TemplateCollectionModel values() throws TemplateModelException { initValues(); http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/ast/BlockAssignment.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/ast/BlockAssignment.java b/src/main/java/org/apache/freemarker/core/ast/BlockAssignment.java index effff2e..20320c2 100644 --- a/src/main/java/org/apache/freemarker/core/ast/BlockAssignment.java +++ b/src/main/java/org/apache/freemarker/core/ast/BlockAssignment.java @@ -89,6 +89,7 @@ final class BlockAssignment extends TemplateElement { fnsModel = (Environment.Namespace ) nsModel; } + @Override public Writer getWriter(Writer out, Map args) { return new StringWriter() { @Override http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/ast/BodyInstruction.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/ast/BodyInstruction.java b/src/main/java/org/apache/freemarker/core/ast/BodyInstruction.java index bcdac8b..548f9fd 100644 --- a/src/main/java/org/apache/freemarker/core/ast/BodyInstruction.java +++ b/src/main/java/org/apache/freemarker/core/ast/BodyInstruction.java @@ -141,10 +141,12 @@ final class BodyInstruction extends TemplateElement { } } + @Override public TemplateModel getLocalVariable(String name) throws TemplateModelException { return bodyVars == null ? null : bodyVars.get(name); } + @Override public Collection getLocalVariableNames() { List bodyParameterNames = invokingMacroContext.nestedContentParameterNames; return bodyParameterNames == null ? Collections.EMPTY_LIST : bodyParameterNames; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/ast/BoundedRangeModel.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/ast/BoundedRangeModel.java b/src/main/java/org/apache/freemarker/core/ast/BoundedRangeModel.java index 65a8821..9024b2b 100644 --- a/src/main/java/org/apache/freemarker/core/ast/BoundedRangeModel.java +++ b/src/main/java/org/apache/freemarker/core/ast/BoundedRangeModel.java @@ -42,6 +42,7 @@ final class BoundedRangeModel extends RangeModel { this.affectedByStringSlicingBug = inclusiveEnd; } + @Override public int size() { return size; } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/ast/BuiltInsForDates.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/ast/BuiltInsForDates.java b/src/main/java/org/apache/freemarker/core/ast/BuiltInsForDates.java index 54f45b4..53a239b 100644 --- a/src/main/java/org/apache/freemarker/core/ast/BuiltInsForDates.java +++ b/src/main/java/org/apache/freemarker/core/ast/BuiltInsForDates.java @@ -88,6 +88,7 @@ class BuiltInsForDates { this.env = env; } + @Override public Object exec(List args) throws TemplateModelException { checkMethodArgCount(args, 1); http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/ast/BuiltInsForLoopVariables.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/ast/BuiltInsForLoopVariables.java b/src/main/java/org/apache/freemarker/core/ast/BuiltInsForLoopVariables.java index 8c8bc97..3cb8684 100644 --- a/src/main/java/org/apache/freemarker/core/ast/BuiltInsForLoopVariables.java +++ b/src/main/java/org/apache/freemarker/core/ast/BuiltInsForLoopVariables.java @@ -140,6 +140,7 @@ class BuiltInsForLoopVariables { this.iterCtx = iterCtx; } + @Override public Object exec(List args) throws TemplateModelException { checkMethodArgCount(args, 1, Integer.MAX_VALUE); return args.get(iterCtx.getIndex() % args.size()); http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/ast/BuiltInsForNodes.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/ast/BuiltInsForNodes.java b/src/main/java/org/apache/freemarker/core/ast/BuiltInsForNodes.java index 5c66edd..d2ca3cf 100644 --- a/src/main/java/org/apache/freemarker/core/ast/BuiltInsForNodes.java +++ b/src/main/java/org/apache/freemarker/core/ast/BuiltInsForNodes.java @@ -127,6 +127,7 @@ class BuiltInsForNodes { this.env = env; } + @Override public Object exec(List names) throws TemplateModelException { if (names == null || names.isEmpty()) { return this; http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/ast/BuiltInsForSequences.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/ast/BuiltInsForSequences.java b/src/main/java/org/apache/freemarker/core/ast/BuiltInsForSequences.java index 87a1555..f0b299b 100644 --- a/src/main/java/org/apache/freemarker/core/ast/BuiltInsForSequences.java +++ b/src/main/java/org/apache/freemarker/core/ast/BuiltInsForSequences.java @@ -61,6 +61,7 @@ class BuiltInsForSequences { this.tsm = tsm; } + @Override public Object exec(List args) throws TemplateModelException { checkMethodArgCount(args, 1, 2); int chunkSize = getNumberMethodArg(args, 0).intValue(); @@ -94,6 +95,7 @@ class BuiltInsForSequences { numberOfChunks = (wrappedTsm.size() + chunkSize - 1) / chunkSize; } + @Override public TemplateModel get(final int chunkIndex) throws TemplateModelException { if (chunkIndex >= numberOfChunks) { @@ -104,6 +106,7 @@ class BuiltInsForSequences { private final int baseIndex = chunkIndex * chunkSize; + @Override public TemplateModel get(int relIndex) throws TemplateModelException { int absIndex = baseIndex + relIndex; @@ -116,6 +119,7 @@ class BuiltInsForSequences { } } + @Override public int size() throws TemplateModelException { return fillerItem != null || chunkIndex + 1 < numberOfChunks ? chunkSize @@ -125,6 +129,7 @@ class BuiltInsForSequences { }; } + @Override public int size() throws TemplateModelException { return numberOfChunks; } @@ -186,6 +191,7 @@ class BuiltInsForSequences { this.coll = coll; } + @Override public Object exec(List args) throws TemplateModelException { checkMethodArgCount(args, 1, 3); @@ -266,10 +272,12 @@ class BuiltInsForSequences { this.seq = seq; } + @Override public TemplateModel get(int index) throws TemplateModelException { return seq.get(seq.size() - 1 - index); } + @Override public int size() throws TemplateModelException { return seq.size(); } @@ -295,6 +303,7 @@ class BuiltInsForSequences { m_env = env; } + @Override public Object exec(List args) throws TemplateModelException { checkMethodArgCount(args, 1); @@ -320,6 +329,7 @@ class BuiltInsForSequences { m_env = env; } + @Override public Object exec(List args) throws TemplateModelException { checkMethodArgCount(args, 1); @@ -383,6 +393,7 @@ class BuiltInsForSequences { m_env = env; } + @Override public final Object exec(List args) throws TemplateModelException { int argCnt = args.size(); @@ -520,6 +531,7 @@ class BuiltInsForSequences { this.seq = seq; } + @Override public Object exec(List args) throws TemplateModelException { // Should be: @@ -568,6 +580,7 @@ class BuiltInsForSequences { private static class BooleanKVPComparator implements Comparator, Serializable { + @Override public int compare(Object arg0, Object arg1) { // JDK 1.2 doesn't have Boolean.compareTo boolean b0 = ((Boolean) ((KVP) arg0).key).booleanValue(); @@ -581,6 +594,7 @@ class BuiltInsForSequences { } private static class DateKVPComparator implements Comparator, Serializable { + @Override public int compare(Object arg0, Object arg1) { return ((Date) ((KVP) arg0).key).compareTo( (Date) ((KVP) arg1).key); @@ -605,6 +619,7 @@ class BuiltInsForSequences { this.collator = collator; } + @Override public int compare(Object arg0, Object arg1) { return collator.compare( ((KVP) arg0).key, ((KVP) arg1).key); @@ -617,6 +632,7 @@ class BuiltInsForSequences { this.ae = ae; } + @Override public int compare(Object arg0, Object arg1) { try { return ae.compareNumbers( http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/ast/BuiltInsForStringsRegexp.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/ast/BuiltInsForStringsRegexp.java b/src/main/java/org/apache/freemarker/core/ast/BuiltInsForStringsRegexp.java index d85950a..b436db9 100644 --- a/src/main/java/org/apache/freemarker/core/ast/BuiltInsForStringsRegexp.java +++ b/src/main/java/org/apache/freemarker/core/ast/BuiltInsForStringsRegexp.java @@ -70,6 +70,7 @@ class BuiltInsForStringsRegexp { this.matchString = matchString; } + @Override public Object exec(List args) throws TemplateModelException { int argCnt = args.size(); checkMethodArgCount(argCnt, 1, 2); @@ -100,6 +101,7 @@ class BuiltInsForStringsRegexp { this.s = s; } + @Override public Object exec(List args) throws TemplateModelException { int argCnt = args.size(); checkMethodArgCount(argCnt, 2, 3); @@ -148,6 +150,7 @@ class BuiltInsForStringsRegexp { } } + @Override public String getAsString() { return matchedInputPart; } @@ -167,6 +170,7 @@ class BuiltInsForStringsRegexp { this.input = input; } + @Override public TemplateModel get(int i) throws TemplateModelException { ArrayList matchingInputParts = this.matchingInputParts; if (matchingInputParts == null) { @@ -175,6 +179,7 @@ class BuiltInsForStringsRegexp { return (TemplateModel) matchingInputParts.get(i); } + @Override public boolean getAsBoolean() { Boolean result = entireInputMatched; return result != null ? result.booleanValue() : isEntrieInputMatchesAndStoreResults(); @@ -192,6 +197,7 @@ class BuiltInsForStringsRegexp { entireInputMatchGroups = new TemplateSequenceModel() { + @Override public TemplateModel get(int i) throws TemplateModelException { try { return new SimpleScalar(firedEntireInputMatcher.group(i)); @@ -200,6 +206,7 @@ class BuiltInsForStringsRegexp { } } + @Override public int size() throws TemplateModelException { try { return firedEntireInputMatcher.groupCount() + 1; @@ -234,6 +241,7 @@ class BuiltInsForStringsRegexp { return matches; } + @Override public TemplateModelIterator iterator() { final ArrayList matchingInputParts = this.matchingInputParts; if (matchingInputParts == null) { @@ -243,6 +251,7 @@ class BuiltInsForStringsRegexp { private int nextIdx = 0; boolean hasFindInfo = matcher.find(); + @Override public boolean hasNext() { final ArrayList matchingInputParts = RegexMatchModel.this.matchingInputParts; if (matchingInputParts == null) { @@ -252,6 +261,7 @@ class BuiltInsForStringsRegexp { } } + @Override public TemplateModel next() throws TemplateModelException { final ArrayList matchingInputParts = RegexMatchModel.this.matchingInputParts; if (matchingInputParts == null) { @@ -275,10 +285,12 @@ class BuiltInsForStringsRegexp { private int nextIdx = 0; + @Override public boolean hasNext() { return nextIdx < matchingInputParts.size(); } + @Override public TemplateModel next() throws TemplateModelException { try { return (TemplateModel) matchingInputParts.get(nextIdx++); @@ -290,6 +302,7 @@ class BuiltInsForStringsRegexp { } } + @Override public int size() throws TemplateModelException { ArrayList matchingInputParts = this.matchingInputParts; if (matchingInputParts == null) { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/ast/BuiltinVariable.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/ast/BuiltinVariable.java b/src/main/java/org/apache/freemarker/core/ast/BuiltinVariable.java index 8925001..2504cfb 100644 --- a/src/main/java/org/apache/freemarker/core/ast/BuiltinVariable.java +++ b/src/main/java/org/apache/freemarker/core/ast/BuiltinVariable.java @@ -280,10 +280,12 @@ final class BuiltinVariable extends Expression { this.env = env; } + @Override public TemplateModel get(String key) throws TemplateModelException { return env.getVariable(key); } + @Override public boolean isEmpty() { return false; } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/ast/CollectionAndSequence.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/ast/CollectionAndSequence.java b/src/main/java/org/apache/freemarker/core/ast/CollectionAndSequence.java index 828303b..b593f56 100644 --- a/src/main/java/org/apache/freemarker/core/ast/CollectionAndSequence.java +++ b/src/main/java/org/apache/freemarker/core/ast/CollectionAndSequence.java @@ -46,6 +46,7 @@ implements TemplateCollectionModel, TemplateSequenceModel, Serializable { this.sequence = sequence; } + @Override public TemplateModelIterator iterator() throws TemplateModelException { if (collection != null) { return collection.iterator(); @@ -54,6 +55,7 @@ implements TemplateCollectionModel, TemplateSequenceModel, Serializable { } } + @Override public TemplateModel get(int i) throws TemplateModelException { if (sequence != null) { return sequence.get(i); @@ -63,6 +65,7 @@ implements TemplateCollectionModel, TemplateSequenceModel, Serializable { } } + @Override public int size() throws TemplateModelException { if (sequence != null) { return sequence.size(); @@ -93,10 +96,12 @@ implements TemplateCollectionModel, TemplateSequenceModel, Serializable { this.size = sequence.size(); } + @Override public TemplateModel next() throws TemplateModelException { return sequence.get(index++); } + @Override public boolean hasNext() { return index < size; } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/ast/CommonTemplateMarkupOutputModel.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/ast/CommonTemplateMarkupOutputModel.java b/src/main/java/org/apache/freemarker/core/ast/CommonTemplateMarkupOutputModel.java index d9ecbe3..fd208e3 100644 --- a/src/main/java/org/apache/freemarker/core/ast/CommonTemplateMarkupOutputModel.java +++ b/src/main/java/org/apache/freemarker/core/ast/CommonTemplateMarkupOutputModel.java @@ -43,6 +43,7 @@ public abstract class CommonTemplateMarkupOutputModel<MO extends CommonTemplateM this.markupContet = markupContent; } + @Override public abstract CommonMarkupOutputFormat<MO> getOutputFormat(); /** Maybe {@code null}, but then {@link #getMarkupContent()} isn't {@code null}. */ http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/ast/DefaultToExpression.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/ast/DefaultToExpression.java b/src/main/java/org/apache/freemarker/core/ast/DefaultToExpression.java index 4e0f3af..f6aef0e 100755 --- a/src/main/java/org/apache/freemarker/core/ast/DefaultToExpression.java +++ b/src/main/java/org/apache/freemarker/core/ast/DefaultToExpression.java @@ -35,25 +35,32 @@ class DefaultToExpression extends Expression { static private class EmptyStringAndSequence implements TemplateScalarModel, TemplateSequenceModel, TemplateHashModelEx { - public String getAsString() { + @Override + public String getAsString() { return ""; } - public TemplateModel get(int i) { + @Override + public TemplateModel get(int i) { return null; } - public TemplateModel get(String s) { + @Override + public TemplateModel get(String s) { return null; } - public int size() { + @Override + public int size() { return 0; } - public boolean isEmpty() { + @Override + public boolean isEmpty() { return true; } - public TemplateCollectionModel keys() { + @Override + public TemplateCollectionModel keys() { return EMPTY_COLLECTION; } - public TemplateCollectionModel values() { + @Override + public TemplateCollectionModel values() { return EMPTY_COLLECTION; } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/ast/ExistenceBuiltins.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/ast/ExistenceBuiltins.java b/src/main/java/org/apache/freemarker/core/ast/ExistenceBuiltins.java index dc1d167..2fc343b 100644 --- a/src/main/java/org/apache/freemarker/core/ast/ExistenceBuiltins.java +++ b/src/main/java/org/apache/freemarker/core/ast/ExistenceBuiltins.java @@ -71,6 +71,7 @@ class ExistenceBuiltins { this.constant = constant; } + @Override public Object exec(List args) { return constant; } @@ -82,6 +83,7 @@ class ExistenceBuiltins { */ private static final TemplateMethodModelEx FIRST_NON_NULL_METHOD = new TemplateMethodModelEx() { + @Override public Object exec(List args) throws TemplateModelException { int argCnt = args.size(); if (argCnt == 0) throw MessageUtil.newArgCntError("?default", argCnt, 1, Integer.MAX_VALUE); http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/ast/FreeMarkerTree.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/ast/FreeMarkerTree.java b/src/main/java/org/apache/freemarker/core/ast/FreeMarkerTree.java index 6cd0915..3c4b412 100644 --- a/src/main/java/org/apache/freemarker/core/ast/FreeMarkerTree.java +++ b/src/main/java/org/apache/freemarker/core/ast/FreeMarkerTree.java @@ -76,38 +76,47 @@ public class FreeMarkerTree extends JTree { this.element = element; } + @Override public Enumeration children() { final Enumeration e = element.children(); return new Enumeration() { + @Override public boolean hasMoreElements() { return e.hasMoreElements(); } + @Override public Object nextElement() { return getNode((TemplateElement) e.nextElement()); } }; } + @Override public boolean getAllowsChildren() { return element.getAllowsChildren(); } + @Override public TreeNode getChildAt(int childIndex) { return getNode(element.getChildAt(childIndex)); } + @Override public int getChildCount() { return element.getChildCount(); } + @Override public int getIndex(TreeNode node) { return element.getIndex(((TemplateElementTreeNode) node).element); } + @Override public TreeNode getParent() { return getNode(element.getParentElement()); } + @Override public boolean isLeaf() { return element.isLeaf(); } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/ast/Interpret.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/ast/Interpret.java b/src/main/java/org/apache/freemarker/core/ast/Interpret.java index c017aa8..140ccea 100644 --- a/src/main/java/org/apache/freemarker/core/ast/Interpret.java +++ b/src/main/java/org/apache/freemarker/core/ast/Interpret.java @@ -117,6 +117,7 @@ class Interpret extends OutputFormatBoundBuiltIn { this.template = template; } + @Override public Writer getWriter(final Writer out, Map args) throws TemplateModelException, IOException { try { Environment env = Environment.getCurrentEnvironment(); http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/ast/ListableRightUnboundedRangeModel.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/ast/ListableRightUnboundedRangeModel.java b/src/main/java/org/apache/freemarker/core/ast/ListableRightUnboundedRangeModel.java index accf42b..d5a28e8 100644 --- a/src/main/java/org/apache/freemarker/core/ast/ListableRightUnboundedRangeModel.java +++ b/src/main/java/org/apache/freemarker/core/ast/ListableRightUnboundedRangeModel.java @@ -38,10 +38,12 @@ final class ListableRightUnboundedRangeModel extends RightUnboundedRangeModel im super(begin); } + @Override public int size() throws TemplateModelException { return Integer.MAX_VALUE; } + @Override public TemplateModelIterator iterator() throws TemplateModelException { return new TemplateModelIterator() { boolean needInc; @@ -50,6 +52,7 @@ final class ListableRightUnboundedRangeModel extends RightUnboundedRangeModel im long nextLong; BigInteger nextBigInteger; + @Override public TemplateModel next() throws TemplateModelException { if (needInc) { switch (nextType) { @@ -82,6 +85,7 @@ final class ListableRightUnboundedRangeModel extends RightUnboundedRangeModel im : new SimpleNumber(nextBigInteger)); } + @Override public boolean hasNext() throws TemplateModelException { return true; } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/ast/MarkReleaserTemplateSpecifiedEncodingHandler.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/ast/MarkReleaserTemplateSpecifiedEncodingHandler.java b/src/main/java/org/apache/freemarker/core/ast/MarkReleaserTemplateSpecifiedEncodingHandler.java index a12fb61..66d1a78 100644 --- a/src/main/java/org/apache/freemarker/core/ast/MarkReleaserTemplateSpecifiedEncodingHandler.java +++ b/src/main/java/org/apache/freemarker/core/ast/MarkReleaserTemplateSpecifiedEncodingHandler.java @@ -40,6 +40,7 @@ public class MarkReleaserTemplateSpecifiedEncodingHandler implements TemplateSpe this.markedInputStream = markedInputStream; } + @Override public void handle(String templateSpecificEncoding, String constructorSpecifiedEncoding) throws WrongEncodingException { TemplateSpecifiedEncodingHandler.DEFAULT.handle(templateSpecificEncoding, constructorSpecifiedEncoding); http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/ast/MiscUtil.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/ast/MiscUtil.java b/src/main/java/org/apache/freemarker/core/ast/MiscUtil.java index 63911ef..87b21cf 100644 --- a/src/main/java/org/apache/freemarker/core/ast/MiscUtil.java +++ b/src/main/java/org/apache/freemarker/core/ast/MiscUtil.java @@ -43,6 +43,7 @@ class MiscUtil { ArrayList res = new ArrayList(map.entrySet()); Collections.sort(res, new Comparator() { // for sorting to source code order + @Override public int compare(Object o1, Object o2) { Map.Entry ent1 = (Map.Entry) o1; Expression exp1 = (Expression) ent1.getValue(); http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/ast/NonListableRightUnboundedRangeModel.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/ast/NonListableRightUnboundedRangeModel.java b/src/main/java/org/apache/freemarker/core/ast/NonListableRightUnboundedRangeModel.java index d9204b3..14c8d9e 100644 --- a/src/main/java/org/apache/freemarker/core/ast/NonListableRightUnboundedRangeModel.java +++ b/src/main/java/org/apache/freemarker/core/ast/NonListableRightUnboundedRangeModel.java @@ -32,6 +32,7 @@ final class NonListableRightUnboundedRangeModel extends RightUnboundedRangeModel super(begin); } + @Override public int size() throws TemplateModelException { return 0; } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/ast/NumberLiteral.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/ast/NumberLiteral.java b/src/main/java/org/apache/freemarker/core/ast/NumberLiteral.java index 5372b30..0960a76 100644 --- a/src/main/java/org/apache/freemarker/core/ast/NumberLiteral.java +++ b/src/main/java/org/apache/freemarker/core/ast/NumberLiteral.java @@ -46,6 +46,7 @@ final class NumberLiteral extends Expression implements TemplateNumberModel { return env.formatNumberToPlainText(this, this, false); } + @Override public Number getAsNumber() { return value; } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/ast/RangeModel.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/ast/RangeModel.java b/src/main/java/org/apache/freemarker/core/ast/RangeModel.java index 02fc844..a038cf0 100644 --- a/src/main/java/org/apache/freemarker/core/ast/RangeModel.java +++ b/src/main/java/org/apache/freemarker/core/ast/RangeModel.java @@ -36,6 +36,7 @@ abstract class RangeModel implements TemplateSequenceModel, java.io.Serializable return begin; } + @Override final public TemplateModel get(int index) throws TemplateModelException { if (index < 0 || index >= size()) { throw new _TemplateModelException("Range item index ", Integer.valueOf(index), " is out of bounds."); http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/ast/StringArraySequence.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/ast/StringArraySequence.java b/src/main/java/org/apache/freemarker/core/ast/StringArraySequence.java index 348e75b..895b31a 100644 --- a/src/main/java/org/apache/freemarker/core/ast/StringArraySequence.java +++ b/src/main/java/org/apache/freemarker/core/ast/StringArraySequence.java @@ -40,6 +40,7 @@ public class StringArraySequence implements TemplateSequenceModel { this.stringArray = stringArray; } + @Override public TemplateModel get(int index) { if (array == null) { array = new TemplateScalarModel[stringArray.length]; @@ -52,6 +53,7 @@ public class StringArraySequence implements TemplateSequenceModel { return result; } + @Override public int size() { return stringArray.length; } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/debug/Breakpoint.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/debug/Breakpoint.java b/src/main/java/org/apache/freemarker/core/debug/Breakpoint.java index 6cd0bf5..c66f9c7 100644 --- a/src/main/java/org/apache/freemarker/core/debug/Breakpoint.java +++ b/src/main/java/org/apache/freemarker/core/debug/Breakpoint.java @@ -67,6 +67,7 @@ public class Breakpoint implements Serializable, Comparable { return false; } + @Override public int compareTo(Object o) { Breakpoint b = (Breakpoint) o; int r = templateName.compareTo(b.templateName); http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/debug/DebuggerClient.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/debug/DebuggerClient.java b/src/main/java/org/apache/freemarker/core/debug/DebuggerClient.java index fb7be4c..0271ff0 100644 --- a/src/main/java/org/apache/freemarker/core/debug/DebuggerClient.java +++ b/src/main/java/org/apache/freemarker/core/debug/DebuggerClient.java @@ -94,11 +94,13 @@ public class DebuggerClient { this.remoteDebugger = remoteDebugger; } + @Override public void addBreakpoint(Breakpoint breakpoint) throws RemoteException { remoteDebugger.addBreakpoint(breakpoint); } - public Object addDebuggerListener(DebuggerListener listener) + @Override + public Object addDebuggerListener(DebuggerListener listener) throws RemoteException { if (listener instanceof RemoteObject) { return remoteDebugger.addDebuggerListener(listener); @@ -109,30 +111,37 @@ public class DebuggerClient { } } + @Override public List getBreakpoints() throws RemoteException { return remoteDebugger.getBreakpoints(); } + @Override public List getBreakpoints(String templateName) throws RemoteException { return remoteDebugger.getBreakpoints(templateName); } + @Override public Collection getSuspendedEnvironments() throws RemoteException { return remoteDebugger.getSuspendedEnvironments(); } + @Override public void removeBreakpoint(Breakpoint breakpoint) throws RemoteException { remoteDebugger.removeBreakpoint(breakpoint); } + @Override public void removeBreakpoints(String templateName) throws RemoteException { remoteDebugger.removeBreakpoints(templateName); } + @Override public void removeBreakpoints() throws RemoteException { remoteDebugger.removeBreakpoints(); } + @Override public void removeDebuggerListener(Object id) throws RemoteException { remoteDebugger.removeDebuggerListener(id); } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/debug/impl/RmiDebugModelImpl.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/debug/impl/RmiDebugModelImpl.java b/src/main/java/org/apache/freemarker/core/debug/impl/RmiDebugModelImpl.java index 61333de..58a37c7 100644 --- a/src/main/java/org/apache/freemarker/core/debug/impl/RmiDebugModelImpl.java +++ b/src/main/java/org/apache/freemarker/core/debug/impl/RmiDebugModelImpl.java @@ -58,26 +58,32 @@ class RmiDebugModelImpl extends UnicastRemoteObject implements DebugModel { private static DebugModel getDebugModel(TemplateModel tm) throws RemoteException { return (DebugModel) RmiDebuggedEnvironmentImpl.getCachedWrapperFor(tm); } + @Override public String getAsString() throws TemplateModelException { return ((TemplateScalarModel) model).getAsString(); } + @Override public Number getAsNumber() throws TemplateModelException { return ((TemplateNumberModel) model).getAsNumber(); } + @Override public Date getAsDate() throws TemplateModelException { return ((TemplateDateModel) model).getAsDate(); } + @Override public int getDateType() { return ((TemplateDateModel) model).getDateType(); } + @Override public boolean getAsBoolean() throws TemplateModelException { return ((TemplateBooleanModel) model).getAsBoolean(); } + @Override public int size() throws TemplateModelException { if (model instanceof TemplateSequenceModel) { return ((TemplateSequenceModel) model).size(); @@ -85,10 +91,12 @@ class RmiDebugModelImpl extends UnicastRemoteObject implements DebugModel { return ((TemplateHashModelEx) model).size(); } + @Override public DebugModel get(int index) throws TemplateModelException, RemoteException { return getDebugModel(((TemplateSequenceModel) model).get(index)); } + @Override public DebugModel[] get(int fromIndex, int toIndex) throws TemplateModelException, RemoteException { DebugModel[] dm = new DebugModel[toIndex - fromIndex]; TemplateSequenceModel s = (TemplateSequenceModel) model; @@ -98,6 +106,7 @@ class RmiDebugModelImpl extends UnicastRemoteObject implements DebugModel { return dm; } + @Override public DebugModel[] getCollection() throws TemplateModelException, RemoteException { List list = new ArrayList(); TemplateModelIterator i = ((TemplateCollectionModel) model).iterator(); @@ -107,10 +116,12 @@ class RmiDebugModelImpl extends UnicastRemoteObject implements DebugModel { return (DebugModel[]) list.toArray(new DebugModel[list.size()]); } + @Override public DebugModel get(String key) throws TemplateModelException, RemoteException { return getDebugModel(((TemplateHashModel) model).get(key)); } + @Override public DebugModel[] get(String[] keys) throws TemplateModelException, RemoteException { DebugModel[] dm = new DebugModel[keys.length]; TemplateHashModel h = (TemplateHashModel) model; @@ -120,6 +131,7 @@ class RmiDebugModelImpl extends UnicastRemoteObject implements DebugModel { return dm; } + @Override public String[] keys() throws TemplateModelException { TemplateHashModelEx h = (TemplateHashModelEx) model; List list = new ArrayList(); @@ -130,6 +142,7 @@ class RmiDebugModelImpl extends UnicastRemoteObject implements DebugModel { return (String[]) list.toArray(new String[list.size()]); } + @Override public int getModelTypes() { return type; } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/debug/impl/RmiDebuggerImpl.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/debug/impl/RmiDebuggerImpl.java b/src/main/java/org/apache/freemarker/core/debug/impl/RmiDebuggerImpl.java index 1d3aaf0..4a05421 100644 --- a/src/main/java/org/apache/freemarker/core/debug/impl/RmiDebuggerImpl.java +++ b/src/main/java/org/apache/freemarker/core/debug/impl/RmiDebuggerImpl.java @@ -43,38 +43,47 @@ implements this.service = service; } + @Override public void addBreakpoint(Breakpoint breakpoint) { service.addBreakpoint(breakpoint); } + @Override public Object addDebuggerListener(DebuggerListener listener) { return service.addDebuggerListener(listener); } + @Override public List getBreakpoints() { return service.getBreakpointsSpi(); } + @Override public List getBreakpoints(String templateName) { return service.getBreakpointsSpi(templateName); } + @Override public Collection getSuspendedEnvironments() { return service.getSuspendedEnvironments(); } + @Override public void removeBreakpoint(Breakpoint breakpoint) { service.removeBreakpoint(breakpoint); } + @Override public void removeDebuggerListener(Object id) { service.removeDebuggerListener(id); } + @Override public void removeBreakpoints() { service.removeBreakpoints(); } + @Override public void removeBreakpoints(String templateName) { service.removeBreakpoints(templateName); } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/model/Constants.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/model/Constants.java b/src/main/java/org/apache/freemarker/core/model/Constants.java index 76f2f45..1438c0d 100644 --- a/src/main/java/org/apache/freemarker/core/model/Constants.java +++ b/src/main/java/org/apache/freemarker/core/model/Constants.java @@ -59,10 +59,12 @@ public class Constants { private static class EmptyIteratorModel implements TemplateModelIterator, Serializable { + @Override public TemplateModel next() throws TemplateModelException { throw new TemplateModelException("The collection has no more elements."); } + @Override public boolean hasNext() throws TemplateModelException { return false; } @@ -73,6 +75,7 @@ public class Constants { private static class EmptyCollectionModel implements TemplateCollectionModel, Serializable { + @Override public TemplateModelIterator iterator() throws TemplateModelException { return EMPTY_ITERATOR; } @@ -83,10 +86,12 @@ public class Constants { private static class EmptySequenceModel implements TemplateSequenceModel, Serializable { + @Override public TemplateModel get(int index) throws TemplateModelException { return null; } + @Override public int size() throws TemplateModelException { return 0; } @@ -97,22 +102,27 @@ public class Constants { private static class EmptyHashModel implements TemplateHashModelEx, Serializable { + @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; } + @Override public TemplateModel get(String key) throws TemplateModelException { return null; } + @Override public boolean isEmpty() throws TemplateModelException { return true; } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/model/FalseTemplateBooleanModel.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/model/FalseTemplateBooleanModel.java b/src/main/java/org/apache/freemarker/core/model/FalseTemplateBooleanModel.java index acbf7dd..d2cc875 100644 --- a/src/main/java/org/apache/freemarker/core/model/FalseTemplateBooleanModel.java +++ b/src/main/java/org/apache/freemarker/core/model/FalseTemplateBooleanModel.java @@ -24,6 +24,7 @@ package org.apache.freemarker.core.model; */ final class FalseTemplateBooleanModel implements SerializableTemplateBooleanModel { + @Override public boolean getAsBoolean() { return false; } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/model/TemplateMethodModelEx.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/model/TemplateMethodModelEx.java b/src/main/java/org/apache/freemarker/core/model/TemplateMethodModelEx.java index afc8e5a..acb5632 100644 --- a/src/main/java/org/apache/freemarker/core/model/TemplateMethodModelEx.java +++ b/src/main/java/org/apache/freemarker/core/model/TemplateMethodModelEx.java @@ -48,6 +48,7 @@ public interface TemplateMethodModelEx extends TemplateMethodModel { * wrapped using the {@link Environment#getObjectWrapper() environment's * object wrapper}. */ + @Override public Object exec(List arguments) throws TemplateModelException; } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/model/TrueTemplateBooleanModel.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/model/TrueTemplateBooleanModel.java b/src/main/java/org/apache/freemarker/core/model/TrueTemplateBooleanModel.java index 71fa341..f180b2c 100644 --- a/src/main/java/org/apache/freemarker/core/model/TrueTemplateBooleanModel.java +++ b/src/main/java/org/apache/freemarker/core/model/TrueTemplateBooleanModel.java @@ -24,6 +24,7 @@ package org.apache.freemarker.core.model; */ final class TrueTemplateBooleanModel implements SerializableTemplateBooleanModel { + @Override public boolean getAsBoolean() { return true; } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/model/impl/DefaultArrayAdapter.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/model/impl/DefaultArrayAdapter.java b/src/main/java/org/apache/freemarker/core/model/impl/DefaultArrayAdapter.java index 1bcef2f..a7e39eb 100644 --- a/src/main/java/org/apache/freemarker/core/model/impl/DefaultArrayAdapter.java +++ b/src/main/java/org/apache/freemarker/core/model/impl/DefaultArrayAdapter.java @@ -105,6 +105,7 @@ public abstract class DefaultArrayAdapter extends WrappingTemplateModel implemen super(wrapper); } + @Override public final Object getAdaptedObject(Class hint) { return getWrappedObject(); } @@ -118,14 +119,17 @@ public abstract class DefaultArrayAdapter extends WrappingTemplateModel implemen this.array = array; } + @Override public TemplateModel get(int index) throws TemplateModelException { return index >= 0 && index < array.length ? wrap(array[index]) : null; } + @Override public int size() throws TemplateModelException { return array.length; } + @Override public Object getWrappedObject() { return array; } @@ -141,14 +145,17 @@ public abstract class DefaultArrayAdapter extends WrappingTemplateModel implemen this.array = array; } + @Override public TemplateModel get(int index) throws TemplateModelException { return index >= 0 && index < array.length ? wrap(Byte.valueOf(array[index])) : null; } + @Override public int size() throws TemplateModelException { return array.length; } + @Override public Object getWrappedObject() { return array; } @@ -164,14 +171,17 @@ public abstract class DefaultArrayAdapter extends WrappingTemplateModel implemen this.array = array; } + @Override public TemplateModel get(int index) throws TemplateModelException { return index >= 0 && index < array.length ? wrap(Short.valueOf(array[index])) : null; } + @Override public int size() throws TemplateModelException { return array.length; } + @Override public Object getWrappedObject() { return array; } @@ -187,14 +197,17 @@ public abstract class DefaultArrayAdapter extends WrappingTemplateModel implemen this.array = array; } + @Override public TemplateModel get(int index) throws TemplateModelException { return index >= 0 && index < array.length ? wrap(Integer.valueOf(array[index])) : null; } + @Override public int size() throws TemplateModelException { return array.length; } + @Override public Object getWrappedObject() { return array; } @@ -210,14 +223,17 @@ public abstract class DefaultArrayAdapter extends WrappingTemplateModel implemen this.array = array; } + @Override public TemplateModel get(int index) throws TemplateModelException { return index >= 0 && index < array.length ? wrap(Long.valueOf(array[index])) : null; } + @Override public int size() throws TemplateModelException { return array.length; } + @Override public Object getWrappedObject() { return array; } @@ -233,14 +249,17 @@ public abstract class DefaultArrayAdapter extends WrappingTemplateModel implemen this.array = array; } + @Override public TemplateModel get(int index) throws TemplateModelException { return index >= 0 && index < array.length ? wrap(Float.valueOf(array[index])) : null; } + @Override public int size() throws TemplateModelException { return array.length; } + @Override public Object getWrappedObject() { return array; } @@ -256,14 +275,17 @@ public abstract class DefaultArrayAdapter extends WrappingTemplateModel implemen this.array = array; } + @Override public TemplateModel get(int index) throws TemplateModelException { return index >= 0 && index < array.length ? wrap(Double.valueOf(array[index])) : null; } + @Override public int size() throws TemplateModelException { return array.length; } + @Override public Object getWrappedObject() { return array; } @@ -279,14 +301,17 @@ public abstract class DefaultArrayAdapter extends WrappingTemplateModel implemen this.array = array; } + @Override public TemplateModel get(int index) throws TemplateModelException { return index >= 0 && index < array.length ? wrap(Character.valueOf(array[index])) : null; } + @Override public int size() throws TemplateModelException { return array.length; } + @Override public Object getWrappedObject() { return array; } @@ -302,14 +327,17 @@ public abstract class DefaultArrayAdapter extends WrappingTemplateModel implemen this.array = array; } + @Override public TemplateModel get(int index) throws TemplateModelException { return index >= 0 && index < array.length ? wrap(Boolean.valueOf(array[index])) : null; } + @Override public int size() throws TemplateModelException { return array.length; } + @Override public Object getWrappedObject() { return array; } @@ -330,14 +358,17 @@ public abstract class DefaultArrayAdapter extends WrappingTemplateModel implemen length = Array.getLength(array); } + @Override public TemplateModel get(int index) throws TemplateModelException { return index >= 0 && index < length ? wrap(Array.get(array, index)) : null; } + @Override public int size() throws TemplateModelException { return length; } + @Override public Object getWrappedObject() { return array; } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/model/impl/DefaultIterableAdapter.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/model/impl/DefaultIterableAdapter.java b/src/main/java/org/apache/freemarker/core/model/impl/DefaultIterableAdapter.java index a5899c8..56fe283 100644 --- a/src/main/java/org/apache/freemarker/core/model/impl/DefaultIterableAdapter.java +++ b/src/main/java/org/apache/freemarker/core/model/impl/DefaultIterableAdapter.java @@ -76,18 +76,22 @@ public class DefaultIterableAdapter extends WrappingTemplateModel implements Tem this.iterable = iterable; } + @Override public TemplateModelIterator iterator() throws TemplateModelException { return new DefaultUnassignableIteratorAdapter(iterable.iterator(), getObjectWrapper()); } + @Override public Object getWrappedObject() { return iterable; } + @Override public Object getAdaptedObject(Class hint) { return getWrappedObject(); } + @Override public TemplateModel getAPI() throws TemplateModelException { return ((ObjectWrapperWithAPISupport) getObjectWrapper()).wrapAsAPI(iterable); } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/model/impl/DefaultIteratorAdapter.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/model/impl/DefaultIteratorAdapter.java b/src/main/java/org/apache/freemarker/core/model/impl/DefaultIteratorAdapter.java index 600e8f7..ccbc1ce 100644 --- a/src/main/java/org/apache/freemarker/core/model/impl/DefaultIteratorAdapter.java +++ b/src/main/java/org/apache/freemarker/core/model/impl/DefaultIteratorAdapter.java @@ -72,14 +72,17 @@ public class DefaultIteratorAdapter extends WrappingTemplateModel implements Tem this.iterator = iterator; } + @Override public Object getWrappedObject() { return iterator; } + @Override public Object getAdaptedObject(Class hint) { return getWrappedObject(); } + @Override public TemplateModelIterator iterator() throws TemplateModelException { return new SimpleTemplateModelIterator(); } @@ -91,6 +94,7 @@ public class DefaultIteratorAdapter extends WrappingTemplateModel implements Tem private boolean iteratorOwnedByMe; + @Override public TemplateModel next() throws TemplateModelException { if (!iteratorOwnedByMe) { checkNotOwner(); @@ -106,6 +110,7 @@ public class DefaultIteratorAdapter extends WrappingTemplateModel implements Tem return value instanceof TemplateModel ? (TemplateModel) value : wrap(value); } + @Override public boolean hasNext() throws TemplateModelException { // Calling hasNext may looks safe, but I have met sync. problems. if (!iteratorOwnedByMe) { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/model/impl/DefaultListAdapter.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/model/impl/DefaultListAdapter.java b/src/main/java/org/apache/freemarker/core/model/impl/DefaultListAdapter.java index 16f21f8..1ebd3e1 100644 --- a/src/main/java/org/apache/freemarker/core/model/impl/DefaultListAdapter.java +++ b/src/main/java/org/apache/freemarker/core/model/impl/DefaultListAdapter.java @@ -81,18 +81,22 @@ public class DefaultListAdapter extends WrappingTemplateModel implements Templat this.list = list; } + @Override public TemplateModel get(int index) throws TemplateModelException { return index >= 0 && index < list.size() ? wrap(list.get(index)) : null; } + @Override public int size() throws TemplateModelException { return list.size(); } + @Override public Object getAdaptedObject(Class hint) { return getWrappedObject(); } + @Override public Object getWrappedObject() { return list; } @@ -104,12 +108,14 @@ public class DefaultListAdapter extends WrappingTemplateModel implements Templat super(list, wrapper); } + @Override public TemplateModelIterator iterator() throws TemplateModelException { return new DefaultUnassignableIteratorAdapter(list.iterator(), getObjectWrapper()); } } + @Override public TemplateModel getAPI() throws TemplateModelException { return ((ObjectWrapperWithAPISupport) getObjectWrapper()).wrapAsAPI(list); } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/model/impl/DefaultMapAdapter.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/model/impl/DefaultMapAdapter.java b/src/main/java/org/apache/freemarker/core/model/impl/DefaultMapAdapter.java index 522c7d0..d63cafe 100644 --- a/src/main/java/org/apache/freemarker/core/model/impl/DefaultMapAdapter.java +++ b/src/main/java/org/apache/freemarker/core/model/impl/DefaultMapAdapter.java @@ -76,6 +76,7 @@ public class DefaultMapAdapter extends WrappingTemplateModel this.map = map; } + @Override public TemplateModel get(String key) throws TemplateModelException { Object val; try { @@ -127,34 +128,42 @@ public class DefaultMapAdapter extends WrappingTemplateModel return wrap(val); } + @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()); } + @Override public KeyValuePairIterator keyValuePairIterator() { return new MapKeyValuePairIterator(map, getObjectWrapper()); } + @Override public Object getAdaptedObject(Class hint) { return map; } + @Override public Object getWrappedObject() { return map; } + @Override public TemplateModel getAPI() throws TemplateModelException { return ((ObjectWrapperWithAPISupport) getObjectWrapper()).wrapAsAPI(map); } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/model/impl/DefaultNonListCollectionAdapter.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/model/impl/DefaultNonListCollectionAdapter.java b/src/main/java/org/apache/freemarker/core/model/impl/DefaultNonListCollectionAdapter.java index f5f6cec..92d5970 100644 --- a/src/main/java/org/apache/freemarker/core/model/impl/DefaultNonListCollectionAdapter.java +++ b/src/main/java/org/apache/freemarker/core/model/impl/DefaultNonListCollectionAdapter.java @@ -82,26 +82,32 @@ public class DefaultNonListCollectionAdapter extends WrappingTemplateModel imple this.collection = collection; } + @Override public TemplateModelIterator iterator() throws TemplateModelException { return new DefaultUnassignableIteratorAdapter(collection.iterator(), getObjectWrapper()); } + @Override public int size() { return collection.size(); } + @Override public boolean isEmpty() { return collection.isEmpty(); } + @Override public Object getWrappedObject() { return collection; } + @Override public Object getAdaptedObject(Class hint) { return getWrappedObject(); } + @Override public boolean contains(TemplateModel item) throws TemplateModelException { Object itemPojo = ((ObjectWrapperAndUnwrapper) getObjectWrapper()).unwrap(item); try { @@ -114,6 +120,7 @@ public class DefaultNonListCollectionAdapter extends WrappingTemplateModel imple } } + @Override public TemplateModel getAPI() throws TemplateModelException { return ((ObjectWrapperWithAPISupport) getObjectWrapper()).wrapAsAPI(collection); } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/model/impl/DefaultObjectWrapperBuilder.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/model/impl/DefaultObjectWrapperBuilder.java b/src/main/java/org/apache/freemarker/core/model/impl/DefaultObjectWrapperBuilder.java index e9f3fab..40768f8 100644 --- a/src/main/java/org/apache/freemarker/core/model/impl/DefaultObjectWrapperBuilder.java +++ b/src/main/java/org/apache/freemarker/core/model/impl/DefaultObjectWrapperBuilder.java @@ -74,6 +74,7 @@ public class DefaultObjectWrapperBuilder extends DefaultObjectWrapperConfigurati private static final DefaultObjectWrapperFactory INSTANCE = new DefaultObjectWrapperFactory(); + @Override public DefaultObjectWrapper create(DefaultObjectWrapperConfiguration bwConf) { return new DefaultObjectWrapper(bwConf, true); } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/model/impl/DefaultUnassignableIteratorAdapter.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/model/impl/DefaultUnassignableIteratorAdapter.java b/src/main/java/org/apache/freemarker/core/model/impl/DefaultUnassignableIteratorAdapter.java index 9c63d10..8553736 100644 --- a/src/main/java/org/apache/freemarker/core/model/impl/DefaultUnassignableIteratorAdapter.java +++ b/src/main/java/org/apache/freemarker/core/model/impl/DefaultUnassignableIteratorAdapter.java @@ -42,6 +42,7 @@ class DefaultUnassignableIteratorAdapter implements TemplateModelIterator { this.wrapper = wrapper; } + @Override public TemplateModel next() throws TemplateModelException { try { return wrapper.wrap(it.next()); @@ -50,6 +51,7 @@ class DefaultUnassignableIteratorAdapter implements TemplateModelIterator { } } + @Override public boolean hasNext() throws TemplateModelException { return it.hasNext(); } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/model/impl/MapKeyValuePairIterator.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/model/impl/MapKeyValuePairIterator.java b/src/main/java/org/apache/freemarker/core/model/impl/MapKeyValuePairIterator.java index 77495be..e8797e7 100644 --- a/src/main/java/org/apache/freemarker/core/model/impl/MapKeyValuePairIterator.java +++ b/src/main/java/org/apache/freemarker/core/model/impl/MapKeyValuePairIterator.java @@ -47,18 +47,22 @@ public class MapKeyValuePairIterator implements KeyValuePairIterator { this.objectWrapper = objectWrapper; } + @Override public boolean hasNext() { return entrySetIterator.hasNext(); } + @Override public KeyValuePair next() { final Entry<?, ?> entry = entrySetIterator.next(); return new KeyValuePair() { + @Override public TemplateModel getKey() throws TemplateModelException { return wrap(entry.getKey()); } + @Override public TemplateModel getValue() throws TemplateModelException { return wrap(entry.getValue()); } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/model/impl/SimpleCollection.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/model/impl/SimpleCollection.java b/src/main/java/org/apache/freemarker/core/model/impl/SimpleCollection.java index 46dbd25..8718d39 100644 --- a/src/main/java/org/apache/freemarker/core/model/impl/SimpleCollection.java +++ b/src/main/java/org/apache/freemarker/core/model/impl/SimpleCollection.java @@ -91,6 +91,7 @@ implements TemplateCollectionModel, Serializable { * <tt>TemplateModelException</tt> when you try to call their methods, since the wrapped <tt>Iterator</tt> * can't return the first element anymore. */ + @Override public TemplateModelIterator iterator() { if (iterator != null) { return new SimpleTemplateModelIterator(iterator, false); @@ -117,6 +118,7 @@ implements TemplateCollectionModel, Serializable { this.iteratorOwnedByMe = iteratorOwnedByMe; } + @Override public TemplateModel next() throws TemplateModelException { if (!iteratorOwnedByMe) { synchronized (SimpleCollection.this) { @@ -134,6 +136,7 @@ implements TemplateCollectionModel, Serializable { return value instanceof TemplateModel ? (TemplateModel) value : wrap(value); } + @Override public boolean hasNext() throws TemplateModelException { // Calling hasNext may looks safe, but I have met sync. problems. if (!iteratorOwnedByMe) { http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/model/impl/SimpleDate.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/model/impl/SimpleDate.java b/src/main/java/org/apache/freemarker/core/model/impl/SimpleDate.java index 8f7ef80..92a5709 100644 --- a/src/main/java/org/apache/freemarker/core/model/impl/SimpleDate.java +++ b/src/main/java/org/apache/freemarker/core/model/impl/SimpleDate.java @@ -66,10 +66,12 @@ public class SimpleDate implements TemplateDateModel { this.type = type; } + @Override public java.util.Date getAsDate() { return date; } + @Override public int getDateType() { return type; } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/model/impl/SimpleNumber.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/model/impl/SimpleNumber.java b/src/main/java/org/apache/freemarker/core/model/impl/SimpleNumber.java index 624eb9d..b6fe8d1 100644 --- a/src/main/java/org/apache/freemarker/core/model/impl/SimpleNumber.java +++ b/src/main/java/org/apache/freemarker/core/model/impl/SimpleNumber.java @@ -65,6 +65,7 @@ public final class SimpleNumber implements TemplateNumberModel, Serializable { this.value = Double.valueOf(val); } + @Override public Number getAsNumber() { return value; } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/model/impl/SimpleScalar.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/model/impl/SimpleScalar.java b/src/main/java/org/apache/freemarker/core/model/impl/SimpleScalar.java index b9114ca..ceb133d 100644 --- a/src/main/java/org/apache/freemarker/core/model/impl/SimpleScalar.java +++ b/src/main/java/org/apache/freemarker/core/model/impl/SimpleScalar.java @@ -50,6 +50,7 @@ implements TemplateScalarModel, Serializable { this.value = value; } + @Override public String getAsString() { return (value == null) ? "" : value; } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/model/impl/TemplateModelListSequence.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/model/impl/TemplateModelListSequence.java b/src/main/java/org/apache/freemarker/core/model/impl/TemplateModelListSequence.java index bdb64ac..5fe309b 100644 --- a/src/main/java/org/apache/freemarker/core/model/impl/TemplateModelListSequence.java +++ b/src/main/java/org/apache/freemarker/core/model/impl/TemplateModelListSequence.java @@ -38,10 +38,12 @@ public class TemplateModelListSequence implements TemplateSequenceModel { this.list = list; } + @Override public TemplateModel get(int index) { return (TemplateModel) list.get(index); } + @Override public int size() { return list.size(); } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/model/impl/beans/ArrayModel.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/model/impl/beans/ArrayModel.java b/src/main/java/org/apache/freemarker/core/model/impl/beans/ArrayModel.java index 83416a0..8be341c 100644 --- a/src/main/java/org/apache/freemarker/core/model/impl/beans/ArrayModel.java +++ b/src/main/java/org/apache/freemarker/core/model/impl/beans/ArrayModel.java @@ -42,6 +42,7 @@ implements static final ModelFactory FACTORY = new ModelFactory() { + @Override public TemplateModel create(Object object, ObjectWrapper wrapper) { return new ArrayModel(object, (BeansWrapper) wrapper); } @@ -68,10 +69,12 @@ implements } + @Override public TemplateModelIterator iterator() { return new Iterator(); } + @Override public TemplateModel get(int index) throws TemplateModelException { try { @@ -88,20 +91,24 @@ implements TemplateModelIterator { private int position = 0; + @Override public boolean hasNext() { return position < length; } + @Override public TemplateModel get(int index) throws TemplateModelException { return ArrayModel.this.get(index); } + @Override public TemplateModel next() throws TemplateModelException { return position < length ? get(position++) : null; } + @Override public int size() { return ArrayModel.this.size(); } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/model/impl/beans/BeansWrapperBuilder.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/model/impl/beans/BeansWrapperBuilder.java b/src/main/java/org/apache/freemarker/core/model/impl/beans/BeansWrapperBuilder.java index 55b5c96..ffd403e 100644 --- a/src/main/java/org/apache/freemarker/core/model/impl/beans/BeansWrapperBuilder.java +++ b/src/main/java/org/apache/freemarker/core/model/impl/beans/BeansWrapperBuilder.java @@ -119,6 +119,7 @@ public class BeansWrapperBuilder extends BeansWrapperConfiguration { private static final BeansWrapperFactory INSTANCE = new BeansWrapperFactory(); + @Override public BeansWrapper create(BeansWrapperConfiguration bwConf) { return new BeansWrapper(bwConf, true); } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/model/impl/beans/BooleanModel.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/model/impl/beans/BooleanModel.java b/src/main/java/org/apache/freemarker/core/model/impl/beans/BooleanModel.java index 63a3111..857df36 100644 --- a/src/main/java/org/apache/freemarker/core/model/impl/beans/BooleanModel.java +++ b/src/main/java/org/apache/freemarker/core/model/impl/beans/BooleanModel.java @@ -33,6 +33,7 @@ public class BooleanModel extends BeanModel implements TemplateBooleanModel { value = bool.booleanValue(); } + @Override public boolean getAsBoolean() { return value; } http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/model/impl/beans/ClassBasedModelFactory.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/freemarker/core/model/impl/beans/ClassBasedModelFactory.java b/src/main/java/org/apache/freemarker/core/model/impl/beans/ClassBasedModelFactory.java index f3274b6..1fd4d61 100644 --- a/src/main/java/org/apache/freemarker/core/model/impl/beans/ClassBasedModelFactory.java +++ b/src/main/java/org/apache/freemarker/core/model/impl/beans/ClassBasedModelFactory.java @@ -42,6 +42,7 @@ abstract class ClassBasedModelFactory implements TemplateHashModel { this.wrapper = wrapper; } + @Override public TemplateModel get(String key) throws TemplateModelException { try { return getInternal(key); @@ -132,6 +133,7 @@ abstract class ClassBasedModelFactory implements TemplateHashModel { } } + @Override public boolean isEmpty() { return false; }
