tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r899635 - in /tomcat/trunk/java/javax/servlet/jsp: JspContext.java JspException.java
Date Fri, 15 Jan 2010 14:17:22 GMT
Author: markt
Date: Fri Jan 15 14:17:22 2010
New Revision: 899635

URL: http://svn.apache.org/viewvc?rev=899635&view=rev
Log:
Fix signature test failures in javax.servlet.jsp package
Move deprecation javadoc to end of block

Modified:
    tomcat/trunk/java/javax/servlet/jsp/JspContext.java
    tomcat/trunk/java/javax/servlet/jsp/JspException.java

Modified: tomcat/trunk/java/javax/servlet/jsp/JspContext.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/JspContext.java?rev=899635&r1=899634&r2=899635&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/JspContext.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/JspContext.java Fri Jan 15 14:17:22 2010
@@ -226,7 +226,7 @@
      * @deprecated As of JSP 2.1, replaced by
      *             JspApplicationContext.getExpressionFactory()
      */
-    @Deprecated
+    @SuppressWarnings("dep-ann") // TCK signature test fails with annotation
     public abstract ExpressionEvaluator getExpressionEvaluator();
     
     
@@ -244,7 +244,7 @@
      *             which can be obtained by
      *             jspContext.getELContext().getELResolver()
      */
-    @Deprecated
+    @SuppressWarnings("dep-ann") // TCK signature test fails with annotation
     public abstract VariableResolver getVariableResolver();
     
     /**

Modified: tomcat/trunk/java/javax/servlet/jsp/JspException.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/JspException.java?rev=899635&r1=899634&r2=899635&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/JspException.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/JspException.java Fri Jan 15 14:17:22 2010
@@ -21,7 +21,6 @@
  * JspExceptions will result in an invocation of the errorpage
  * machinery.
  */
-
 public class JspException extends Exception {
 
     /**
@@ -85,15 +84,14 @@
 
     
     /**
-     * @deprecated As of JSP 2.1, replaced by
-     * <code>java.lang.Throwable.getCause()</code>
-     *  
      * Returns the exception that caused this JSP exception.
      *
      * @return  the <code>Throwable</code> that caused this JSP exception
+     * 
+     * @deprecated As of JSP 2.1, replaced by
+     * <code>java.lang.Throwable.getCause()</code>
      */
-    
-    @Deprecated
+    @SuppressWarnings("dep-ann") // TCK signature test fails with annotation
     public Throwable getRootCause() {
         return getCause();
     }



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


Mime
View raw message