Fix remaining warnings in javax package (with recently documented settings)

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

diff --git a/java/javax/servlet/http/HttpServlet.java b/java/javax/servlet/http/HttpServlet.java
index 7bb6cfa..92ea07d 100644 (file)
--- a/java/javax/servlet/http/HttpServlet.java
+++ b/java/javax/servlet/http/HttpServlet.java
@@ -200,8 +200,7 @@ public abstract class HttpServlet extends GenericServlet {
      *              since midnight, January 1, 1970 GMT, or
      *              -1 if the time is not known
      */
-    protected long getLastModified(
-            @SuppressWarnings("unused") HttpServletRequest req) {
+    protected long getLastModified(HttpServletRequest req) {
         return -1;
     }
 
@@ -475,8 +474,7 @@ public abstract class HttpServlet extends GenericServlet {
      * @exception ServletException  if the request for the
      *                                  OPTIONS cannot be handled
      */
-    protected void doOptions(
-            @SuppressWarnings("unused") HttpServletRequest req,
+    protected void doOptions(HttpServletRequest req,
             HttpServletResponse resp)
         throws ServletException, IOException {
 

diff --git a/java/javax/servlet/jsp/JspContext.java b/java/javax/servlet/jsp/JspContext.java
index 97310e5..3898319 100644 (file)
--- a/java/javax/servlet/jsp/JspContext.java
+++ b/java/javax/servlet/jsp/JspContext.java
@@ -19,8 +19,6 @@ package javax.servlet.jsp;
 import java.util.Enumeration;
 
 import javax.el.ELContext;
-import javax.servlet.jsp.el.ExpressionEvaluator;
-import javax.servlet.jsp.el.VariableResolver;
 
 /**
  * <p>
@@ -227,7 +225,7 @@ public abstract class JspContext {
      *             JspApplicationContext.getExpressionFactory()
      */
     @SuppressWarnings("dep-ann") // TCK signature test fails with annotation
-    public abstract ExpressionEvaluator getExpressionEvaluator();
+    public abstract javax.servlet.jsp.el.ExpressionEvaluator getExpressionEvaluator();
     
     
     public abstract ELContext getELContext();
@@ -245,7 +243,7 @@ public abstract class JspContext {
      *             jspContext.getELContext().getELResolver()
      */
     @SuppressWarnings("dep-ann") // TCK signature test fails with annotation
-    public abstract VariableResolver getVariableResolver();
+    public abstract javax.servlet.jsp.el.VariableResolver getVariableResolver();
     
     /**
      * Return a new JspWriter object that sends output to the

diff --git a/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java b/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java
index a54a53e..588039d 100644 (file)
--- a/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java
+++ b/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java
@@ -504,10 +504,12 @@ public class ImplicitObjectELResolver extends ELResolver {
 
         protected abstract V getAttribute(String name);
 
+        @SuppressWarnings("unused")
         protected void removeAttribute(String name) {
             throw new UnsupportedOperationException();
         }
 
+        @SuppressWarnings("unused")
         protected void setAttribute(String name, Object value) {
             throw new UnsupportedOperationException();
         }