jvanzyl 01/03/05 03:21:53
Modified: src/java/org/apache/velocity/context AbstractContext.java
Context.java InternalContextAdapter.java
InternalContextAdapterImpl.java
InternalContextBase.java
InternalHousekeepingContext.java
InternalWrapperContext.java VMContext.java
Log:
- no functional changes, just formatting and updating the
date of the license.
Revision Changes Path
1.3 +2 -2
jakarta-velocity/src/java/org/apache/velocity/context/AbstractContext.java
Index: AbstractContext.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/context/AbstractContext.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractContext.java 2001/03/05 11:16:48 1.2
+++ AbstractContext.java 2001/03/05 11:21:39 1.3
@@ -3,7 +3,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -85,7 +85,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Fedor Karpelevitch</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
- * @version $Id: AbstractContext.java,v 1.2 2001/03/05 11:16:48 jvanzyl Exp $
+ * @version $Id: AbstractContext.java,v 1.3 2001/03/05 11:21:39 jvanzyl Exp $
*/
public abstract class AbstractContext extends InternalContextBase
1.2 +2 -2
jakarta-velocity/src/java/org/apache/velocity/context/Context.java
Index: Context.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/context/Context.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Context.java 2001/01/03 05:16:24 1.1
+++ Context.java 2001/03/05 11:21:40 1.2
@@ -3,7 +3,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -73,7 +73,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
- * @version $Id: Context.java,v 1.1 2001/01/03 05:16:24 geirm Exp $
+ * @version $Id: Context.java,v 1.2 2001/03/05 11:21:40 jvanzyl Exp $
*/
public interface Context
{
1.3 +4 -4
jakarta-velocity/src/java/org/apache/velocity/context/InternalContextAdapter.java
Index: InternalContextAdapter.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/context/InternalContextAdapter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- InternalContextAdapter.java 2001/01/13 16:31:51 1.2
+++ InternalContextAdapter.java 2001/03/05 11:21:41 1.3
@@ -1,10 +1,9 @@
package org.apache.velocity.context;
-
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -65,9 +64,10 @@
* I will rename soon :)
*
* @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
- * @version $Id: InternalContextAdapter.java,v 1.2 2001/01/13 16:31:51 geirm Exp $
+ * @version $Id: InternalContextAdapter.java,v 1.3 2001/03/05 11:21:41 jvanzyl Exp
$
*/
-public interface InternalContextAdapter extends InternalHousekeepingContext,
Context, InternalWrapperContext
+public interface InternalContextAdapter
+ extends InternalHousekeepingContext, Context, InternalWrapperContext
{
}
1.3 +2 -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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- InternalContextAdapterImpl.java 2001/02/05 04:30:02 1.2
+++ InternalContextAdapterImpl.java 2001/03/05 11:21:42 1.3
@@ -3,7 +3,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -84,7 +84,7 @@
*
*
* @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
- * @version $$
+ * @version $Id: InternalContextAdapterImpl.java,v 1.3 2001/03/05 11:21:42 jvanzyl
Exp $
*/
public final class InternalContextAdapterImpl implements InternalContextAdapter
1.5 +2 -2
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- InternalContextBase.java 2001/02/05 04:30:02 1.4
+++ InternalContextBase.java 2001/03/05 11:21:43 1.5
@@ -3,7 +3,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -73,7 +73,7 @@
* is derived from this.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
- * @version $Id: InternalContextBase.java,v 1.4 2001/02/05 04:30:02 geirm Exp $
+ * @version $Id: InternalContextBase.java,v 1.5 2001/03/05 11:21:43 jvanzyl Exp $
*/
class InternalContextBase implements InternalHousekeepingContext,Serializable
{
1.3 +2 -2
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- InternalHousekeepingContext.java 2001/02/05 04:30:02 1.2
+++ InternalHousekeepingContext.java 2001/03/05 11:21:44 1.3
@@ -3,7 +3,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -67,7 +67,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.2 2001/02/05 04:30:02 geirm
Exp $
+ * @version $Id: InternalHousekeepingContext.java,v 1.3 2001/03/05 11:21:44
jvanzyl Exp $
*/
interface InternalHousekeepingContext
{
1.2 +2 -2
jakarta-velocity/src/java/org/apache/velocity/context/InternalWrapperContext.java
Index: InternalWrapperContext.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/context/InternalWrapperContext.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- InternalWrapperContext.java 2001/01/13 16:23:28 1.1
+++ InternalWrapperContext.java 2001/03/05 11:21:45 1.2
@@ -3,7 +3,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000 The Apache Software Foundation. All rights
+ * Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -58,7 +58,7 @@
* interface for internal context wrapping functionality
*
* @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
- * @version $Id: InternalWrapperContext.java,v 1.1 2001/01/13 16:23:28 geirm Exp $
+ * @version $Id: InternalWrapperContext.java,v 1.2 2001/03/05 11:21:45 jvanzyl Exp
$
*/
public interface InternalWrapperContext
{
1.4 +9 -6
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- VMContext.java 2001/02/05 04:30:02 1.3
+++ VMContext.java 2001/03/05 11:21:45 1.4
@@ -1,3 +1,5 @@
+package org.apache.velocity.context;
+
/*
* The Apache Software License, Version 1.1
*
@@ -52,8 +54,6 @@
* <http://www.apache.org/>.
*/
-package org.apache.velocity.context;
-
import java.util.HashMap;
import org.apache.velocity.runtime.Runtime;
@@ -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.3 2001/02/05 04:30:02 geirm Exp $
+ * @version $Id: VMContext.java,v 1.4 2001/03/05 11:21:45 jvanzyl Exp $
*/
public class VMContext implements InternalContextAdapter
{
@@ -89,7 +89,8 @@
InternalContextAdapter wrappedContext = null;
/** support for local context scope feature, where all references are local */
- static boolean localcontextscope =
Runtime.getBoolean(Runtime.VM_CONTEXT_LOCALSCOPE, true);
+ static boolean localcontextscope =
+ Runtime.getBoolean(Runtime.VM_CONTEXT_LOCALSCOPE, true);
/**
* CTOR, wraps an ICA
@@ -165,7 +166,8 @@
if(localcontextscope)
{
/*
- * if we have localcontextscope mode, then just put in the local
context
+ * if we have localcontextscope mode, then just
+ * put in the local context
*/
return localcontext.put( key, value );
@@ -217,7 +219,8 @@
if(localcontextscope)
{
/*
- * if we have localcontextscope mode, then just put in the local
context
+ * if we have localcontextscope mode, then just
+ * put in the local context
*/
o = localcontext.get( key );
