Merge feature/fix-some-generics

1 files changed, 43 insertions, 0 deletions

diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/visitor/BaseVisitor.java b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/visitor/BaseVisitor.java
index c2afdfd1..397a3cd6 100644
--- a/velocity-engine-core/src/main/java/org/apache/velocity/runtime/visitor/BaseVisitor.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/runtime/visitor/BaseVisitor.java
@@ -60,6 +60,7 @@ public abstract class BaseVisitor implements ParserVisitor
     /**
      * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.SimpleNode, java.lang.Object)
      */
+    @Override
     public Object visit(SimpleNode node, Object data)
     {
         data = node.childrenAccept(this, data);
@@ -69,6 +70,7 @@ public abstract class BaseVisitor implements ParserVisitor
     /**
      * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTprocess, java.lang.Object)
      */
+    @Override
     public Object visit(ASTprocess node, Object data)
     {
         data = node.childrenAccept(this, data);
@@ -78,6 +80,7 @@ public abstract class BaseVisitor implements ParserVisitor
     /**
      * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTExpression, java.lang.Object)
      */
+    @Override
     public Object visit(ASTExpression node, Object data)
     {
         data = node.childrenAccept(this, data);
@@ -87,6 +90,7 @@ public abstract class BaseVisitor implements ParserVisitor
     /**
      * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTAssignment, java.lang.Object)
      */
+    @Override
     public Object visit(ASTAssignment node, Object data)
     {
         data = node.childrenAccept(this, data);
@@ -96,6 +100,7 @@ public abstract class BaseVisitor implements ParserVisitor
     /**
      * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTOrNode, java.lang.Object)
      */
+    @Override
     public Object visit(ASTOrNode node, Object data)
     {
         data = node.childrenAccept(this, data);
@@ -105,6 +110,7 @@ public abstract class BaseVisitor implements ParserVisitor
     /**
      * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTAndNode, java.lang.Object)
      */
+    @Override
     public Object visit(ASTAndNode node, Object data)
     {
         data = node.childrenAccept(this, data);
@@ -114,6 +120,7 @@ public abstract class BaseVisitor implements ParserVisitor
     /**
      * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTEQNode, java.lang.Object)
      */
+    @Override
     public Object visit(ASTEQNode node, Object data)
     {
         data = node.childrenAccept(this, data);
@@ -123,6 +130,7 @@ public abstract class BaseVisitor implements ParserVisitor
     /**
      * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTNENode, java.lang.Object)
      */
+    @Override
     public Object visit(ASTNENode node, Object data)
     {
         data = node.childrenAccept(this, data);
@@ -132,6 +140,7 @@ public abstract class BaseVisitor implements ParserVisitor
     /**
      * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTLTNode, java.lang.Object)
      */
+    @Override
     public Object visit(ASTLTNode node, Object data)
     {
         data = node.childrenAccept(this, data);
@@ -141,6 +150,7 @@ public abstract class BaseVisitor implements ParserVisitor
     /**
      * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTGTNode, java.lang.Object)
      */
+    @Override
     public Object visit(ASTGTNode node, Object data)
     {
         data = node.childrenAccept(this, data);
@@ -150,6 +160,7 @@ public abstract class BaseVisitor implements ParserVisitor
     /**
      * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTLENode, java.lang.Object)
      */
+    @Override
     public Object visit(ASTLENode node, Object data)
     {
         data = node.childrenAccept(this, data);
@@ -159,6 +170,7 @@ public abstract class BaseVisitor implements ParserVisitor
     /**
      * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTGENode, java.lang.Object)
      */
+    @Override
     public Object visit(ASTGENode node, Object data)
     {
         data = node.childrenAccept(this, data);
@@ -168,6 +180,7 @@ public abstract class BaseVisitor implements ParserVisitor
     /**
      * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTAddNode, java.lang.Object)
      */
+    @Override
     public Object visit(ASTAddNode node, Object data)
     {
         data = node.childrenAccept(this, data);
@@ -177,6 +190,7 @@ public abstract class BaseVisitor implements ParserVisitor
     /**
      * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTSubtractNode, java.lang.Object)
      */
+    @Override
     public Object visit(ASTSubtractNode node, Object data)
     {
         data = node.childrenAccept(this, data);
@@ -186,6 +200,7 @@ public abstract class BaseVisitor implements ParserVisitor
     /**
      * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTMulNode, java.lang.Object)
      */
+    @Override
     public Object visit(ASTMulNode node, Object data)
     {
         data = node.childrenAccept(this, data);
@@ -195,6 +210,7 @@ public abstract class BaseVisitor implements ParserVisitor
     /**
      * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTDivNode, java.lang.Object)
      */
+    @Override
     public Object visit(ASTDivNode node, Object data)
     {
         data = node.childrenAccept(this, data);
@@ -204,6 +220,7 @@ public abstract class BaseVisitor implements ParserVisitor
     /**
      * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTModNode, java.lang.Object)
      */
+    @Override
     public Object visit(ASTModNode node, Object data)
     {
         data = node.childrenAccept(this, data);
@@ -213,6 +230,7 @@ public abstract class BaseVisitor implements ParserVisitor
     /**
      * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTNotNode, java.lang.Object)
      */
+    @Override
     public Object visit(ASTNotNode node, Object data)
     {
         data = node.childrenAccept(this, data);
@@ -222,6 +240,7 @@ public abstract class BaseVisitor implements ParserVisitor
     /**
      * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTIntegerLiteral, java.lang.Object)
      */
+    @Override
     public Object visit(ASTIntegerLiteral node, Object data)
     {
         data = node.childrenAccept(this, data);
@@ -232,6 +251,7 @@ public abstract class BaseVisitor implements ParserVisitor
      * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTFloatingPointLiteral, java.lang.Object)
      * @since 1.5
      */
+    @Override
     public Object visit(ASTFloatingPointLiteral node, Object data)
     {
         data = node.childrenAccept(this, data);
@@ -241,6 +261,7 @@ public abstract class BaseVisitor implements ParserVisitor
     /**
      * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTStringLiteral, java.lang.Object)
      */
+    @Override
     public Object visit(ASTStringLiteral node, Object data)
     {
         data = node.childrenAccept(this, data);
@@ -250,6 +271,7 @@ public abstract class BaseVisitor implements ParserVisitor
     /**
      * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTIdentifier, java.lang.Object)
      */
+    @Override
     public Object visit(ASTIdentifier node, Object data)
     {
         data = node.childrenAccept(this, data);
@@ -259,6 +281,7 @@ public abstract class BaseVisitor implements ParserVisitor
     /**
      * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTMethod, java.lang.Object)
      */
+    @Override
     public Object visit(ASTMethod node, Object data)
     {
         data = node.childrenAccept(this, data);
@@ -268,6 +291,7 @@ public abstract class BaseVisitor implements ParserVisitor
     /**
      * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTIndex, java.lang.Object)
      */
+    @Override
     public Object visit(ASTIndex node, Object data)
     {
         data = node.childrenAccept(this, data);
@@ -277,6 +301,7 @@ public abstract class BaseVisitor implements ParserVisitor
     /**
      * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTReference, java.lang.Object)
      */
+    @Override
     public Object visit(ASTReference node, Object data)
     {
         data = node.childrenAccept(this, data);
@@ -286,6 +311,7 @@ public abstract class BaseVisitor implements ParserVisitor
     /**
      * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTTrue, java.lang.Object)
      */
+    @Override
     public Object visit(ASTTrue node, Object data)
     {
         data = node.childrenAccept(this, data);
@@ -295,6 +321,7 @@ public abstract class BaseVisitor implements ParserVisitor
     /**
      * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTFalse, java.lang.Object)
      */
+    @Override
     public Object visit(ASTFalse node, Object data)
     {
         data = node.childrenAccept(this, data);
@@ -304,6 +331,7 @@ public abstract class BaseVisitor implements ParserVisitor
     /**
      * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTBlock, java.lang.Object)
      */
+    @Override
     public Object visit(ASTBlock node, Object data)
     {
         data = node.childrenAccept(this, data);
@@ -313,6 +341,7 @@ public abstract class BaseVisitor implements ParserVisitor
     /**
      * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTText, java.lang.Object)
      */
+    @Override
     public Object visit(ASTText node, Object data)
     {
         data = node.childrenAccept(this, data);
@@ -322,6 +351,7 @@ public abstract class BaseVisitor implements ParserVisitor
     /**
      * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTIfStatement, java.lang.Object)
      */
+    @Override
     public Object visit(ASTIfStatement node, Object data)
     {
         data = node.childrenAccept(this, data);
@@ -331,6 +361,7 @@ public abstract class BaseVisitor implements ParserVisitor
     /**
      * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTElseStatement, java.lang.Object)
      */
+    @Override
     public Object visit(ASTElseStatement node, Object data)
     {
         data = node.childrenAccept(this, data);
@@ -340,6 +371,7 @@ public abstract class BaseVisitor implements ParserVisitor
     /**
      * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTElseIfStatement, java.lang.Object)
      */
+    @Override
     public Object visit(ASTElseIfStatement node, Object data)
     {
         data = node.childrenAccept(this, data);
@@ -349,6 +381,7 @@ public abstract class BaseVisitor implements ParserVisitor
     /**
      * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTComment, java.lang.Object)
      */
+    @Override
     public Object visit(ASTComment node, Object data)
     {
         data = node.childrenAccept(this, data);
@@ -358,6 +391,7 @@ public abstract class BaseVisitor implements ParserVisitor
     /**
      * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTTextblock, java.lang.Object)
      */
+    @Override
     public Object visit(ASTTextblock node, Object data)
     {
         data = node.childrenAccept(this, data);
@@ -367,6 +401,7 @@ public abstract class BaseVisitor implements ParserVisitor
     /**
      * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTObjectArray, java.lang.Object)
      */
+    @Override
     public Object visit(ASTObjectArray node, Object data)
     {
         data = node.childrenAccept(this, data);
@@ -376,6 +411,7 @@ public abstract class BaseVisitor implements ParserVisitor
     /**
      * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTWord, java.lang.Object)
      */
+    @Override
     public Object visit(ASTWord node, Object data)
     {
         data = node.childrenAccept(this, data);
@@ -385,6 +421,7 @@ public abstract class BaseVisitor implements ParserVisitor
     /**
      * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTSetDirective, java.lang.Object)
      */
+    @Override
     public Object visit(ASTSetDirective node, Object data)
     {
         data = node.childrenAccept(this, data);
@@ -394,6 +431,7 @@ public abstract class BaseVisitor implements ParserVisitor
     /**
      * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTDirectiveAssign, java.lang.Object)
      */
+    @Override
     public Object visit(ASTDirectiveAssign node, Object data)
     {
         data = node.childrenAccept(this, data);
@@ -403,6 +441,7 @@ public abstract class BaseVisitor implements ParserVisitor
     /**
      * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTDirective, java.lang.Object)
      */
+    @Override
     public Object visit(ASTDirective node, Object data)
     {
         data = node.childrenAccept(this, data);
@@ -413,6 +452,7 @@ public abstract class BaseVisitor implements ParserVisitor
      * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTEscapedDirective, java.lang.Object)
      * @since 1.5
      */
+    @Override
     public Object visit(ASTEscapedDirective node, Object data)
     {
         data = node.childrenAccept(this, data);
@@ -423,6 +463,7 @@ public abstract class BaseVisitor implements ParserVisitor
      * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTEscape, java.lang.Object)
      * @since 1.5
      */
+    @Override
     public Object visit(ASTEscape node, Object data)
     {
         data = node.childrenAccept(this, data);
@@ -433,6 +474,7 @@ public abstract class BaseVisitor implements ParserVisitor
      * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTMap, java.lang.Object)
      * @since 1.5
      */
+    @Override
     public Object visit(ASTMap node, Object data)
     {
         data = node.childrenAccept(this, data);
@@ -443,6 +485,7 @@ public abstract class BaseVisitor implements ParserVisitor
      * @see org.apache.velocity.runtime.parser.node.ParserVisitor#visit(org.apache.velocity.runtime.parser.node.ASTIntegerRange, java.lang.Object)
      * @since 1.5
      */
+    @Override
     public Object visit(ASTIntegerRange node, Object data)
     {
         data = node.childrenAccept(this, data);