From eb4ad07aec158cc20b8d2e3fd6e4d19790bed63c Mon Sep 17 00:00:00 2001 From: markt Date: Sat, 27 Jan 2007 23:15:00 +0000 Subject: [PATCH] Code clean up in the examples. Removed unused imports and unused code. git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@500674 13f79535-47bb-0310-9956-ffa450edef68 --- webapps/examples/WEB-INF/classes/CookieExample.java | 1 - .../examples/WEB-INF/classes/HelloWorldExample.java | 1 - .../WEB-INF/classes/RequestHeaderExample.java | 1 - .../examples/WEB-INF/classes/RequestInfoExample.java | 1 - .../WEB-INF/classes/RequestParamExample.java | 1 - webapps/examples/WEB-INF/classes/SessionExample.java | 1 - webapps/examples/WEB-INF/classes/cal/Entries.java | 1 - .../examples/WEB-INF/classes/cal/JspCalendar.java | 1 - webapps/examples/WEB-INF/classes/cal/TableBean.java | 2 -- .../examples/WEB-INF/classes/dates/JspCalendar.java | 1 - webapps/examples/WEB-INF/classes/error/Smart.java | 3 --- .../examples/WEB-INF/classes/examples/FooTag.java | 7 ++----- .../examples/WEB-INF/classes/examples/LogTag.java | 3 +-- .../WEB-INF/classes/examples/ShowSource.java | 4 +--- .../WEB-INF/classes/filters/ExampleFilter.java | 1 - .../WEB-INF/classes/filters/RequestDumperFilter.java | 1 - .../classes/filters/SetCharacterEncodingFilter.java | 1 - .../WEB-INF/classes/jsp2/examples/el/Functions.java | 2 -- .../jsp2/examples/simpletag/EchoAttributesTag.java | 1 - .../jsp2/examples/simpletag/FindBookSimpleTag.java | 1 - .../jsp2/examples/simpletag/RepeatSimpleTag.java | 1 - .../jsp2/examples/simpletag/ShuffleSimpleTag.java | 1 - .../jsp2/examples/simpletag/TileSimpleTag.java | 1 - .../WEB-INF/classes/listeners/ContextListener.java | 20 -------------------- .../WEB-INF/classes/listeners/SessionListener.java | 20 -------------------- webapps/examples/WEB-INF/classes/servletToJsp.java | 1 - .../examples/WEB-INF/classes/sessions/DummyCart.java | 1 - 27 files changed, 4 insertions(+), 76 deletions(-) diff --git a/webapps/examples/WEB-INF/classes/CookieExample.java b/webapps/examples/WEB-INF/classes/CookieExample.java index 04b392540..c60d1c02b 100644 --- a/webapps/examples/WEB-INF/classes/CookieExample.java +++ b/webapps/examples/WEB-INF/classes/CookieExample.java @@ -19,7 +19,6 @@ */ import java.io.*; -import java.text.*; import java.util.*; import javax.servlet.*; import javax.servlet.http.*; diff --git a/webapps/examples/WEB-INF/classes/HelloWorldExample.java b/webapps/examples/WEB-INF/classes/HelloWorldExample.java index 44f24e393..c364ccbff 100644 --- a/webapps/examples/WEB-INF/classes/HelloWorldExample.java +++ b/webapps/examples/WEB-INF/classes/HelloWorldExample.java @@ -19,7 +19,6 @@ */ import java.io.*; -import java.text.*; import java.util.*; import javax.servlet.*; import javax.servlet.http.*; diff --git a/webapps/examples/WEB-INF/classes/RequestHeaderExample.java b/webapps/examples/WEB-INF/classes/RequestHeaderExample.java index 43e8b0ad1..87af27582 100644 --- a/webapps/examples/WEB-INF/classes/RequestHeaderExample.java +++ b/webapps/examples/WEB-INF/classes/RequestHeaderExample.java @@ -19,7 +19,6 @@ */ import java.io.*; -import java.text.*; import java.util.*; import javax.servlet.*; import javax.servlet.http.*; diff --git a/webapps/examples/WEB-INF/classes/RequestInfoExample.java b/webapps/examples/WEB-INF/classes/RequestInfoExample.java index 4c768b619..404061944 100644 --- a/webapps/examples/WEB-INF/classes/RequestInfoExample.java +++ b/webapps/examples/WEB-INF/classes/RequestInfoExample.java @@ -19,7 +19,6 @@ */ import java.io.*; -import java.text.*; import java.util.*; import javax.servlet.*; import javax.servlet.http.*; diff --git a/webapps/examples/WEB-INF/classes/RequestParamExample.java b/webapps/examples/WEB-INF/classes/RequestParamExample.java index 6ed3c3b61..e64e2cab9 100644 --- a/webapps/examples/WEB-INF/classes/RequestParamExample.java +++ b/webapps/examples/WEB-INF/classes/RequestParamExample.java @@ -19,7 +19,6 @@ */ import java.io.*; -import java.text.*; import java.util.*; import javax.servlet.*; import javax.servlet.http.*; diff --git a/webapps/examples/WEB-INF/classes/SessionExample.java b/webapps/examples/WEB-INF/classes/SessionExample.java index d04c94ed1..ca369a134 100644 --- a/webapps/examples/WEB-INF/classes/SessionExample.java +++ b/webapps/examples/WEB-INF/classes/SessionExample.java @@ -19,7 +19,6 @@ */ import java.io.*; -import java.text.*; import java.util.*; import javax.servlet.*; import javax.servlet.http.*; diff --git a/webapps/examples/WEB-INF/classes/cal/Entries.java b/webapps/examples/WEB-INF/classes/cal/Entries.java index 7ef6c78c6..3836b2366 100644 --- a/webapps/examples/WEB-INF/classes/cal/Entries.java +++ b/webapps/examples/WEB-INF/classes/cal/Entries.java @@ -16,7 +16,6 @@ */ package cal; -import java.util.Enumeration; import java.util.Hashtable; import javax.servlet.http.*; diff --git a/webapps/examples/WEB-INF/classes/cal/JspCalendar.java b/webapps/examples/WEB-INF/classes/cal/JspCalendar.java index 295ef3a87..4350165a8 100644 --- a/webapps/examples/WEB-INF/classes/cal/JspCalendar.java +++ b/webapps/examples/WEB-INF/classes/cal/JspCalendar.java @@ -17,7 +17,6 @@ package cal; -import java.text.DateFormat; import java.util.*; public class JspCalendar { diff --git a/webapps/examples/WEB-INF/classes/cal/TableBean.java b/webapps/examples/WEB-INF/classes/cal/TableBean.java index 26e3b015f..f79d8823e 100644 --- a/webapps/examples/WEB-INF/classes/cal/TableBean.java +++ b/webapps/examples/WEB-INF/classes/cal/TableBean.java @@ -16,9 +16,7 @@ */ package cal; -import java.beans.*; import javax.servlet.http.*; -import javax.servlet.*; import java.util.Hashtable; public class TableBean { diff --git a/webapps/examples/WEB-INF/classes/dates/JspCalendar.java b/webapps/examples/WEB-INF/classes/dates/JspCalendar.java index 419eea3a7..82fadd451 100644 --- a/webapps/examples/WEB-INF/classes/dates/JspCalendar.java +++ b/webapps/examples/WEB-INF/classes/dates/JspCalendar.java @@ -16,7 +16,6 @@ */ package dates; -import java.text.DateFormat; import java.util.*; public class JspCalendar { diff --git a/webapps/examples/WEB-INF/classes/error/Smart.java b/webapps/examples/WEB-INF/classes/error/Smart.java index 999aef309..94beb3958 100644 --- a/webapps/examples/WEB-INF/classes/error/Smart.java +++ b/webapps/examples/WEB-INF/classes/error/Smart.java @@ -18,9 +18,6 @@ package error; -import java.io.*; -import java.lang.*; - public class Smart { String name = "JSP"; diff --git a/webapps/examples/WEB-INF/classes/examples/FooTag.java b/webapps/examples/WEB-INF/classes/examples/FooTag.java index c55f36a72..ab8ee2b19 100644 --- a/webapps/examples/WEB-INF/classes/examples/FooTag.java +++ b/webapps/examples/WEB-INF/classes/examples/FooTag.java @@ -17,9 +17,6 @@ package examples; import javax.servlet.jsp.*; -import javax.servlet.jsp.tagext.*; -import java.util.Hashtable; -import java.io.Writer; import java.io.IOException; /** @@ -58,7 +55,7 @@ public class FooTag */ public int doStartTag() throws JspException { i = 0; - return EVAL_BODY_TAG; + return EVAL_BODY_BUFFERED; } public void doInitBody() throws JspException { @@ -74,7 +71,7 @@ public class FooTag } else pageContext.setAttribute("member", atts[i]); i++; - return EVAL_BODY_TAG; + return EVAL_BODY_BUFFERED; } catch (IOException ex) { throw new JspTagException(ex.toString()); } diff --git a/webapps/examples/WEB-INF/classes/examples/LogTag.java b/webapps/examples/WEB-INF/classes/examples/LogTag.java index ff394b88e..975667952 100644 --- a/webapps/examples/WEB-INF/classes/examples/LogTag.java +++ b/webapps/examples/WEB-INF/classes/examples/LogTag.java @@ -18,7 +18,6 @@ package examples; import javax.servlet.jsp.*; -import javax.servlet.jsp.tagext.*; import java.io.IOException; @@ -40,7 +39,7 @@ public class LogTag } public int doStartTag() throws JspException { - return EVAL_BODY_TAG; + return EVAL_BODY_BUFFERED; } public int doAfterBody() throws JspException { diff --git a/webapps/examples/WEB-INF/classes/examples/ShowSource.java b/webapps/examples/WEB-INF/classes/examples/ShowSource.java index 8fb65c557..4de72317f 100644 --- a/webapps/examples/WEB-INF/classes/examples/ShowSource.java +++ b/webapps/examples/WEB-INF/classes/examples/ShowSource.java @@ -17,7 +17,6 @@ package examples; -import javax.servlet.*; import javax.servlet.jsp.*; import javax.servlet.jsp.tagext.*; @@ -47,8 +46,7 @@ public class ShowSource if (in == null) throw new JspTagException("Unable to find JSP file: "+jspFile); - InputStreamReader reader = new InputStreamReader(in); - JspWriter out = pageContext.getOut(); + JspWriter out = pageContext.getOut(); try { diff --git a/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java b/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java index 64aa4ecdc..f8aaa36c7 100644 --- a/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java +++ b/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java @@ -22,7 +22,6 @@ import java.io.IOException; import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; -import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; diff --git a/webapps/examples/WEB-INF/classes/filters/RequestDumperFilter.java b/webapps/examples/WEB-INF/classes/filters/RequestDumperFilter.java index c8df2446e..214944255 100644 --- a/webapps/examples/WEB-INF/classes/filters/RequestDumperFilter.java +++ b/webapps/examples/WEB-INF/classes/filters/RequestDumperFilter.java @@ -28,7 +28,6 @@ import java.util.Locale; import javax.servlet.Filter; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; -import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; diff --git a/webapps/examples/WEB-INF/classes/filters/SetCharacterEncodingFilter.java b/webapps/examples/WEB-INF/classes/filters/SetCharacterEncodingFilter.java index 5cbbecd81..cfc164fef 100644 --- a/webapps/examples/WEB-INF/classes/filters/SetCharacterEncodingFilter.java +++ b/webapps/examples/WEB-INF/classes/filters/SetCharacterEncodingFilter.java @@ -25,7 +25,6 @@ import javax.servlet.FilterConfig; import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; -import javax.servlet.UnavailableException; /** diff --git a/webapps/examples/WEB-INF/classes/jsp2/examples/el/Functions.java b/webapps/examples/WEB-INF/classes/jsp2/examples/el/Functions.java index 325c2fe77..ea12e445a 100644 --- a/webapps/examples/WEB-INF/classes/jsp2/examples/el/Functions.java +++ b/webapps/examples/WEB-INF/classes/jsp2/examples/el/Functions.java @@ -16,8 +16,6 @@ */ package jsp2.examples.el; -import java.util.*; - /** * Defines the functions for the jsp2 example tag library. * 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 982e7116e..9e7d20196 100644 --- a/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/EchoAttributesTag.java +++ b/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/EchoAttributesTag.java @@ -23,7 +23,6 @@ import javax.servlet.jsp.JspWriter; import javax.servlet.jsp.tagext.SimpleTagSupport; import javax.servlet.jsp.tagext.DynamicAttributes; import java.util.ArrayList; -import java.util.Iterator; import java.io.IOException; /** 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 998edd04c..538670684 100644 --- a/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/FindBookSimpleTag.java +++ b/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/FindBookSimpleTag.java @@ -20,7 +20,6 @@ package jsp2.examples.simpletag; import javax.servlet.jsp.JspException; import javax.servlet.jsp.tagext.SimpleTagSupport; -import java.util.HashMap; import jsp2.examples.BookBean; /** 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 afd6952c6..db9861cec 100644 --- a/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/RepeatSimpleTag.java +++ b/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/RepeatSimpleTag.java @@ -20,7 +20,6 @@ package jsp2.examples.simpletag; import javax.servlet.jsp.JspException; import javax.servlet.jsp.tagext.SimpleTagSupport; -import java.util.HashMap; import java.io.IOException; /** diff --git a/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/ShuffleSimpleTag.java b/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/ShuffleSimpleTag.java index 701c02345..11124facf 100644 --- a/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/ShuffleSimpleTag.java +++ b/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/ShuffleSimpleTag.java @@ -21,7 +21,6 @@ package jsp2.examples.simpletag; import javax.servlet.jsp.JspException; import javax.servlet.jsp.tagext.JspFragment; import javax.servlet.jsp.tagext.SimpleTagSupport; -import java.util.HashMap; import java.io.IOException; /** diff --git a/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/TileSimpleTag.java b/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/TileSimpleTag.java index 8e7dd3794..0c2cee540 100644 --- a/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/TileSimpleTag.java +++ b/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/TileSimpleTag.java @@ -21,7 +21,6 @@ package jsp2.examples.simpletag; import javax.servlet.jsp.JspException; import javax.servlet.jsp.tagext.SimpleTagSupport; import java.io.IOException; -import java.util.HashMap; /** * Displays a tile as a single cell in a table. diff --git a/webapps/examples/WEB-INF/classes/listeners/ContextListener.java b/webapps/examples/WEB-INF/classes/listeners/ContextListener.java index 74aaf20f4..754b75ecc 100644 --- a/webapps/examples/WEB-INF/classes/listeners/ContextListener.java +++ b/webapps/examples/WEB-INF/classes/listeners/ContextListener.java @@ -133,24 +133,4 @@ public final class ContextListener } - - /** - * Log a message and associated exception to the servlet context - * application log. - * - * @param message Message to be logged - * @param throwable Exception to be logged - */ - private void log(String message, Throwable throwable) { - - if (context != null) - context.log("ContextListener: " + message, throwable); - else { - System.out.println("ContextListener: " + message); - throwable.printStackTrace(System.out); - } - - } - - } diff --git a/webapps/examples/WEB-INF/classes/listeners/SessionListener.java b/webapps/examples/WEB-INF/classes/listeners/SessionListener.java index b9142d623..5aa818134 100644 --- a/webapps/examples/WEB-INF/classes/listeners/SessionListener.java +++ b/webapps/examples/WEB-INF/classes/listeners/SessionListener.java @@ -160,24 +160,4 @@ public final class SessionListener } - - /** - * Log a message and associated exception to the servlet context - * application log. - * - * @param message Message to be logged - * @param throwable Exception to be logged - */ - private void log(String message, Throwable throwable) { - - if (context != null) - context.log("SessionListener: " + message, throwable); - else { - System.out.println("SessionListener: " + message); - throwable.printStackTrace(System.out); - } - - } - - } diff --git a/webapps/examples/WEB-INF/classes/servletToJsp.java b/webapps/examples/WEB-INF/classes/servletToJsp.java index aadf92467..11af6b405 100644 --- a/webapps/examples/WEB-INF/classes/servletToJsp.java +++ b/webapps/examples/WEB-INF/classes/servletToJsp.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import javax.servlet.*; import javax.servlet.http.*; public class servletToJsp extends HttpServlet { diff --git a/webapps/examples/WEB-INF/classes/sessions/DummyCart.java b/webapps/examples/WEB-INF/classes/sessions/DummyCart.java index 1ba6df686..e359eb8a4 100644 --- a/webapps/examples/WEB-INF/classes/sessions/DummyCart.java +++ b/webapps/examples/WEB-INF/classes/sessions/DummyCart.java @@ -18,7 +18,6 @@ package sessions; import javax.servlet.http.*; import java.util.Vector; -import java.util.Enumeration; public class DummyCart { Vector v = new Vector(); -- 2.11.0