Fix generics warnings

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@791139 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/jasper/el/ELContextWrapper.java b/java/org/apache/jasper/el/ELContextWrapper.java
index a0754c3..14aea27 100644 (file)
--- a/java/org/apache/jasper/el/ELContextWrapper.java
+++ b/java/org/apache/jasper/el/ELContextWrapper.java
@@ -51,7 +51,7 @@ public final class ELContextWrapper extends ELContext {
         return this.target.getVariableMapper();
     }
 
-    public Object getContext(Class key) {
+    public Object getContext(Class<?> key) {
         return this.target.getContext(key);
     }
 
@@ -63,7 +63,7 @@ public final class ELContextWrapper extends ELContext {
         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);
     }
 

diff --git a/java/org/apache/jasper/el/ExpressionEvaluatorImpl.java b/java/org/apache/jasper/el/ExpressionEvaluatorImpl.java
index f08704f..b0c11d7 100644 (file)
--- a/java/org/apache/jasper/el/ExpressionEvaluatorImpl.java
+++ b/java/org/apache/jasper/el/ExpressionEvaluatorImpl.java
@@ -34,7 +34,7 @@ public final class ExpressionEvaluatorImpl extends ExpressionEvaluator {
                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 final class ExpressionEvaluatorImpl extends ExpressionEvaluator {
                }
        }
 
-       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);