tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r899653 - in /tomcat/trunk/java: javax/servlet/jsp/el/ javax/servlet/jsp/tagext/ org/apache/jasper/el/
Date Fri, 15 Jan 2010 15:00:51 GMT
Author: markt
Date: Fri Jan 15 15:00:50 2010
New Revision: 899653

URL: http://svn.apache.org/viewvc?rev=899653&view=rev
Log:
Fix the remaining TCK signature test failures.

Modified:
    tomcat/trunk/java/javax/servlet/jsp/el/ELException.java
    tomcat/trunk/java/javax/servlet/jsp/el/ELParseException.java
    tomcat/trunk/java/javax/servlet/jsp/el/Expression.java
    tomcat/trunk/java/javax/servlet/jsp/el/ExpressionEvaluator.java
    tomcat/trunk/java/javax/servlet/jsp/el/FunctionMapper.java
    tomcat/trunk/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java
    tomcat/trunk/java/javax/servlet/jsp/el/VariableResolver.java
    tomcat/trunk/java/javax/servlet/jsp/tagext/BodyTag.java
    tomcat/trunk/java/javax/servlet/jsp/tagext/TagSupport.java
    tomcat/trunk/java/org/apache/jasper/el/ExpressionEvaluatorImpl.java

Modified: tomcat/trunk/java/javax/servlet/jsp/el/ELException.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/el/ELException.java?rev=899653&r1=899652&r2=899653&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/el/ELException.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/el/ELException.java Fri Jan 15 15:00:50 2010
@@ -24,7 +24,7 @@
  * @since 2.0
  * @deprecated
  */
