geirm 01/01/02 21:24:59
Modified: src/java/org/apache/velocity/runtime/parser/node
ASTDirective.java ASTDivNode.java
Log:
No functional change. New context support in AST.
Revision Changes Path
1.13 +7 -6
jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTDirective.java
Index: ASTDirective.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTDirective.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ASTDirective.java 2000/12/11 04:36:03 1.12
+++ ASTDirective.java 2001/01/03 05:24:59 1.13
@@ -64,7 +64,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
- * @version $Id: ASTDirective.java,v 1.12 2000/12/11 04:36:03 geirm Exp $
+ * @version $Id: ASTDirective.java,v 1.13 2001/01/03 05:24:59 geirm Exp $
*/
package org.apache.velocity.runtime.parser.node;
@@ -72,10 +72,10 @@
import java.io.Writer;
import java.io.IOException;
-import org.apache.velocity.Context;
+import org.apache.velocity.context.InternalContextAdapter;
import org.apache.velocity.runtime.directive.Directive;
import org.apache.velocity.runtime.directive.Parse;
-import org.apache.velocity.runtime.parser.*;
+import org.apache.velocity.runtime.parser.Parser;
import org.apache.velocity.runtime.Runtime;
public class ASTDirective extends SimpleNode
@@ -103,7 +103,8 @@
return visitor.visit(this, data);
}
- public Object init(Context context, Object data) throws Exception
+ public Object init( InternalContextAdapter context, Object data)
+ throws Exception
{
/*
* only do things that are not context dependant
@@ -131,7 +132,7 @@
*/
isDirective = true;
- directive = (Directive) Runtime.getVelocimacro( directiveName,
context.getCurrentTemplateName() );
+ directive = (Directive) Runtime.getVelocimacro( directiveName,
context.getCurrentTemplateName() );
directive.init( context, this );
}
else
@@ -142,7 +143,7 @@
return data;
}
- public boolean render(Context context, Writer writer)
+ public boolean render( InternalContextAdapter context, Writer writer)
throws IOException
{
/*
1.3 +5 -5
jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTDivNode.java
Index: ASTDivNode.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTDivNode.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ASTDivNode.java 2000/12/27 14:31:53 1.2
+++ ASTDivNode.java 2001/01/03 05:24:59 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: ASTDivNode.java,v 1.2 2000/12/27 14:31:53 geirm Exp $
+ * @version $Id: ASTDivNode.java,v 1.3 2001/01/03 05:24:59 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 @@
* 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 division
operation has null value."
+ " Operation not possible. "
- + context.getCurrentTemplateName() + " [line " +
getLine()
+ + context.getCurrentTemplateName() + " [line " +
getLine()
+ ", column " + getColumn() + "]");
return null;
}
@@ -139,7 +139,7 @@
if ( ( (Integer) right).intValue() == 0 )
{
Runtime.error( "Right side of division operation is zero. Must be
non-zero. "
- + context.getCurrentTemplateName() + " [line " +
getLine()
+ + context.getCurrentTemplateName() + " [line " +
getLine()
+ ", column " + getColumn() + "]");
return null;
