[Httpunit-commit] CVS: httpunit/src/com/meterware/httpunit WebClient.java,1.8,1.9 WebForm.java,1.24,1.25

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

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

Modified Files:
	WebClient.java WebForm.java 
Log Message:
Return option values in HTML order

Index: WebClient.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/WebClient.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- WebClient.java	2001/07/17 12:50:47	1.8
+++ WebClient.java	2001/08/06 20:19:41	1.9
@@ -97,7 +97,7 @@
      * Defines a cookie to be sent to the server on every request.
      **/
     public void addCookie( String name, String value ) {
-	_cookies.put( name, value );
+        _cookies.put( name, value );
     }
 
 
@@ -216,8 +216,8 @@
      **/
     final
     protected void updateClient( WebResponse response ) throws MalformedURLException, IOException, SAXException {
-        validateHeaders( response );
         updateCookies( response );
+        validateHeaders( response );
         if (HttpUnitOptions.getAutoRefresh() && response.getRefreshRequest() != null) {
             getResponse( response.getRefreshRequest() );
         } else if (response.getHeaderField( "Location" ) == null) {

Index: WebForm.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/WebForm.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- WebForm.java	2001/07/31 16:08:59	1.24
+++ WebForm.java	2001/08/06 20:19:41	1.25
@@ -503,8 +503,8 @@
      **/
     private String[] withNewValue( String[] group, String value ) {
         String[] result = new String[ group.length+1 ];
-        System.arraycopy( group, 0, result, 1, group.length );
-        result[0] = value;
+        System.arraycopy( group, 0, result, 0, group.length );
+        result[ group.length ] = value;
         return result;
     }