Author: markt Date: Sat Feb 6 21:56:30 2010 New Revision: 907317 URL: http://svn.apache.org/viewvc?rev=907317&view=rev Log: Cosmetic changes - fix eclipse warnings - tabs to spaces
Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/CookieExample.java tomcat/trunk/webapps/examples/WEB-INF/classes/HelloWorldExample.java tomcat/trunk/webapps/examples/WEB-INF/classes/RequestHeaderExample.java tomcat/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java tomcat/trunk/webapps/examples/WEB-INF/classes/RequestParamExample.java tomcat/trunk/webapps/examples/WEB-INF/classes/SessionExample.java tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async0.java tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async1.java tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async2.java tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async3.java tomcat/trunk/webapps/examples/WEB-INF/classes/async/AsyncStockServlet.java tomcat/trunk/webapps/examples/WEB-INF/classes/async/Stockticker.java tomcat/trunk/webapps/examples/WEB-INF/classes/chat/ChatServlet.java tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.java tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java tomcat/trunk/webapps/examples/WEB-INF/classes/examples/ExampleTagBase.java tomcat/trunk/webapps/examples/WEB-INF/classes/examples/FooTag.java tomcat/trunk/webapps/examples/WEB-INF/classes/examples/LogTag.java tomcat/trunk/webapps/examples/WEB-INF/classes/examples/ShowSource.java tomcat/trunk/webapps/examples/WEB-INF/classes/examples/ValuesTag.java tomcat/trunk/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java tomcat/trunk/webapps/examples/WEB-INF/classes/filters/SetCharacterEncodingFilter.java tomcat/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/ValuesBean.java tomcat/trunk/webapps/examples/WEB-INF/classes/servletToJsp.java Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/CookieExample.java URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/CookieExample.java?rev=907317&r1=907316&r2=907317&view=diff ============================================================================== --- tomcat/trunk/webapps/examples/WEB-INF/classes/CookieExample.java (original) +++ tomcat/trunk/webapps/examples/WEB-INF/classes/CookieExample.java Sat Feb 6 21:56:30 2010 @@ -33,6 +33,8 @@ public class CookieExample extends HttpServlet { + private static final long serialVersionUID = 1L; + ResourceBundle rb = ResourceBundle.getBundle("LocalStrings"); @Override Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/HelloWorldExample.java URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/HelloWorldExample.java?rev=907317&r1=907316&r2=907317&view=diff ============================================================================== --- tomcat/trunk/webapps/examples/WEB-INF/classes/HelloWorldExample.java (original) +++ tomcat/trunk/webapps/examples/WEB-INF/classes/HelloWorldExample.java Sat Feb 6 21:56:30 2010 @@ -31,6 +31,7 @@ public class HelloWorldExample extends HttpServlet { + private static final long serialVersionUID = 1L; @Override public void doGet(HttpServletRequest request, Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/RequestHeaderExample.java URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/RequestHeaderExample.java?rev=907317&r1=907316&r2=907317&view=diff ============================================================================== --- tomcat/trunk/webapps/examples/WEB-INF/classes/RequestHeaderExample.java (original) +++ tomcat/trunk/webapps/examples/WEB-INF/classes/RequestHeaderExample.java Sat Feb 6 21:56:30 2010 @@ -33,6 +33,8 @@ public class RequestHeaderExample extends HttpServlet { + private static final long serialVersionUID = 1L; + ResourceBundle rb = ResourceBundle.getBundle("LocalStrings"); @Override Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java?rev=907317&r1=907316&r2=907317&view=diff ============================================================================== --- tomcat/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java (original) +++ tomcat/trunk/webapps/examples/WEB-INF/classes/RequestInfoExample.java Sat Feb 6 21:56:30 2010 @@ -33,6 +33,7 @@ public class RequestInfoExample extends HttpServlet { + private static final long serialVersionUID = 1L; ResourceBundle rb = ResourceBundle.getBundle("LocalStrings"); Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/RequestParamExample.java URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/RequestParamExample.java?rev=907317&r1=907316&r2=907317&view=diff ============================================================================== --- tomcat/trunk/webapps/examples/WEB-INF/classes/RequestParamExample.java (original) +++ tomcat/trunk/webapps/examples/WEB-INF/classes/RequestParamExample.java Sat Feb 6 21:56:30 2010 @@ -33,6 +33,7 @@ public class RequestParamExample extends HttpServlet { + private static final long serialVersionUID = 1L; ResourceBundle rb = ResourceBundle.getBundle("LocalStrings"); Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/SessionExample.java URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/SessionExample.java?rev=907317&r1=907316&r2=907317&view=diff ============================================================================== --- tomcat/trunk/webapps/examples/WEB-INF/classes/SessionExample.java (original) +++ tomcat/trunk/webapps/examples/WEB-INF/classes/SessionExample.java Sat Feb 6 21:56:30 2010 @@ -33,6 +33,8 @@ public class SessionExample extends HttpServlet { + private static final long serialVersionUID = 1L; + ResourceBundle rb = ResourceBundle.getBundle("LocalStrings"); @Override Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async0.java URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async0.java?rev=907317&r1=907316&r2=907317&view=diff ============================================================================== --- tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async0.java (original) +++ tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async0.java Sat Feb 6 21:56:30 2010 @@ -28,9 +28,10 @@ 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 { Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async1.java URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async1.java?rev=907317&r1=907316&r2=907317&view=diff ============================================================================== --- tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async1.java (original) +++ tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async1.java Sat Feb 6 21:56:30 2010 @@ -28,9 +28,10 @@ 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 { Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async2.java URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async2.java?rev=907317&r1=907316&r2=907317&view=diff ============================================================================== --- tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async2.java (original) +++ tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async2.java Sat Feb 6 21:56:30 2010 @@ -28,9 +28,10 @@ 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 { Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async3.java URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async3.java?rev=907317&r1=907316&r2=907317&view=diff ============================================================================== --- tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async3.java (original) +++ tomcat/trunk/webapps/examples/WEB-INF/classes/async/Async3.java Sat Feb 6 21:56:30 2010 @@ -24,13 +24,9 @@ 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 { Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/async/AsyncStockServlet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/async/AsyncStockServlet.java?rev=907317&r1=907316&r2=907317&view=diff ============================================================================== --- tomcat/trunk/webapps/examples/WEB-INF/classes/async/AsyncStockServlet.java (original) +++ tomcat/trunk/webapps/examples/WEB-INF/classes/async/AsyncStockServlet.java Sat Feb 6 21:56:30 2010 @@ -36,6 +36,8 @@ 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 @@ writer.flush(); response.flushBuffer(); }catch (IOException x) { - try {actx.complete();}catch (Exception ignore){} + try {actx.complete();}catch (Exception ignore){/* Ignore */} } } Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/async/Stockticker.java URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/async/Stockticker.java?rev=907317&r1=907316&r2=907317&view=diff ============================================================================== --- tomcat/trunk/webapps/examples/WEB-INF/classes/async/Stockticker.java (original) +++ tomcat/trunk/webapps/examples/WEB-INF/classes/async/Stockticker.java Sat Feb 6 21:56:30 2010 @@ -83,14 +83,11 @@ 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(); } Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/chat/ChatServlet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/chat/ChatServlet.java?rev=907317&r1=907316&r2=907317&view=diff ============================================================================== --- tomcat/trunk/webapps/examples/WEB-INF/classes/chat/ChatServlet.java (original) +++ tomcat/trunk/webapps/examples/WEB-INF/classes/chat/ChatServlet.java Sat Feb 6 21:56:30 2010 @@ -39,6 +39,8 @@ public class ChatServlet extends HttpServlet implements CometProcessor { + private static final long serialVersionUID = 1L; + protected ArrayList<HttpServletResponse> connections = new ArrayList<HttpServletResponse>(); protected MessageSender messageSender = null; Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.java?rev=907317&r1=907316&r2=907317&view=diff ============================================================================== --- tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.java (original) +++ tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionFilterTestServlet.java Sat Feb 6 21:56:30 2010 @@ -30,6 +30,8 @@ public class CompressionFilterTestServlet extends HttpServlet { + private static final long serialVersionUID = 1L; + @Override public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java?rev=907317&r1=907316&r2=907317&view=diff ============================================================================== --- tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java (original) +++ tomcat/trunk/webapps/examples/WEB-INF/classes/compressionFilters/CompressionServletResponseWrapper.java Sat Feb 6 21:56:30 2010 @@ -140,11 +140,12 @@ 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; } Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/examples/ExampleTagBase.java URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/examples/ExampleTagBase.java?rev=907317&r1=907316&r2=907317&view=diff ============================================================================== --- tomcat/trunk/webapps/examples/WEB-INF/classes/examples/ExampleTagBase.java (original) +++ tomcat/trunk/webapps/examples/WEB-INF/classes/examples/ExampleTagBase.java Sat Feb 6 21:56:30 2010 @@ -21,6 +21,8 @@ public abstract class ExampleTagBase extends BodyTagSupport { + private static final long serialVersionUID = 1L; + @Override public void setParent(Tag parent) { this.parent = parent; Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/examples/FooTag.java URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/examples/FooTag.java?rev=907317&r1=907316&r2=907317&view=diff ============================================================================== --- tomcat/trunk/webapps/examples/WEB-INF/classes/examples/FooTag.java (original) +++ tomcat/trunk/webapps/examples/WEB-INF/classes/examples/FooTag.java Sat Feb 6 21:56:30 2010 @@ -26,9 +26,10 @@ * <foo att1="..." att2="...." att3="...." /> */ -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; Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/examples/LogTag.java URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/examples/LogTag.java?rev=907317&r1=907316&r2=907317&view=diff ============================================================================== --- tomcat/trunk/webapps/examples/WEB-INF/classes/examples/LogTag.java (original) +++ tomcat/trunk/webapps/examples/WEB-INF/classes/examples/LogTag.java Sat Feb 6 21:56:30 2010 @@ -24,9 +24,10 @@ /** * 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) { Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/examples/ShowSource.java URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/examples/ShowSource.java?rev=907317&r1=907316&r2=907317&view=diff ============================================================================== --- tomcat/trunk/webapps/examples/WEB-INF/classes/examples/ShowSource.java (original) +++ tomcat/trunk/webapps/examples/WEB-INF/classes/examples/ShowSource.java Sat Feb 6 21:56:30 2010 @@ -25,9 +25,10 @@ /** * 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) { Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/examples/ValuesTag.java URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/examples/ValuesTag.java?rev=907317&r1=907316&r2=907317&view=diff ============================================================================== --- tomcat/trunk/webapps/examples/WEB-INF/classes/examples/ValuesTag.java (original) +++ tomcat/trunk/webapps/examples/WEB-INF/classes/examples/ValuesTag.java Sat Feb 6 21:56:30 2010 @@ -25,6 +25,9 @@ * 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 @@ this.doubleValue = doubleValue; } + @Override public int doEndTag() throws JspException { JspWriter out = pageContext.getOut(); Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java?rev=907317&r1=907316&r2=907317&view=diff ============================================================================== --- tomcat/trunk/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java (original) +++ tomcat/trunk/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java Sat Feb 6 21:56:30 2010 @@ -90,19 +90,19 @@ */ 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 @@ /** * 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 @@ @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()); } Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/filters/SetCharacterEncodingFilter.java URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/filters/SetCharacterEncodingFilter.java?rev=907317&r1=907316&r2=907317&view=diff ============================================================================== --- tomcat/trunk/webapps/examples/WEB-INF/classes/filters/SetCharacterEncodingFilter.java (original) +++ tomcat/trunk/webapps/examples/WEB-INF/classes/filters/SetCharacterEncodingFilter.java Sat Feb 6 21:56:30 2010 @@ -113,9 +113,9 @@ // 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 @@ /** * 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")) Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/ValuesBean.java URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/ValuesBean.java?rev=907317&r1=907316&r2=907317&view=diff ============================================================================== --- tomcat/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/ValuesBean.java (original) +++ tomcat/trunk/webapps/examples/WEB-INF/classes/jsp2/examples/ValuesBean.java Sat Feb 6 21:56:30 2010 @@ -26,9 +26,6 @@ private double doubleValue; private long longValue; - public ValuesBean() { - } - public String getString() { return this.string; } Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/servletToJsp.java URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/servletToJsp.java?rev=907317&r1=907316&r2=907317&view=diff ============================================================================== --- tomcat/trunk/webapps/examples/WEB-INF/classes/servletToJsp.java (original) +++ tomcat/trunk/webapps/examples/WEB-INF/classes/servletToJsp.java Sat Feb 6 21:56:30 2010 @@ -18,6 +18,8 @@ public class servletToJsp extends HttpServlet { + private static final long serialVersionUID = 1L; + @Override public void doGet (HttpServletRequest request, HttpServletResponse response) { --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org