geirm 01/01/02 21:27:04
Modified: src/java/org/apache/velocity/runtime/parser/node
ASTSetDirective.java ASTStringLiteral.java
ASTSubtractNode.java
Log:
No functional change. New context support in AST.
Revision Changes Path
1.11 +6 -5
jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTSetDirective.java
Index: ASTSetDirective.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTSetDirective.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ASTSetDirective.java 2000/12/27 14:29:44 1.10
+++ ASTSetDirective.java 2001/01/03 05:27:04 1.11
@@ -59,7 +59,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
- * @version $Id: ASTSetDirective.java,v 1.10 2000/12/27 14:29:44 geirm Exp $
+ * @version $Id: ASTSetDirective.java,v 1.11 2001/01/03 05:27:04 geirm Exp $
*/
package org.apache.velocity.runtime.parser.node;
@@ -67,10 +67,11 @@
import java.io.IOException;
import java.io.Writer;
-import org.apache.velocity.Context;
+import org.apache.velocity.context.InternalContextAdapter;
import org.apache.velocity.runtime.Runtime;
import org.apache.velocity.runtime.exception.ReferenceException;
-import org.apache.velocity.runtime.parser.*;
+import org.apache.velocity.runtime.parser.Parser;
+import org.apache.velocity.runtime.parser.Token;
public class ASTSetDirective extends SimpleNode
{
@@ -98,7 +99,7 @@
/**
* simple init. We can get the RHS and LHS as the the tree structure is static
*/
- public Object init(Context context, Object data) throws Exception
+ public Object init( InternalContextAdapter context, Object data) throws
Exception
{
/*
* init the tree correctly
@@ -137,7 +138,7 @@
/**
* puts the value of the RHS into the context under the key of the LHS
*/
- public boolean render(Context context, Writer writer)
+ public boolean render( InternalContextAdapter context, Writer writer)
throws IOException
{
/*
1.7 +5 -5
jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTStringLiteral.java
Index: ASTStringLiteral.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTStringLiteral.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ASTStringLiteral.java 2000/12/21 05:51:38 1.6
+++ ASTStringLiteral.java 2001/01/03 05:27:04 1.7
@@ -59,13 +59,13 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
- * @version $Id: ASTStringLiteral.java,v 1.6 2000/12/21 05:51:38 geirm Exp $
+ * @version $Id: ASTStringLiteral.java,v 1.7 2001/01/03 05:27:04 geirm Exp $
*/
package org.apache.velocity.runtime.parser.node;
-import org.apache.velocity.Context;
-import org.apache.velocity.runtime.parser.*;
+import org.apache.velocity.context.InternalContextAdapter;
+import org.apache.velocity.runtime.parser.Parser;
import java.io.StringWriter;
import java.io.ByteArrayInputStream;
@@ -92,7 +92,7 @@
* init : we don't have to do much. Init the tree (there shouldn't be
* one ) and then see if interpolation is turned on.
*/
- public Object init(Context context, Object data)
+ public Object init( InternalContextAdapter context, Object data)
throws Exception
{
/*
@@ -135,7 +135,7 @@
* the literal is rendered against the context
* Otherwise, the stringlit is returned.
*/
- public Object value(Context context)
+ public Object value( InternalContextAdapter context)
{
if (interpolate )
{
1.3 +5 -4
jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTSubtractNode.java
Index: ASTSubtractNode.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTSubtractNode.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ASTSubtractNode.java 2000/12/27 14:31:54 1.2
+++ ASTSubtractNode.java 2001/01/03 05:27:04 1.3
@@ -63,12 +63,12 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
- * @version $Id: ASTSubtractNode.java,v 1.2 2000/12/27 14:31:54 geirm Exp $
+ * @version $Id: ASTSubtractNode.java,v 1.3 2001/01/03 05:27:04 geirm Exp $
*/
package org.apache.velocity.runtime.parser.node;
-import org.apache.velocity.Context;
+import org.apache.velocity.context.InternalContextAdapter;
import org.apache.velocity.runtime.Runtime;
import org.apache.velocity.runtime.parser.Parser;
@@ -95,7 +95,7 @@
* limited to integers
* @return Integer(value) or null
*/
- public Object value(Context context)
+ public Object value( InternalContextAdapter context)
{
/*
* get the two args
@@ -112,7 +112,7 @@
{
Runtime.error( ( left == null ? "Left" : "Right" ) + " side of
subtraction operation has null value."
+ " Operation not possible. "
- + context.getCurrentTemplateName() + " [line " +
getLine()
+ + context.getCurrentTemplateName() + " [line " +
getLine()
+ ", column " + getColumn() + "]");
return null;
}
@@ -135,5 +135,6 @@
return new Integer( ( (Integer) left ).intValue() - ( (Integer) right
).intValue() );
}
}
+
