velocity-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wgl...@apache.org
Subject svn commit: r517553 [1/2] - in /velocity/engine/trunk/src/java/org/apache/velocity/runtime: parser/ parser/node/ visitor/
Date Tue, 13 Mar 2007 06:10:01 GMT
Author: wglass
Date: Mon Mar 12 23:09:58 2007
New Revision: 517553

URL: http://svn.apache.org/viewvc?view=rev&rev=517553
Log:
move ParserVisitor to node package to avoid being overwritten by javacc.  

Added:
    velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ParserVisitor.java
      - copied, changed from r517533, velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/ParserVisitor.java
Removed:
    velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/ParserVisitor.java
Modified:
    velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTAddNode.java
    velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTAndNode.java
    velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTAssignment.java
    velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTBlock.java
    velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTComment.java
    velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTDirective.java
    velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTDivNode.java
    velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTEQNode.java
    velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTElseIfStatement.java
    velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTElseStatement.java
    velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTEscape.java
    velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTEscapedDirective.java
    velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTExpression.java
    velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTFalse.java
    velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTFloatingPointLiteral.java
    velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTGENode.java
    velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTGTNode.java
    velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTIdentifier.java
    velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTIfStatement.java
    velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTIncludeStatement.java
    velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTIntegerLiteral.java
    velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTIntegerRange.java
    velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTLENode.java
    velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTLTNode.java
    velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTMap.java
    velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTMethod.java
    velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTModNode.java
    velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTMulNode.java
    velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTNENode.java
    velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTNotNode.java
    velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTObjectArray.java
    velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTOrNode.java
    velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTParameters.java
    velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTReference.java
    velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTSetDirective.java
    velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTStop.java
    velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTStringLiteral.java
    velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTSubtractNode.java
    velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTText.java
    velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTTrue.java
    velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTVariable.java
    velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTWord.java
    velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTprocess.java
    velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/Node.java
    velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/SimpleNode.java
    velocity/engine/trunk/src/java/org/apache/velocity/runtime/visitor/BaseVisitor.java

Modified: velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTAddNode.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTAddNode.java?view=diff&rev=517553&r1=517552&r2=517553
==============================================================================
--- velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTAddNode.java (original)
+++ velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTAddNode.java Mon Mar 12 23:09:58 2007
@@ -32,11 +32,8 @@
  * @version $Id$
  */
 import org.apache.velocity.context.InternalContextAdapter;
-import org.apache.velocity.runtime.parser.Parser;
-import org.apache.velocity.runtime.parser.ParserVisitor;
-
 import org.apache.velocity.exception.MethodInvocationException;
