svn commit: r791219 - in /tomcat/trunk/java: javax/el/ELContext.java org/apache/el/lang/EvaluationContext.java org/apache/jasper/el/ELContextWrapper.java

[markt]

Author: markt
Date: Sun Jul  5 11:11:57 2009
New Revision: 791219

URL: http://svn.apache.org/viewvc?rev=791219&view=rev
Log:
Revert generics changes that require changes in spec classes

Modified:
    tomcat/trunk/java/javax/el/ELContext.java
    tomcat/trunk/java/org/apache/el/lang/EvaluationContext.java
    tomcat/trunk/java/org/apache/jasper/el/ELContextWrapper.java

Modified: tomcat/trunk/java/javax/el/ELContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/ELContext.java?rev=791219&r1=791218&r2=791219&view=diff
==============================================================================
--- tomcat/trunk/java/javax/el/ELContext.java (original)
+++ tomcat/trunk/java/javax/el/ELContext.java Sun Jul  5 11:11:57 2009
@@ -39,14 +39,14 @@
         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();
         }

Modified: tomcat/trunk/java/org/apache/el/lang/EvaluationContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/lang/EvaluationContext.java?rev=791219&r1=791218&r2=791219&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/lang/EvaluationContext.java (original)
+++ tomcat/trunk/java/org/apache/el/lang/EvaluationContext.java Sun Jul  5 
11:11:57 2009
@@ -51,7 +51,7 @@
         return this.varMapper;
     }
 
-    public Object getContext(Class<?> key) {
+    public Object getContext(Class key) {
         return this.elContext.getContext(key);
     }
 
@@ -63,7 +63,7 @@
         return this.elContext.isPropertyResolved();
     }
 
-    public void putContext(Class<?> key, Object contextObject) {
+    public void putContext(Class key, Object contextObject) {
         this.elContext.putContext(key, contextObject);
     }
 

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=791219&r1=791218&r2=791219&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/el/ELContextWrapper.java (original)
+++ tomcat/trunk/java/org/apache/jasper/el/ELContextWrapper.java Sun Jul  5 
11:11:57 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);
     }
 



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