From: markt Date: Thu, 5 Nov 2009 01:28:51 +0000 (+0000) Subject: Add other @Override annotations identified by Eclipse X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=299d32044b86796e88b7fedfa6fd6096c979ef7c;p=tomcat7.0 Add other @Override annotations identified by Eclipse git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@832961 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/java/org/apache/tomcat/util/net/NioBlockingSelector.java b/java/org/apache/tomcat/util/net/NioBlockingSelector.java index 73d634efc..0305f80f6 100644 --- a/java/org/apache/tomcat/util/net/NioBlockingSelector.java +++ b/java/org/apache/tomcat/util/net/NioBlockingSelector.java @@ -303,6 +303,7 @@ public class NioBlockingSelector { return result; } + @Override public void run() { while (run) { try { diff --git a/webapps/examples/WEB-INF/classes/CookieExample.java b/webapps/examples/WEB-INF/classes/CookieExample.java index c60d1c02b..37320a98a 100644 --- a/webapps/examples/WEB-INF/classes/CookieExample.java +++ b/webapps/examples/WEB-INF/classes/CookieExample.java @@ -35,6 +35,7 @@ public class CookieExample extends HttpServlet { ResourceBundle rb = ResourceBundle.getBundle("LocalStrings"); + @Override public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException @@ -109,6 +110,7 @@ public class CookieExample extends HttpServlet { out.println(""); } + @Override public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException diff --git a/webapps/examples/WEB-INF/classes/HelloWorldExample.java b/webapps/examples/WEB-INF/classes/HelloWorldExample.java index c364ccbff..74fbb1ddc 100644 --- a/webapps/examples/WEB-INF/classes/HelloWorldExample.java +++ b/webapps/examples/WEB-INF/classes/HelloWorldExample.java @@ -32,6 +32,7 @@ import javax.servlet.http.*; public class HelloWorldExample extends HttpServlet { + @Override public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException diff --git a/webapps/examples/WEB-INF/classes/RequestHeaderExample.java b/webapps/examples/WEB-INF/classes/RequestHeaderExample.java index f73f8a5bb..756e20701 100644 --- a/webapps/examples/WEB-INF/classes/RequestHeaderExample.java +++ b/webapps/examples/WEB-INF/classes/RequestHeaderExample.java @@ -35,6 +35,7 @@ public class RequestHeaderExample extends HttpServlet { ResourceBundle rb = ResourceBundle.getBundle("LocalStrings"); + @Override public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException @@ -79,6 +80,7 @@ public class RequestHeaderExample extends HttpServlet { out.println(""); } + @Override public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException diff --git a/webapps/examples/WEB-INF/classes/RequestInfoExample.java b/webapps/examples/WEB-INF/classes/RequestInfoExample.java index 404061944..a0fcb84c8 100644 --- a/webapps/examples/WEB-INF/classes/RequestInfoExample.java +++ b/webapps/examples/WEB-INF/classes/RequestInfoExample.java @@ -36,6 +36,7 @@ public class RequestInfoExample extends HttpServlet { ResourceBundle rb = ResourceBundle.getBundle("LocalStrings"); + @Override public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException @@ -103,6 +104,7 @@ public class RequestInfoExample extends HttpServlet { } + @Override public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException diff --git a/webapps/examples/WEB-INF/classes/RequestParamExample.java b/webapps/examples/WEB-INF/classes/RequestParamExample.java index e64e2cab9..218b4b097 100644 --- a/webapps/examples/WEB-INF/classes/RequestParamExample.java +++ b/webapps/examples/WEB-INF/classes/RequestParamExample.java @@ -36,6 +36,7 @@ public class RequestParamExample extends HttpServlet { ResourceBundle rb = ResourceBundle.getBundle("LocalStrings"); + @Override public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException @@ -96,6 +97,7 @@ public class RequestParamExample extends HttpServlet { out.println(""); } + @Override public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException diff --git a/webapps/examples/WEB-INF/classes/SessionExample.java b/webapps/examples/WEB-INF/classes/SessionExample.java index deeaab5b9..f988e6dbe 100644 --- a/webapps/examples/WEB-INF/classes/SessionExample.java +++ b/webapps/examples/WEB-INF/classes/SessionExample.java @@ -35,6 +35,7 @@ public class SessionExample extends HttpServlet { ResourceBundle rb = ResourceBundle.getBundle("LocalStrings"); + @Override public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException @@ -130,6 +131,7 @@ public class SessionExample extends HttpServlet { out.println(""); } + @Override public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException diff --git a/webapps/examples/WEB-INF/classes/async/Stockticker.java b/webapps/examples/WEB-INF/classes/async/Stockticker.java index d02b3ad27..96206c163 100644 --- a/webapps/examples/WEB-INF/classes/async/Stockticker.java +++ b/webapps/examples/WEB-INF/classes/async/Stockticker.java @@ -151,10 +151,12 @@ public class Stockticker implements Runnable { return df.format(lastchange); } + @Override public int hashCode() { return symbol.hashCode(); } + @Override public boolean equals(Object other) { if (other instanceof Stock) { return this.symbol.equals(((Stock) other).symbol); @@ -163,6 +165,7 @@ public class Stockticker implements Runnable { } } + @Override public String toString() { StringBuilder buf = new StringBuilder("STOCK#"); buf.append(getSymbol()); @@ -176,6 +179,7 @@ public class Stockticker implements Runnable { } + @Override public Object clone() { Stock s = new Stock(this.getSymbol(), this.getValue()); s.setLastChange(this.getLastChange()); diff --git a/webapps/examples/WEB-INF/classes/chat/ChatServlet.java b/webapps/examples/WEB-INF/classes/chat/ChatServlet.java index 84c2c062f..8028f407a 100644 --- a/webapps/examples/WEB-INF/classes/chat/ChatServlet.java +++ b/webapps/examples/WEB-INF/classes/chat/ChatServlet.java @@ -43,6 +43,7 @@ public class ChatServlet new ArrayList(); protected MessageSender messageSender = null; + @Override public void init() throws ServletException { messageSender = new MessageSender(); Thread messageSenderThread = @@ -51,6 +52,7 @@ public class ChatServlet messageSenderThread.start(); } + @Override public void destroy() { connections.clear(); messageSender.stop(); @@ -162,6 +164,7 @@ public class ChatServlet } } + @Override protected void service(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { // Compatibility method: equivalent method using the regular connection model diff --git a/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.java b/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.java index daf861dd7..72617be77 100644 --- a/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.java +++ b/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.java @@ -30,6 +30,7 @@ import javax.servlet.http.*; public class CompressionFilterTestServlet extends HttpServlet { + @Override public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { diff --git a/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java b/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java index 1ec0215be..e89c6caf5 100644 --- a/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java +++ b/webapps/examples/WEB-INF/classes/compressionFilters/CompressionResponseStream.java @@ -130,6 +130,7 @@ public class CompressionResponseStream * Close this output stream, causing any buffered data to be flushed and * any further output data to throw an IOException. */ + @Override public void close() throws IOException { if (debug > 1) { @@ -164,6 +165,7 @@ public class CompressionResponseStream * Flush any buffered data for this output stream, which also causes the * response to be committed. */ + @Override public void flush() throws IOException { if (debug > 1) { @@ -201,6 +203,7 @@ public class CompressionResponseStream * * @exception IOException if an input/output error occurs */ + @Override public void write(int b) throws IOException { if (debug > 1) { @@ -226,6 +229,7 @@ public class CompressionResponseStream * * @exception IOException if an input/output error occurs */ + @Override public void write(byte b[]) throws IOException { write(b, 0, b.length); @@ -243,6 +247,7 @@ public class CompressionResponseStream * * @exception IOException if an input/output error occurs */ + @Override public void write(byte b[], int off, int len) throws IOException { if (debug > 1) { diff --git a/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java b/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java index 559d6d906..05c019fa6 100644 --- a/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java +++ b/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java @@ -100,6 +100,7 @@ public class CompressionServletResponseWrapper extends HttpServletResponseWrappe /** * Set content type */ + @Override public void setContentType(String contentType) { if (debug > 1) { System.out.println("setContentType to "+contentType); @@ -173,6 +174,7 @@ public class CompressionServletResponseWrapper extends HttpServletResponseWrappe * * @exception IOException if an input/output error occurs */ + @Override public void flushBuffer() throws IOException { if (debug > 1) { System.out.println("flush buffer @ CompressionServletResponseWrapper"); @@ -188,6 +190,7 @@ public class CompressionServletResponseWrapper extends HttpServletResponseWrappe * already been called for this response * @exception IOException if an input/output error occurs */ + @Override public ServletOutputStream getOutputStream() throws IOException { if (writer != null) @@ -210,6 +213,7 @@ public class CompressionServletResponseWrapper extends HttpServletResponseWrappe * already been called for this response * @exception IOException if an input/output error occurs */ + @Override public PrintWriter getWriter() throws IOException { if (writer != null) @@ -239,7 +243,7 @@ public class CompressionServletResponseWrapper extends HttpServletResponseWrappe } - + @Override public void setContentLength(int length) { // Don't, as compression will change it } diff --git a/webapps/examples/WEB-INF/classes/examples/ExampleTagBase.java b/webapps/examples/WEB-INF/classes/examples/ExampleTagBase.java index 5d4fbc941..23eb19274 100644 --- a/webapps/examples/WEB-INF/classes/examples/ExampleTagBase.java +++ b/webapps/examples/WEB-INF/classes/examples/ExampleTagBase.java @@ -21,40 +21,49 @@ import javax.servlet.jsp.tagext.*; public abstract class ExampleTagBase extends BodyTagSupport { + @Override public void setParent(Tag parent) { this.parent = parent; } + @Override public void setBodyContent(BodyContent bodyOut) { this.bodyOut = bodyOut; } + @Override public void setPageContext(PageContext pageContext) { this.pageContext = pageContext; } + @Override public Tag getParent() { return this.parent; } + @Override public int doStartTag() throws JspException { return SKIP_BODY; } + @Override public int doEndTag() throws JspException { return EVAL_PAGE; } + @Override public void doInitBody() throws JspException { // Default implementations for BodyTag methods as well // just in case a tag decides to implement BodyTag. } + @Override public int doAfterBody() throws JspException { return SKIP_BODY; } + @Override public void release() { bodyOut = null; pageContext = null; diff --git a/webapps/examples/WEB-INF/classes/examples/FooTag.java b/webapps/examples/WEB-INF/classes/examples/FooTag.java index b48d25485..8e8dc720a 100644 --- a/webapps/examples/WEB-INF/classes/examples/FooTag.java +++ b/webapps/examples/WEB-INF/classes/examples/FooTag.java @@ -53,16 +53,19 @@ public class FooTag * * @return EVAL_BODY_INCLUDE */ + @Override public int doStartTag() throws JspException { i = 0; return EVAL_BODY_BUFFERED; } + @Override public void doInitBody() throws JspException { pageContext.setAttribute("member", atts[i]); i++; } + @Override public int doAfterBody() throws JspException { try { if (i == 3) { diff --git a/webapps/examples/WEB-INF/classes/examples/FooTagExtraInfo.java b/webapps/examples/WEB-INF/classes/examples/FooTagExtraInfo.java index 6733efd24..9aaa62858 100644 --- a/webapps/examples/WEB-INF/classes/examples/FooTagExtraInfo.java +++ b/webapps/examples/WEB-INF/classes/examples/FooTagExtraInfo.java @@ -19,6 +19,7 @@ package examples; import javax.servlet.jsp.tagext.*; public class FooTagExtraInfo extends TagExtraInfo { + @Override public VariableInfo[] getVariableInfo(TagData data) { return new VariableInfo[] { diff --git a/webapps/examples/WEB-INF/classes/examples/LogTag.java b/webapps/examples/WEB-INF/classes/examples/LogTag.java index 975667952..04ebd0911 100644 --- a/webapps/examples/WEB-INF/classes/examples/LogTag.java +++ b/webapps/examples/WEB-INF/classes/examples/LogTag.java @@ -38,10 +38,12 @@ public class LogTag toBrowser = false; } + @Override public int doStartTag() throws JspException { return EVAL_BODY_BUFFERED; } + @Override public int doAfterBody() throws JspException { try { String s = bodyOut.getString(); diff --git a/webapps/examples/WEB-INF/classes/examples/ShowSource.java b/webapps/examples/WEB-INF/classes/examples/ShowSource.java index 4de72317f..a700d118d 100644 --- a/webapps/examples/WEB-INF/classes/examples/ShowSource.java +++ b/webapps/examples/WEB-INF/classes/examples/ShowSource.java @@ -34,6 +34,7 @@ public class ShowSource this.jspFile = jspFile; } + @Override public int doEndTag() throws JspException { if ((jspFile.indexOf( ".." ) >= 0) || (jspFile.toUpperCase().indexOf("/WEB-INF/") != 0) || diff --git a/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java b/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java index d61b2d98e..01b32ff45 100644 --- a/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java +++ b/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java @@ -123,6 +123,7 @@ public final class ExampleFilter implements Filter { /** * Return a String representation of this object. */ + @Override public String toString() { if (filterConfig == null) diff --git a/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/EchoAttributesTag.java b/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/EchoAttributesTag.java index 232cf6039..97d9e0e17 100644 --- a/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/EchoAttributesTag.java +++ b/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/EchoAttributesTag.java @@ -35,6 +35,7 @@ public class EchoAttributesTag private ArrayList keys = new ArrayList(); private ArrayList values = new ArrayList(); + @Override public void doTag() throws JspException, IOException { JspWriter out = getJspContext().getOut(); for( int i = 0; i < keys.size(); i++ ) { diff --git a/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/FindBookSimpleTag.java b/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/FindBookSimpleTag.java index 538670684..9cccdac29 100644 --- a/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/FindBookSimpleTag.java +++ b/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/FindBookSimpleTag.java @@ -33,6 +33,7 @@ public class FindBookSimpleTag extends SimpleTagSupport { private static final String BOOK_AUTHOR = "J. R. R. Tolkein"; private static final String BOOK_ISBN = "0618002251"; + @Override public void doTag() throws JspException { BookBean book = new BookBean( BOOK_TITLE, BOOK_AUTHOR, BOOK_ISBN ); getJspContext().setAttribute( this.var, book ); diff --git a/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/HelloWorldSimpleTag.java b/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/HelloWorldSimpleTag.java index b8e3aa3f6..38a6cd321 100644 --- a/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/HelloWorldSimpleTag.java +++ b/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/HelloWorldSimpleTag.java @@ -26,6 +26,7 @@ import java.io.IOException; * SimpleTag handler that prints "Hello, world!" */ public class HelloWorldSimpleTag extends SimpleTagSupport { + @Override public void doTag() throws JspException, IOException { getJspContext().getOut().write( "Hello, world!" ); } diff --git a/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/RepeatSimpleTag.java b/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/RepeatSimpleTag.java index db9861cec..5d4c5b1c3 100644 --- a/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/RepeatSimpleTag.java +++ b/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/RepeatSimpleTag.java @@ -29,6 +29,7 @@ import java.io.IOException; public class RepeatSimpleTag extends SimpleTagSupport { private int num; + @Override public void doTag() throws JspException, IOException { for (int i=0; i