-
+import org.apache.velocity.runtime.parser.Parser;
 import org.apache.velocity.util.TemplateNumber;
 
 /**
@@ -62,7 +59,7 @@
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
      */
     public Object jjtAccept(ParserVisitor visitor, Object data)
     {

Modified: velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTAndNode.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTAndNode.java?view=diff&rev=517553&r1=517552&r2=517553
==============================================================================
--- velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTAndNode.java (original)
+++ velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTAndNode.java Mon Mar 12 23:09:58 2007
@@ -20,9 +20,8 @@
  */
 
 import org.apache.velocity.context.InternalContextAdapter;
-import org.apache.velocity.runtime.parser.Parser;
-import org.apache.velocity.runtime.parser.ParserVisitor;
 import org.apache.velocity.exception.MethodInvocationException;
+import org.apache.velocity.runtime.parser.Parser;
 
 /**
  * Please look at the Parser.jjt file which is
@@ -52,7 +51,7 @@
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
      */
     public Object jjtAccept(ParserVisitor visitor, Object data)
     {

Modified: velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTAssignment.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTAssignment.java?view=diff&rev=517553&r1=517552&r2=517553
==============================================================================
--- velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTAssignment.java (original)
+++ velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTAssignment.java Mon Mar 12 23:09:58 2007
@@ -20,7 +20,6 @@
  */
 
 import org.apache.velocity.runtime.parser.Parser;
-import org.apache.velocity.runtime.parser.ParserVisitor;
 
 /**
  *
@@ -45,7 +44,7 @@
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
      */
     public Object jjtAccept(ParserVisitor visitor, Object data)
     {

Modified: velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTBlock.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTBlock.java?view=diff&rev=517553&r1=517552&r2=517553
==============================================================================
--- velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTBlock.java (original)
+++ velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTBlock.java Mon Mar 12 23:09:58 2007
@@ -19,16 +19,14 @@
  * under the License.    
  */
 
-import java.io.Writer;
 import java.io.IOException;
+import java.io.Writer;
 
 import org.apache.velocity.context.InternalContextAdapter;
-import org.apache.velocity.runtime.parser.Parser;
-import org.apache.velocity.runtime.parser.ParserVisitor;
-
 import org.apache.velocity.exception.MethodInvocationException;
 import org.apache.velocity.exception.ParseErrorException;
 import org.apache.velocity.exception.ResourceNotFoundException;
+import org.apache.velocity.runtime.parser.Parser;
 
 
 /**
@@ -54,7 +52,7 @@
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
      */
     public Object jjtAccept(ParserVisitor visitor, Object data)
     {

Modified: velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTComment.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTComment.java?view=diff&rev=517553&r1=517552&r2=517553
==============================================================================
--- velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTComment.java (original)
+++ velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTComment.java Mon Mar 12 23:09:58 2007
@@ -27,7 +27,6 @@
 import org.apache.velocity.exception.ParseErrorException;
 import org.apache.velocity.exception.ResourceNotFoundException;
 import org.apache.velocity.runtime.parser.Parser;
-import org.apache.velocity.runtime.parser.ParserVisitor;
 import org.apache.velocity.runtime.parser.Token;
 
 /**
@@ -60,7 +59,7 @@
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
      */
     public Object jjtAccept(ParserVisitor visitor, Object data)
     {

Modified: velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTDirective.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTDirective.java?view=diff&rev=517553&r1=517552&r2=517553
==============================================================================
--- velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTDirective.java (original)
+++ velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTDirective.java Mon Mar 12 23:09:58 2007
@@ -31,7 +31,6 @@
 import org.apache.velocity.runtime.directive.Directive;
 import org.apache.velocity.runtime.parser.ParseException;
 import org.apache.velocity.runtime.parser.Parser;
-import org.apache.velocity.runtime.parser.ParserVisitor;
 import org.apache.velocity.util.ExceptionUtils;
 
 /**
@@ -73,7 +72,7 @@
 
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
      */
     public Object jjtAccept(ParserVisitor visitor, Object data)
     {

Modified: velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTDivNode.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTDivNode.java?view=diff&rev=517553&r1=517552&r2=517553
==============================================================================
--- velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTDivNode.java (original)
+++ velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTDivNode.java Mon Mar 12 23:09:58 2007
@@ -22,7 +22,6 @@
 import org.apache.velocity.context.InternalContextAdapter;
 import org.apache.velocity.exception.MethodInvocationException;
 import org.apache.velocity.runtime.parser.Parser;
-import org.apache.velocity.runtime.parser.ParserVisitor;
 import org.apache.velocity.util.TemplateNumber;
 
 /**
@@ -57,7 +56,7 @@
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
      */
     public Object jjtAccept(ParserVisitor visitor, Object data)
     {

Modified: velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTEQNode.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTEQNode.java?view=diff&rev=517553&r1=517552&r2=517553
==============================================================================
--- velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTEQNode.java (original)
+++ velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTEQNode.java Mon Mar 12 23:09:58 2007
@@ -22,7 +22,6 @@
 import org.apache.velocity.context.InternalContextAdapter;
 import org.apache.velocity.exception.MethodInvocationException;
 import org.apache.velocity.runtime.parser.Parser;
-import org.apache.velocity.runtime.parser.ParserVisitor;
 import org.apache.velocity.util.TemplateNumber;
 
 /**
@@ -55,7 +54,7 @@
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
      */
     public Object jjtAccept(ParserVisitor visitor, Object data)
     {

Modified: velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTElseIfStatement.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTElseIfStatement.java?view=diff&rev=517553&r1=517552&r2=517553
==============================================================================
--- velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTElseIfStatement.java (original)
+++ velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTElseIfStatement.java Mon Mar 12 23:09:58 2007
@@ -27,7 +27,6 @@
 import org.apache.velocity.exception.ParseErrorException;
 import org.apache.velocity.exception.ResourceNotFoundException;
 import org.apache.velocity.runtime.parser.Parser;
-import org.apache.velocity.runtime.parser.ParserVisitor;
 
 /**
  * This class is responsible for handling the ElseIf VTL control statement.
@@ -59,7 +58,7 @@
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
      */
     public Object jjtAccept(ParserVisitor visitor, Object data)
     {

Modified: velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTElseStatement.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTElseStatement.java?view=diff&rev=517553&r1=517552&r2=517553
==============================================================================
--- velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTElseStatement.java (original)
+++ velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTElseStatement.java Mon Mar 12 23:09:58 2007
@@ -21,7 +21,6 @@
 
 import org.apache.velocity.context.InternalContextAdapter;
 import org.apache.velocity.runtime.parser.Parser;
-import org.apache.velocity.runtime.parser.ParserVisitor;
 
 /**
  * This class is responsible for handling the Else VTL control statement.
@@ -53,7 +52,7 @@
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
      */
     public Object jjtAccept(ParserVisitor visitor, Object data)
     {

Modified: velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTEscape.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTEscape.java?view=diff&rev=517553&r1=517552&r2=517553
==============================================================================
--- velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTEscape.java (original)
+++ velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTEscape.java Mon Mar 12 23:09:58 2007
@@ -19,12 +19,11 @@
  * under the License.    
  */
 
-import java.io.Writer;
 import java.io.IOException;
+import java.io.Writer;
 
 import org.apache.velocity.context.InternalContextAdapter;
 import org.apache.velocity.runtime.parser.Parser;
-import org.apache.velocity.runtime.parser.ParserVisitor;
 
 /**
  * This class is responsible for handling Escapes
@@ -60,7 +59,7 @@
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
      */
     public Object jjtAccept(ParserVisitor visitor, Object data)
     {

Modified: velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTEscapedDirective.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTEscapedDirective.java?view=diff&rev=517553&r1=517552&r2=517553
==============================================================================
--- velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTEscapedDirective.java (original)
+++ velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTEscapedDirective.java Mon Mar 12 23:09:58 2007
@@ -19,12 +19,11 @@
  * under the License.    
  */
 
-import java.io.Writer;
 import java.io.IOException;
+import java.io.Writer;
 
 import org.apache.velocity.context.InternalContextAdapter;
 import org.apache.velocity.runtime.parser.Parser;
-import org.apache.velocity.runtime.parser.ParserVisitor;
 
 /**
  * This class is responsible for handling EscapedDirectives
@@ -57,7 +56,7 @@
 
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
      */
     public Object jjtAccept(ParserVisitor visitor, Object data)
     {

Modified: velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTExpression.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTExpression.java?view=diff&rev=517553&r1=517552&r2=517553
==============================================================================
--- velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTExpression.java (original)
+++ velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTExpression.java Mon Mar 12 23:09:58 2007
@@ -20,10 +20,8 @@
  */
 
 import org.apache.velocity.context.InternalContextAdapter;
-import org.apache.velocity.runtime.parser.Parser;
-import org.apache.velocity.runtime.parser.ParserVisitor;
-
 import org.apache.velocity.exception.MethodInvocationException;
+import org.apache.velocity.runtime.parser.Parser;
 
 /**
  *
@@ -48,7 +46,7 @@
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
      */
     public Object jjtAccept(ParserVisitor visitor, Object data)
     {

Modified: velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTFalse.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTFalse.java?view=diff&rev=517553&r1=517552&r2=517553
==============================================================================
--- velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTFalse.java (original)
+++ velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTFalse.java Mon Mar 12 23:09:58 2007
@@ -21,7 +21,6 @@
 
 import org.apache.velocity.context.InternalContextAdapter;
 import org.apache.velocity.runtime.parser.Parser;
-import org.apache.velocity.runtime.parser.ParserVisitor;
 
 /**
  *
@@ -48,7 +47,7 @@
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
      */
     public Object jjtAccept(ParserVisitor visitor, Object data)
     {

Modified: velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTFloatingPointLiteral.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTFloatingPointLiteral.java?view=diff&rev=517553&r1=517552&r2=517553
==============================================================================
--- velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTFloatingPointLiteral.java (original)
+++ velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTFloatingPointLiteral.java Mon Mar 12 23:09:58 2007
@@ -24,7 +24,6 @@
 import org.apache.velocity.context.InternalContextAdapter;
 import org.apache.velocity.exception.TemplateInitException;
 import org.apache.velocity.runtime.parser.Parser;
-import org.apache.velocity.runtime.parser.ParserVisitor;
 
 
 /**
@@ -58,7 +57,7 @@
 
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
      */
     public Object jjtAccept(ParserVisitor visitor, Object data)
     {

Modified: velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTGENode.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTGENode.java?view=diff&rev=517553&r1=517552&r2=517553
==============================================================================
--- velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTGENode.java (original)
+++ velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTGENode.java Mon Mar 12 23:09:58 2007
@@ -20,10 +20,8 @@
  */
 
 import org.apache.velocity.context.InternalContextAdapter;
-import org.apache.velocity.runtime.parser.Parser;
-import org.apache.velocity.runtime.parser.ParserVisitor;
 import org.apache.velocity.exception.MethodInvocationException;
-
+import org.apache.velocity.runtime.parser.Parser;
 import org.apache.velocity.util.TemplateNumber;
 
 
@@ -59,7 +57,7 @@
 
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
      */
     public Object jjtAccept(ParserVisitor visitor, Object data)
     {

Modified: velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTGTNode.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTGTNode.java?view=diff&rev=517553&r1=517552&r2=517553
==============================================================================
--- velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTGTNode.java (original)
+++ velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTGTNode.java Mon Mar 12 23:09:58 2007
@@ -20,9 +20,8 @@
  */
 
 import org.apache.velocity.context.InternalContextAdapter;
-import org.apache.velocity.runtime.parser.Parser;
-import org.apache.velocity.runtime.parser.ParserVisitor;
 import org.apache.velocity.exception.MethodInvocationException;
+import org.apache.velocity.runtime.parser.Parser;
 import org.apache.velocity.util.TemplateNumber;
 
 /**
@@ -58,7 +57,7 @@
 
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
      */
     public Object jjtAccept(ParserVisitor visitor, Object data)
     {

Modified: velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTIdentifier.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTIdentifier.java?view=diff&rev=517553&r1=517552&r2=517553
==============================================================================
--- velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTIdentifier.java (original)
+++ velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTIdentifier.java Mon Mar 12 23:09:58 2007
@@ -26,7 +26,6 @@
 import org.apache.velocity.exception.MethodInvocationException;
 import org.apache.velocity.exception.TemplateInitException;
 import org.apache.velocity.runtime.parser.Parser;
-import org.apache.velocity.runtime.parser.ParserVisitor;
 import org.apache.velocity.util.introspection.Info;
 import org.apache.velocity.util.introspection.IntrospectionCacheData;
 import org.apache.velocity.util.introspection.VelPropertyGet;
@@ -75,7 +74,7 @@
 
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
      */
     public Object jjtAccept(ParserVisitor visitor, Object data)
     {

Modified: velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTIfStatement.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTIfStatement.java?view=diff&rev=517553&r1=517552&r2=517553
==============================================================================
--- velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTIfStatement.java (original)
+++ velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTIfStatement.java Mon Mar 12 23:09:58 2007
@@ -37,7 +37,6 @@
 import org.apache.velocity.exception.ParseErrorException;
 import org.apache.velocity.exception.ResourceNotFoundException;
 import org.apache.velocity.runtime.parser.Parser;
-import org.apache.velocity.runtime.parser.ParserVisitor;
 
 
 /**
@@ -64,7 +63,7 @@
 
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
      */
     public Object jjtAccept(ParserVisitor visitor, Object data)
     {

Modified: velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTIncludeStatement.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTIncludeStatement.java?view=diff&rev=517553&r1=517552&r2=517553
==============================================================================
--- velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTIncludeStatement.java (original)
+++ velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTIncludeStatement.java Mon Mar 12 23:09:58 2007
@@ -20,7 +20,6 @@
  */
 
 import org.apache.velocity.runtime.parser.Parser;
-import org.apache.velocity.runtime.parser.ParserVisitor;
 
 /**
  *
@@ -46,7 +45,7 @@
 
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
      */
     public Object jjtAccept(ParserVisitor visitor, Object data)
     {

Modified: velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTIntegerLiteral.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTIntegerLiteral.java?view=diff&rev=517553&r1=517552&r2=517553
==============================================================================
--- velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTIntegerLiteral.java (original)
+++ velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTIntegerLiteral.java Mon Mar 12 23:09:58 2007
@@ -19,12 +19,11 @@
  * under the License.    
  */
 
+import java.math.BigInteger;
+
 import org.apache.velocity.context.InternalContextAdapter;
 import org.apache.velocity.exception.TemplateInitException;
 import org.apache.velocity.runtime.parser.Parser;
-import org.apache.velocity.runtime.parser.ParserVisitor;
-
-import java.math.BigInteger;
 
 /**
  * Handles integer numbers.  The value will be either an Integer, a Long, or a BigInteger.
@@ -56,7 +55,7 @@
 
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
      */
     public Object jjtAccept(ParserVisitor visitor, Object data)
     {

Modified: velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTIntegerRange.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTIntegerRange.java?view=diff&rev=517553&r1=517552&r2=517553
==============================================================================
--- velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTIntegerRange.java (original)
+++ velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTIntegerRange.java Mon Mar 12 23:09:58 2007
@@ -25,7 +25,6 @@
 import org.apache.velocity.context.InternalContextAdapter;
 import org.apache.velocity.exception.MethodInvocationException;
 import org.apache.velocity.runtime.parser.Parser;
-import org.apache.velocity.runtime.parser.ParserVisitor;
 
 /**
  * handles the range 'operator'  [ n .. m ]
@@ -55,7 +54,7 @@
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
      */
     public Object jjtAccept(ParserVisitor visitor, Object data)
     {

Modified: velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTLENode.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTLENode.java?view=diff&rev=517553&r1=517552&r2=517553
==============================================================================
--- velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTLENode.java (original)
+++ velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTLENode.java Mon Mar 12 23:09:58 2007
@@ -20,10 +20,8 @@
  */
 
 import org.apache.velocity.context.InternalContextAdapter;
-import org.apache.velocity.runtime.parser.Parser;
-import org.apache.velocity.runtime.parser.ParserVisitor;
-
 import org.apache.velocity.exception.MethodInvocationException;
+import org.apache.velocity.runtime.parser.Parser;
 import org.apache.velocity.util.TemplateNumber;
 
 /**
@@ -59,7 +57,7 @@
 
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
      */
     public Object jjtAccept(ParserVisitor visitor, Object data)
     {

Modified: velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTLTNode.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTLTNode.java?view=diff&rev=517553&r1=517552&r2=517553
==============================================================================
--- velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTLTNode.java (original)
+++ velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTLTNode.java Mon Mar 12 23:09:58 2007
@@ -20,10 +20,8 @@
  */
 
 import org.apache.velocity.context.InternalContextAdapter;
-import org.apache.velocity.runtime.parser.Parser;
-import org.apache.velocity.runtime.parser.ParserVisitor;
-
 import org.apache.velocity.exception.MethodInvocationException;
+import org.apache.velocity.runtime.parser.Parser;
 import org.apache.velocity.util.TemplateNumber;
 
 /**
@@ -59,7 +57,7 @@
 
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
      */
     public Object jjtAccept(ParserVisitor visitor, Object data)
     {

Modified: velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTMap.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTMap.java?view=diff&rev=517553&r1=517552&r2=517553
==============================================================================
--- velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTMap.java (original)
+++ velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTMap.java Mon Mar 12 23:09:58 2007
@@ -19,15 +19,13 @@
  * under the License.    
  */
 
-import org.apache.velocity.context.InternalContextAdapter;
-import org.apache.velocity.runtime.parser.Parser;
-import org.apache.velocity.runtime.parser.ParserVisitor;
-
-import org.apache.velocity.exception.MethodInvocationException;
-
 import java.util.HashMap;
 import java.util.Map;
 
+import org.apache.velocity.context.InternalContextAdapter;
+import org.apache.velocity.exception.MethodInvocationException;
+import org.apache.velocity.runtime.parser.Parser;
+
 /**
  * AST Node for creating a map / dictionary.
  *
@@ -55,7 +53,7 @@
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
      */
     public Object jjtAccept(ParserVisitor visitor, Object data)
     {

Modified: velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTMethod.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTMethod.java?view=diff&rev=517553&r1=517552&r2=517553
==============================================================================
--- velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTMethod.java (original)
+++ velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTMethod.java Mon Mar 12 23:09:58 2007
@@ -28,7 +28,6 @@
 import org.apache.velocity.exception.MethodInvocationException;
 import org.apache.velocity.exception.TemplateInitException;
 import org.apache.velocity.runtime.parser.Parser;
-import org.apache.velocity.runtime.parser.ParserVisitor;
 import org.apache.velocity.util.introspection.Info;
 import org.apache.velocity.util.introspection.IntrospectionCacheData;
 import org.apache.velocity.util.introspection.VelMethod;
@@ -74,7 +73,7 @@
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
      */
     public Object jjtAccept(ParserVisitor visitor, Object data)
     {

Modified: velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTModNode.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTModNode.java?view=diff&rev=517553&r1=517552&r2=517553
==============================================================================
--- velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTModNode.java (original)
+++ velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTModNode.java Mon Mar 12 23:09:58 2007
@@ -33,7 +33,6 @@
 import org.apache.velocity.context.InternalContextAdapter;
 import org.apache.velocity.exception.MethodInvocationException;
 import org.apache.velocity.runtime.parser.Parser;
-import org.apache.velocity.runtime.parser.ParserVisitor;
 import org.apache.velocity.util.TemplateNumber;
 
 /**
@@ -59,7 +58,7 @@
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
      */
     public Object jjtAccept(ParserVisitor visitor, Object data)
     {

Modified: velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTMulNode.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTMulNode.java?view=diff&rev=517553&r1=517552&r2=517553
==============================================================================
--- velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTMulNode.java (original)
+++ velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTMulNode.java Mon Mar 12 23:09:58 2007
@@ -22,7 +22,6 @@
 import org.apache.velocity.context.InternalContextAdapter;
 import org.apache.velocity.exception.MethodInvocationException;
 import org.apache.velocity.runtime.parser.Parser;
-import org.apache.velocity.runtime.parser.ParserVisitor;
 import org.apache.velocity.util.TemplateNumber;
 
 /**
@@ -57,7 +56,7 @@
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
      */
     public Object jjtAccept(ParserVisitor visitor, Object data)
     {

Modified: velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTNENode.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTNENode.java?view=diff&rev=517553&r1=517552&r2=517553
==============================================================================
--- velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTNENode.java (original)
+++ velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTNENode.java Mon Mar 12 23:09:58 2007
@@ -20,11 +20,8 @@
  */
 
 import org.apache.velocity.context.InternalContextAdapter;
-import org.apache.velocity.runtime.parser.Parser;
-import org.apache.velocity.runtime.parser.ParserVisitor;
-
 import org.apache.velocity.exception.MethodInvocationException;
-
+import org.apache.velocity.runtime.parser.Parser;
 import org.apache.velocity.util.TemplateNumber;
 
 /**
@@ -56,7 +53,7 @@
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
      */
     public Object jjtAccept(ParserVisitor visitor, Object data)
     {

Modified: velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTNotNode.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTNotNode.java?view=diff&rev=517553&r1=517552&r2=517553
==============================================================================
--- velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTNotNode.java (original)
+++ velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTNotNode.java Mon Mar 12 23:09:58 2007
@@ -22,7 +22,6 @@
 import org.apache.velocity.context.InternalContextAdapter;
 import org.apache.velocity.exception.MethodInvocationException;
 import org.apache.velocity.runtime.parser.Parser;
-import org.apache.velocity.runtime.parser.ParserVisitor;
 
 /**
  *
@@ -48,7 +47,7 @@
 
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
      */
     public Object jjtAccept(ParserVisitor visitor, Object data)
     {

Modified: velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTObjectArray.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTObjectArray.java?view=diff&rev=517553&r1=517552&r2=517553
==============================================================================
--- velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTObjectArray.java (original)
+++ velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTObjectArray.java Mon Mar 12 23:09:58 2007
@@ -25,7 +25,6 @@
 import org.apache.velocity.context.InternalContextAdapter;
 import org.apache.velocity.exception.MethodInvocationException;
 import org.apache.velocity.runtime.parser.Parser;
-import org.apache.velocity.runtime.parser.ParserVisitor;
 
 /**
  *
@@ -51,7 +50,7 @@
 
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
      */
     public Object jjtAccept(ParserVisitor visitor, Object data)
     {

Modified: velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTOrNode.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTOrNode.java?view=diff&rev=517553&r1=517552&r2=517553
==============================================================================
--- velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTOrNode.java (original)
+++ velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTOrNode.java Mon Mar 12 23:09:58 2007
@@ -19,11 +19,9 @@
  * under the License.    
  */
 
-import org.apache.velocity.runtime.parser.Parser;
-import org.apache.velocity.runtime.parser.ParserVisitor;
 import org.apache.velocity.context.InternalContextAdapter;
-
 import org.apache.velocity.exception.MethodInvocationException;
+import org.apache.velocity.runtime.parser.Parser;
 
 /**
  * Please look at the Parser.jjt file which is
@@ -53,7 +51,7 @@
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
      */
     public Object jjtAccept(ParserVisitor visitor, Object data)
     {

Modified: velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTParameters.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTParameters.java?view=diff&rev=517553&r1=517552&r2=517553
==============================================================================
--- velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTParameters.java (original)
+++ velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTParameters.java Mon Mar 12 23:09:58 2007
@@ -20,7 +20,7 @@
  */
 
 import org.apache.velocity.runtime.parser.Parser;
-import org.apache.velocity.runtime.parser.ParserVisitor;
+
 
 /**
  *
@@ -45,7 +45,7 @@
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
      */
     public Object jjtAccept(ParserVisitor visitor, Object data)
     {

Modified: velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTReference.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTReference.java?view=diff&rev=517553&r1=517552&r2=517553
==============================================================================
--- velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTReference.java (original)
+++ velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTReference.java Mon Mar 12 23:09:58 2007
@@ -30,7 +30,6 @@
 import org.apache.velocity.exception.TemplateInitException;
 import org.apache.velocity.runtime.RuntimeConstants;
 import org.apache.velocity.runtime.parser.Parser;
-import org.apache.velocity.runtime.parser.ParserVisitor;
 import org.apache.velocity.runtime.parser.Token;
 import org.apache.velocity.util.introspection.Info;
 import org.apache.velocity.util.introspection.VelPropertySet;
@@ -90,7 +89,7 @@
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
      */
     public Object jjtAccept(ParserVisitor visitor, Object data)
     {

Modified: velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTSetDirective.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTSetDirective.java?view=diff&rev=517553&r1=517552&r2=517553
==============================================================================
--- velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTSetDirective.java (original)
+++ velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTSetDirective.java Mon Mar 12 23:09:58 2007
@@ -28,7 +28,6 @@
 import org.apache.velocity.exception.TemplateInitException;
 import org.apache.velocity.runtime.RuntimeConstants;
 import org.apache.velocity.runtime.parser.Parser;
-import org.apache.velocity.runtime.parser.ParserVisitor;
 import org.apache.velocity.util.introspection.Info;
 
 /**
@@ -68,7 +67,7 @@
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
      */
     public Object jjtAccept(ParserVisitor visitor, Object data)
     {

Modified: velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTStop.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTStop.java?view=diff&rev=517553&r1=517552&r2=517553
==============================================================================
--- velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTStop.java (original)
+++ velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTStop.java Mon Mar 12 23:09:58 2007
@@ -19,16 +19,14 @@
  * under the License.    
  */
 
-import java.io.Writer;
 import java.io.IOException;
+import java.io.Writer;
 
 import org.apache.velocity.context.InternalContextAdapter;
-import org.apache.velocity.runtime.parser.Parser;
-import org.apache.velocity.runtime.parser.ParserVisitor;
-
 import org.apache.velocity.exception.MethodInvocationException;
 import org.apache.velocity.exception.ParseErrorException;
 import org.apache.velocity.exception.ResourceNotFoundException;
+import org.apache.velocity.runtime.parser.Parser;
 
 /**
  * This class is responsible for handling the #stop directive
@@ -59,7 +57,7 @@
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
      */
     public Object jjtAccept(ParserVisitor visitor, Object data)
     {

Modified: velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTStringLiteral.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTStringLiteral.java?view=diff&rev=517553&r1=517552&r2=517553
==============================================================================
--- velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTStringLiteral.java (original)
+++ velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTStringLiteral.java Mon Mar 12 23:09:58 2007
@@ -1,22 +1,20 @@
 package org.apache.velocity.runtime.parser.node;
 
 /*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
  */
 
 import java.io.BufferedReader;
@@ -32,11 +30,10 @@
 import org.apache.velocity.runtime.RuntimeConstants;
 import org.apache.velocity.runtime.parser.ParseException;
 import org.apache.velocity.runtime.parser.Parser;
-import org.apache.velocity.runtime.parser.ParserVisitor;
 
 /**
- * ASTStringLiteral support.  Will interpolate!
- *
+ * ASTStringLiteral support. Will interpolate!
+ * 
  * @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
  * @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
  * @version $Id$
@@ -45,8 +42,11 @@
 {
     /* cache the value of the interpolation switch */
     private boolean interpolate = true;
+
     private SimpleNode nodeTree = null;
+
     private String image = "";
+
     private String interpolateimage = "";
 
     /** true if the string contains a line comment (##) */
@@ -70,60 +70,59 @@
     }
 
     /**
-     *  init : we don't have to do much.  Init the tree (there
-     *  shouldn't be one) and then see if interpolation is turned on.
+     * init : we don't have to do much. Init the tree (there shouldn't be one)
+     * and then see if interpolation is turned on.
+     * 
      * @param context
      * @param data
      * @return Init result.
      * @throws TemplateInitException
      */
     public Object init(InternalContextAdapter context, Object data)
-    throws TemplateInitException
+            throws TemplateInitException
     {
         /*
-         *  simple habit...  we prollie don't have an AST beneath us
+         * simple habit... we prollie don't have an AST beneath us
          */
 
         super.init(context, data);
 
         /*
-         *  the stringlit is set at template parse time, so we can
-         *  do this here for now.  if things change and we can somehow
-         * create stringlits at runtime, this must
-         *  move to the runtime execution path
-         *
-         *  so, only if interpolation is turned on AND it starts
-         *  with a " AND it has a  directive or reference, then we
-         *  can  interpolate.  Otherwise, don't bother.
+         * the stringlit is set at template parse time, so we can do this here
+         * for now. if things change and we can somehow create stringlits at
+         * runtime, this must move to the runtime execution path
+         * 
+         * so, only if interpolation is turned on AND it starts with a " AND it
+         * has a directive or reference, then we can interpolate. Otherwise,
+         * don't bother.
          */
 
-        interpolate = rsvc.getBoolean(RuntimeConstants.INTERPOLATE_STRINGLITERALS , true)
-            && getFirstToken().image.startsWith("\"")
-            && ((getFirstToken().image.indexOf('$') != -1)
-                 || (getFirstToken().image.indexOf('#') != -1));
+        interpolate = rsvc.getBoolean(
+                RuntimeConstants.INTERPOLATE_STRINGLITERALS, true)
+                && getFirstToken().image.startsWith("\"")
+                && ((getFirstToken().image.indexOf('$') != -1) || (getFirstToken().image
+                        .indexOf('#') != -1));
 
         /*
-         *  get the contents of the string, minus the '/" at each end
+         * get the contents of the string, minus the '/" at each end
          */
 
-        image = getFirstToken().image.substring(1,
-                                                getFirstToken().image.length() - 1);
+        image = getFirstToken().image.substring(1, getFirstToken().image
+                .length() - 1);
 
         /**
-         * note.  A kludge on a kludge.  The first part, Geir calls
-         * this the dreaded <MORE> kludge.  Basically, the use of the
-         * <MORE> token eats the last character of an interpolated
-         * string.  EXCEPT when a line comment (##) is in
-         * the string this isn't an issue.
-         *
-         * So, to solve this we look for a line comment.  If it isn't found
-         * we add a space here and remove it later.
+         * note. A kludge on a kludge. The first part, Geir calls this the
+         * dreaded <MORE> kludge. Basically, the use of the <MORE> token eats
+         * the last character of an interpolated string. EXCEPT when a line
+         * comment (##) is in the string this isn't an issue.
+         * 
+         * So, to solve this we look for a line comment. If it isn't found we
+         * add a space here and remove it later.
          */
 
         /**
-         * Note - this should really use a regexp to look for [^\]##
-         * but apparently escaping of line comments isn't working right
-         * now anyway.
+         * Note - this should really use a regexp to look for [^\]## but
+         * apparently escaping of line comments isn't working right now anyway.
          */
         containsLineComment = (image.indexOf("##") != -1);
 
@@ -143,33 +142,33 @@
         if (interpolate)
         {
             /*
-             *  now parse and init the nodeTree
+             * now parse and init the nodeTree
              */
-            BufferedReader br = new BufferedReader(new StringReader(interpolateimage));
+            BufferedReader br = new BufferedReader(new StringReader(
+                    interpolateimage));
 
             /*
              * it's possible to not have an initialization context - or we don't
              * want to trust the caller - so have a fallback value if so
-             *
-             *  Also, do *not* dump the VM namespace for this template
+             * 
+             * Also, do *not* dump the VM namespace for this template
              */
 
-            try 
+            try
             {
-                nodeTree  = rsvc.parse(br, (context != null) ?
-                        context.getCurrentTemplateName() : "StringLiteral", false);
+                nodeTree = rsvc.parse(br, (context != null) ? context
+                        .getCurrentTemplateName() : "StringLiteral", false);
             }
             catch (ParseException e)
             {
-                throw new TemplateInitException("Problem parsing String literal.",
-                        e,
-                        (context != null) ? context.getCurrentTemplateName() : "StringLiteral",
-                        getColumn(),
-                        getLine() );
+                throw new TemplateInitException(
+                        "Problem parsing String literal.", e,
+                        (context != null) ? context.getCurrentTemplateName()
+                                : "StringLiteral", getColumn(), getLine());
             }
-                
+
             /*
-             *  init with context. It won't modify anything
+             * init with context. It won't modify anything
              */
 
             nodeTree.init(context, rsvc);
@@ -179,7 +178,8 @@
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor,
+     *      java.lang.Object)
      */
     public Object jjtAccept(ParserVisitor visitor, Object data)
     {
@@ -187,10 +187,10 @@
     }
 
     /**
-     *  renders the value of the string literal
-     *  If the properties allow, and the string literal contains a $ or a #
-     *  the literal is rendered against the context
-     *  Otherwise, the stringlit is returned.
+     * renders the value of the string literal If the properties allow, and the
+     * string literal contains a $ or a # the literal is rendered against the
+     * context Otherwise, the stringlit is returned.
+     * 
      * @param context
      * @return result of the rendering.
      */
@@ -201,7 +201,7 @@
             try
             {
                 /*
-                 *  now render against the real context
+                 * now render against the real context
                  */
 
                 StringWriter writer = new StringWriter();
@@ -214,8 +214,8 @@
                 String ret = writer.toString();
 
                 /*
-                 * if appropriate, remove the space from the end
-                 * (dreaded <MORE> kludge part deux)
+                 * if appropriate, remove the space from the end (dreaded <MORE>
+                 * kludge part deux)
                  */
                 if (!containsLineComment && ret.length() > 0)
                 {
@@ -228,31 +228,31 @@
             }
 
             /**
-             * For interpolated Strings we do not pass exceptions 
-             * through -- just log the problem and move on.
+             * For interpolated Strings we do not pass exceptions through --
+             * just log the problem and move on.
              */
-            catch( ParseErrorException  e )
+            catch (ParseErrorException e)
             {
                 log.error("Error in interpolating string literal", e);
             }
-            catch( MethodInvocationException  e )
+            catch (MethodInvocationException e)
             {
                 log.error("Error in interpolating string literal", e);
             }
-            catch( ResourceNotFoundException  e )
+            catch (ResourceNotFoundException e)
             {
                 log.error("Error in interpolating string literal", e);
             }
-            
+
             /**
              * pass through application level runtime exceptions
              */
-            catch( RuntimeException e )
+            catch (RuntimeException e)
             {
                 throw e;
             }
-            
-            catch( IOException  e )
+
+            catch (IOException e)
             {
                 log.error("Error in interpolating string literal", e);
             }
@@ -260,9 +260,8 @@
         }
 
         /*
-         *  ok, either not allowed to interpolate, there wasn't
-         *  a ref or directive, or we failed, so
-         *  just output the literal
+         * ok, either not allowed to interpolate, there wasn't a ref or
+         * directive, or we failed, so just output the literal
          */
 
         return image;

Modified: velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTSubtractNode.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTSubtractNode.java?view=diff&rev=517553&r1=517552&r2=517553
==============================================================================
--- velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTSubtractNode.java (original)
+++ velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTSubtractNode.java Mon Mar 12 23:09:58 2007
@@ -22,7 +22,6 @@
 import org.apache.velocity.context.InternalContextAdapter;
 import org.apache.velocity.exception.MethodInvocationException;
 import org.apache.velocity.runtime.parser.Parser;
-import org.apache.velocity.runtime.parser.ParserVisitor;
 import org.apache.velocity.util.TemplateNumber;
 
 /**
@@ -57,7 +56,7 @@
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
      */
     public Object jjtAccept(ParserVisitor visitor, Object data)
     {

Modified: velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTText.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTText.java?view=diff&rev=517553&r1=517552&r2=517553
==============================================================================
--- velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTText.java (original)
+++ velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTText.java Mon Mar 12 23:09:58 2007
@@ -19,13 +19,12 @@
  * under the License.    
  */
 
-import java.io.Writer;
 import java.io.IOException;
+import java.io.Writer;
 
 import org.apache.velocity.context.InternalContextAdapter;
 import org.apache.velocity.exception.TemplateInitException;
 import org.apache.velocity.runtime.parser.Parser;
-import org.apache.velocity.runtime.parser.ParserVisitor;
 import org.apache.velocity.runtime.parser.Token;
 
 /**
@@ -53,7 +52,7 @@
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
      */
     public Object jjtAccept(ParserVisitor visitor, Object data)
     {

Modified: velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTTrue.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTTrue.java?view=diff&rev=517553&r1=517552&r2=517553
==============================================================================
--- velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTTrue.java (original)
+++ velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTTrue.java Mon Mar 12 23:09:58 2007
@@ -21,7 +21,6 @@
 
 import org.apache.velocity.context.InternalContextAdapter;
 import org.apache.velocity.runtime.parser.Parser;
-import org.apache.velocity.runtime.parser.ParserVisitor;
 
 /**
  *
@@ -48,7 +47,7 @@
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
      */
     public Object jjtAccept(ParserVisitor visitor, Object data)
     {

Modified: velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTVariable.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTVariable.java?view=diff&rev=517553&r1=517552&r2=517553
==============================================================================
--- velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTVariable.java (original)
+++ velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTVariable.java Mon Mar 12 23:09:58 2007
@@ -20,7 +20,7 @@
  */
 
 import org.apache.velocity.runtime.parser.Parser;
-import org.apache.velocity.runtime.parser.ParserVisitor;
+
 
 /**
  *
@@ -45,7 +45,7 @@
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
      */
     public Object jjtAccept(ParserVisitor visitor, Object data)
     {

Modified: velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTWord.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTWord.java?view=diff&rev=517553&r1=517552&r2=517553
==============================================================================
--- velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTWord.java (original)
+++ velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTWord.java Mon Mar 12 23:09:58 2007
@@ -20,7 +20,6 @@
  */
 
 import org.apache.velocity.runtime.parser.Parser;
-import org.apache.velocity.runtime.parser.ParserVisitor;
 
 /**
  *
@@ -45,7 +44,7 @@
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
      */
     public Object jjtAccept(ParserVisitor visitor, Object data)
     {

Modified: velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTprocess.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTprocess.java?view=diff&rev=517553&r1=517552&r2=517553
==============================================================================
--- velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTprocess.java (original)
+++ velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTprocess.java Mon Mar 12 23:09:58 2007
@@ -20,7 +20,6 @@
  */
 
 import org.apache.velocity.runtime.parser.Parser;
-import org.apache.velocity.runtime.parser.ParserVisitor;
 
 /**
  *
@@ -45,7 +44,7 @@
     }
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.SimpleNode#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
      */
     public Object jjtAccept(ParserVisitor visitor, Object data)
     {

Modified: velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/Node.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/Node.java?view=diff&rev=517553&r1=517552&r2=517553
==============================================================================
--- velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/Node.java (original)
+++ velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/Node.java Mon Mar 12 23:09:58 2007
@@ -27,7 +27,6 @@
 import org.apache.velocity.exception.ParseErrorException;
 import org.apache.velocity.exception.ResourceNotFoundException;
 import org.apache.velocity.exception.TemplateInitException;
-import org.apache.velocity.runtime.parser.ParserVisitor;
 import org.apache.velocity.runtime.parser.Token;
 
 /**

Copied: velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ParserVisitor.java (from r517533, velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/ParserVisitor.java)
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ParserVisitor.java?view=diff&rev=517553&p1=velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/ParserVisitor.java&r1=517533&p2=velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ParserVisitor.java&r2=517553
==============================================================================
--- velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/ParserVisitor.java (original)
+++ velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/ParserVisitor.java Mon Mar 12 23:09:58 2007
@@ -1,4 +1,4 @@
-package org.apache.velocity.runtime.parser;
+package org.apache.velocity.runtime.parser.node;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -16,50 +16,8 @@
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
-
-import org.apache.velocity.runtime.parser.node.ASTAddNode;
-import org.apache.velocity.runtime.parser.node.ASTAndNode;
-import org.apache.velocity.runtime.parser.node.ASTAssignment;
-import org.apache.velocity.runtime.parser.node.ASTBlock;
-import org.apache.velocity.runtime.parser.node.ASTComment;
-import org.apache.velocity.runtime.parser.node.ASTDirective;
-import org.apache.velocity.runtime.parser.node.ASTDivNode;
-import org.apache.velocity.runtime.parser.node.ASTEQNode;
-import org.apache.velocity.runtime.parser.node.ASTElseIfStatement;
-import org.apache.velocity.runtime.parser.node.ASTElseStatement;
-import org.apache.velocity.runtime.parser.node.ASTEscape;
-import org.apache.velocity.runtime.parser.node.ASTEscapedDirective;
-import org.apache.velocity.runtime.parser.node.ASTExpression;
-import org.apache.velocity.runtime.parser.node.ASTFalse;
-import org.apache.velocity.runtime.parser.node.ASTFloatingPointLiteral;
-import org.apache.velocity.runtime.parser.node.ASTGENode;
-import org.apache.velocity.runtime.parser.node.ASTGTNode;
-import org.apache.velocity.runtime.parser.node.ASTIdentifier;
-import org.apache.velocity.runtime.parser.node.ASTIfStatement;
-import org.apache.velocity.runtime.parser.node.ASTIntegerLiteral;
-import org.apache.velocity.runtime.parser.node.ASTIntegerRange;
-import org.apache.velocity.runtime.parser.node.ASTLENode;
-import org.apache.velocity.runtime.parser.node.ASTLTNode;
-import org.apache.velocity.runtime.parser.node.ASTMap;
-import org.apache.velocity.runtime.parser.node.ASTMethod;
-import org.apache.velocity.runtime.parser.node.ASTModNode;
-import org.apache.velocity.runtime.parser.node.ASTMulNode;
-import org.apache.velocity.runtime.parser.node.ASTNENode;
-import org.apache.velocity.runtime.parser.node.ASTNotNode;
-import org.apache.velocity.runtime.parser.node.ASTObjectArray;
-import org.apache.velocity.runtime.parser.node.ASTOrNode;
-import org.apache.velocity.runtime.parser.node.ASTReference;
-import org.apache.velocity.runtime.parser.node.ASTSetDirective;
-import org.apache.velocity.runtime.parser.node.ASTStop;
-import org.apache.velocity.runtime.parser.node.ASTStringLiteral;
-import org.apache.velocity.runtime.parser.node.ASTSubtractNode;
-import org.apache.velocity.runtime.parser.node.ASTText;
-import org.apache.velocity.runtime.parser.node.ASTTrue;
-import org.apache.velocity.runtime.parser.node.ASTWord;
-import org.apache.velocity.runtime.parser.node.ASTprocess;
-import org.apache.velocity.runtime.parser.node.SimpleNode;
 
 /**
  *

Modified: velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/SimpleNode.java
URL: http://svn.apache.org/viewvc/velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/SimpleNode.java?view=diff&rev=517553&r1=517552&r2=517553
==============================================================================
--- velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/SimpleNode.java (original)
+++ velocity/engine/trunk/src/java/org/apache/velocity/runtime/parser/node/SimpleNode.java Mon Mar 12 23:09:58 2007
@@ -31,7 +31,6 @@
 import org.apache.velocity.runtime.RuntimeServices;
 import org.apache.velocity.runtime.log.Log;
 import org.apache.velocity.runtime.parser.Parser;
-import org.apache.velocity.runtime.parser.ParserVisitor;
 import org.apache.velocity.runtime.parser.Token;
 
 /**
@@ -182,7 +181,7 @@
 
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.Node#jjtAccept(org.apache.velocity.runtime.parser.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.Node#jjtAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
      */
     public Object jjtAccept(ParserVisitor visitor, Object data)
     {
@@ -191,7 +190,7 @@
 
 
     /**
-     * @see org.apache.velocity.runtime.parser.node.Node#childrenAccept(org.apache.velocity.runtime.parser.ParserVisitor, java.lang.Object)
+     * @see org.apache.velocity.runtime.parser.node.Node#childrenAccept(org.apache.velocity.runtime.parser.node.ParserVisitor, java.lang.Object)
      */
     public Object childrenAccept(ParserVisitor visitor, Object data)
     {



Mime
View raw message