svn commit: r345574 - in /jakarta/velocity/core/trunk/src/java/org/apache/velocity: app/event/implement/ context/ exception/ runtime/ runtime/directive/ runtime/log/ runtime/parser/

[wg...@apache.org]

Author: wglass
Date: Fri Nov 18 13:11:38 2005
New Revision: 345574

URL: http://svn.apache.org/viewcvs?rev=345574&view=rev
Log:
fix imports

Modified:
    jakarta/velocity/core/trunk/src/java/org/apache/velocity/app/event/implement/PrintExceptions.java
    jakarta/velocity/core/trunk/src/java/org/apache/velocity/context/AbstractContext.java
    jakarta/velocity/core/trunk/src/java/org/apache/velocity/exception/ParseErrorException.java
    jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/VelocimacroManager.java
    jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/VMProxyArg.java
    jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/VelocimacroProxy.java
    jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/log/Log.java
    jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/log/SimpleLog4JLogSystem.java
    jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/JJTParserState.java
    jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/Parser.java
    jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/ParserTokenManager.java

Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/app/event/implement/PrintExceptions.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/app/event/implement/PrintExceptions.java?rev=345574&r1=345573&r2=345574&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/app/event/implement/PrintExceptions.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/app/event/implement/PrintExceptions.java Fri Nov 18 13:11:38 2005
@@ -16,12 +16,10 @@
  * limitations under the License.
  */
 
-import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
-
-import org.apache.velocity.app.event.RuntimeServicesAware;
 import org.apache.velocity.app.event.MethodExceptionEventHandler;
+import org.apache.velocity.app.event.RuntimeServicesAware;
 import org.apache.velocity.runtime.RuntimeServices;
 
 /**

Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/context/AbstractContext.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/context/AbstractContext.java?rev=345574&r1=345573&r2=345574&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/context/AbstractContext.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/context/AbstractContext.java Fri Nov 18 13:11:38 2005
@@ -16,7 +16,6 @@
  * limitations under the License.
  */
 
-import java.io.Serializable;
 
 /**
  *  This class is the abstract base class for all conventional 

Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/exception/ParseErrorException.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/exception/ParseErrorException.java?rev=345574&r1=345573&r2=345574&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/exception/ParseErrorException.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/exception/ParseErrorException.java Fri Nov 18 13:11:38 2005
@@ -17,7 +17,6 @@
  */
 
 import org.apache.velocity.runtime.parser.ParseException;
-import org.apache.velocity.runtime.parser.TemplateParseException;
 
 /**
  *  Application-level exception thrown when a resource of any type

Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/VelocimacroManager.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/VelocimacroManager.java?rev=345574&r1=345573&r2=345574&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/VelocimacroManager.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/VelocimacroManager.java Fri Nov 18 13:11:38 2005
@@ -16,16 +16,12 @@
  * limitations under the License.
  */
 
-import java.util.Hashtable;
-
-import java.io.StringReader;
 import java.io.BufferedReader;
-
+import java.io.StringReader;
+import java.util.Hashtable;
+import org.apache.velocity.context.InternalContextAdapter;
 import org.apache.velocity.runtime.directive.VelocimacroProxy;
 import org.apache.velocity.runtime.parser.node.SimpleNode;
-import org.apache.velocity.util.StringUtils;
-
-import org.apache.velocity.context.InternalContextAdapter;
 
 /**
  * Manages VMs in namespaces.  Currently, two namespace modes are

Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/VMProxyArg.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/VMProxyArg.java?rev=345574&r1=345573&r2=345574&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/VMProxyArg.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/VMProxyArg.java Fri Nov 18 13:11:38 2005
@@ -16,21 +16,18 @@
  * limitations under the License.
  */
 
-import java.io.StringWriter;
-import java.io.StringReader;
 import java.io.BufferedReader;
-
+import java.io.StringReader;
+import java.io.StringWriter;
+import org.apache.velocity.VelocityContext;
 import org.apache.velocity.context.InternalContextAdapter;
 import org.apache.velocity.context.InternalContextAdapterImpl;
-import org.apache.velocity.runtime.log.Log;
+import org.apache.velocity.exception.MethodInvocationException;
 import org.apache.velocity.runtime.RuntimeServices;
-import org.apache.velocity.runtime.parser.node.ASTReference;
+import org.apache.velocity.runtime.log.Log;
 import org.apache.velocity.runtime.parser.ParserTreeConstants;
+import org.apache.velocity.runtime.parser.node.ASTReference;
 import org.apache.velocity.runtime.parser.node.SimpleNode;
-import org.apache.velocity.util.StringUtils;
-
-import org.apache.velocity.exception.MethodInvocationException;
-import org.apache.velocity.VelocityContext;
 
 /**
  *  The function of this class is to proxy for the calling parameter to the VM.

Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/VelocimacroProxy.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/VelocimacroProxy.java?rev=345574&r1=345573&r2=345574&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/VelocimacroProxy.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/VelocimacroProxy.java Fri Nov 18 13:11:38 2005
@@ -16,25 +16,20 @@
  * limitations under the License.
  */
 
