You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xu...@apache.org on 2009/12/11 03:09:51 UTC
svn commit: r889488 -
/geronimo/specs/trunk/geronimo-jsp_2.1_spec/src/main/java/javax/servlet/jsp/el/ExpressionEvaluator.java
Author: xuhaihong
Date: Fri Dec 11 02:09:50 2009
New Revision: 889488
URL: http://svn.apache.org/viewvc?rev=889488&view=rev
Log:
Revert the last change, as a new MR2 code base will be created
Modified:
geronimo/specs/trunk/geronimo-jsp_2.1_spec/src/main/java/javax/servlet/jsp/el/ExpressionEvaluator.java
Modified: geronimo/specs/trunk/geronimo-jsp_2.1_spec/src/main/java/javax/servlet/jsp/el/ExpressionEvaluator.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jsp_2.1_spec/src/main/java/javax/servlet/jsp/el/ExpressionEvaluator.java?rev=889488&r1=889487&r2=889488&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jsp_2.1_spec/src/main/java/javax/servlet/jsp/el/ExpressionEvaluator.java (original)
+++ geronimo/specs/trunk/geronimo-jsp_2.1_spec/src/main/java/javax/servlet/jsp/el/ExpressionEvaluator.java Fri Dec 11 02:09:50 2009
@@ -77,8 +77,8 @@
* @exception ELException Thrown if parsing errors were found.
*/
public abstract Expression parseExpression( String expression,
- Class<?> expectedType,
- FunctionMapper fMapper )
+ Class expectedType,
+ FunctionMapper fMapper )
throws ELException;
@@ -100,9 +100,9 @@
* @exception ELException Thrown if the expression evaluation failed.
*/
public abstract Object evaluate( String expression,
- Class<?> expectedType,
- VariableResolver vResolver,
- FunctionMapper fMapper )
+ Class expectedType,
+ VariableResolver vResolver,
+ FunctionMapper fMapper )
throws ELException;
}