geirm 01/01/02 21:25:51
Modified: src/java/org/apache/velocity/runtime/parser/node
ASTIdentifier.java ASTIfStatement.java
ASTIntegerRange.java
Log:
No functional change. New context support in AST.
Revision Changes Path
1.5 +4 -4
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ASTIdentifier.java 2000/12/12 23:46:07 1.4
+++ ASTIdentifier.java 2001/01/03 05:25:50 1.5
@@ -71,14 +71,14 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
- * @version $Id: ASTIdentifier.java,v 1.4 2000/12/12 23:46:07 geirm Exp $
+ * @version $Id: ASTIdentifier.java,v 1.5 2001/01/03 05:25:50 geirm Exp $
*/
package org.apache.velocity.runtime.parser.node;
import java.util.Map;
import java.lang.reflect.Method;
-import org.apache.velocity.Context;
+import org.apache.velocity.context.InternalContextAdapter;
import org.apache.velocity.runtime.parser.*;
import org.apache.velocity.util.introspection.IntrospectionCacheData;
@@ -107,7 +107,7 @@
* simple init - don't do anything that is context specific.
* just get what we need from the AST, which is static.
*/
- public Object init(Context context, Object data)
+ public Object init( InternalContextAdapter context, Object data)
throws Exception
{
super.init( context, data );
@@ -152,7 +152,7 @@
/**
* invokes the method on the object passed in
*/
- public Object execute(Object o, Context context)
+ public Object execute(Object o, InternalContextAdapter context)
{
AbstractExecutor executor = null;
1.6 +4 -12
jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTIfStatement.java
Index: ASTIfStatement.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTIfStatement.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ASTIfStatement.java 2000/12/15 06:55:33 1.5
+++ ASTIfStatement.java 2001/01/03 05:25:51 1.6
@@ -60,7 +60,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
- * @version $Id: ASTIfStatement.java,v 1.5 2000/12/15 06:55:33 jvanzyl Exp $
+ * @version $Id: ASTIfStatement.java,v 1.6 2001/01/03 05:25:51 geirm Exp $
*/
package org.apache.velocity.runtime.parser.node;
@@ -68,7 +68,7 @@
import java.io.Writer;
import java.io.IOException;
-import org.apache.velocity.Context;
+import org.apache.velocity.context.InternalContextAdapter;
import org.apache.velocity.runtime.parser.*;
public class ASTIfStatement extends SimpleNode
@@ -89,7 +89,7 @@
return visitor.visit(this, data);
}
- public boolean render(Context context, Writer writer)
+ public boolean render( InternalContextAdapter context, Writer writer)
throws IOException
{
/*
@@ -131,18 +131,10 @@
return true;
}
- public void process(Context context, ParserVisitor visitor)
+ public void process( InternalContextAdapter context, ParserVisitor visitor)
{
}
}
-
-
-
-
-
-
-
-
1.2 +7 -7
jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTIntegerRange.java
Index: ASTIntegerRange.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTIntegerRange.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ASTIntegerRange.java 2000/12/28 16:22:00 1.1
+++ ASTIntegerRange.java 2001/01/03 05:25:51 1.2
@@ -61,14 +61,14 @@
* what controls the generation of this class.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
- * @version $Id: ASTIntegerRange.java,v 1.1 2000/12/28 16:22:00 geirm Exp $
+ * @version $Id: ASTIntegerRange.java,v 1.2 2001/01/03 05:25:51 geirm Exp $
*/
package org.apache.velocity.runtime.parser.node;
-import java.util.Vector;
+import java.util.ArrayList;
-import org.apache.velocity.Context;
+import org.apache.velocity.context.InternalContextAdapter;
import org.apache.velocity.runtime.Runtime;
import org.apache.velocity.runtime.parser.Parser;
@@ -97,7 +97,7 @@
* @param context app context used if Left or Right of .. is a ref
* @return Object array of Integers
*/
- public Object value(Context context)
+ public Object value( InternalContextAdapter context)
{
/*
* get the two range ends
@@ -114,7 +114,7 @@
{
Runtime.error( ( left == null ? "Left" : "Right" ) + " side of range
operator [n..m] has null value."
+ " Operation not possible. "
- + context.getCurrentTemplateName() + " [line " +
getLine()
+ + context.getCurrentTemplateName() + " [line " +
getLine()
+ ", column " + getColumn() + "]");
return null;
}
@@ -159,12 +159,12 @@
* make the vector and fill it
*/
- Object[] foo = new Object[num];
+ ArrayList foo = new ArrayList();
int val = l;
for(int i =0; i < num; i++)
{
- foo[i] = new Integer( val );
+ foo.add( new Integer( val ));
val += delta;
}
