[Httpunit-commit] CVS: httpunit/src/com/meterware/httpunit WebClient.java,1.44,1.45 WebResponse.java,1.94,1.95

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

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

Modified Files:
	WebClient.java WebResponse.java 
Log Message:
Prepare for Location object

Index: WebClient.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/WebClient.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- WebClient.java	17 Oct 2002 23:50:48 -0000	1.44
+++ WebClient.java	1 Nov 2002 14:54:59 -0000	1.45
@@ -571,7 +571,7 @@
     /**
      * Examines the headers in the response and throws an exception if appropriate.
      **/
-    private void validateHeaders( WebResponse response ) throws HttpException, IOException {
+    private void validateHeaders( WebResponse response ) throws HttpException {
         if (!getExceptionsThrownOnErrorStatus()) return;
 
         if (response.getHeaderField( "WWW-Authenticate" ) != null) {

Index: WebResponse.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/WebResponse.java,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- WebResponse.java	24 Oct 2002 13:28:53 -0000	1.94
+++ WebResponse.java	1 Nov 2002 14:55:00 -0000	1.95
@@ -609,7 +609,7 @@
                 return getFrameName().equals( WebRequest.TOP_FRAME ) ? null
                         : _window.getFrameContents( WebFrame.getParentFrameName( getFrameName() ) ).getScriptableObject();
             } else if (propertyName.equalsIgnoreCase( "location" )) {
-                return WebResponse.this._url.toExternalForm();
+                return getURL().toExternalForm();
             } else if (propertyName.equalsIgnoreCase( "opener" )) {
                 return getFrameName().equals( WebRequest.TOP_FRAME ) ? getScriptable( _window.getOpener() ) : null;
             } else if (propertyName.equalsIgnoreCase( "closed" )) {
@@ -650,6 +650,11 @@
             } else {
                 super.set( propertyName, value );
             }
+        }
+
+
+        public URL getURL() {
+            return WebResponse.this._url;
         }
     }