-import java.io.Writer;
-import java.io.IOException;
 import java.io.BufferedReader;
+import java.io.IOException;
 import java.io.StringReader;
-
+import java.io.Writer;
 import java.util.HashMap;
-
 import org.apache.velocity.context.InternalContextAdapter;
 import org.apache.velocity.context.VMContext;
-
-import org.apache.velocity.runtime.visitor.VMReferenceMungeVisitor;
+import org.apache.velocity.exception.MethodInvocationException;
 import org.apache.velocity.runtime.RuntimeServices;
-import org.apache.velocity.runtime.parser.node.Node;
-import org.apache.velocity.runtime.parser.Token;
 import org.apache.velocity.runtime.parser.ParserTreeConstants;
+import org.apache.velocity.runtime.parser.Token;
+import org.apache.velocity.runtime.parser.node.Node;
 import org.apache.velocity.runtime.parser.node.SimpleNode;
-import org.apache.velocity.util.StringUtils;
-
-import org.apache.velocity.exception.MethodInvocationException;
+import org.apache.velocity.runtime.visitor.VMReferenceMungeVisitor;
 
 /**
  *  VelocimacroProxy.java

Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/log/Log.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/log/Log.java?rev=345574&r1=345573&r2=345574&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/log/Log.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/log/Log.java Fri Nov 18 13:11:38 2005
@@ -16,7 +16,6 @@
 
 package org.apache.velocity.runtime.log;
 
-import org.apache.velocity.util.StringUtils;
 
 /**
  * Convenient wrapper for LogChute functions. This implements

Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/log/SimpleLog4JLogSystem.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/log/SimpleLog4JLogSystem.java?rev=345574&r1=345573&r2=345574&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/log/SimpleLog4JLogSystem.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/log/SimpleLog4JLogSystem.java Fri Nov 18 13:11:38 2005
@@ -16,14 +16,10 @@
  * limitations under the License.
  */
 
-import java.util.Enumeration;
-
 import org.apache.log4j.Category;
-import org.apache.log4j.RollingFileAppender;
-import org.apache.log4j.PatternLayout;
-import org.apache.log4j.Appender;
 import org.apache.log4j.Level;
-
+import org.apache.log4j.PatternLayout;
+import org.apache.log4j.RollingFileAppender;
 import org.apache.velocity.runtime.RuntimeConstants;
 import org.apache.velocity.runtime.RuntimeServices;
 

Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/JJTParserState.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/JJTParserState.java?rev=345574&r1=345573&r2=345574&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/JJTParserState.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/JJTParserState.java Fri Nov 18 13:11:38 2005
@@ -2,7 +2,6 @@
 
 package org.apache.velocity.runtime.parser;
 
-import org.apache.velocity.runtime.parser.node.*;
 
 class JJTParserState {
   private java.util.Stack nodes;

Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/Parser.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/Parser.java?rev=345574&r1=345573&r2=345574&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/Parser.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/Parser.java Fri Nov 18 13:11:38 2005
@@ -1,15 +1,54 @@
 /* Generated By:JJTree&JavaCC: Do not edit this line. Parser.java */
 package org.apache.velocity.runtime.parser;
 
-import java.io.*;
-import java.util.*;
-
+import java.io.ByteArrayInputStream;
+import java.io.Reader;
+import java.util.Hashtable;
 import org.apache.velocity.runtime.RuntimeServices;
-import org.apache.velocity.runtime.parser.node.*;
 import org.apache.velocity.runtime.directive.Directive;
 import org.apache.velocity.runtime.directive.Macro;
 import org.apache.velocity.runtime.directive.MacroParseException;
-import org.apache.velocity.util.StringUtils;
+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;
 
 /**
  * This class is responsible for parsing a Velocity

Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/ParserTokenManager.java
URL: http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/ParserTokenManager.java?rev=345574&r1=345573&r2=345574&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/ParserTokenManager.java (original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/ParserTokenManager.java Fri Nov 18 13:11:38 2005
@@ -1,13 +1,8 @@
 /* Generated By:JJTree&JavaCC: Do not edit this line. ParserTokenManager.java */
 package org.apache.velocity.runtime.parser;
-import java.io.*;
-import java.util.*;
-import org.apache.velocity.runtime.RuntimeServices;
-import org.apache.velocity.runtime.parser.node.*;
-import org.apache.velocity.runtime.directive.Directive;
-import org.apache.velocity.runtime.directive.Macro;
-import org.apache.velocity.runtime.directive.MacroParseException;
-import org.apache.velocity.util.StringUtils;
+import java.util.EmptyStackException;
+import java.util.Hashtable;
+import java.util.Stack;
 
 public class ParserTokenManager implements ParserConstants
 {



---------------------------------------------------------------------
To unsubscribe, e-mail: velocity-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: velocity-dev-help@jakarta.apache.org