You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@velocity.apache.org by ge...@apache.org on 2001/03/19 19:33:10 UTC
cvs commit: jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node ASTElseStatement.java ASTEscape.java ASTEscapedDirective.java ASTFalse.java ASTIdentifier.java ASTNumberLiteral.java ASTParameters.java
geirm 01/03/19 10:33:10
Modified: src/java/org/apache/velocity/runtime/parser/node
ASTElseStatement.java ASTEscape.java
ASTEscapedDirective.java ASTFalse.java
ASTIdentifier.java ASTNumberLiteral.java
ASTParameters.java
Log:
Another batch : license, date, package, and autogenline
Revision Changes Path
1.6 +9 -13 jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTElseStatement.java
Index: ASTElseStatement.java
===================================================================
RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTElseStatement.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ASTElseStatement.java 2001/01/03 05:25:17 1.5
+++ ASTElseStatement.java 2001/03/19 18:33:09 1.6
@@ -1,9 +1,9 @@
-/* Generated By:JJTree: Do not edit this line. ASTElseStatement.java */
+package org.apache.velocity.runtime.parser.node;
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -25,7 +25,7 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
+ * 4. The names "The Jakarta Project", "Velocity", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact apache@apache.org.
@@ -54,6 +54,11 @@
* <http://www.apache.org/>.
*/
+import java.io.Writer;
+import java.io.IOException;
+
+import org.apache.velocity.context.InternalContextAdapter;
+import org.apache.velocity.runtime.parser.Parser;
/**
* This class is responsible for handling the Else VTL control statement.
@@ -63,17 +68,8 @@
*
* @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
* @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
- * @version $Id: ASTElseStatement.java,v 1.5 2001/01/03 05:25:17 geirm Exp $
+ * @version $Id: ASTElseStatement.java,v 1.6 2001/03/19 18:33:09 geirm Exp $
*/
-
-package org.apache.velocity.runtime.parser.node;
-
-import java.io.Writer;
-import java.io.IOException;
-
-import org.apache.velocity.context.InternalContextAdapter;
-import org.apache.velocity.runtime.parser.Parser;
-
public class ASTElseStatement extends SimpleNode
{
public ASTElseStatement(int id)
1.4 +11 -14 jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTEscape.java
Index: ASTEscape.java
===================================================================
RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTEscape.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ASTEscape.java 2001/01/03 05:25:17 1.3
+++ ASTEscape.java 2001/03/19 18:33:09 1.4
@@ -1,9 +1,9 @@
-/* Generated By:JJTree: Do not edit this line. ASTEscape.java */
+package org.apache.velocity.runtime.parser.node;
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -25,7 +25,7 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
+ * 4. The names "The Jakarta Project", "Velocity", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact apache@apache.org.
@@ -54,6 +54,12 @@
* <http://www.apache.org/>.
*/
+import java.io.Writer;
+import java.io.IOException;
+
+import org.apache.velocity.context.InternalContextAdapter;
+import org.apache.velocity.runtime.parser.Parser;
+
/**
* This class is responsible for handling Escapes
* in VTL.
@@ -62,17 +68,8 @@
* what controls the generation of this class.
*
* @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
- * @version $Id: ASTEscape.java,v 1.3 2001/01/03 05:25:17 geirm Exp $
-*/
-
-package org.apache.velocity.runtime.parser.node;
-
-import java.io.Writer;
-import java.io.IOException;
-
-import org.apache.velocity.context.InternalContextAdapter;
-import org.apache.velocity.runtime.parser.Parser;
-
+ * @version $Id: ASTEscape.java,v 1.4 2001/03/19 18:33:09 geirm Exp $
+ */
public class ASTEscape extends SimpleNode
{
private String text = "";
1.3 +11 -14 jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTEscapedDirective.java
Index: ASTEscapedDirective.java
===================================================================
RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTEscapedDirective.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ASTEscapedDirective.java 2001/01/03 05:25:17 1.2
+++ ASTEscapedDirective.java 2001/03/19 18:33:09 1.3
@@ -1,9 +1,9 @@
-/* Generated By:JJTree: Do not edit this line. ASTEscapedDirective.java */
+package org.apache.velocity.runtime.parser.node;
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -25,7 +25,7 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
+ * 4. The names "The Jakarta Project", "Velocity", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact apache@apache.org.
@@ -54,6 +54,12 @@
* <http://www.apache.org/>.
*/
+import java.io.Writer;
+import java.io.IOException;
+
+import org.apache.velocity.context.InternalContextAdapter;
+import org.apache.velocity.runtime.parser.Parser;
+
/**
* This class is responsible for handling EscapedDirectives
* in VTL.
@@ -62,17 +68,8 @@
* what controls the generation of this class.
*
* @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
- * @version $Id: ASTEscapedDirective.java,v 1.2 2001/01/03 05:25:17 geirm Exp $
-*/
-
-package org.apache.velocity.runtime.parser.node;
-
-import java.io.Writer;
-import java.io.IOException;
-
-import org.apache.velocity.context.InternalContextAdapter;
-import org.apache.velocity.runtime.parser.Parser;
-
+ * @version $Id: ASTEscapedDirective.java,v 1.3 2001/03/19 18:33:09 geirm Exp $
+ */
public class ASTEscapedDirective extends SimpleNode
{
public ASTEscapedDirective(int id)
1.3 +4 -4 jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTFalse.java
Index: ASTFalse.java
===================================================================
RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTFalse.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ASTFalse.java 2001/01/03 05:27:37 1.2
+++ ASTFalse.java 2001/03/19 18:33:09 1.3
@@ -1,8 +1,9 @@
-/* Generated By:JJTree: Do not edit this line. ASTFalse.java */
+package org.apache.velocity.runtime.parser.node;
+
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -24,7 +25,7 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
+ * 4. The names "The Jakarta Project", "Velocity", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact apache@apache.org.
@@ -53,7 +54,6 @@
* <http://www.apache.org/>.
*/
-package org.apache.velocity.runtime.parser.node;
import org.apache.velocity.context.InternalContextAdapter;
import org.apache.velocity.runtime.parser.Parser;
1.9 +18 -23 jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTIdentifier.java
Index: ASTIdentifier.java
===================================================================
RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTIdentifier.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ASTIdentifier.java 2001/03/15 19:28:37 1.8
+++ ASTIdentifier.java 2001/03/19 18:33:10 1.9
@@ -1,9 +1,9 @@
-/* Generated By:JJTree: Do not edit this line. ASTIdentifier.java */
+package org.apache.velocity.runtime.parser.node;
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -25,7 +25,7 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
+ * 4. The names "The Jakarta Project", "Velocity", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact apache@apache.org.
@@ -53,7 +53,15 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
+import java.util.Map;
+
+import java.lang.reflect.Method;
+import org.apache.velocity.context.InternalContextAdapter;
+import org.apache.velocity.runtime.parser.*;
+import org.apache.velocity.util.introspection.IntrospectionCacheData;
+import org.apache.velocity.util.introspection.Introspector;
+
/**
* ASTIdentifier.java
*
@@ -61,29 +69,15 @@
*
* mainly used by ASTRefrence
*
- * Introspection is now moved to 'just in time' or at render / execution time.
- * There are many reasons why this has to be done, but the primary two are
- * thread safety, to remove any context-derived information from class member
- * variables.
+ * Introspection is now moved to 'just in time' or at render / execution
+ * time. There are many reasons why this has to be done, but the
+ * primary two are thread safety, to remove any context-derived
+ * information from class member variables.
*
- * Please look at the Parser.jjt file which is
- * what controls the generation of this class.
- *
* @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
* @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
- * @version $Id: ASTIdentifier.java,v 1.8 2001/03/15 19:28:37 jvanzyl Exp $
+ * @version $Id: ASTIdentifier.java,v 1.9 2001/03/19 18:33:10 geirm Exp $
*/
-package org.apache.velocity.runtime.parser.node;
-
-import java.util.Map;
-
-import java.lang.reflect.Method;
-
-import org.apache.velocity.context.InternalContextAdapter;
-import org.apache.velocity.runtime.parser.*;
-import org.apache.velocity.util.introspection.IntrospectionCacheData;
-import org.apache.velocity.util.introspection.Introspector;
-
public class ASTIdentifier extends SimpleNode
{
private String identifier = "";
@@ -196,7 +190,8 @@
catch( Exception e)
{
e.printStackTrace();
- System.out.println("ASTIdentifier.execute() : identifier = " + identifier + " : " + e );
+ System.out.println("ASTIdentifier.execute() : identifier = "
+ + identifier + " : " + e );
}
if (executor != null)
1.3 +3 -5 jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTNumberLiteral.java
Index: ASTNumberLiteral.java
===================================================================
RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTNumberLiteral.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ASTNumberLiteral.java 2001/01/03 05:26:44 1.2
+++ ASTNumberLiteral.java 2001/03/19 18:33:10 1.3
@@ -1,9 +1,9 @@
-/* Generated By:JJTree: Do not edit this line. ASTNumberLiteral.java */
+package org.apache.velocity.runtime.parser.node;
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -25,7 +25,7 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
+ * 4. The names "The Jakarta Project", "Velocity", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact apache@apache.org.
@@ -53,8 +53,6 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
-
-package org.apache.velocity.runtime.parser.node;
import org.apache.velocity.context.InternalContextAdapter;
import org.apache.velocity.runtime.parser.Parser;
1.3 +4 -5 jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTParameters.java
Index: ASTParameters.java
===================================================================
RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTParameters.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ASTParameters.java 2001/01/03 05:27:37 1.2
+++ ASTParameters.java 2001/03/19 18:33:10 1.3
@@ -1,8 +1,9 @@
-/* Generated By:JJTree: Do not edit this line. ASTParameters.java */
+package org.apache.velocity.runtime.parser.node;
+
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -24,7 +25,7 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
+ * 4. The names "The Jakarta Project", "Velocity", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact apache@apache.org.
@@ -52,8 +53,6 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
-
-package org.apache.velocity.runtime.parser.node;
import org.apache.velocity.runtime.parser.Parser;