geirm 01/05/20 12:50:09
Modified: src/java/org/apache/velocity/runtime/parser/node
ASTMethod.java ASTReference.java
ASTSetDirective.java PropertyExecutor.java
Log:
Should be no more than changes to import because of event migration from
context to app.event
Revision Changes Path
1.17 +3 -3
jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTMethod.java
Index: ASTMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTMethod.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ASTMethod.java 2001/04/23 00:41:37 1.16
+++ ASTMethod.java 2001/05/20 19:50:05 1.17
@@ -67,8 +67,8 @@
import org.apache.velocity.exception.MethodInvocationException;
import java.lang.reflect.InvocationTargetException;
-import org.apache.velocity.context.EventCartridge;
-import org.apache.velocity.context.MethodExceptionEventHandler;
+import org.apache.velocity.app.event.EventCartridge;
+import org.apache.velocity.app.event.MethodExceptionEventHandler;
/**
* ASTMethod.java
@@ -84,7 +84,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
- * @version $Id: ASTMethod.java,v 1.16 2001/04/23 00:41:37 geirm Exp $
+ * @version $Id: ASTMethod.java,v 1.17 2001/05/20 19:50:05 geirm Exp $
*/
public class ASTMethod extends SimpleNode
{
1.33 +3 -3
jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTReference.java
Index: ASTReference.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/ASTReference.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- ASTReference.java 2001/05/17 16:04:23 1.32
+++ ASTReference.java 2001/05/20 19:50:06 1.33
@@ -69,8 +69,8 @@
import org.apache.velocity.exception.MethodInvocationException;
-import org.apache.velocity.context.EventCartridge;
-import org.apache.velocity.context.ReferenceInsertionEventHandler;
+import org.apache.velocity.app.event.EventCartridge;
+import org.apache.velocity.app.event.ReferenceInsertionEventHandler;
/**
* This class is responsible for handling the references in
@@ -83,7 +83,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Christoph Reck</a>
* @author <a href="mailto:[EMAIL PROTECTED]>Kent Johnson</a>
- * @version $Id: ASTReference.java,v 1.32 2001/05/17 16:04:23 geirm Exp $
+ * @version $Id: ASTReference.java,v 1.33 2001/05/20 19:50:06 geirm Exp $
*/
public class ASTReference extends SimpleNode
{
1.17 +3 -3
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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ASTSetDirective.java 2001/04/20 04:28:47 1.16
+++ ASTSetDirective.java 2001/05/20 19:50:06 1.17
@@ -65,15 +65,15 @@
import org.apache.velocity.exception.MethodInvocationException;
-import org.apache.velocity.context.NullSetEventHandler;
-import org.apache.velocity.context.EventCartridge;
+import org.apache.velocity.app.event.NullSetEventHandler;
+import org.apache.velocity.app.event.EventCartridge;
/**
* Node for the #set directive
*
* @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.16 2001/04/20 04:28:47 geirm Exp $
+ * @version $Id: ASTSetDirective.java,v 1.17 2001/05/20 19:50:06 geirm Exp $
*/
public class ASTSetDirective extends SimpleNode
{
1.8 +1 -1
jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/PropertyExecutor.java
Index: PropertyExecutor.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/parser/node/PropertyExecutor.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- PropertyExecutor.java 2001/04/23 00:41:37 1.7
+++ PropertyExecutor.java 2001/05/20 19:50:07 1.8
@@ -57,7 +57,7 @@
import java.lang.reflect.InvocationTargetException;
import org.apache.velocity.exception.MethodInvocationException;
-import org.apache.velocity.context.EventCartridge;
+import org.apache.velocity.app.event.EventCartridge;
import org.apache.velocity.context.InternalContextAdapter;
/**