jvanzyl 00/10/20 19:00:18
Modified: src/java/org/apache/velocity Template.java
src/java/org/apache/velocity/runtime Runtime.java
src/java/org/apache/velocity/runtime/visitor
BaseVisitor.java NodeViewMode.java
src/java/org/apache/velocity/test TemplateNodeView.java
Log:
- cleanups.
Revision Changes Path
1.9 +2 -2 jakarta-velocity/src/java/org/apache/velocity/Template.java
Index: Template.java
===================================================================
RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/Template.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Template.java 2000/10/20 02:38:06 1.8
+++ Template.java 2000/10/21 02:00:17 1.9
@@ -59,7 +59,7 @@
import java.io.Writer;
import org.apache.velocity.runtime.Runtime;
-import org.apache.velocity.runtime.parser.SimpleNode;
+import org.apache.velocity.runtime.parser.node.SimpleNode;
/**
* This class is used for controlling all template
@@ -81,7 +81,7 @@
* </pre>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
- * @version $Id: Template.java,v 1.8 2000/10/20 02:38:06 jvanzyl Exp $
+ * @version $Id: Template.java,v 1.9 2000/10/21 02:00:17 jvanzyl Exp $
*/
public class Template
{
1.22 +2 -2
jakarta-velocity/src/java/org/apache/velocity/runtime/Runtime.java
Index: Runtime.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/Runtime.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Runtime.java 2000/10/19 22:10:10 1.21
+++ Runtime.java 2000/10/21 02:00:17 1.22
@@ -73,7 +73,7 @@
import org.apache.velocity.Template;
import org.apache.velocity.runtime.parser.Parser;
-import org.apache.velocity.runtime.parser.SimpleNode;
+import org.apache.velocity.runtime.parser.node.SimpleNode;
import org.apache.velocity.runtime.loader.TemplateFactory;
import org.apache.velocity.runtime.loader.TemplateLoader;
@@ -138,7 +138,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Jeff Bowden</a>
- * @version $Id: Runtime.java,v 1.21 2000/10/19 22:10:10 jvanzyl Exp $
+ * @version $Id: Runtime.java,v 1.22 2000/10/21 02:00:17 jvanzyl Exp $
*/
public class Runtime
{
1.3 +2 -1
jakarta-velocity/src/java/org/apache/velocity/runtime/visitor/BaseVisitor.java
Index: BaseVisitor.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/visitor/BaseVisitor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BaseVisitor.java 2000/10/12 16:33:23 1.2
+++ BaseVisitor.java 2000/10/21 02:00:17 1.3
@@ -62,7 +62,8 @@
import org.apache.velocity.Context;
import org.apache.velocity.util.ClassUtils;
-import org.apache.velocity.runtime.parser.*;
+import org.apache.velocity.runtime.parser.ParserVisitor;
+import org.apache.velocity.runtime.parser.node.*;
/**
* This is the base class for all visitors.
1.3 +3 -2
jakarta-velocity/src/java/org/apache/velocity/runtime/visitor/NodeViewMode.java
Index: NodeViewMode.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/visitor/NodeViewMode.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NodeViewMode.java 2000/10/03 17:03:49 1.2
+++ NodeViewMode.java 2000/10/21 02:00:18 1.3
@@ -55,7 +55,8 @@
*/
import org.apache.velocity.*;
-import org.apache.velocity.runtime.parser.*;
+import org.apache.velocity.runtime.parser.Token;
+import org.apache.velocity.runtime.parser.node.*;
/**
* This class is simply a visitor implementation
@@ -66,7 +67,7 @@
* as well.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
- * @version $Id: NodeViewMode.java,v 1.2 2000/10/03 17:03:49 jvanzyl Exp $
+ * @version $Id: NodeViewMode.java,v 1.3 2000/10/21 02:00:18 jvanzyl Exp $
*/
public class NodeViewMode extends BaseVisitor
{
1.3 +1 -1
jakarta-velocity/src/java/org/apache/velocity/test/TemplateNodeView.java
Index: TemplateNodeView.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/test/TemplateNodeView.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TemplateNodeView.java 2000/10/12 15:14:33 1.2
+++ TemplateNodeView.java 2000/10/21 02:00:18 1.3
@@ -60,8 +60,8 @@
import org.apache.velocity.runtime.Runtime;
-import org.apache.velocity.runtime.parser.SimpleNode;
import org.apache.velocity.runtime.visitor.NodeViewMode;
+import org.apache.velocity.runtime.parser.node.SimpleNode;
/**
* Simple class for dumping the AST for a template.
