From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 4 Jul 2009 15:46:47 +0000 (+0000)
Subject: Fix generics warnings
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=342b32871c7fadaa86ac32ca5f3d6db2ce508c30;p=tomcat7.0

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 a0754c3ef..14aea2755 100644
--- 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 f08704fe3..b0c11d73d 100644
--- 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);