[Httpunit-commit] CVS: httpunit/src/com/meterware/servletunit InvocationContext.java,1.1,1.2 ServletRunner.java,1.6,1.7 ServletUnitHttpRequest.java,1.4,1.5 ServletUnitHttpResponse.java,1.6,1.7 ServletUnitHttpSession.java,1.2,1.3

[Russell G. <rus...@us...>]

Update of /cvsroot/httpunit/httpunit/src/com/meterware/servletunit
In directory usw-pr-cvs1:/tmp/cvs-serv31024/src/com/meterware/servletunit

Modified Files:
	InvocationContext.java ServletRunner.java 
	ServletUnitHttpRequest.java ServletUnitHttpResponse.java 
	ServletUnitHttpSession.java 
Log Message:
General code cleanup

Index: InvocationContext.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/servletunit/InvocationContext.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- InvocationContext.java	2001/06/06 13:25:04	1.1
+++ InvocationContext.java	2001/11/12 19:48:35	1.2
@@ -19,11 +19,8 @@
 * DEALINGS IN THE SOFTWARE.
 *
 *******************************************************************************************************************/
-
 import com.meterware.httpunit.WebRequest;
 import com.meterware.httpunit.WebResponse;
-
-import java.io.IOException;
 
 import java.net.MalformedURLException;
 import java.net.URL;

Index: ServletRunner.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/servletunit/ServletRunner.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ServletRunner.java	2001/11/08 22:07:53	1.6
+++ ServletRunner.java	2001/11/12 19:48:35	1.7
@@ -19,37 +19,30 @@
 * DEALINGS IN THE SOFTWARE.
 *
 *******************************************************************************************************************/
+import com.meterware.httpunit.WebResponse;
+import com.meterware.httpunit.WebRequest;
+import com.meterware.httpunit.HttpNotFoundException;
+import com.meterware.httpunit.HttpInternalErrorException;
 
-import java.io.IOException;
 import java.io.InputStream;
-import java.io.ByteArrayInputStream;
-
+import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
-
-import java.util.Hashtable;
-import java.util.StringTokenizer;
-import java.util.Vector;
 import java.util.Dictionary;
+import java.util.Hashtable;
 
 import javax.servlet.Servlet;
-import javax.servlet.ServletException;
-
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import com.meterware.httpunit.*;
 
-import org.xml.sax.SAXException;
-import org.xml.sax.InputSource;
 import org.apache.xerces.parsers.DOMParser;
-import org.w3c.dom.Document;
+
 import org.w3c.dom.NodeList;
+import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 
+import org.xml.sax.SAXException;
+import org.xml.sax.InputSource;
+
 
 /**
  * This class acts as a test environment for servlets.
@@ -171,10 +164,10 @@
 
 
     /** A mapping of resource names to servlet class names. **/
-    Hashtable _servlets = new Hashtable();
+    private Hashtable _servlets = new Hashtable();
 
-    ServletUnitClient  _client = new ServletUnitClient( this );
-    ServletUnitContext _context = new ServletUnitContext();
+    private ServletUnitClient  _client = new ServletUnitClient( this );
+    private ServletUnitContext _context = new ServletUnitContext();
 
 
     private String getServletName( String urlFile ) {

Index: ServletUnitHttpRequest.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/servletunit/ServletUnitHttpRequest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ServletUnitHttpRequest.java	2001/11/08 22:07:53	1.4
+++ ServletUnitHttpRequest.java	2001/11/12 19:48:35	1.5
@@ -19,21 +19,23 @@
 * DEALINGS IN THE SOFTWARE.
 *
 *******************************************************************************************************************/
-import java.io.*;
+import com.meterware.httpunit.HttpUnitUtils;
+import com.meterware.httpunit.WebRequest;
 
+import java.io.BufferedReader;
+import java.io.IOException;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
-
 import java.util.Enumeration;
 import java.util.Hashtable;
-import java.util.StringTokenizer;
 import java.util.Vector;
-
-import javax.servlet.*;
-import javax.servlet.http.*;
+import java.util.StringTokenizer;
 
-import com.meterware.httpunit.WebRequest;
-import com.meterware.httpunit.HttpUnitUtils;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpSession;
+import javax.servlet.ServletInputStream;
+import javax.servlet.RequestDispatcher;
 
 
 /**

Index: ServletUnitHttpResponse.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/servletunit/ServletUnitHttpResponse.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ServletUnitHttpResponse.java	2001/11/08 22:07:53	1.6
+++ ServletUnitHttpResponse.java	2001/11/12 19:48:35	1.7
@@ -1,4 +1,5 @@
 package com.meterware.servletunit;
+
 /********************************************************************************************************************
 * $Id$
 *
@@ -19,19 +20,22 @@
 * DEALINGS IN THE SOFTWARE.
 *
 *******************************************************************************************************************/
-import java.io.*;
-import java.net.HttpURLConnection;
+import com.meterware.httpunit.HttpUnitUtils;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.io.UnsupportedEncodingException;
 
 import java.util.Enumeration;
 import java.util.Hashtable;
 import java.util.Locale;
 import java.util.Vector;
 
-import javax.servlet.*;
-import javax.servlet.http.*;
-
-import com.meterware.httpunit.HttpUnitUtils;
-import com.meterware.httpunit.WebRequest;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletResponse;
 
 
 class ServletUnitHttpResponse implements HttpServletResponse {

Index: ServletUnitHttpSession.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/servletunit/ServletUnitHttpSession.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ServletUnitHttpSession.java	2000/11/21 22:18:19	1.2
+++ ServletUnitHttpSession.java	2001/11/12 19:48:35	1.3
@@ -19,22 +19,12 @@
 * DEALINGS IN THE SOFTWARE.
 *
 *******************************************************************************************************************/
-import java.io.*;
-
-import java.net.HttpURLConnection;
-
 import java.util.Date;
 import java.util.Enumeration;
 import java.util.Hashtable;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.*;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
 
-import com.meterware.httpunit.*;
+import javax.servlet.http.HttpSession;
+import javax.servlet.http.HttpSessionContext;
 
 
 class ServletUnitHttpSession implements HttpSession {
@@ -216,7 +206,7 @@
 
     private int _maxInactiveInterval;
 
-    private long _creationTime = new Date().getTime();
+    private final long _creationTime = new Date().getTime();
 
     private long _lastAccessedTime = new Date().getTime();
 
@@ -226,6 +216,6 @@
 
     private boolean _isNew = true;
 
-    private String _id = Integer.toString( _NextID++ );
+    private final String _id = Integer.toString( _NextID++ );
 
 }