1 files changed, 23 insertions, 14 deletions

diff --git a/libjava/classpath/java/sql/Statement.java b/libjava/classpath/java/sql/Statement.java
index 42e8e8e8816..195600eaa2c 100644
--- a/libjava/classpath/java/sql/Statement.java
+++ b/libjava/classpath/java/sql/Statement.java
@@ -1,5 +1,5 @@
 /* Statement.java -- Interface for executing SQL statements.
-   Copyright (C) 1999, 2000, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2002, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -91,10 +91,10 @@ public interface Statement
   /**
    * This method sets the limit for the maximum length of any column in bytes.
    *
-   * @param maxsize The new maximum length of any column in bytes.
+   * @param maxSize The new maximum length of any column in bytes.
    * @exception SQLException If an error occurs.
    */
-  void setMaxFieldSize(int max) throws SQLException;
+  void setMaxFieldSize(int maxSize) throws SQLException;
 
   /**
    * This method returns the maximum possible number of rows in a result set.
@@ -108,20 +108,20 @@ public interface Statement
    * This method sets the maximum number of rows that can be present in a
    * result set.
    *
-   * @param maxrows The maximum possible number of rows in a result set.
+   * @param maxRows The maximum possible number of rows in a result set.
    * @exception SQLException If an error occurs.
    */
-  void setMaxRows(int max) throws SQLException;
+  void setMaxRows(int maxRows) throws SQLException;
 
   /**
    * This method sets the local escape processing mode on or off.  The
    * default value is on.
    *
    * @param escape <code>true</code> to enable local escape processing, 
-   *        <code>false</code> to disable it.
+   *               <code>false</code> to disable it.
    * @exception SQLException If an error occurs.
    */
-  void setEscapeProcessing(boolean enable) throws SQLException;
+  void setEscapeProcessing(boolean escape) throws SQLException;
 
   /**
    * The method returns the number of seconds a statement may be in process
@@ -136,7 +136,7 @@ public interface Statement
    * This method sets the number of seconds a statement may be in process
    * before timing out.  A value of 0 means there is no timeout.
    *
-   * @param timeout The new SQL statement timeout value.
+   * @param seconds The new SQL statement timeout value.
    * @exception SQLException If an error occurs.
    */
   void setQueryTimeout(int seconds) throws SQLException;
@@ -192,7 +192,10 @@ public interface Statement
    * @return The result set of the query, or <code>null</code> if there was
    *         no result set (for example, if the statement was an UPDATE).
    * @exception SQLException If an error occurs.
-   * @see execute
+   * @see #execute(String)
+   * @see #execute(String, int)
+   * @see #execute(String, int[])
+   * @see #execute(String, String[])
    */
   ResultSet getResultSet() throws SQLException;
 
@@ -203,7 +206,10 @@ public interface Statement
    * @return The update count of the query, or -1 if there was no update
    *         count (for example, if the statement was a SELECT).
    * @exception SQLException If an error occurs.
-   * @see execute
+   * @see #execute(String)
+   * @see #execute(String, int)
+   * @see #execute(String, int[])
+   * @see #execute(String, String[])
    */
   int getUpdateCount() throws SQLException;
 
@@ -215,7 +221,10 @@ public interface Statement
    *         <code>false</code> otherwise (for example, the next result is an
    *         update count).
    * @exception SQLException If an error occurs.
-   * @see execute
+   * @see #execute(String)
+   * @see #execute(String, int)
+   * @see #execute(String, int[])
+   * @see #execute(String, String[])
    */
   boolean getMoreResults() throws SQLException;
 
@@ -241,11 +250,11 @@ public interface Statement
    * This method informs the driver how many rows it should fetch from the
    * database at a time.
    *
-   * @param numrows The number of rows the driver should fetch at a time
-   *        to populate the result set.
+   * @param numRows The number of rows the driver should fetch at a time
+   *                to populate the result set.
    * @exception SQLException If an error occurs.
    */
-  void setFetchSize(int rows) throws SQLException;
+  void setFetchSize(int numRows) throws SQLException;
 
   /**
    * This method returns the number of rows the driver believes should be