freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject [2/4] incubator-freemarker git commit: Added missing @Override annotations (which were illegal on Java 5)
Date Fri, 17 Feb 2017 16:34:53 GMT
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/model/impl/beans/CollectionAdapter.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/model/impl/beans/CollectionAdapter.java b/src/main/java/org/apache/freemarker/core/model/impl/beans/CollectionAdapter.java
index e3f8066..74db4cb 100644
--- a/src/main/java/org/apache/freemarker/core/model/impl/beans/CollectionAdapter.java
+++ b/src/main/java/org/apache/freemarker/core/model/impl/beans/CollectionAdapter.java
@@ -42,6 +42,7 @@ class CollectionAdapter extends AbstractCollection implements TemplateModelAdapt
         this.wrapper = wrapper;
     }
     
+    @Override
     public TemplateModel getTemplateModel() {
         return model;
     }
@@ -57,6 +58,7 @@ class CollectionAdapter extends AbstractCollection implements TemplateModelAdapt
             return new Iterator() {
                 final TemplateModelIterator i = model.iterator();
     
+                @Override
                 public boolean hasNext() {
                     try {
                         return i.hasNext();
@@ -65,6 +67,7 @@ class CollectionAdapter extends AbstractCollection implements TemplateModelAdapt
                     }
                 }
                 
+                @Override
                 public Object next() {
                     try {
                         return wrapper.unwrap(i.next());
@@ -73,6 +76,7 @@ class CollectionAdapter extends AbstractCollection implements TemplateModelAdapt
                     }
                 }
                 
+                @Override
                 public void remove() {
                     throw new UnsupportedOperationException();
                 }

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/model/impl/beans/CollectionModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/model/impl/beans/CollectionModel.java b/src/main/java/org/apache/freemarker/core/model/impl/beans/CollectionModel.java
index 1520d72..d27a56d 100644
--- a/src/main/java/org/apache/freemarker/core/model/impl/beans/CollectionModel.java
+++ b/src/main/java/org/apache/freemarker/core/model/impl/beans/CollectionModel.java
@@ -43,6 +43,7 @@ implements
     static final ModelFactory FACTORY =
         new ModelFactory()
         {
+            @Override
             public TemplateModel create(Object object, ObjectWrapper wrapper) {
                 return new CollectionModel((Collection) object, (BeansWrapper) wrapper);
             }
@@ -66,6 +67,7 @@ implements
      * @throws TemplateModelException if the index is out of bounds, or the
      * underlying collection is not a List.
      */
+    @Override
     public TemplateModel get(int index)
     throws TemplateModelException {
         // Don't forget to keep getSupportsIndexedAccess in sync with this!
@@ -94,6 +96,7 @@ implements
         return object instanceof List;
     }
     
+    @Override
     public TemplateModelIterator iterator() {
         return new IteratorModel(((Collection) object).iterator(), wrapper);
     }

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/model/impl/beans/DateModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/model/impl/beans/DateModel.java b/src/main/java/org/apache/freemarker/core/model/impl/beans/DateModel.java
index 5b382e4..55419cd 100644
--- a/src/main/java/org/apache/freemarker/core/model/impl/beans/DateModel.java
+++ b/src/main/java/org/apache/freemarker/core/model/impl/beans/DateModel.java
@@ -38,6 +38,7 @@ implements
     static final ModelFactory FACTORY =
         new ModelFactory()
         {
+            @Override
             public TemplateModel create(Object object, ObjectWrapper wrapper) {
                 return new DateModel((Date) object, (BeansWrapper) wrapper);
             }
@@ -66,10 +67,12 @@ implements
         }
     }
 
+    @Override
     public Date getAsDate() {
         return (Date) object;
     }
 
+    @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/beans/EnumerationModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/model/impl/beans/EnumerationModel.java b/src/main/java/org/apache/freemarker/core/model/impl/beans/EnumerationModel.java
index 73a47fc..e90aab9 100644
--- a/src/main/java/org/apache/freemarker/core/model/impl/beans/EnumerationModel.java
+++ b/src/main/java/org/apache/freemarker/core/model/impl/beans/EnumerationModel.java
@@ -61,6 +61,7 @@ implements
      * This allows the enumeration to be used in a <tt>&lt;#list&gt;</tt> block.
      * @return "this"
      */
+    @Override
     public TemplateModelIterator iterator() throws TemplateModelException {
         synchronized (this) {
             if (accessed) {
@@ -76,6 +77,7 @@ implements
     /**
      * Calls underlying {@link Enumeration#nextElement()}.
      */
+    @Override
     public boolean hasNext() {
         return ((Enumeration) object).hasMoreElements();
     }
@@ -84,6 +86,7 @@ implements
     /**
      * Calls underlying {@link Enumeration#nextElement()} and wraps the result.
      */
+    @Override
     public TemplateModel next()
     throws TemplateModelException {
         try {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/model/impl/beans/HashAdapter.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/model/impl/beans/HashAdapter.java b/src/main/java/org/apache/freemarker/core/model/impl/beans/HashAdapter.java
index bf7f30f..0fcc58f 100644
--- a/src/main/java/org/apache/freemarker/core/model/impl/beans/HashAdapter.java
+++ b/src/main/java/org/apache/freemarker/core/model/impl/beans/HashAdapter.java
@@ -45,6 +45,7 @@ public class HashAdapter extends AbstractMap implements TemplateModelAdapter {
         this.wrapper = wrapper;
     }
     
+    @Override
     public TemplateModel getTemplateModel() {
         return model;
     }
@@ -91,6 +92,7 @@ public class HashAdapter extends AbstractMap implements TemplateModelAdapter {
                     throw new UndeclaredThrowableException(e);
                 }
                 return new Iterator() {
+                    @Override
                     public boolean hasNext() {
                         try {
                             return i.hasNext();
@@ -99,6 +101,7 @@ public class HashAdapter extends AbstractMap implements TemplateModelAdapter {
                         }
                     }
                     
+                    @Override
                     public Object next() {
                         final Object key;
                         try {
@@ -107,14 +110,17 @@ public class HashAdapter extends AbstractMap implements TemplateModelAdapter {
                             throw new UndeclaredThrowableException(e);
                         }
                         return new Map.Entry() {
+                            @Override
                             public Object getKey() {
                                 return key;
                             }
                             
+                            @Override
                             public Object getValue() {
                                 return get(key);
                             }
                             
+                            @Override
                             public Object setValue(Object value) {
                                 throw new UnsupportedOperationException();
                             }
@@ -144,6 +150,7 @@ public class HashAdapter extends AbstractMap implements TemplateModelAdapter {
                         };
                     }
                     
+                    @Override
                     public void remove() {
                         throw new UnsupportedOperationException();
                     }

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/model/impl/beans/IteratorModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/model/impl/beans/IteratorModel.java b/src/main/java/org/apache/freemarker/core/model/impl/beans/IteratorModel.java
index 17968b8..767c15e 100644
--- a/src/main/java/org/apache/freemarker/core/model/impl/beans/IteratorModel.java
+++ b/src/main/java/org/apache/freemarker/core/model/impl/beans/IteratorModel.java
@@ -65,6 +65,7 @@ implements
      * This allows the iterator to be used in a <tt>&lt;#list&gt;</tt> block.
      * @return "this"
      */
+    @Override
     public TemplateModelIterator iterator() throws TemplateModelException {
         synchronized (this) {
             if (accessed) {
@@ -80,6 +81,7 @@ implements
     /**
      * Calls underlying {@link Iterator#hasNext()}.
      */
+    @Override
     public boolean hasNext() {
         return ((Iterator) object).hasNext();
     }
@@ -88,6 +90,7 @@ implements
     /**
      * Calls underlying {@link Iterator#next()} and wraps the result.
      */
+    @Override
     public TemplateModel next()
     throws TemplateModelException {
         try {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/model/impl/beans/JRebelClassChangeNotifier.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/model/impl/beans/JRebelClassChangeNotifier.java b/src/main/java/org/apache/freemarker/core/model/impl/beans/JRebelClassChangeNotifier.java
index f9d463c..956a6c4 100644
--- a/src/main/java/org/apache/freemarker/core/model/impl/beans/JRebelClassChangeNotifier.java
+++ b/src/main/java/org/apache/freemarker/core/model/impl/beans/JRebelClassChangeNotifier.java
@@ -30,6 +30,7 @@ class JRebelClassChangeNotifier implements ClassChangeNotifier {
         ReloaderFactory.getInstance();
     }
 
+    @Override
     public void subscribe(ClassIntrospector classIntrospector) {
         ReloaderFactory.getInstance().addClassReloadListener(
                 new ClassIntrospectorCacheInvalidator(classIntrospector));
@@ -43,6 +44,7 @@ class JRebelClassChangeNotifier implements ClassChangeNotifier {
             ref = new WeakReference(w);
         }
 
+        @Override
         public void onClassEvent(int eventType, Class pClass) {
             ClassIntrospector ci = (ClassIntrospector) ref.get();
             if (ci == null) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/model/impl/beans/MapModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/model/impl/beans/MapModel.java b/src/main/java/org/apache/freemarker/core/model/impl/beans/MapModel.java
index cf7e6cb..0af8749 100644
--- a/src/main/java/org/apache/freemarker/core/model/impl/beans/MapModel.java
+++ b/src/main/java/org/apache/freemarker/core/model/impl/beans/MapModel.java
@@ -49,6 +49,7 @@ implements
     static final ModelFactory FACTORY =
         new ModelFactory()
         {
+            @Override
             public TemplateModel create(Object object, ObjectWrapper wrapper) {
                 return new MapModel((Map) object, (BeansWrapper) wrapper);
             }
@@ -69,6 +70,7 @@ implements
     /**
      * The first argument is used as a key to call the map's <tt>get</tt> method.
      */
+    @Override
     public Object exec(List arguments)
     throws TemplateModelException {
         Object key = unwrap((TemplateModel) arguments.get(0));

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/model/impl/beans/NumberModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/model/impl/beans/NumberModel.java b/src/main/java/org/apache/freemarker/core/model/impl/beans/NumberModel.java
index 4d4e2bb..1d0013e 100644
--- a/src/main/java/org/apache/freemarker/core/model/impl/beans/NumberModel.java
+++ b/src/main/java/org/apache/freemarker/core/model/impl/beans/NumberModel.java
@@ -36,6 +36,7 @@ implements
     static final ModelFactory FACTORY =
         new ModelFactory()
         {
+            @Override
             public TemplateModel create(Object object, ObjectWrapper wrapper) {
                 return new NumberModel((Number) object, (BeansWrapper) wrapper);
             }
@@ -52,6 +53,7 @@ implements
         super(number, wrapper);
     }
 
+    @Override
     public Number getAsNumber() {
         return (Number) object;
     }

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/model/impl/beans/OverloadedMethodsModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/model/impl/beans/OverloadedMethodsModel.java b/src/main/java/org/apache/freemarker/core/model/impl/beans/OverloadedMethodsModel.java
index 65f59c8..9951c3e 100644
--- a/src/main/java/org/apache/freemarker/core/model/impl/beans/OverloadedMethodsModel.java
+++ b/src/main/java/org/apache/freemarker/core/model/impl/beans/OverloadedMethodsModel.java
@@ -54,6 +54,7 @@ implements
      * @throws TemplateModelException if the method cannot be chosen
      * unambiguously.
      */
+    @Override
     public Object exec(List arguments)
     throws TemplateModelException {
         MemberAndArguments maa = overloadedMethods.getMemberAndArguments(arguments, wrapper);
@@ -69,11 +70,13 @@ implements
         }
     }
 
+    @Override
     public TemplateModel get(int index) throws TemplateModelException {
         return (TemplateModel) exec(Collections.singletonList(
                 new SimpleNumber(Integer.valueOf(index))));
     }
 
+    @Override
     public int size() throws TemplateModelException {
         throw new TemplateModelException("?size is unsupported for " + getClass().getName());
     }

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/model/impl/beans/OverloadedNumberUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/model/impl/beans/OverloadedNumberUtil.java b/src/main/java/org/apache/freemarker/core/model/impl/beans/OverloadedNumberUtil.java
index 8f27ecf..e435d2d 100644
--- a/src/main/java/org/apache/freemarker/core/model/impl/beans/OverloadedNumberUtil.java
+++ b/src/main/java/org/apache/freemarker/core/model/impl/beans/OverloadedNumberUtil.java
@@ -383,6 +383,7 @@ class OverloadedNumberUtil {
 
         // We have to implement this, so that if a potential matching method expects a Comparable, which is implemented
         // by all the supported numerical types, the "Or" type will be a match. 
+        @Override
         public int compareTo(Object o) {
             Number n = getSourceNumber();
             if (n instanceof Comparable) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/model/impl/beans/ResourceBundleModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/model/impl/beans/ResourceBundleModel.java b/src/main/java/org/apache/freemarker/core/model/impl/beans/ResourceBundleModel.java
index a181baf..4dadba3 100644
--- a/src/main/java/org/apache/freemarker/core/model/impl/beans/ResourceBundleModel.java
+++ b/src/main/java/org/apache/freemarker/core/model/impl/beans/ResourceBundleModel.java
@@ -59,6 +59,7 @@ public class ResourceBundleModel
     static final ModelFactory FACTORY =
         new ModelFactory()
         {
+            @Override
             public TemplateModel create(Object object, ObjectWrapper wrapper) {
                 return new ResourceBundleModel((ResourceBundle) object, (BeansWrapper) wrapper);
             }
@@ -115,6 +116,7 @@ public class ResourceBundleModel
      * with this key, then applies a MessageFormat.format on the string with the
      * rest of the arguments. The created MessageFormats are cached for later reuse.
      */
+    @Override
     public Object exec(List arguments)
         throws TemplateModelException {
         // Must have at least one argument - the key

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/model/impl/beans/SequenceAdapter.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/model/impl/beans/SequenceAdapter.java b/src/main/java/org/apache/freemarker/core/model/impl/beans/SequenceAdapter.java
index 7f09e10..7f66cf9 100644
--- a/src/main/java/org/apache/freemarker/core/model/impl/beans/SequenceAdapter.java
+++ b/src/main/java/org/apache/freemarker/core/model/impl/beans/SequenceAdapter.java
@@ -38,6 +38,7 @@ class SequenceAdapter extends AbstractList implements TemplateModelAdapter {
         this.wrapper = wrapper;
     }
     
+    @Override
     public TemplateModel getTemplateModel() {
         return model;
     }

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/model/impl/beans/SimpleMapModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/model/impl/beans/SimpleMapModel.java b/src/main/java/org/apache/freemarker/core/model/impl/beans/SimpleMapModel.java
index c681d9c..a501501 100644
--- a/src/main/java/org/apache/freemarker/core/model/impl/beans/SimpleMapModel.java
+++ b/src/main/java/org/apache/freemarker/core/model/impl/beans/SimpleMapModel.java
@@ -49,6 +49,7 @@ WrapperTemplateModel, TemplateModelWithAPISupport {
     static final ModelFactory FACTORY =
         new ModelFactory()
         {
+            @Override
             public TemplateModel create(Object object, ObjectWrapper wrapper) {
                 return new SimpleMapModel((Map) object, (BeansWrapper) wrapper);
             }
@@ -61,6 +62,7 @@ WrapperTemplateModel, TemplateModelWithAPISupport {
         this.map = map;
     }
 
+    @Override
     public TemplateModel get(String key) throws TemplateModelException {
         Object val = map.get(key);
         if (val == null) {
@@ -78,6 +80,7 @@ WrapperTemplateModel, TemplateModelWithAPISupport {
         return wrap(val);
     }
     
+    @Override
     public Object exec(List args) throws TemplateModelException {
         Object key = ((BeansWrapper) getObjectWrapper()).unwrap((TemplateModel) args.get(0));
         Object value = map.get(key);
@@ -87,34 +90,42 @@ WrapperTemplateModel, TemplateModelWithAPISupport {
         return wrap(value);
     }
 
+    @Override
     public boolean isEmpty() {
         return map.isEmpty();
     }
 
+    @Override
     public int size() {
         return map.size();
     }
 
+    @Override
     public TemplateCollectionModel keys() {
         return new CollectionAndSequence(new SimpleSequence(map.keySet(), getObjectWrapper()));
     }
 
+    @Override
     public TemplateCollectionModel values() {
         return new CollectionAndSequence(new SimpleSequence(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 ((RichObjectWrapper) getObjectWrapper()).wrapAsAPI(map);
     }

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/model/impl/beans/SimpleMethodModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/model/impl/beans/SimpleMethodModel.java b/src/main/java/org/apache/freemarker/core/model/impl/beans/SimpleMethodModel.java
index 220f5fe..0105412 100644
--- a/src/main/java/org/apache/freemarker/core/model/impl/beans/SimpleMethodModel.java
+++ b/src/main/java/org/apache/freemarker/core/model/impl/beans/SimpleMethodModel.java
@@ -63,6 +63,7 @@ public final class SimpleMethodModel extends SimpleMethod
     /**
      * Invokes the method, passing it the arguments from the list.
      */
+    @Override
     public Object exec(List arguments)
         throws TemplateModelException {
         try {
@@ -75,11 +76,13 @@ public final class SimpleMethodModel extends SimpleMethod
         }
     }
     
+    @Override
     public TemplateModel get(int index) throws TemplateModelException {
         return (TemplateModel) exec(Collections.singletonList(
                 new SimpleNumber(Integer.valueOf(index))));
     }
 
+    @Override
     public int size() throws TemplateModelException {
         throw new TemplateModelException(
                 "Getting the number of items or enumerating the items is not supported on this "
@@ -98,6 +101,7 @@ public final class SimpleMethodModel extends SimpleMethod
     /**
      * Implementation of experimental interface; don't use it, no backward compatibility guarantee!
      */
+    @Override
     public Object[] explainTypeError(Class[] expectedClasses) {
         final Member member = getMember();
         if (!(member instanceof Method)) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/model/impl/beans/StringModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/model/impl/beans/StringModel.java b/src/main/java/org/apache/freemarker/core/model/impl/beans/StringModel.java
index 4c12c6d..0591f6e 100644
--- a/src/main/java/org/apache/freemarker/core/model/impl/beans/StringModel.java
+++ b/src/main/java/org/apache/freemarker/core/model/impl/beans/StringModel.java
@@ -33,6 +33,7 @@ implements TemplateScalarModel {
     static final ModelFactory FACTORY =
         new ModelFactory()
         {
+            @Override
             public TemplateModel create(Object object, ObjectWrapper wrapper) {
                 return new StringModel(object, (BeansWrapper) wrapper);
             }
@@ -55,6 +56,7 @@ implements TemplateScalarModel {
      * Returns the result of calling {@link Object#toString()} on the wrapped
      * object.
      */
+    @Override
     public String getAsString() {
         return object.toString();
     }

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/model/impl/dom/AttributeNodeModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/model/impl/dom/AttributeNodeModel.java b/src/main/java/org/apache/freemarker/core/model/impl/dom/AttributeNodeModel.java
index 2f849a6..30bab99 100644
--- a/src/main/java/org/apache/freemarker/core/model/impl/dom/AttributeNodeModel.java
+++ b/src/main/java/org/apache/freemarker/core/model/impl/dom/AttributeNodeModel.java
@@ -29,10 +29,12 @@ class AttributeNodeModel extends NodeModel implements TemplateScalarModel {
         super(att);
     }
     
+    @Override
     public String getAsString() {
         return ((Attr) node).getValue();
     }
     
+    @Override
     public String getNodeName() {
         String result = node.getLocalName();
         if (result == null || result.equals("")) {
@@ -41,6 +43,7 @@ class AttributeNodeModel extends NodeModel implements TemplateScalarModel {
         return result;
     }
     
+    @Override
     public boolean isEmpty() {
         return true;
     }

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/model/impl/dom/CharacterDataNodeModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/model/impl/dom/CharacterDataNodeModel.java b/src/main/java/org/apache/freemarker/core/model/impl/dom/CharacterDataNodeModel.java
index d87e27a..a488fee 100644
--- a/src/main/java/org/apache/freemarker/core/model/impl/dom/CharacterDataNodeModel.java
+++ b/src/main/java/org/apache/freemarker/core/model/impl/dom/CharacterDataNodeModel.java
@@ -29,14 +29,17 @@ class CharacterDataNodeModel extends NodeModel implements TemplateScalarModel {
         super(text);
     }
     
+    @Override
     public String getAsString() {
         return ((org.w3c.dom.CharacterData) node).getData();
     }
     
+    @Override
     public String getNodeName() {
         return (node instanceof Comment) ? "@comment" : "@text";
     }
     
+    @Override
     public boolean isEmpty() {
         return true;
     }

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/model/impl/dom/DocumentModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/model/impl/dom/DocumentModel.java b/src/main/java/org/apache/freemarker/core/model/impl/dom/DocumentModel.java
index 42b4dda..2e17632 100644
--- a/src/main/java/org/apache/freemarker/core/model/impl/dom/DocumentModel.java
+++ b/src/main/java/org/apache/freemarker/core/model/impl/dom/DocumentModel.java
@@ -39,6 +39,7 @@ class DocumentModel extends NodeModel implements TemplateHashModel {
         super(doc);
     }
     
+    @Override
     public String getNodeName() {
         return "@document";
     }
@@ -68,6 +69,7 @@ class DocumentModel extends NodeModel implements TemplateHashModel {
         return rootElement;
     }
     
+    @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/model/impl/dom/DocumentTypeModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/model/impl/dom/DocumentTypeModel.java b/src/main/java/org/apache/freemarker/core/model/impl/dom/DocumentTypeModel.java
index 196b91c..d4ad5f1 100644
--- a/src/main/java/org/apache/freemarker/core/model/impl/dom/DocumentTypeModel.java
+++ b/src/main/java/org/apache/freemarker/core/model/impl/dom/DocumentTypeModel.java
@@ -44,10 +44,12 @@ class DocumentTypeModel extends NodeModel {
         throw new TemplateModelException("accessing properties of a DTD is not currently supported");
     }
     
+    @Override
     public String getNodeName() {
         return "@document_type$" + ((DocumentType) node).getNodeName();
     }
     
+    @Override
     public boolean isEmpty() {
         return true;
     }

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/model/impl/dom/ElementModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/model/impl/dom/ElementModel.java b/src/main/java/org/apache/freemarker/core/model/impl/dom/ElementModel.java
index 27720bc..8874cba 100644
--- a/src/main/java/org/apache/freemarker/core/model/impl/dom/ElementModel.java
+++ b/src/main/java/org/apache/freemarker/core/model/impl/dom/ElementModel.java
@@ -39,6 +39,7 @@ class ElementModel extends NodeModel implements TemplateScalarModel {
         super(element);
     }
     
+    @Override
     public boolean isEmpty() {
         return false;
     }
@@ -125,6 +126,7 @@ class ElementModel extends NodeModel implements TemplateScalarModel {
         }
     }
 
+    @Override
     public String getAsString() throws TemplateModelException {
         NodeList nl = node.getChildNodes();
         String result = "";
@@ -144,6 +146,7 @@ class ElementModel extends NodeModel implements TemplateScalarModel {
         return result;
     }
     
+    @Override
     public String getNodeName() {
         String result = node.getLocalName();
         if (result == null || result.equals("")) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/model/impl/dom/PINodeModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/model/impl/dom/PINodeModel.java b/src/main/java/org/apache/freemarker/core/model/impl/dom/PINodeModel.java
index 340497e..f2fe0f7 100644
--- a/src/main/java/org/apache/freemarker/core/model/impl/dom/PINodeModel.java
+++ b/src/main/java/org/apache/freemarker/core/model/impl/dom/PINodeModel.java
@@ -28,14 +28,17 @@ class PINodeModel extends NodeModel implements TemplateScalarModel {
         super(pi);
     }
     
+    @Override
     public String getAsString() {
         return ((ProcessingInstruction) node).getData();
     }
     
+    @Override
     public String getNodeName() {
         return "@pi$" + ((ProcessingInstruction) node).getTarget();
     }
     
+    @Override
     public boolean isEmpty() {
         return true;
     }

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/model/impl/dom/SunInternalXalanXPathSupport.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/model/impl/dom/SunInternalXalanXPathSupport.java b/src/main/java/org/apache/freemarker/core/model/impl/dom/SunInternalXalanXPathSupport.java
index 2783cdc..716dc2d 100644
--- a/src/main/java/org/apache/freemarker/core/model/impl/dom/SunInternalXalanXPathSupport.java
+++ b/src/main/java/org/apache/freemarker/core/model/impl/dom/SunInternalXalanXPathSupport.java
@@ -59,6 +59,7 @@ class SunInternalXalanXPathSupport implements XPathSupport {
     private static final String ERRMSG_EMPTY_NODE_SET
             = "Cannot perform an XPath query against an empty node set." + ERRMSG_RECOMMEND_JAXEN;
     
+    @Override
     synchronized public TemplateModel executeQuery(Object context, String xpathQuery) throws TemplateModelException {
         if (!(context instanceof Node)) {
             if (context != null) {
@@ -118,10 +119,12 @@ class SunInternalXalanXPathSupport implements XPathSupport {
     
     private static PrefixResolver customPrefixResolver = new PrefixResolver() {
         
+        @Override
         public String getNamespaceForPrefix(String prefix, Node node) {
             return getNamespaceForPrefix(prefix);
         }
         
+        @Override
         public String getNamespaceForPrefix(String prefix) {
             if (prefix.equals(Template.DEFAULT_NAMESPACE_PREFIX)) {
                 return Environment.getCurrentEnvironment().getDefaultNS();
@@ -129,10 +132,12 @@ class SunInternalXalanXPathSupport implements XPathSupport {
             return Environment.getCurrentEnvironment().getNamespaceForPrefix(prefix);
         }
         
+        @Override
         public String getBaseIdentifier() {
             return null;
         }
         
+        @Override
         public boolean handlesNullPrefixes() {
             return false;
         }

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/model/impl/dom/XalanXPathSupport.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/model/impl/dom/XalanXPathSupport.java b/src/main/java/org/apache/freemarker/core/model/impl/dom/XalanXPathSupport.java
index 27983c5..0e4a5b4 100644
--- a/src/main/java/org/apache/freemarker/core/model/impl/dom/XalanXPathSupport.java
+++ b/src/main/java/org/apache/freemarker/core/model/impl/dom/XalanXPathSupport.java
@@ -59,6 +59,7 @@ class XalanXPathSupport implements XPathSupport {
     private static final String ERRMSG_EMPTY_NODE_SET
             = "Cannot perform an XPath query against an empty node set."; /* " + ERRMSG_RECOMMEND_JAXEN;*/
     
+    @Override
     synchronized public TemplateModel executeQuery(Object context, String xpathQuery) throws TemplateModelException {
         if (!(context instanceof Node)) {
             if (context != null) {
@@ -118,10 +119,12 @@ class XalanXPathSupport implements XPathSupport {
     
     private static PrefixResolver customPrefixResolver = new PrefixResolver() {
         
+        @Override
         public String getNamespaceForPrefix(String prefix, Node node) {
             return getNamespaceForPrefix(prefix);
         }
         
+        @Override
         public String getNamespaceForPrefix(String prefix) {
             if (prefix.equals(Template.DEFAULT_NAMESPACE_PREFIX)) {
                 return Environment.getCurrentEnvironment().getDefaultNS();
@@ -129,10 +132,12 @@ class XalanXPathSupport implements XPathSupport {
             return Environment.getCurrentEnvironment().getNamespaceForPrefix(prefix);
         }
         
+        @Override
         public String getBaseIdentifier() {
             return null;
         }
         
+        @Override
         public boolean handlesNullPrefixes() {
             return false;
         }

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/templateresolver/impl/MruCacheStorage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/templateresolver/impl/MruCacheStorage.java b/src/main/java/org/apache/freemarker/core/templateresolver/impl/MruCacheStorage.java
index 62fe137..367714f 100644
--- a/src/main/java/org/apache/freemarker/core/templateresolver/impl/MruCacheStorage.java
+++ b/src/main/java/org/apache/freemarker/core/templateresolver/impl/MruCacheStorage.java
@@ -85,6 +85,7 @@ public class MruCacheStorage implements CacheStorageWithGetSize {
         this.softSizeLimit = softSizeLimit;
     }
     
+    @Override
     public Object get(Object key) {
         removeClearedReferences();
         MruEntry entry = (MruEntry) map.get(key);
@@ -100,6 +101,7 @@ public class MruCacheStorage implements CacheStorageWithGetSize {
         return value;
     }
 
+    @Override
     public void put(Object key, Object value) {
         removeClearedReferences();
         MruEntry entry = (MruEntry) map.get(key);
@@ -113,6 +115,7 @@ public class MruCacheStorage implements CacheStorageWithGetSize {
         
     }
 
+    @Override
     public void remove(Object key) {
         removeClearedReferences();
         removeInternal(key);
@@ -125,6 +128,7 @@ public class MruCacheStorage implements CacheStorageWithGetSize {
         }
     }
 
+    @Override
     public void clear() {
         strongHead.makeHead();
         softHead.linkAfter(strongHead);
@@ -250,6 +254,7 @@ public class MruCacheStorage implements CacheStorageWithGetSize {
      * @see #getSoftSize()
      * @since 2.3.21
      */
+    @Override
     public int getSize() {
         return getSoftSize() + getStrongSize();
     }

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/templateresolver/impl/NullCacheStorage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/templateresolver/impl/NullCacheStorage.java b/src/main/java/org/apache/freemarker/core/templateresolver/impl/NullCacheStorage.java
index 9bc24eb..64f51b0 100644
--- a/src/main/java/org/apache/freemarker/core/templateresolver/impl/NullCacheStorage.java
+++ b/src/main/java/org/apache/freemarker/core/templateresolver/impl/NullCacheStorage.java
@@ -38,22 +38,27 @@ public class NullCacheStorage implements ConcurrentCacheStorage, CacheStorageWit
      */
     public static final NullCacheStorage INSTANCE = new NullCacheStorage();
 
+    @Override
     public boolean isConcurrent() {
         return true;
     }
     
+    @Override
     public Object get(Object key) {
         return null;
     }
 
+    @Override
     public void put(Object key, Object value) {
         // do nothing
     }
 
+    @Override
     public void remove(Object key) {
         // do nothing
     }
     
+    @Override
     public void clear() {
         // do nothing
     }
@@ -63,6 +68,7 @@ public class NullCacheStorage implements ConcurrentCacheStorage, CacheStorageWit
      * 
      * @since 2.3.21
      */
+    @Override
     public int getSize() {
         return 0;
     }

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/templateresolver/impl/SoftCacheStorage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/templateresolver/impl/SoftCacheStorage.java b/src/main/java/org/apache/freemarker/core/templateresolver/impl/SoftCacheStorage.java
index cb0d963..0973989 100644
--- a/src/main/java/org/apache/freemarker/core/templateresolver/impl/SoftCacheStorage.java
+++ b/src/main/java/org/apache/freemarker/core/templateresolver/impl/SoftCacheStorage.java
@@ -58,6 +58,7 @@ public class SoftCacheStorage implements ConcurrentCacheStorage, CacheStorageWit
     /**
      * Returns true if the underlying Map is a {@code ConcurrentMap}.
      */
+    @Override
     public boolean isConcurrent() {
         return concurrent;
     }
@@ -67,22 +68,26 @@ public class SoftCacheStorage implements ConcurrentCacheStorage, CacheStorageWit
         this.concurrent = map instanceof ConcurrentMap;
     }
     
+    @Override
     public Object get(Object key) {
         processQueue();
         Reference ref = (Reference) map.get(key);
         return ref == null ? null : ref.get();
     }
 
+    @Override
     public void put(Object key, Object value) {
         processQueue();
         map.put(key, new SoftValueReference(key, value, queue));
     }
 
+    @Override
     public void remove(Object key) {
         processQueue();
         map.remove(key);
     }
 
+    @Override
     public void clear() {
         map.clear();
         processQueue();
@@ -93,6 +98,7 @@ public class SoftCacheStorage implements ConcurrentCacheStorage, CacheStorageWit
      * 
      * @since 2.3.21
      */
+    @Override
     public int getSize() {
         processQueue();
         return map.size();

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/templateresolver/impl/StrongCacheStorage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/templateresolver/impl/StrongCacheStorage.java b/src/main/java/org/apache/freemarker/core/templateresolver/impl/StrongCacheStorage.java
index fa13778..8447db8 100644
--- a/src/main/java/org/apache/freemarker/core/templateresolver/impl/StrongCacheStorage.java
+++ b/src/main/java/org/apache/freemarker/core/templateresolver/impl/StrongCacheStorage.java
@@ -40,18 +40,22 @@ public class StrongCacheStorage implements ConcurrentCacheStorage, CacheStorageW
     /**
      * Always returns {@code true}.
      */
+    @Override
     public boolean isConcurrent() {
         return true;
     }
     
+    @Override
     public Object get(Object key) {
         return map.get(key);
     }
 
+    @Override
     public void put(Object key, Object value) {
         map.put(key, value);
     }
 
+    @Override
     public void remove(Object key) {
         map.remove(key);
     }
@@ -61,10 +65,12 @@ public class StrongCacheStorage implements ConcurrentCacheStorage, CacheStorageW
      * 
      * @since 2.3.21
      */
+    @Override
     public int getSize() {
         return map.size();
     }
     
+    @Override
     public void clear() {
         map.clear();
     }

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/util/HtmlEscape.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/util/HtmlEscape.java b/src/main/java/org/apache/freemarker/core/util/HtmlEscape.java
index c31da70..a686f6e 100644
--- a/src/main/java/org/apache/freemarker/core/util/HtmlEscape.java
+++ b/src/main/java/org/apache/freemarker/core/util/HtmlEscape.java
@@ -60,6 +60,7 @@ public class HtmlEscape implements TemplateTransformModel {
     private static final char[] AMP = "&amp;".toCharArray();
     private static final char[] QUOT = "&quot;".toCharArray();
 
+    @Override
     public Writer getWriter(final Writer out, Map args) {
         return new Writer()
         {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/util/NormalizeNewlines.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/util/NormalizeNewlines.java b/src/main/java/org/apache/freemarker/core/util/NormalizeNewlines.java
index 22ffaa4..4e47eb2 100644
--- a/src/main/java/org/apache/freemarker/core/util/NormalizeNewlines.java
+++ b/src/main/java/org/apache/freemarker/core/util/NormalizeNewlines.java
@@ -64,6 +64,7 @@ import org.apache.freemarker.core.model.TemplateTransformModel;
 // [FM3] Remove (or move to o.a.f.test)
 public class NormalizeNewlines implements TemplateTransformModel {
 
+    @Override
     public Writer getWriter(final Writer out,
                             final Map args) {
         final StringBuilder buf = new StringBuilder();

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/util/StandardCompress.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/util/StandardCompress.java b/src/main/java/org/apache/freemarker/core/util/StandardCompress.java
index 2e5a9fe..e8519fa 100644
--- a/src/main/java/org/apache/freemarker/core/util/StandardCompress.java
+++ b/src/main/java/org/apache/freemarker/core/util/StandardCompress.java
@@ -88,6 +88,7 @@ public class StandardCompress implements TemplateTransformModel {
         this.defaultBufferSize = defaultBufferSize;
     }
 
+    @Override
     public Writer getWriter(final Writer out, Map args)
     throws TemplateModelException {
         int bufferSize = defaultBufferSize;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/util/XmlEscape.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/util/XmlEscape.java b/src/main/java/org/apache/freemarker/core/util/XmlEscape.java
index 009b813..70508eb 100644
--- a/src/main/java/org/apache/freemarker/core/util/XmlEscape.java
+++ b/src/main/java/org/apache/freemarker/core/util/XmlEscape.java
@@ -41,6 +41,7 @@ public class XmlEscape implements TemplateTransformModel {
     private static final char[] QUOT = "&quot;".toCharArray();
     private static final char[] APOS = "&apos;".toCharArray();
 
+    @Override
     public Writer getWriter(final Writer out, Map args) {
         return new Writer()
         {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/util/_ArrayEnumeration.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/util/_ArrayEnumeration.java b/src/main/java/org/apache/freemarker/core/util/_ArrayEnumeration.java
index a5ca102..d16afac 100644
--- a/src/main/java/org/apache/freemarker/core/util/_ArrayEnumeration.java
+++ b/src/main/java/org/apache/freemarker/core/util/_ArrayEnumeration.java
@@ -35,10 +35,12 @@ public class _ArrayEnumeration implements Enumeration {
         this.nextIndex = 0;
     }
 
+    @Override
     public boolean hasMoreElements() {
         return nextIndex < size;
     }
 
+    @Override
     public Object nextElement() {
         if (nextIndex >= size) {
             throw new NoSuchElementException();

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/util/_ArrayIterator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/util/_ArrayIterator.java b/src/main/java/org/apache/freemarker/core/util/_ArrayIterator.java
index 7617407..4bcd654 100644
--- a/src/main/java/org/apache/freemarker/core/util/_ArrayIterator.java
+++ b/src/main/java/org/apache/freemarker/core/util/_ArrayIterator.java
@@ -33,10 +33,12 @@ public class _ArrayIterator implements Iterator {
         this.nextIndex = 0;
     }
 
+    @Override
     public boolean hasNext() {
         return nextIndex < array.length;
     }
 
+    @Override
     public Object next() {
         if (nextIndex >= array.length) {
             throw new NoSuchElementException();
@@ -44,6 +46,7 @@ public class _ArrayIterator implements Iterator {
         return array[nextIndex++];
     }
 
+    @Override
     public void remove() {
         throw new UnsupportedOperationException();
     }

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/util/_DateUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/util/_DateUtil.java b/src/main/java/org/apache/freemarker/core/util/_DateUtil.java
index b79c0bd..5f38549 100644
--- a/src/main/java/org/apache/freemarker/core/util/_DateUtil.java
+++ b/src/main/java/org/apache/freemarker/core/util/_DateUtil.java
@@ -844,6 +844,7 @@ public class _DateUtil {
         private GregorianCalendar calendar;
         private TimeZone lastlySetTimeZone;
     
+        @Override
         public GregorianCalendar get(TimeZone tz, Date date) {
             if (calendar == null) {
                 calendar = new GregorianCalendar(tz, Locale.US);
@@ -870,8 +871,9 @@ public class _DateUtil {
         private GregorianCalendar calendar;
         private TimeZone lastlySetTimeZone;
 
+        @Override
         public Date calculate(int era, int year, int month, int day, int hours, int minutes, int secs, int millisecs,
-                boolean addOneDay, TimeZone tz) {
+                              boolean addOneDay, TimeZone tz) {
             if (calendar == null) {
                 calendar = new GregorianCalendar(tz, Locale.US);
                 calendar.setLenient(false);

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/core/util/_UnmodifiableCompositeSet.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/util/_UnmodifiableCompositeSet.java b/src/main/java/org/apache/freemarker/core/util/_UnmodifiableCompositeSet.java
index b64ab10..b194a06 100644
--- a/src/main/java/org/apache/freemarker/core/util/_UnmodifiableCompositeSet.java
+++ b/src/main/java/org/apache/freemarker/core/util/_UnmodifiableCompositeSet.java
@@ -54,6 +54,7 @@ public class _UnmodifiableCompositeSet<E> extends _UnmodifiableSet<E> {
         private Iterator<E> it1, it2;
         private boolean it1Deplected;
         
+        @Override
         public boolean hasNext() {
             if (!it1Deplected) {
                 if (it1 == null) {
@@ -71,6 +72,7 @@ public class _UnmodifiableCompositeSet<E> extends _UnmodifiableSet<E> {
             return it2.hasNext();
         }
 
+        @Override
         public E next() {
             if (!it1Deplected) {
                 if (it1 == null) {
@@ -88,6 +90,7 @@ public class _UnmodifiableCompositeSet<E> extends _UnmodifiableSet<E> {
             return it2.next();
         }
 
+        @Override
         public void remove() {
             throw new UnsupportedOperationException();
         }

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/servlet/HttpRequestHashModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/servlet/HttpRequestHashModel.java b/src/main/java/org/apache/freemarker/servlet/HttpRequestHashModel.java
index 2de6814..eaf024f 100644
--- a/src/main/java/org/apache/freemarker/servlet/HttpRequestHashModel.java
+++ b/src/main/java/org/apache/freemarker/servlet/HttpRequestHashModel.java
@@ -59,14 +59,17 @@ public final class HttpRequestHashModel implements TemplateHashModelEx {
         this.wrapper = wrapper;
     }
     
+    @Override
     public TemplateModel get(String key) throws TemplateModelException {
         return wrapper.wrap(request.getAttribute(key));
     }
 
+    @Override
     public boolean isEmpty() {
         return !request.getAttributeNames().hasMoreElements();
     }
     
+    @Override
     public int size() {
         int result = 0;
         for (Enumeration enumeration = request.getAttributeNames(); enumeration.hasMoreElements(); ) {
@@ -76,6 +79,7 @@ public final class HttpRequestHashModel implements TemplateHashModelEx {
         return result;
     }
     
+    @Override
     public TemplateCollectionModel keys() {
         ArrayList keys = new ArrayList();
         for (Enumeration enumeration = request.getAttributeNames(); enumeration.hasMoreElements(); ) {
@@ -84,6 +88,7 @@ public final class HttpRequestHashModel implements TemplateHashModelEx {
         return new SimpleCollection(keys.iterator());
     }
     
+    @Override
     public TemplateCollectionModel values() {
         ArrayList values = new ArrayList();
         for (Enumeration enumeration = request.getAttributeNames(); enumeration.hasMoreElements(); ) {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/servlet/HttpRequestParametersHashModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/servlet/HttpRequestParametersHashModel.java b/src/main/java/org/apache/freemarker/servlet/HttpRequestParametersHashModel.java
index 6a1b4bb..b582a1f 100644
--- a/src/main/java/org/apache/freemarker/servlet/HttpRequestParametersHashModel.java
+++ b/src/main/java/org/apache/freemarker/servlet/HttpRequestParametersHashModel.java
@@ -46,33 +46,41 @@ public class HttpRequestParametersHashModel
         this.request = request;
     }
 
+    @Override
     public TemplateModel get(String key) {
         String value = request.getParameter(key);
         return value == null ? null : new SimpleScalar(value);
     }
 
+    @Override
     public boolean isEmpty() {
         return !request.getParameterNames().hasMoreElements();
     }
     
+    @Override
     public int size() {
         return getKeys().size();
     }
     
+    @Override
     public TemplateCollectionModel keys() {
         return new SimpleCollection(getKeys().iterator());
     }
     
+    @Override
     public TemplateCollectionModel values() {
         final Iterator iter = getKeys().iterator();
         return new SimpleCollection(
             new Iterator() {
+                @Override
                 public boolean hasNext() {
                     return iter.hasNext();
                 }
+                @Override
                 public Object next() {
                     return request.getParameter((String) iter.next()); 
                 }
+                @Override
                 public void remove() {
                     throw new UnsupportedOperationException();
                 }

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/servlet/HttpSessionHashModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/servlet/HttpSessionHashModel.java b/src/main/java/org/apache/freemarker/servlet/HttpSessionHashModel.java
index 23dc80e..405f710 100644
--- a/src/main/java/org/apache/freemarker/servlet/HttpSessionHashModel.java
+++ b/src/main/java/org/apache/freemarker/servlet/HttpSessionHashModel.java
@@ -77,6 +77,7 @@ public final class HttpSessionHashModel implements TemplateHashModel, Serializab
         this.response = response;
     }
 
+    @Override
     public TemplateModel get(String key) throws TemplateModelException {
         checkSessionExistence();
         return wrapper.wrap(session != null ? session.getAttribute(key) : null);
@@ -103,6 +104,7 @@ public final class HttpSessionHashModel implements TemplateHashModel, Serializab
             (session == null && request == null);
     }
     
+    @Override
     public boolean isEmpty()
     throws TemplateModelException {
         checkSessionExistence();

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/servlet/IncludePage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/servlet/IncludePage.java b/src/main/java/org/apache/freemarker/servlet/IncludePage.java
index c4b9310..2889ab2 100644
--- a/src/main/java/org/apache/freemarker/servlet/IncludePage.java
+++ b/src/main/java/org/apache/freemarker/servlet/IncludePage.java
@@ -68,8 +68,9 @@ public class IncludePage implements TemplateDirectiveModel {
         this.response = response;
     }
     
-    public void execute(final Environment env, Map params, 
-            TemplateModel[] loopVars, TemplateDirectiveBody body)
+    @Override
+    public void execute(final Environment env, Map params,
+                        TemplateModel[] loopVars, TemplateDirectiveBody body)
     throws TemplateException, IOException {
         // Determine the path
         final TemplateModel path = (TemplateModel) params.get("path");

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/servlet/ServletContextHashModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/servlet/ServletContextHashModel.java b/src/main/java/org/apache/freemarker/servlet/ServletContextHashModel.java
index fcd0cc1..29b12d8 100644
--- a/src/main/java/org/apache/freemarker/servlet/ServletContextHashModel.java
+++ b/src/main/java/org/apache/freemarker/servlet/ServletContextHashModel.java
@@ -54,10 +54,12 @@ public final class ServletContextHashModel implements TemplateHashModel {
         this.wrapper = wrapper;
     }
 
+    @Override
     public TemplateModel get(String key) throws TemplateModelException {
         return wrapper.wrap(servletctx.getAttribute(key));
     }
 
+    @Override
     public boolean isEmpty() {
         return !servletctx.getAttributeNames().hasMoreElements();
     }

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/servlet/jsp/CustomTagAndELFunctionCombiner.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/servlet/jsp/CustomTagAndELFunctionCombiner.java b/src/main/java/org/apache/freemarker/servlet/jsp/CustomTagAndELFunctionCombiner.java
index 9e87e01..5af65f2 100644
--- a/src/main/java/org/apache/freemarker/servlet/jsp/CustomTagAndELFunctionCombiner.java
+++ b/src/main/java/org/apache/freemarker/servlet/jsp/CustomTagAndELFunctionCombiner.java
@@ -104,23 +104,28 @@ class CustomTagAndELFunctionCombiner {
             this.simpleMethodModel = simpleMethodModel;
         }
 
+        @Override
         public Object exec(List arguments) throws TemplateModelException {
             return simpleMethodModel.exec(arguments);
         }
 
+        @Override
         public void execute(Environment env, Map params, TemplateModel[] loopVars, TemplateDirectiveBody body)
                 throws TemplateException, IOException {
             templateDirectiveModel.execute(env, params, loopVars, body);
         }
 
+        @Override
         public Object[] explainTypeError(Class[] expectedClasses) {
             return simpleMethodModel.explainTypeError(expectedClasses);
         }
 
+        @Override
         public TemplateModel get(int index) throws TemplateModelException {
             return simpleMethodModel.get(index);
         }
 
+        @Override
         public int size() throws TemplateModelException {
             return simpleMethodModel.size();
         }
@@ -139,10 +144,12 @@ class CustomTagAndELFunctionCombiner {
             this.templateMethodModelEx = templateMethodModelEx;
         }
 
+        @Override
         public Object exec(List arguments) throws TemplateModelException {
             return templateMethodModelEx.exec(arguments);
         }
 
+        @Override
         public void execute(Environment env, Map params, TemplateModel[] loopVars, TemplateDirectiveBody body)
                 throws TemplateException, IOException {
             templateDirectiveModel.execute(env, params, loopVars, body);
@@ -162,10 +169,12 @@ class CustomTagAndELFunctionCombiner {
             this.templateMethodModelEx = templateMethodModelEx;
         }
 
+        @Override
         public Object exec(List arguments) throws TemplateModelException {
             return templateMethodModelEx.exec(arguments);
         }
 
+        @Override
         public Writer getWriter(Writer out, Map args) throws TemplateModelException, IOException {
             return templateTransformModel.getWriter(out, args);
         }
@@ -185,22 +194,27 @@ class CustomTagAndELFunctionCombiner {
             this.simpleMethodModel = simpleMethodModel;
         }
 
+        @Override
         public Object exec(List arguments) throws TemplateModelException {
             return simpleMethodModel.exec(arguments);
         }
 
+        @Override
         public Object[] explainTypeError(Class[] expectedClasses) {
             return simpleMethodModel.explainTypeError(expectedClasses);
         }
 
+        @Override
         public TemplateModel get(int index) throws TemplateModelException {
             return simpleMethodModel.get(index);
         }
 
+        @Override
         public int size() throws TemplateModelException {
             return simpleMethodModel.size();
         }
 
+        @Override
         public Writer getWriter(Writer out, Map args) throws TemplateModelException, IOException {
             return templateTransformModel.getWriter(out, args);
         }

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/servlet/jsp/FreeMarkerPageContext.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/servlet/jsp/FreeMarkerPageContext.java b/src/main/java/org/apache/freemarker/servlet/jsp/FreeMarkerPageContext.java
index 0abe393..8b413f7 100644
--- a/src/main/java/org/apache/freemarker/servlet/jsp/FreeMarkerPageContext.java
+++ b/src/main/java/org/apache/freemarker/servlet/jsp/FreeMarkerPageContext.java
@@ -473,6 +473,7 @@ public JspWriter pushBody(Writer w) {
             it = hashEx.keys().iterator();
         }
         
+        @Override
         public boolean hasMoreElements() {
             try {
                 return it.hasNext();
@@ -481,6 +482,7 @@ public JspWriter pushBody(Writer w) {
             }
         }
         
+        @Override
         public Object nextElement() {
             try {
                 return ((TemplateScalarModel) it.next()).getAsString();

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/servlet/jsp/FreemarkerTag.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/servlet/jsp/FreemarkerTag.java b/src/main/java/org/apache/freemarker/servlet/jsp/FreemarkerTag.java
index df8fb5b..da77b7d 100644
--- a/src/main/java/org/apache/freemarker/servlet/jsp/FreemarkerTag.java
+++ b/src/main/java/org/apache/freemarker/servlet/jsp/FreemarkerTag.java
@@ -57,40 +57,49 @@ public class FreemarkerTag implements BodyTag {
         this.name = name == null ? "" : name;
     }
     
+    @Override
     public Tag getParent() {
         return parent;
     }
 
+    @Override
     public void setParent(Tag parent) {
         this.parent = parent;
     }
 
+    @Override
     public int doStartTag() {
         return EVAL_BODY_BUFFERED;
     }
 
+    @Override
     public void setBodyContent(BodyContent bodyContent) {
         this.bodyContent = bodyContent;
     }
 
+    @Override
     public void setPageContext(PageContext pageContext) {
         this.pageContext = pageContext;
         root = null;
     }
 
+    @Override
     public void doInitBody() {
     }
 
+    @Override
     public int doAfterBody() {
         return SKIP_BODY;
     }
 
+    @Override
     public void release() {
         root = null;
         template = null;
         name = "";
     }
 
+    @Override
     public int doEndTag()
         throws JspException {
         if (bodyContent == null)

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/main/java/org/apache/freemarker/servlet/jsp/SimpleTagDirectiveModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/servlet/jsp/SimpleTagDirectiveModel.java b/src/main/java/org/apache/freemarker/servlet/jsp/SimpleTagDirectiveModel.java
index f3ff665..687f9b3 100644
--- a/src/main/java/org/apache/freemarker/servlet/jsp/SimpleTagDirectiveModel.java
+++ b/src/main/java/org/apache/freemarker/servlet/jsp/SimpleTagDirectiveModel.java
@@ -52,8 +52,9 @@ class SimpleTagDirectiveModel extends JspTagModelBase implements TemplateDirecti
         }
     }
 
-    public void execute(Environment env, Map args, TemplateModel[] outArgs, 
-            final TemplateDirectiveBody body) 
+    @Override
+    public void execute(Environment env, Map args, TemplateModel[] outArgs,
+                        final TemplateDirectiveBody body)
     throws TemplateException, IOException {
         try {
             SimpleTag tag = (SimpleTag) getTagInstance();

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/test/java/org/apache/freemarker/core/MockServletContext.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/MockServletContext.java b/src/test/java/org/apache/freemarker/core/MockServletContext.java
index 558d410..64f0efb 100644
--- a/src/test/java/org/apache/freemarker/core/MockServletContext.java
+++ b/src/test/java/org/apache/freemarker/core/MockServletContext.java
@@ -31,101 +31,126 @@ import javax.servlet.ServletException;
 
 public class MockServletContext implements ServletContext {
 
+    @Override
     public Object getAttribute(String arg0) {
         return null;
     }
 
+    @Override
     public Enumeration getAttributeNames() {
         return null;
     }
 
+    @Override
     public ServletContext getContext(String arg0) {
         return null;
     }
 
+    @Override
     public String getContextPath() {
         return "/myapp";
     }
 
+    @Override
     public String getInitParameter(String arg0) {
         return null;
     }
 
+    @Override
     public Enumeration getInitParameterNames() {
         return null;
     }
 
+    @Override
     public int getMajorVersion() {
         return 0;
     }
 
+    @Override
     public String getMimeType(String arg0) {
         return null;
     }
 
+    @Override
     public int getMinorVersion() {
         return 0;
     }
 
+    @Override
     public RequestDispatcher getNamedDispatcher(String arg0) {
         return null;
     }
 
+    @Override
     public String getRealPath(String arg0) {
         return null;
     }
 
+    @Override
     public RequestDispatcher getRequestDispatcher(String arg0) {
         return null;
     }
 
+    @Override
     public URL getResource(String arg0) throws MalformedURLException {
         return null;
     }
 
+    @Override
     public InputStream getResourceAsStream(String arg0) {
         return null;
     }
 
+    @Override
     public Set getResourcePaths(String arg0) {
         return null;
     }
 
+    @Override
     public String getServerInfo() {
         return null;
     }
 
+    @Override
     public Servlet getServlet(String arg0) throws ServletException {
         return null;
     }
 
+    @Override
     public String getServletContextName() {
         return "MyApp";
     }
 
+    @Override
     public Enumeration getServletNames() {
         return null;
     }
 
+    @Override
     public Enumeration getServlets() {
         return null;
     }
 
+    @Override
     public void log(String arg0) {
         
     }
 
+    @Override
     public void log(Exception arg0, String arg1) {
         
     }
 
+    @Override
     public void log(String arg0, Throwable arg1) {
         
     }
 
+    @Override
     public void removeAttribute(String arg0) {
     }
 
+    @Override
     public void setAttribute(String arg0, Object arg1) {
     }
     

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/test/java/org/apache/freemarker/core/ast/AppMetaTemplateDateFormatFactory.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/ast/AppMetaTemplateDateFormatFactory.java b/src/test/java/org/apache/freemarker/core/ast/AppMetaTemplateDateFormatFactory.java
index 1bec5bd..3205181 100644
--- a/src/test/java/org/apache/freemarker/core/ast/AppMetaTemplateDateFormatFactory.java
+++ b/src/test/java/org/apache/freemarker/core/ast/AppMetaTemplateDateFormatFactory.java
@@ -110,10 +110,12 @@ public class AppMetaTemplateDateFormatFactory extends TemplateDateFormatFactory
             this.appMeta = appMeta;
         }
 
+        @Override
         public Date getAsDate() throws TemplateModelException {
             return date;
         }
 
+        @Override
         public int getDateType() {
             return dateType;
         }

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/test/java/org/apache/freemarker/core/ast/DateFormatTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/ast/DateFormatTest.java b/src/test/java/org/apache/freemarker/core/ast/DateFormatTest.java
index b80cb2d..a0c7f95 100644
--- a/src/test/java/org/apache/freemarker/core/ast/DateFormatTest.java
+++ b/src/test/java/org/apache/freemarker/core/ast/DateFormatTest.java
@@ -449,10 +449,12 @@ public class DateFormatTest extends TemplateTest {
             this.date = date;
         }
 
+        @Override
         public Date getAsDate() throws TemplateModelException {
             return date;
         }
 
+        @Override
         public int getDateType() {
             return DATETIME;
         }

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/test/java/org/apache/freemarker/core/ast/DirectiveCallPlaceTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/ast/DirectiveCallPlaceTest.java b/src/test/java/org/apache/freemarker/core/ast/DirectiveCallPlaceTest.java
index 4000e39..24e0a31 100644
--- a/src/test/java/org/apache/freemarker/core/ast/DirectiveCallPlaceTest.java
+++ b/src/test/java/org/apache/freemarker/core/ast/DirectiveCallPlaceTest.java
@@ -123,6 +123,7 @@ public class DirectiveCallPlaceTest extends TemplateTest {
             cacheRecreationCount.set(0);
         }
         
+        @Override
         public void execute(Environment env, Map params, TemplateModel[] loopVars, final TemplateDirectiveBody body)
                 throws TemplateException, IOException {
             if (body == null) {
@@ -137,6 +138,7 @@ public class DirectiveCallPlaceTest extends TemplateTest {
                     convertedText = (String) callPlace.getOrCreateCustomData(
                             getTextConversionIdentity(), new ObjectFactory<String>() {
 
+                                @Override
                                 public String createObject() throws TemplateException, IOException {
                                     return convertBodyText(body)
                                             + "[cached " + cacheRecreationCount.incrementAndGet() + "]";
@@ -196,6 +198,7 @@ public class DirectiveCallPlaceTest extends TemplateTest {
     
     private static class PositionAwareDirective implements TemplateDirectiveModel {
 
+        @Override
         public void execute(Environment env, Map params, TemplateModel[] loopVars, TemplateDirectiveBody body)
                 throws TemplateException, IOException {
             Writer out = env.getOut();
@@ -224,6 +227,7 @@ public class DirectiveCallPlaceTest extends TemplateTest {
 
     private static class ArgPrinterDirective implements TemplateDirectiveModel {
 
+        @Override
         public void execute(Environment env, Map params, TemplateModel[] loopVars, TemplateDirectiveBody body)
                 throws TemplateException, IOException {
             final Writer out = env.getOut();
@@ -243,6 +247,7 @@ public class DirectiveCallPlaceTest extends TemplateTest {
     
     private static class CurDirLineScalar implements TemplateScalarModel {
 
+        @Override
         public String getAsString() throws TemplateModelException {
             DirectiveCallPlace callPlace = Environment.getCurrentEnvironment().getCurrentDirectiveCallPlace();
             return callPlace != null

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/test/java/org/apache/freemarker/core/ast/EnvironmentGetTemplateVariantsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/ast/EnvironmentGetTemplateVariantsTest.java b/src/test/java/org/apache/freemarker/core/ast/EnvironmentGetTemplateVariantsTest.java
index 7c81954..2243e6f 100644
--- a/src/test/java/org/apache/freemarker/core/ast/EnvironmentGetTemplateVariantsTest.java
+++ b/src/test/java/org/apache/freemarker/core/ast/EnvironmentGetTemplateVariantsTest.java
@@ -209,6 +209,7 @@ public class EnvironmentGetTemplateVariantsTest extends TemplateTest {
     protected Object createDataModel() {
         return Collections.singletonMap("tNames", new TemplateDirectiveModel() {
 
+            @Override
             public void execute(Environment env, Map params, TemplateModel[] loopVars, TemplateDirectiveBody body)
                     throws TemplateException, IOException {
                 Writer out = env.getOut();

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/test/java/org/apache/freemarker/core/ast/NumberFormatTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/ast/NumberFormatTest.java b/src/test/java/org/apache/freemarker/core/ast/NumberFormatTest.java
index bdcc8c2..3699d83 100644
--- a/src/test/java/org/apache/freemarker/core/ast/NumberFormatTest.java
+++ b/src/test/java/org/apache/freemarker/core/ast/NumberFormatTest.java
@@ -186,6 +186,7 @@ public class NumberFormatTest extends TemplateTest {
         addToDataModel("n", nm);
         addToDataModel("incN", new TemplateDirectiveModel() {
             
+            @Override
             public void execute(Environment env, Map params, TemplateModel[] loopVars, TemplateDirectiveBody body)
                     throws TemplateException, IOException {
                 nm.setNumber(nm.getAsNumber().intValue() + 1);
@@ -327,6 +328,7 @@ public class NumberFormatTest extends TemplateTest {
             this.number = number;
         }
 
+        @Override
         public Number getAsNumber() throws TemplateModelException {
             return number;
         }

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/test/java/org/apache/freemarker/core/ast/TheadInterruptingSupportTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/ast/TheadInterruptingSupportTest.java b/src/test/java/org/apache/freemarker/core/ast/TheadInterruptingSupportTest.java
index 59aae80..d6b8a4e 100644
--- a/src/test/java/org/apache/freemarker/core/ast/TheadInterruptingSupportTest.java
+++ b/src/test/java/org/apache/freemarker/core/ast/TheadInterruptingSupportTest.java
@@ -121,6 +121,7 @@ public class TheadInterruptingSupportTest {
 
         public class StartedDirective implements TemplateDirectiveModel {
             
+            @Override
             public void execute(Environment env, Map params, TemplateModel[] loopVars, TemplateDirectiveBody body)
                     throws TemplateException, IOException {
                 synchronized (TemplateRunnerThread.this) {
@@ -133,6 +134,7 @@ public class TheadInterruptingSupportTest {
 
         public class CustomLoopDirective implements TemplateDirectiveModel {
 
+            @Override
             public void execute(Environment env, Map params, TemplateModel[] loopVars, TemplateDirectiveBody body)
                     throws TemplateException, IOException {
                 while (true) {
@@ -144,6 +146,7 @@ public class TheadInterruptingSupportTest {
         
         public class SleepDirective implements TemplateDirectiveModel {
 
+            @Override
             public void execute(Environment env, Map params, TemplateModel[] loopVars, TemplateDirectiveBody body)
                     throws TemplateException, IOException {
                 try {

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/test/java/org/apache/freemarker/core/model/impl/beans/AlphabeticalMethodSorter.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/model/impl/beans/AlphabeticalMethodSorter.java b/src/test/java/org/apache/freemarker/core/model/impl/beans/AlphabeticalMethodSorter.java
index 357624b..473ad38 100644
--- a/src/test/java/org/apache/freemarker/core/model/impl/beans/AlphabeticalMethodSorter.java
+++ b/src/test/java/org/apache/freemarker/core/model/impl/beans/AlphabeticalMethodSorter.java
@@ -35,9 +35,11 @@ class AlphabeticalMethodSorter implements MethodSorter {
         this.desc = desc;
     }
 
+    @Override
     public MethodDescriptor[] sortMethodDescriptors(MethodDescriptor[] methodDescriptors) {
         ArrayList<MethodDescriptor> ls = new ArrayList<>(Arrays.asList(methodDescriptors));
         Collections.sort(ls, new Comparator<MethodDescriptor>() {
+            @Override
             public int compare(MethodDescriptor o1, MethodDescriptor o2) {
                 int res = o1.getMethod().toString().compareTo(o2.getMethod().toString());
                 return desc ? -res : res;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/test/java/org/apache/freemarker/core/model/impl/beans/BeansWrapperCachesTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/model/impl/beans/BeansWrapperCachesTest.java b/src/test/java/org/apache/freemarker/core/model/impl/beans/BeansWrapperCachesTest.java
index 52cf3a9..dc8ae43 100644
--- a/src/test/java/org/apache/freemarker/core/model/impl/beans/BeansWrapperCachesTest.java
+++ b/src/test/java/org/apache/freemarker/core/model/impl/beans/BeansWrapperCachesTest.java
@@ -54,6 +54,7 @@ public class BeansWrapperCachesTest {
         checkRegisteredModelFactories(ci3, bw.getStaticModels(), bw.getEnumModels(), bw.getModelCache());
         
         MethodAppearanceFineTuner maf = new MethodAppearanceFineTuner() {
+            @Override
             public void process(MethodAppearanceDecisionInput in, MethodAppearanceDecision out) {
                 // nop
             }

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/test/java/org/apache/freemarker/core/model/impl/beans/GetlessMethodsAsPropertyGettersRule.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/model/impl/beans/GetlessMethodsAsPropertyGettersRule.java b/src/test/java/org/apache/freemarker/core/model/impl/beans/GetlessMethodsAsPropertyGettersRule.java
index fa135f2..ae6d7f1 100644
--- a/src/test/java/org/apache/freemarker/core/model/impl/beans/GetlessMethodsAsPropertyGettersRule.java
+++ b/src/test/java/org/apache/freemarker/core/model/impl/beans/GetlessMethodsAsPropertyGettersRule.java
@@ -35,6 +35,7 @@ class GetlessMethodsAsPropertyGettersRule implements MethodAppearanceFineTuner,
     // Can't be constructed from outside
     private GetlessMethodsAsPropertyGettersRule() { }
 
+    @Override
     public void process(
             MethodAppearanceDecisionInput in, MethodAppearanceDecision out) {
         legacyProcess(in.getContainingClass(), in.getMethod(), out);

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/test/java/org/apache/freemarker/core/model/impl/beans/Java7MembersOnlyBeansWrapper.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/model/impl/beans/Java7MembersOnlyBeansWrapper.java b/src/test/java/org/apache/freemarker/core/model/impl/beans/Java7MembersOnlyBeansWrapper.java
index 621fc8e..547917d 100644
--- a/src/test/java/org/apache/freemarker/core/model/impl/beans/Java7MembersOnlyBeansWrapper.java
+++ b/src/test/java/org/apache/freemarker/core/model/impl/beans/Java7MembersOnlyBeansWrapper.java
@@ -47,6 +47,7 @@ public class Java7MembersOnlyBeansWrapper extends BeansWrapper {
     
     MethodAppearanceFineTuner POST_JAVA_7_FILTER = new MethodAppearanceFineTuner() {
 
+        @Override
         public void process(MethodAppearanceDecisionInput in, MethodAppearanceDecision out) {
             Method m = in.getMethod();
             Class declCl = m.getDeclaringClass();

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/test/java/org/apache/freemarker/core/model/impl/beans/TypeFlagsTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/core/model/impl/beans/TypeFlagsTest.java b/src/test/java/org/apache/freemarker/core/model/impl/beans/TypeFlagsTest.java
index ce9c40e..c784e95 100644
--- a/src/test/java/org/apache/freemarker/core/model/impl/beans/TypeFlagsTest.java
+++ b/src/test/java/org/apache/freemarker/core/model/impl/beans/TypeFlagsTest.java
@@ -562,48 +562,60 @@ public class TypeFlagsTest extends TestCase {
 
     static public class MapDate extends Date implements Map {
     
+        @Override
         public int size() {
             return 0;
         }
     
+        @Override
         public boolean isEmpty() {
             return false;
         }
     
+        @Override
         public boolean containsKey(Object key) {
             return false;
         }
     
+        @Override
         public boolean containsValue(Object value) {
             return false;
         }
     
+        @Override
         public Object get(Object key) {
             return null;
         }
     
+        @Override
         public Object put(Object key, Object value) {
             return null;
         }
     
+        @Override
         public Object remove(Object key) {
             return null;
         }
     
+        @Override
         public void putAll(Map m) {
         }
     
+        @Override
         public void clear() {
         }
     
+        @Override
         public Set keySet() {
             return null;
         }
     
+        @Override
         public Collection values() {
             return null;
         }
     
+        @Override
         public Set entrySet() {
             return null;
         }
@@ -621,6 +633,7 @@ public class TypeFlagsTest extends TestCase {
         }
         // As the order in which getMethods() returns the methods is undefined, we sort them for test predictability: 
         Collections.sort(filteredMethods, new Comparator<Method>() {
+            @Override
             public int compare(Method o1, Method o2) {
                 int res = o1.toString().compareTo(o2.toString());
                 return desc ? -res : res;

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/test/java/org/apache/freemarker/manualtest/UnitAwareTemplateNumberModel.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/manualtest/UnitAwareTemplateNumberModel.java b/src/test/java/org/apache/freemarker/manualtest/UnitAwareTemplateNumberModel.java
index b50bcd8..dbd6a60 100644
--- a/src/test/java/org/apache/freemarker/manualtest/UnitAwareTemplateNumberModel.java
+++ b/src/test/java/org/apache/freemarker/manualtest/UnitAwareTemplateNumberModel.java
@@ -31,6 +31,7 @@ public class UnitAwareTemplateNumberModel implements TemplateNumberModel {
         this.unit = unit;
     }
 
+    @Override
     public Number getAsNumber() throws TemplateModelException {
         return value;
     }

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/test/java/org/apache/freemarker/servlet/jsp/RealServletContainertTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/servlet/jsp/RealServletContainertTest.java b/src/test/java/org/apache/freemarker/servlet/jsp/RealServletContainertTest.java
index 6232e91..8cfdf57 100644
--- a/src/test/java/org/apache/freemarker/servlet/jsp/RealServletContainertTest.java
+++ b/src/test/java/org/apache/freemarker/servlet/jsp/RealServletContainertTest.java
@@ -337,14 +337,17 @@ public class RealServletContainertTest extends WebAppTestCase {
                 this.value = value;
             }
 
+            @Override
             public String getKey() {
                 return key;
             }
 
+            @Override
             public Integer getValue() {
                 return value;
             }
 
+            @Override
             public Integer setValue(Integer value) {
                 throw new UnsupportedOperationException();
             }

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/test/java/org/apache/freemarker/servlet/jsp/TLDParsingTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/servlet/jsp/TLDParsingTest.java b/src/test/java/org/apache/freemarker/servlet/jsp/TLDParsingTest.java
index 594df00..5825a56 100644
--- a/src/test/java/org/apache/freemarker/servlet/jsp/TLDParsingTest.java
+++ b/src/test/java/org/apache/freemarker/servlet/jsp/TLDParsingTest.java
@@ -131,7 +131,9 @@ public class TLDParsingTest {
     }
     
     public static class ExampleContextListener implements ServletContextListener {
+        @Override
         public void contextInitialized(ServletContextEvent event) { }
+        @Override
         public void contextDestroyed(ServletContextEvent event) { }
     }    
     

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/test/java/org/apache/freemarker/servlet/jsp/taglibmembers/TestTag.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/servlet/jsp/taglibmembers/TestTag.java b/src/test/java/org/apache/freemarker/servlet/jsp/taglibmembers/TestTag.java
index 8a30bcd..68954ab 100644
--- a/src/test/java/org/apache/freemarker/servlet/jsp/taglibmembers/TestTag.java
+++ b/src/test/java/org/apache/freemarker/servlet/jsp/taglibmembers/TestTag.java
@@ -77,10 +77,12 @@ public class TestTag extends BodyTagSupport implements TryCatchFinally {
         }
     }
     
+    @Override
     public void doCatch(Throwable t) throws Throwable {
         pageContext.getOut().println("doCatch() called here with " + t.getClass() + ": " + getFirstLine(t.getMessage()));
     }
 
+    @Override
     public void doFinally() {
         try {
             pageContext.getOut().println("doFinally() called here");

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/test/java/org/apache/freemarker/test/servlet/DefaultModel2TesterAction.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/test/servlet/DefaultModel2TesterAction.java b/src/test/java/org/apache/freemarker/test/servlet/DefaultModel2TesterAction.java
index d34f277..1bf3b14 100644
--- a/src/test/java/org/apache/freemarker/test/servlet/DefaultModel2TesterAction.java
+++ b/src/test/java/org/apache/freemarker/test/servlet/DefaultModel2TesterAction.java
@@ -36,6 +36,7 @@ public class DefaultModel2TesterAction implements Model2Action {
     
     protected DefaultModel2TesterAction() { }
 
+    @Override
     @SuppressWarnings("boxing")
     public String execute(HttpServletRequest req, HttpServletResponse resp) throws Exception {
         req.setAttribute("s", "abc");

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/693a94c4/src/test/java/org/apache/freemarker/test/templatesuite/models/AllTemplateModels.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/freemarker/test/templatesuite/models/AllTemplateModels.java b/src/test/java/org/apache/freemarker/test/templatesuite/models/AllTemplateModels.java
index 6075e1f..80879b9 100644
--- a/src/test/java/org/apache/freemarker/test/templatesuite/models/AllTemplateModels.java
+++ b/src/test/java/org/apache/freemarker/test/templatesuite/models/AllTemplateModels.java
@@ -44,10 +44,12 @@ public class AllTemplateModels implements
     
     private final TemplateModelIterator EMPTY_ITERATOR = new TemplateModelIterator() {
 
+        @Override
         public TemplateModel next() throws TemplateModelException {
             return null;
         }
 
+        @Override
         public boolean hasNext() throws TemplateModelException {
             return false;
         }
@@ -56,56 +58,69 @@ public class AllTemplateModels implements
     
     private final TemplateCollectionModel EMPTY_COLLECTION = new TemplateCollectionModel() {
 
+        @Override
         public TemplateModelIterator iterator() throws TemplateModelException {
             return EMPTY_ITERATOR;
         }
     };
     
+    @Override
     public TemplateModel get(String key) throws TemplateModelException {
         return new SimpleScalar("value for key " + key);
     }
 
+    @Override
     public boolean isEmpty() throws TemplateModelException {
         return true;
     }
 
+    @Override
     public TemplateModelIterator iterator() throws TemplateModelException {
         return EMPTY_ITERATOR;
     }
 
+    @Override
     public TemplateModel get(int index) throws TemplateModelException {
         return null;
     }
 
+    @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 boolean getAsBoolean() throws TemplateModelException {
         return true;
     }
 
+    @Override
     public Date getAsDate() throws TemplateModelException {
         return new Date(0);
     }
 
+    @Override
     public int getDateType() {
         return TemplateDateModel.DATETIME;
     }
 
+    @Override
     @SuppressWarnings("boxing")
     public Number getAsNumber() throws TemplateModelException {
         return 1;
     }
 
+    @Override
     public String getAsString() throws TemplateModelException {
         return "s";
     }



Mime
View raw message