[Httpunit-commit] CVS: httpunit/src/com/meterware/httpunit MessageBody.java,1.3,1.4 WebRequest.java,1.53,1.54 WebResponse.java,1.108,1.109 WebTable.java,1.25,1.26

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

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

Modified Files:
	MessageBody.java WebRequest.java WebResponse.java 
	WebTable.java 
Log Message:
Prepare for 1.5.2 release

Index: MessageBody.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/MessageBody.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MessageBody.java	6 Jun 2001 13:25:33 -0000	1.3
+++ MessageBody.java	14 Feb 2003 19:04:24 -0000	1.4
@@ -2,7 +2,7 @@
 /********************************************************************************************************************
 * $Id$
 *
-* Copyright (c) 2000, Russell Gold
+* Copyright (c) 2000-2001, 2003 Russell Gold
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated 
 * documentation files (the "Software"), to deal in the Software without restriction, including without limitation 
@@ -22,9 +22,6 @@
 import java.io.IOException;
 import java.io.OutputStream;
 
-import java.net.URLConnection;
-
-
 /**
  * An abstract class representing the body of a web request.
  **/
@@ -43,15 +40,6 @@
      **/
     abstract
     String getContentType();
-
-
-    /**
-     * Updates the headers for this request as needed.
-     * @deprecated use getContentType
-     **/
-    final
-    void updateHeaders( URLConnection connection ) throws IOException {
-    }
 
 
     /**

Index: WebRequest.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/WebRequest.java,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- WebRequest.java	4 Feb 2003 19:17:30 -0000	1.53
+++ WebRequest.java	14 Feb 2003 19:04:24 -0000	1.54
@@ -191,15 +191,6 @@
 
 
     /**
-     * Returns an enumeration of all parameters in this web request. May include some parameters that will not be sent.
-     * @deprecated use getRequestParameterNames instead
-     **/
-    public Enumeration getParameterNames() {
-        return new Vector( Arrays.asList( _parameterHolder.getParameterNames() ) ).elements();
-    }
-
-
-    /**
      * Returns an array of all parameter names defined as part of this web request.
      * @since 1.3.1
      **/

Index: WebResponse.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/WebResponse.java,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- WebResponse.java	5 Feb 2003 16:07:39 -0000	1.108
+++ WebResponse.java	14 Feb 2003 19:04:24 -0000	1.109
@@ -120,15 +120,6 @@
 
 
     /**
-     * Returns the target of the page.
-     * @deprecated use getFrameName
-     **/
-    public String getTarget() {
-        return getFrameName();
-    }
-
-
-    /**
      * Returns the name of the frame containing this page.
      **/
     public String getFrameName() {
@@ -511,23 +502,6 @@
 
 
 //---------------------------------------- JavaScript methods ----------------------------------------
-
-    /**
-     * Returns the next javascript alert without removing it from the queue.
-     * @deprecated use WebClient#getNextAlert. Will be removed in next release.
-     */
-    public String getNextAlert() {
-        return _client.getNextAlert();
-    }
-
-
-    /**
-     * Returns the next javascript alert and removes it from the queue.
-     * @deprecated use WebClient#popNextAlert. Will be removed in next release.
-     */
-    public String popNextAlert() {
-        return _client.popNextAlert();
-    }
 
 
     public Scriptable getScriptableObject() {

Index: WebTable.java
===================================================================
RCS file: /cvsroot/httpunit/httpunit/src/com/meterware/httpunit/WebTable.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- WebTable.java	4 Feb 2003 05:32:03 -0000	1.25
+++ WebTable.java	14 Feb 2003 19:04:24 -0000	1.26
@@ -76,17 +76,6 @@
      * Returns the contents of the specified table cell as text.
      * The row and column numbers are zero-based.
      * @throws IndexOutOfBoundsException if the specified cell numbers are not valid
-     * @deprecated use #getCellAsText
-     **/
-    public String getCell( int row, int column ) {
-        return getCellAsText( row, column );
-    }
-
-
-    /**
-     * Returns the contents of the specified table cell as text.
-     * The row and column numbers are zero-based.
-     * @throws IndexOutOfBoundsException if the specified cell numbers are not valid
      **/
     public String getCellAsText( int row, int column ) {
         TableCell cell = getTableCell( row, column );