Author: wglass
Date: Sun Feb 6 07:42:19 2005
New Revision: 151591
URL: http://svn.apache.org/viewcvs?view=rev&rev=151591
Log:
Reverse revision 151478 as change to Context interface was a bad idea.
http://issues.apache.org/bugzilla/show_bug.cgi?id=30220
Modified:
jakarta/velocity/trunk/src/java/org/apache/velocity/context/AbstractContext.java
jakarta/velocity/trunk/src/java/org/apache/velocity/context/Context.java
jakarta/velocity/trunk/src/java/org/apache/velocity/context/InternalContextAdapterImpl.java
jakarta/velocity/trunk/src/java/org/apache/velocity/context/VMContext.java
jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/directive/Foreach.java
jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/directive/VMProxyArg.java
jakarta/velocity/trunk/src/java/org/apache/velocity/test/MethodInvocationExceptionTest.java
Modified:
jakarta/velocity/trunk/src/java/org/apache/velocity/context/AbstractContext.java
URL:
http://svn.apache.org/viewcvs/jakarta/velocity/trunk/src/java/org/apache/velocity/context/AbstractContext.java?view=diff&r1=151590&r2=151591
==============================================================================
---
jakarta/velocity/trunk/src/java/org/apache/velocity/context/AbstractContext.java
(original)
+++
jakarta/velocity/trunk/src/java/org/apache/velocity/context/AbstractContext.java
Sun Feb 6 07:42:19 2005
@@ -18,10 +18,6 @@
import java.io.Serializable;
-import org.apache.velocity.context.Context;
-import org.apache.velocity.context.InternalContextBase;
-import org.apache.velocity.exception.MethodInvocationException;
-
/**
* This class is the abstract base class for all conventional
* Velocity Context implementations. Simply extend this class
@@ -182,7 +178,7 @@
* @return The value corresponding to the provided key or null if
* the key param is null.
*/
- public Object get(String key) throws MethodInvocationException
+ public Object get(String key)
{
/*
* punt if key is null
Modified:
jakarta/velocity/trunk/src/java/org/apache/velocity/context/Context.java
URL:
http://svn.apache.org/viewcvs/jakarta/velocity/trunk/src/java/org/apache/velocity/context/Context.java?view=diff&r1=151590&r2=151591
==============================================================================
--- jakarta/velocity/trunk/src/java/org/apache/velocity/context/Context.java
(original)
+++ jakarta/velocity/trunk/src/java/org/apache/velocity/context/Context.java
Sun Feb 6 07:42:19 2005
@@ -1,6 +1,5 @@
package org.apache.velocity.context;
-import org.apache.velocity.exception.MethodInvocationException;
/*
* Copyright 2001-2004 The Apache Software Foundation.
@@ -49,9 +48,8 @@
*
* @param key The name of the desired value.
* @return The value corresponding to the provided key.
- * @throws MethodInvocationException
*/
- Object get(String key) throws MethodInvocationException;
+ Object get(String key);
/**
* Indicates whether the specified key is in the context.
Modified:
jakarta/velocity/trunk/src/java/org/apache/velocity/context/InternalContextAdapterImpl.java
URL:
http://svn.apache.org/viewcvs/jakarta/velocity/trunk/src/java/org/apache/velocity/context/InternalContextAdapterImpl.java?view=diff&r1=151590&r2=151591
==============================================================================
---
jakarta/velocity/trunk/src/java/org/apache/velocity/context/InternalContextAdapterImpl.java
(original)
+++
jakarta/velocity/trunk/src/java/org/apache/velocity/context/InternalContextAdapterImpl.java
Sun Feb 6 07:42:19 2005
@@ -16,12 +16,9 @@
* limitations under the License.
*/
-import org.apache.velocity.util.introspection.IntrospectionCacheData;
-
import org.apache.velocity.app.event.EventCartridge;
-import org.apache.velocity.exception.MethodInvocationException;
-
import org.apache.velocity.runtime.resource.Resource;
+import org.apache.velocity.util.introspection.IntrospectionCacheData;
/**
* This adapter class is the container for all context types for internal
@@ -169,7 +166,7 @@
return context.put( key , value );
}
- public Object get(String key) throws MethodInvocationException
+ public Object get(String key)
{
return context.get( key );
}
Modified:
jakarta/velocity/trunk/src/java/org/apache/velocity/context/VMContext.java
URL:
http://svn.apache.org/viewcvs/jakarta/velocity/trunk/src/java/org/apache/velocity/context/VMContext.java?view=diff&r1=151590&r2=151591
==============================================================================
--- jakarta/velocity/trunk/src/java/org/apache/velocity/context/VMContext.java
(original)
+++ jakarta/velocity/trunk/src/java/org/apache/velocity/context/VMContext.java
Sun Feb 6 07:42:19 2005
@@ -167,7 +167,7 @@
* @param key name of item to get
* @return stored object or null
*/
- public Object get( String key ) throws MethodInvocationException
+ public Object get( String key )
{
/*
* first, see if it's a VMPA
Modified:
jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/directive/Foreach.java
URL:
http://svn.apache.org/viewcvs/jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/directive/Foreach.java?view=diff&r1=151590&r2=151591
==============================================================================
---
jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/directive/Foreach.java
(original)
+++
jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/directive/Foreach.java
Sun Feb 6 07:42:19 2005
@@ -79,7 +79,7 @@
* Get an object from the context, or null if the key is equal to the
loop variable
* @see
org.apache.velocity.context.InternalContextAdapter#get(java.lang.String)
*/
- public Object get( String key ) throws MethodInvocationException
+ public Object get( String key )
{
return ( active && loopVariableKey.equals(key) )
? null
Modified:
jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/directive/VMProxyArg.java
URL:
http://svn.apache.org/viewcvs/jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/directive/VMProxyArg.java?view=diff&r1=151590&r2=151591
==============================================================================
---
jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/directive/VMProxyArg.java
(original)
+++
jakarta/velocity/trunk/src/java/org/apache/velocity/runtime/directive/VMProxyArg.java
Sun Feb 6 07:42:19 2005
@@ -240,7 +240,7 @@
* @return Object value
*
*/
- public Object getObject( InternalContextAdapter context ) throws
MethodInvocationException
+ public Object getObject( InternalContextAdapter context )
{
try
{
@@ -346,7 +346,7 @@
rsvc.error("VMProxyArg.getObject() : method invocation error
getting value : " + mie );
- throw mie;
+ return null;
}
}
Modified:
jakarta/velocity/trunk/src/java/org/apache/velocity/test/MethodInvocationExceptionTest.java
URL:
http://svn.apache.org/viewcvs/jakarta/velocity/trunk/src/java/org/apache/velocity/test/MethodInvocationExceptionTest.java?view=diff&r1=151590&r2=151591
==============================================================================
---
jakarta/velocity/trunk/src/java/org/apache/velocity/test/MethodInvocationExceptionTest.java
(original)
+++
jakarta/velocity/trunk/src/java/org/apache/velocity/test/MethodInvocationExceptionTest.java
Sun Feb 6 07:42:19 2005
@@ -185,28 +185,19 @@
}
/**
- * test that exception is thrown when in parameter to macro
+ * test that no exception is thrown when in parameter to macro.
+ * This is the way we expect the system to work, but it would be better
+ * to throw an exception.
*/
template = "#macro (macro1 $param) $param #end
#macro1($woogie.getFoo())";
try
{
Velocity. evaluate( vc, w, "test", template );
- fail("No exception thrown, set test.");
}
catch( MethodInvocationException mie )
{
- System.out.println("Caught MIE (good!) :" );
- System.out.println(" reference = " + mie.getReferenceName() );
- System.out.println(" method = " + mie.getMethodName() );
-
- Throwable t = mie.getWrappedThrowable();
- System.out.println(" throwable = " + t );
-
- if( t instanceof Exception)
- {
- System.out.println(" exception = " + ( (Exception)
t).getMessage() );
- }
+ fail("Shouldn't have thrown exception, macro param test.");
}
catch( Exception e)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
