[Httpunit-commit] CVS: httpunit/src/com/meterware/httpunit ClientProperties.java,NONE,1.1 WebClient.java,1.31,1.32 WebResponse.java,1.79,1.80

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

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

Modified Files:
	WebClient.java WebResponse.java 
Added Files:
	ClientProperties.java 
Log Message:
Added support for Javascript Navigator object

***** Error reading new file[Errno 2] No such file or directory: 'ClientProperties.java'
Index: WebClient.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/WebClient.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- WebClient.java	5 Sep 2002 19:29:55 -0000	1.31
+++ WebClient.java	1 Oct 2002 16:11:47 -0000	1.32
@@ -197,18 +197,28 @@
 
 
     /**
+     * Returns the properties associated with this client.
+     */
+    public ClientProperties getClientProperties() {
+        return _clientProperties;
+    }
+
+
+    /**
      * Specifies the user agent identification. Used to trigger browser-specific server behavior.
+     * @deprecated as of 1.4.6. Use ClientProperties#setUserAgent instead.
      **/
     public void setUserAgent( String userAgent ) {
-	    setHeaderField( "User-Agent", userAgent );
+	    getClientProperties().setUserAgent( userAgent );
     }
 
 
     /**
      * Returns the current user agent setting.
+     * @deprecated as of 1.4.6. Use ClientProperties#getUserAgent instead.
      **/
     public String getUserAgent() {
-	    return getHeaderField( "User-Agent" );
+	    return getClientProperties().getUserAgent();
     }
 
 
@@ -351,6 +361,7 @@
      * Returns the value of all current header fields.
      **/
     protected Dictionary getHeaderFields() {
+        setHeaderField( "User-Agent", getClientProperties().getUserAgent() );
         Hashtable result = (Hashtable) _headers.clone();
         if (getCookieHeaderField() != null) result.put( "Cookie", getCookieHeaderField() );
         return result;
@@ -422,6 +433,8 @@
     private List _clientListeners = new ArrayList();
 
     private DialogResponder _dialogResponder = new DialogAdapter();
+
+    private ClientProperties _clientProperties = ClientProperties.getDefaultProperties().cloneProperties();
 
 
     /**

Index: WebResponse.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/WebResponse.java,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- WebResponse.java	13 Sep 2002 14:17:25 -0000	1.79
+++ WebResponse.java	1 Oct 2002 16:11:48 -0000	1.80
@@ -543,6 +543,11 @@
         }
 
 
+        public ClientProperties getClientProperties() {
+            return _client.getClientProperties();
+        }
+
+
         public HTMLPage.Scriptable getDocument() throws SAXException {
             return getReceivedPage().getScriptableObject();
         }