-@Deprecated
+@SuppressWarnings("dep-ann") // TCK signature test fails with annotation
 public class ELException extends Exception {
 
     /**

Modified: tomcat/trunk/java/javax/servlet/jsp/el/ELParseException.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/el/ELParseException.java?rev=899653&r1=899652&r2=899653&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/el/ELParseException.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/el/ELParseException.java Fri Jan 15 15:00:50 2010
@@ -24,8 +24,7 @@
  * @since 2.0
  * @deprecated
  */
-
-@Deprecated
+@SuppressWarnings("dep-ann") // TCK signature test fails with annotation
 public class ELParseException extends ELException {
 
  //-------------------------------------

Modified: tomcat/trunk/java/javax/servlet/jsp/el/Expression.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/el/Expression.java?rev=899653&r1=899652&r2=899653&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/el/Expression.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/el/Expression.java Fri Jan 15 15:00:50 2010
@@ -32,7 +32,7 @@
  * @since 2.0
  * @deprecated
  */
-@Deprecated
+@SuppressWarnings("dep-ann") // TCK signature test fails with annotation
 public abstract class Expression {
 
     /** 

Modified: tomcat/trunk/java/javax/servlet/jsp/el/ExpressionEvaluator.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/el/ExpressionEvaluator.java?rev=899653&r1=899652&r2=899653&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/el/ExpressionEvaluator.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/el/ExpressionEvaluator.java Fri Jan 15 15:00:50 2010
@@ -53,7 +53,7 @@
  * @since 2.0
  * @deprecated
  */
-@Deprecated
+@SuppressWarnings("dep-ann") // TCK signature test fails with annotation
 public abstract class ExpressionEvaluator {
 
     /**
@@ -77,9 +77,10 @@
      *
      * @exception ELException Thrown if parsing errors were found.
      */ 
-    public abstract Expression parseExpression( String expression, 
-				       Class<?> expectedType, 
-				       FunctionMapper fMapper ) 
+    public abstract Expression parseExpression( String expression,
+            @SuppressWarnings("unchecked") // TCK signature fails with generics
+            Class expectedType,
+	        FunctionMapper fMapper) 
       throws ELException; 
 
 
@@ -99,11 +100,12 @@
      * @return The result of the expression evaluation.
      *
      * @exception ELException Thrown if the expression evaluation failed.
-     */ 
-    public abstract Object evaluate( String expression, 
-			    Class<?> expectedType, 
-			    VariableResolver vResolver,
-			    FunctionMapper fMapper ) 
+     */
+    public abstract Object evaluate( String expression,
+            @SuppressWarnings("unchecked") // TCK signature fails with generics
+		    Class expectedType,
+		    VariableResolver vResolver,
+		    FunctionMapper fMapper)
       throws ELException; 
 }
 

Modified: tomcat/trunk/java/javax/servlet/jsp/el/FunctionMapper.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/el/FunctionMapper.java?rev=899653&r1=899652&r2=899653&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/el/FunctionMapper.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/el/FunctionMapper.java Fri Jan 15 15:00:50 2010
@@ -26,7 +26,7 @@
  * @since 2.0
  * @deprecated
  */
-@Deprecated
+@SuppressWarnings("dep-ann") // TCK signature test fails with annotation
 public interface FunctionMapper {
   /**
    * Resolves the specified local name and prefix into a Java.lang.Method.

Modified: tomcat/trunk/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java?rev=899653&r1=899652&r2=899653&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java Fri Jan 15 15:00:50
2010
@@ -121,7 +121,8 @@
     }
 
     @Override
-    public Class<?> getType(ELContext context, Object base, Object property)
+    @SuppressWarnings("unchecked") // TCK signature test fails with generics
+    public Class getType(ELContext context, Object base, Object property)
             throws NullPointerException, PropertyNotFoundException, ELException {
         if (context == null) {
             throw new NullPointerException();

Modified: tomcat/trunk/java/javax/servlet/jsp/el/VariableResolver.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/el/VariableResolver.java?rev=899653&r1=899652&r2=899653&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/el/VariableResolver.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/el/VariableResolver.java Fri Jan 15 15:00:50 2010
@@ -31,7 +31,7 @@
  * @since 2.0
  * @deprecated
  */
-@Deprecated
+@SuppressWarnings("dep-ann") // TCK signature test fails with annotation
 public interface VariableResolver
 {
   //-------------------------------------

Modified: tomcat/trunk/java/javax/servlet/jsp/tagext/BodyTag.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/tagext/BodyTag.java?rev=899653&r1=899652&r2=899653&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/tagext/BodyTag.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/tagext/BodyTag.java Fri Jan 15 15:00:50 2010
@@ -122,8 +122,7 @@
      * @deprecated	As of Java JSP API 1.2, use BodyTag.EVAL_BODY_BUFFERED
      * or IterationTag.EVAL_BODY_AGAIN.
      */
- 
-    @Deprecated
+    @SuppressWarnings("dep-ann") // TCK signature test fails with annotation
     public final static int EVAL_BODY_TAG = 2;
 
     /**

Modified: tomcat/trunk/java/javax/servlet/jsp/tagext/TagSupport.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/tagext/TagSupport.java?rev=899653&r1=899652&r2=899653&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/tagext/TagSupport.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/tagext/TagSupport.java Fri Jan 15 15:00:50 2010
@@ -71,7 +71,10 @@
      * @return the nearest ancestor that implements the interface
      * or is an instance of the class specified
      */
-    public static final Tag findAncestorWithClass(Tag from, Class<?> klass) {
+    public static final Tag findAncestorWithClass(Tag from,
+            // TCK signature test fails with generics
+            @SuppressWarnings("unchecked")
+            Class klass) {
         boolean isInterface = false;
 
         if (from == null ||

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=899653&r1=899652&r2=899653&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/el/ExpressionEvaluatorImpl.java (original)
+++ tomcat/trunk/java/org/apache/jasper/el/ExpressionEvaluatorImpl.java Fri Jan 15 15:00:50
2010
@@ -35,7 +35,9 @@
 	}
 
 	@Override
-    public Expression parseExpression(String expression, Class<?> expectedType,
+    public Expression parseExpression(String expression,
+            @SuppressWarnings("unchecked") // API does not use generics
+            Class expectedType,
 			FunctionMapper fMapper) throws ELException {
 		try {
 			ELContextImpl ctx =
@@ -51,7 +53,9 @@
 	}
 
 	@Override
-    public Object evaluate(String expression, Class<?> expectedType,
+    public Object evaluate(String expression,
+            @SuppressWarnings("unchecked") // API does not use generics
+            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