Revert generics changes that require changes in spec classes

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

diff --git a/java/javax/el/ELContext.java b/java/javax/el/ELContext.java
index 88a0125..db59394 100644 (file)
--- a/java/javax/el/ELContext.java
+++ b/java/javax/el/ELContext.java
@@ -39,14 +39,14 @@ public abstract class ELContext {
         this.resolved = false;
     }
     
-    public Object getContext(Class<?> key) {
+    public Object getContext(Class key) {
         if (this.map == null) {
             return null;
         }
         return this.map.get(key);
     }
     
-    public void putContext(Class<?> key, Object contextObject) throws NullPointerException {
+    public void putContext(Class key, Object contextObject) throws NullPointerException {
         if (key == null || contextObject == null) {
             throw new NullPointerException();
         }

diff --git a/java/org/apache/el/lang/EvaluationContext.java b/java/org/apache/el/lang/EvaluationContext.java
index c3ba3d7..94b6980 100644 (file)
--- a/java/org/apache/el/lang/EvaluationContext.java
+++ b/java/org/apache/el/lang/EvaluationContext.java
@@ -51,7 +51,7 @@ public final class EvaluationContext extends ELContext {
         return this.varMapper;
     }
 
-    public Object getContext(Class<?> key) {
+    public Object getContext(Class key) {
         return this.elContext.getContext(key);
     }
 
@@ -63,7 +63,7 @@ public final class EvaluationContext extends ELContext {
         return this.elContext.isPropertyResolved();
     }
 
-    public void putContext(Class<?> key, Object contextObject) {
+    public void putContext(Class key, Object contextObject) {
         this.elContext.putContext(key, contextObject);
     }
 

diff --git a/java/org/apache/jasper/el/ELContextWrapper.java b/java/org/apache/jasper/el/ELContextWrapper.java
index 14aea27..a0754c3 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);
     }