You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2010/12/17 22:49:54 UTC
svn commit: r1050498 - in /tomcat/trunk/java/javax/servlet:
http/HttpServlet.java jsp/JspContext.java
jsp/el/ImplicitObjectELResolver.java
Author: markt
Date: Fri Dec 17 21:49:54 2010
New Revision: 1050498
URL: http://svn.apache.org/viewvc?rev=1050498&view=rev
Log:
Fix remaining warnings in javax package (with recently documented settings)
Modified:
tomcat/trunk/java/javax/servlet/http/HttpServlet.java
tomcat/trunk/java/javax/servlet/jsp/JspContext.java
tomcat/trunk/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java
Modified: tomcat/trunk/java/javax/servlet/http/HttpServlet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/http/HttpServlet.java?rev=1050498&r1=1050497&r2=1050498&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/http/HttpServlet.java (original)
+++ tomcat/trunk/java/javax/servlet/http/HttpServlet.java Fri Dec 17 21:49:54 2010
@@ -200,8 +200,7 @@ public abstract class HttpServlet extend
* 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 extend
* @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 {
Modified: tomcat/trunk/java/javax/servlet/jsp/JspContext.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/JspContext.java?rev=1050498&r1=1050497&r2=1050498&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/JspContext.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/JspContext.java Fri Dec 17 21:49:54 2010
@@ -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
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=1050498&r1=1050497&r2=1050498&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java Fri Dec 17 21:49:54 2010
@@ -504,10 +504,12 @@ public class ImplicitObjectELResolver ex
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();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org