geirm 01/04/19 21:31:32
Modified: src/java/org/apache/velocity/context
InternalContextAdapterImpl.java
InternalContextBase.java
InternalHousekeepingContext.java VMContext.java
Log:
Hopefully only changes are support for the EventCartridge. I want to give
the whole context thing and interfaces a good scrubbing...
Revision Changes Path
1.5 +14 -2
jakarta-velocity/src/java/org/apache/velocity/context/InternalContextAdapterImpl.java
Index: InternalContextAdapterImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/context/InternalContextAdapterImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- InternalContextAdapterImpl.java 2001/03/31 20:14:25 1.4
+++ InternalContextAdapterImpl.java 2001/04/20 04:31:29 1.5
@@ -56,6 +56,8 @@
import org.apache.velocity.util.introspection.IntrospectionCacheData;
+import org.apache.velocity.context.EventCartridge;
+
/**
* This adapter class is the container for all context types for internal
* use. The AST now uses this class rather than the app-level Context
@@ -84,9 +86,8 @@
*
*
* @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
- * @version $Id: InternalContextAdapterImpl.java,v 1.4 2001/03/31 20:14:25 geirm
Exp $
+ * @version $Id: InternalContextAdapterImpl.java,v 1.5 2001/04/20 04:31:29 geirm
Exp $
*/
-
public final class InternalContextAdapterImpl implements InternalContextAdapter
{
/** the Context that we are wrapping */
@@ -127,6 +128,16 @@
return context;
}
+ public EventCartridge attachEventCartridge( EventCartridge ec )
+ {
+ return icb.attachEventCartridge( ec );
+ }
+
+ public EventCartridge getEventCartridge()
+ {
+ return icb.getEventCartridge( );
+ }
+
/* --- InternalContext interface methods --- */
public void pushCurrentTemplateName( String s )
@@ -190,4 +201,5 @@
{
return this;
}
+
}
1.6 +21 -1
jakarta-velocity/src/java/org/apache/velocity/context/InternalContextBase.java
Index: InternalContextBase.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/context/InternalContextBase.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- InternalContextBase.java 2001/03/05 11:21:43 1.5
+++ InternalContextBase.java 2001/04/20 04:31:29 1.6
@@ -60,6 +60,8 @@
import org.apache.velocity.util.introspection.IntrospectionCacheData;
+import org.apache.velocity.context.EventCartridge;
+
/**
* class to encapsulate the 'stuff' for internal operation of velocity.
* We use the context as a thread-safe storage : we take advantage of the
@@ -73,7 +75,7 @@
* is derived from this.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
- * @version $Id: InternalContextBase.java,v 1.5 2001/03/05 11:21:43 jvanzyl Exp $
+ * @version $Id: InternalContextBase.java,v 1.6 2001/04/20 04:31:29 geirm Exp $
*/
class InternalContextBase implements InternalHousekeepingContext,Serializable
{
@@ -87,6 +89,9 @@
*/
private Stack templateNameStack = new Stack();
+
+ private EventCartridge eventCartridge = null;
+
/**
* set the current template name on top of stack
*
@@ -153,4 +158,19 @@
{
introspectionCache.put( key, o );
}
+
+ public EventCartridge attachEventCartridge( EventCartridge ec )
+ {
+ EventCartridge temp = eventCartridge;
+
+ eventCartridge = ec;
+
+ return temp;
+ }
+
+ public EventCartridge getEventCartridge()
+ {
+ return eventCartridge;
+ }
+
}
1.4 +6 -1
jakarta-velocity/src/java/org/apache/velocity/context/InternalHousekeepingContext.java
Index: InternalHousekeepingContext.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/context/InternalHousekeepingContext.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- InternalHousekeepingContext.java 2001/03/05 11:21:44 1.3
+++ InternalHousekeepingContext.java 2001/04/20 04:31:30 1.4
@@ -56,6 +56,8 @@
import org.apache.velocity.util.introspection.IntrospectionCacheData;
+import org.apache.velocity.context.EventCartridge;
+
/**
* interface to encapsulate the 'stuff' for internal operation of velocity.
* We use the context as a thread-safe storage : we take advantage of the
@@ -67,7 +69,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Christoph Reck</a>
- * @version $Id: InternalHousekeepingContext.java,v 1.3 2001/03/05 11:21:44
jvanzyl Exp $
+ * @version $Id: InternalHousekeepingContext.java,v 1.4 2001/04/20 04:31:30 geirm
Exp $
*/
interface InternalHousekeepingContext
{
@@ -114,4 +116,7 @@
* @param o IntrospectionCacheData object to place in cache
*/
void icachePut( Object key, IntrospectionCacheData o );
+
+ EventCartridge attachEventCartridge( EventCartridge ec);
+ EventCartridge getEventCartridge();
}
1.5 +11 -1
jakarta-velocity/src/java/org/apache/velocity/context/VMContext.java
Index: VMContext.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/context/VMContext.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- VMContext.java 2001/03/05 11:21:45 1.4
+++ VMContext.java 2001/04/20 04:31:30 1.5
@@ -72,7 +72,7 @@
* local to the vm, protecting the global context.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
- * @version $Id: VMContext.java,v 1.4 2001/03/05 11:21:45 jvanzyl Exp $
+ * @version $Id: VMContext.java,v 1.5 2001/04/20 04:31:30 geirm Exp $
*/
public class VMContext implements InternalContextAdapter
{
@@ -299,6 +299,16 @@
public void icachePut( Object key, IntrospectionCacheData o )
{
innerContext.icachePut( key, o );
+ }
+
+ public EventCartridge attachEventCartridge( EventCartridge ec )
+ {
+ return innerContext.attachEventCartridge( ec );
+ }
+
+ public EventCartridge getEventCartridge()
+ {
+ return innerContext.getEventCartridge();
}
}
