svn commit: r791139 - in /tomcat/trunk/java/org/apache/jasper/el: ELContextWrapper.java ExpressionEvaluatorImpl.java

[markt]

Author: markt
Date: Sat Jul  4 15:46:47 2009
New Revision: 791139

URL: http://svn.apache.org/viewvc?rev=791139&view=rev
Log:
Fix generics warnings

Modified:
    tomcat/trunk/java/org/apache/jasper/el/ELContextWrapper.java
    tomcat/trunk/java/org/apache/jasper/el/ExpressionEvaluatorImpl.java

Modified: tomcat/trunk/java/org/apache/jasper/el/ELContextWrapper.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/el/ELContextWrapper.java?rev=791139&r1=791138&r2=791139&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/el/ELContextWrapper.java (original)
+++ tomcat/trunk/java/org/apache/jasper/el/ELContextWrapper.java Sat Jul  4 
15:46:47 2009
@@ -51,7 +51,7 @@
         return this.target.getVariableMapper();
     }
 
-    public Object getContext(Class key) {
+    public Object getContext(Class<?> key) {
         return this.target.getContext(key);
     }
 
@@ -63,7 +63,7 @@
         return this.target.isPropertyResolved();
     }
 
-    public void putContext(Class key, Object contextObject) throws 
NullPointerException {
+    public void putContext(Class<?> key, Object contextObject) throws 
NullPointerException {
         this.target.putContext(key, contextObject);
     }
 

Modified: tomcat/trunk/java/org/apache/jasper/el/ExpressionEvaluatorImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/el/ExpressionEvaluatorImpl.java?rev=791139&r1=791138&r2=791139&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/el/ExpressionEvaluatorImpl.java 
(original)
+++ tomcat/trunk/java/org/apache/jasper/el/ExpressionEvaluatorImpl.java Sat Jul 
 4 15:46:47 2009
@@ -34,7 +34,7 @@
                this.factory = factory;
        }
 
-       public Expression parseExpression(String expression, Class expectedType,
+       public Expression parseExpression(String expression, Class<?> 
expectedType,
                        FunctionMapper fMapper) throws ELException {
                try {
                        ELContextImpl ctx =
@@ -49,7 +49,7 @@
                }
        }
 
-       public Object evaluate(String expression, Class expectedType,
+       public Object evaluate(String expression, Class<?> expectedType,
                        VariableResolver vResolver, FunctionMapper fMapper)
                        throws ELException {
                return this.parseExpression(expression, expectedType, 
fMapper).evaluate(vResolver);



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org