From: markt Date: Sat, 6 Feb 2010 21:56:30 +0000 (+0000) Subject: Cosmetic changes X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=42e7fe21200b83cd1398145aba18a9419c485b40;p=tomcat7.0 Cosmetic changes - fix eclipse warnings - tabs to spaces git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@907317 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/webapps/examples/WEB-INF/classes/CookieExample.java b/webapps/examples/WEB-INF/classes/CookieExample.java index 37320a98a..b3a6e71cf 100644 --- a/webapps/examples/WEB-INF/classes/CookieExample.java +++ b/webapps/examples/WEB-INF/classes/CookieExample.java @@ -33,6 +33,8 @@ import util.HTMLFilter; public class CookieExample extends HttpServlet { + private static final long serialVersionUID = 1L; + ResourceBundle rb = ResourceBundle.getBundle("LocalStrings"); @Override diff --git a/webapps/examples/WEB-INF/classes/HelloWorldExample.java b/webapps/examples/WEB-INF/classes/HelloWorldExample.java index 74fbb1ddc..be8cb065d 100644 --- a/webapps/examples/WEB-INF/classes/HelloWorldExample.java +++ b/webapps/examples/WEB-INF/classes/HelloWorldExample.java @@ -31,6 +31,7 @@ import javax.servlet.http.*; public class HelloWorldExample extends HttpServlet { + private static final long serialVersionUID = 1L; @Override public void doGet(HttpServletRequest request, diff --git a/webapps/examples/WEB-INF/classes/RequestHeaderExample.java b/webapps/examples/WEB-INF/classes/RequestHeaderExample.java index 756e20701..ca204fa94 100644 --- a/webapps/examples/WEB-INF/classes/RequestHeaderExample.java +++ b/webapps/examples/WEB-INF/classes/RequestHeaderExample.java @@ -33,6 +33,8 @@ import util.HTMLFilter; public class RequestHeaderExample extends HttpServlet { + private static final long serialVersionUID = 1L; + ResourceBundle rb = ResourceBundle.getBundle("LocalStrings"); @Override diff --git a/webapps/examples/WEB-INF/classes/RequestInfoExample.java b/webapps/examples/WEB-INF/classes/RequestInfoExample.java index a0fcb84c8..efc2159c3 100644 --- a/webapps/examples/WEB-INF/classes/RequestInfoExample.java +++ b/webapps/examples/WEB-INF/classes/RequestInfoExample.java @@ -33,6 +33,7 @@ import util.HTMLFilter; public class RequestInfoExample extends HttpServlet { + private static final long serialVersionUID = 1L; ResourceBundle rb = ResourceBundle.getBundle("LocalStrings"); diff --git a/webapps/examples/WEB-INF/classes/RequestParamExample.java b/webapps/examples/WEB-INF/classes/RequestParamExample.java index 218b4b097..c98ae5ea2 100644 --- a/webapps/examples/WEB-INF/classes/RequestParamExample.java +++ b/webapps/examples/WEB-INF/classes/RequestParamExample.java @@ -33,6 +33,7 @@ import util.HTMLFilter; public class RequestParamExample extends HttpServlet { + private static final long serialVersionUID = 1L; ResourceBundle rb = ResourceBundle.getBundle("LocalStrings"); diff --git a/webapps/examples/WEB-INF/classes/SessionExample.java b/webapps/examples/WEB-INF/classes/SessionExample.java index f988e6dbe..5acc50f30 100644 --- a/webapps/examples/WEB-INF/classes/SessionExample.java +++ b/webapps/examples/WEB-INF/classes/SessionExample.java @@ -33,6 +33,8 @@ import util.HTMLFilter; public class SessionExample extends HttpServlet { + private static final long serialVersionUID = 1L; + ResourceBundle rb = ResourceBundle.getBundle("LocalStrings"); @Override diff --git a/webapps/examples/WEB-INF/classes/async/Async0.java b/webapps/examples/WEB-INF/classes/async/Async0.java index af5133f29..5a5af978e 100644 --- a/webapps/examples/WEB-INF/classes/async/Async0.java +++ b/webapps/examples/WEB-INF/classes/async/Async0.java @@ -28,9 +28,10 @@ import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; public class Async0 extends HttpServlet { + + private static final long serialVersionUID = 1L; + private static final Log log = LogFactory.getLog(Async0.class); - public Async0() { - } @Override protected void service(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { diff --git a/webapps/examples/WEB-INF/classes/async/Async1.java b/webapps/examples/WEB-INF/classes/async/Async1.java index 6d589fb15..907e1d4d4 100644 --- a/webapps/examples/WEB-INF/classes/async/Async1.java +++ b/webapps/examples/WEB-INF/classes/async/Async1.java @@ -28,9 +28,10 @@ import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; public class Async1 extends HttpServlet { + + private static final long serialVersionUID = 1L; + private static final Log log = LogFactory.getLog(Async1.class); - public Async1() { - } @Override protected void service(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { diff --git a/webapps/examples/WEB-INF/classes/async/Async2.java b/webapps/examples/WEB-INF/classes/async/Async2.java index 83a3f4039..bb39ff13b 100644 --- a/webapps/examples/WEB-INF/classes/async/Async2.java +++ b/webapps/examples/WEB-INF/classes/async/Async2.java @@ -28,9 +28,10 @@ import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; public class Async2 extends HttpServlet { + + private static final long serialVersionUID = 1L; + private static final Log log = LogFactory.getLog(Async2.class); - public Async2() { - } @Override protected void service(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { diff --git a/webapps/examples/WEB-INF/classes/async/Async3.java b/webapps/examples/WEB-INF/classes/async/Async3.java index 164033b88..f7bff30b3 100644 --- a/webapps/examples/WEB-INF/classes/async/Async3.java +++ b/webapps/examples/WEB-INF/classes/async/Async3.java @@ -24,13 +24,9 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.juli.logging.Log; -import org.apache.juli.logging.LogFactory; - public class Async3 extends HttpServlet { - private static final Log log = LogFactory.getLog(Async3.class); - public Async3() { - } + + private static final long serialVersionUID = 1L; @Override protected void service(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { diff --git a/webapps/examples/WEB-INF/classes/async/AsyncStockServlet.java b/webapps/examples/WEB-INF/classes/async/AsyncStockServlet.java index fbec89e80..fd5ce9bc1 100644 --- a/webapps/examples/WEB-INF/classes/async/AsyncStockServlet.java +++ b/webapps/examples/WEB-INF/classes/async/AsyncStockServlet.java @@ -36,6 +36,8 @@ import async.Stockticker.TickListener; public class AsyncStockServlet extends HttpServlet implements TickListener, AsyncListener{ + private static final long serialVersionUID = 1L; + public static final String POLL = "POLL"; public static final String LONG_POLL = "LONG-POLL"; public static final String STREAM = "STREAM"; @@ -98,7 +100,7 @@ public class AsyncStockServlet extends HttpServlet implements TickListener, Asyn writer.flush(); response.flushBuffer(); }catch (IOException x) { - try {actx.complete();}catch (Exception ignore){} + try {actx.complete();}catch (Exception ignore){/* Ignore */} } } diff --git a/webapps/examples/WEB-INF/classes/async/Stockticker.java b/webapps/examples/WEB-INF/classes/async/Stockticker.java index 96206c163..b99fe4b6c 100644 --- a/webapps/examples/WEB-INF/classes/async/Stockticker.java +++ b/webapps/examples/WEB-INF/classes/async/Stockticker.java @@ -83,14 +83,11 @@ public class Stockticker implements Runnable { l.tick(stock); } -// System.out.println("Stock: " + stock.getSymbol() -// + " Price: " + stock.getValueAsString() -// + " Change: " + stock.getLastChangeAsString()); } Thread.sleep(850); } } catch (InterruptedException ix) { - + // Ignore } catch (Exception x) { x.printStackTrace(); } diff --git a/webapps/examples/WEB-INF/classes/chat/ChatServlet.java b/webapps/examples/WEB-INF/classes/chat/ChatServlet.java index 8e24cbfe7..15f025a46 100644 --- a/webapps/examples/WEB-INF/classes/chat/ChatServlet.java +++ b/webapps/examples/WEB-INF/classes/chat/ChatServlet.java @@ -39,6 +39,8 @@ import javax.servlet.http.HttpServletResponse; public class ChatServlet extends HttpServlet implements CometProcessor { + private static final long serialVersionUID = 1L; + protected ArrayList connections = new ArrayList(); protected MessageSender messageSender = null; diff --git a/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.java b/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.java index 72617be77..078eb7783 100644 --- a/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.java +++ b/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.java @@ -30,6 +30,8 @@ import javax.servlet.http.*; public class CompressionFilterTestServlet extends HttpServlet { + private static final long serialVersionUID = 1L; + @Override public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { diff --git a/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java b/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java index 05c019fa6..2e98cf0b7 100644 --- a/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java +++ b/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java @@ -140,11 +140,12 @@ public class CompressionServletResponseWrapper extends HttpServletResponseWrappe System.out.println("createOutputStream gets called"); } - CompressionResponseStream stream = new CompressionResponseStream(origResponse); - stream.setDebugLevel(debug); - stream.setBuffer(threshold); + CompressionResponseStream compressedStream = + new CompressionResponseStream(origResponse); + compressedStream.setDebugLevel(debug); + compressedStream.setBuffer(threshold); - return stream; + return compressedStream; } diff --git a/webapps/examples/WEB-INF/classes/examples/ExampleTagBase.java b/webapps/examples/WEB-INF/classes/examples/ExampleTagBase.java index 23eb19274..cea926db4 100644 --- a/webapps/examples/WEB-INF/classes/examples/ExampleTagBase.java +++ b/webapps/examples/WEB-INF/classes/examples/ExampleTagBase.java @@ -21,6 +21,8 @@ import javax.servlet.jsp.tagext.*; public abstract class ExampleTagBase extends BodyTagSupport { + private static final long serialVersionUID = 1L; + @Override public void setParent(Tag parent) { this.parent = parent; diff --git a/webapps/examples/WEB-INF/classes/examples/FooTag.java b/webapps/examples/WEB-INF/classes/examples/FooTag.java index 8e8dc720a..fba2bc661 100644 --- a/webapps/examples/WEB-INF/classes/examples/FooTag.java +++ b/webapps/examples/WEB-INF/classes/examples/FooTag.java @@ -26,9 +26,10 @@ import java.io.IOException; * */ -public class FooTag - extends ExampleTagBase -{ +public class FooTag extends ExampleTagBase { + + private static final long serialVersionUID = 1L; + private String atts[] = new String[3]; int i = 0; diff --git a/webapps/examples/WEB-INF/classes/examples/LogTag.java b/webapps/examples/WEB-INF/classes/examples/LogTag.java index 04ebd0911..9bc478907 100644 --- a/webapps/examples/WEB-INF/classes/examples/LogTag.java +++ b/webapps/examples/WEB-INF/classes/examples/LogTag.java @@ -24,9 +24,10 @@ import java.io.IOException; /** * Log the contents of the body. Could be used to handle errors etc. */ -public class LogTag - extends ExampleTagBase -{ +public class LogTag extends ExampleTagBase { + + private static final long serialVersionUID = 1L; + boolean toBrowser = false; public void setToBrowser(String value) { diff --git a/webapps/examples/WEB-INF/classes/examples/ShowSource.java b/webapps/examples/WEB-INF/classes/examples/ShowSource.java index a700d118d..d3144cede 100644 --- a/webapps/examples/WEB-INF/classes/examples/ShowSource.java +++ b/webapps/examples/WEB-INF/classes/examples/ShowSource.java @@ -25,9 +25,10 @@ import java.io.*; /** * Display the sources of the JSP file. */ -public class ShowSource - extends TagSupport -{ +public class ShowSource extends TagSupport { + + private static final long serialVersionUID = 1L; + String jspFile; public void setJspFile(String jspFile) { diff --git a/webapps/examples/WEB-INF/classes/examples/ValuesTag.java b/webapps/examples/WEB-INF/classes/examples/ValuesTag.java index 5e9f70b84..869c34a7c 100644 --- a/webapps/examples/WEB-INF/classes/examples/ValuesTag.java +++ b/webapps/examples/WEB-INF/classes/examples/ValuesTag.java @@ -25,6 +25,9 @@ import java.io.*; * Accept and display a value. */ public class ValuesTag extends TagSupport { + + private static final long serialVersionUID = 1L; + // Using "-1" as the default value, // in the assumption that it won't be used as the value. // Cannot use null here, because null is an important case @@ -50,6 +53,7 @@ public class ValuesTag extends TagSupport { this.doubleValue = doubleValue; } + @Override public int doEndTag() throws JspException { JspWriter out = pageContext.getOut(); diff --git a/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java b/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java index 01b32ff45..eb5a52895 100644 --- a/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java +++ b/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java @@ -90,19 +90,19 @@ public final class ExampleFilter implements Filter { */ public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) - throws IOException, ServletException { + throws IOException, ServletException { - // Store ourselves as a request attribute (if requested) - if (attribute != null) - request.setAttribute(attribute, this); + // Store ourselves as a request attribute (if requested) + if (attribute != null) + request.setAttribute(attribute, this); - // Time and log the subsequent processing - long startTime = System.currentTimeMillis(); + // Time and log the subsequent processing + long startTime = System.currentTimeMillis(); chain.doFilter(request, response); - long stopTime = System.currentTimeMillis(); - filterConfig.getServletContext().log - (this.toString() + ": " + (stopTime - startTime) + - " milliseconds"); + long stopTime = System.currentTimeMillis(); + filterConfig.getServletContext().log + (this.toString() + ": " + (stopTime - startTime) + + " milliseconds"); } @@ -110,12 +110,12 @@ public final class ExampleFilter implements Filter { /** * Place this filter into service. * - * @param filterConfig The filter configuration object + * @param fConfig The filter configuration object */ - public void init(FilterConfig filterConfig) throws ServletException { + public void init(FilterConfig fConfig) throws ServletException { - this.filterConfig = filterConfig; - this.attribute = filterConfig.getInitParameter("attribute"); + this.filterConfig = fConfig; + this.attribute = fConfig.getInitParameter("attribute"); } @@ -126,12 +126,12 @@ public final class ExampleFilter implements Filter { @Override public String toString() { - if (filterConfig == null) - return ("TimingFilter()"); - StringBuilder sb = new StringBuilder("TimingFilter("); - sb.append(filterConfig); - sb.append(")"); - return (sb.toString()); + if (filterConfig == null) + return ("TimingFilter()"); + StringBuilder sb = new StringBuilder("TimingFilter("); + sb.append(filterConfig); + sb.append(")"); + return (sb.toString()); } diff --git a/webapps/examples/WEB-INF/classes/filters/SetCharacterEncodingFilter.java b/webapps/examples/WEB-INF/classes/filters/SetCharacterEncodingFilter.java index 0f8e40e22..ce6ff0346 100644 --- a/webapps/examples/WEB-INF/classes/filters/SetCharacterEncodingFilter.java +++ b/webapps/examples/WEB-INF/classes/filters/SetCharacterEncodingFilter.java @@ -113,9 +113,9 @@ public class SetCharacterEncodingFilter implements Filter { // Conditionally select and set the character encoding to be used if (ignore || (request.getCharacterEncoding() == null)) { - String encoding = selectEncoding(request); - if (encoding != null) - request.setCharacterEncoding(encoding); + String characterEncoding = selectEncoding(request); + if (characterEncoding != null) + request.setCharacterEncoding(characterEncoding); } // Pass control on to the next filter @@ -127,13 +127,13 @@ public class SetCharacterEncodingFilter implements Filter { /** * Place this filter into service. * - * @param filterConfig The filter configuration object + * @param fConfig The filter configuration object */ - public void init(FilterConfig filterConfig) throws ServletException { + public void init(FilterConfig fConfig) throws ServletException { - this.filterConfig = filterConfig; - this.encoding = filterConfig.getInitParameter("encoding"); - String value = filterConfig.getInitParameter("ignore"); + this.filterConfig = fConfig; + this.encoding = fConfig.getInitParameter("encoding"); + String value = fConfig.getInitParameter("ignore"); if (value == null) this.ignore = true; else if (value.equalsIgnoreCase("true")) diff --git a/webapps/examples/WEB-INF/classes/jsp2/examples/ValuesBean.java b/webapps/examples/WEB-INF/classes/jsp2/examples/ValuesBean.java index 718888e28..6b481fcb1 100644 --- a/webapps/examples/WEB-INF/classes/jsp2/examples/ValuesBean.java +++ b/webapps/examples/WEB-INF/classes/jsp2/examples/ValuesBean.java @@ -26,9 +26,6 @@ public class ValuesBean { private double doubleValue; private long longValue; - public ValuesBean() { - } - public String getString() { return this.string; } diff --git a/webapps/examples/WEB-INF/classes/servletToJsp.java b/webapps/examples/WEB-INF/classes/servletToJsp.java index c67d599fe..ffc2737fa 100644 --- a/webapps/examples/WEB-INF/classes/servletToJsp.java +++ b/webapps/examples/WEB-INF/classes/servletToJsp.java @@ -18,6 +18,8 @@ import javax.servlet.http.*; public class servletToJsp extends HttpServlet { + private static final long serialVersionUID = 1L; + @Override public void doGet (HttpServletRequest request, HttpServletResponse response) {