tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1380349 - in /tomcat/trunk/java/org/apache/jasper/el: ELContextImpl.java ELContextWrapper.java ExpressionEvaluatorImpl.java
Date Mon, 03 Sep 2012 20:39:16 GMT
Author: markt
Date: Mon Sep  3 20:39:15 2012
New Revision: 1380349

URL: http://svn.apache.org/viewvc?rev=1380349&view=rev
Log:
Clean-up
- Java 7 <>
- remove unnecessary warnings

Modified:
    tomcat/trunk/java/org/apache/jasper/el/ELContextImpl.java
    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/ELContextImpl.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/el/ELContextImpl.java?rev=1380349&r1=1380348&r2=1380349&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/el/ELContextImpl.java (original)
+++ tomcat/trunk/java/org/apache/jasper/el/ELContextImpl.java Mon Sep  3 20:39:15 2012
@@ -64,7 +64,7 @@ public final class ELContextImpl extends
         public ValueExpression setVariable(String variable,
                 ValueExpression expression) {
             if (vars == null)
-                vars = new HashMap<String, ValueExpression>();
+                vars = new HashMap<>();
             return vars.put(variable, expression);
         }
 

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=1380349&r1=1380348&r2=1380349&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/el/ELContextWrapper.java (original)
+++ tomcat/trunk/java/org/apache/jasper/el/ELContextWrapper.java Mon Sep  3 20:39:15 2012
@@ -55,7 +55,6 @@ public final class ELContextWrapper exte
     }
 
     @Override
-    @SuppressWarnings("rawtypes") // Can't use Class<?> because API needs to match
super-class specification
     public Object getContext(Class key) {
         return this.target.getContext(key);
     }
@@ -71,7 +70,6 @@ public final class ELContextWrapper exte
     }
 
     @Override
-    @SuppressWarnings("rawtypes") // Can't use Class<?> because API needs to match
super-class specification
     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=1380349&r1=1380348&r2=1380349&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/el/ExpressionEvaluatorImpl.java (original)
+++ tomcat/trunk/java/org/apache/jasper/el/ExpressionEvaluatorImpl.java Mon Sep  3 20:39:15
2012
@@ -35,9 +35,7 @@ public final class ExpressionEvaluatorIm
     }
 
     @Override
-    public Expression parseExpression(String expression,
-            @SuppressWarnings("rawtypes") // API does not use generics
-            Class expectedType,
+    public Expression parseExpression(String expression, Class expectedType,
             FunctionMapper fMapper) throws ELException {
         try {
             ELContextImpl ctx =
@@ -53,9 +51,7 @@ public final class ExpressionEvaluatorIm
     }
 
     @Override
-    public Object evaluate(String expression,
-            @SuppressWarnings("rawtypes") // API does not use generics
-            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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message