diff options
| author | David Gilbert <david.gilbert@object-refinery.com> | 2006-04-20 18:04:56 +0000 |
|---|---|---|
| committer | David Gilbert <david.gilbert@object-refinery.com> | 2006-04-20 18:04:56 +0000 |
| commit | 6065de96735e1ea31f6dd688f06602f36019ff91 (patch) | |
| tree | c4d610e06f29533f3b7250e8c9f003fab07d8c14 /java/sql | |
| parent | 8bb27371ef6730f9e2a48d8bc5711054a743a49d (diff) | |
| download | classpath-6065de96735e1ea31f6dd688f06602f36019ff91.tar.gz | |
2006-04-20 David Gilbert <david.gilbert@object-refinery.com>
* java/sql/Array.java: Fixed Eclipse API doc warnings,
* java/sql/Blob.java: Likewise,
* java/sql/CallableStatement.java: Likewise,
* java/sql/Clob.java: Likewise,
* java/sql/Connection.java: Likewise,
* java/sql/DatabaseMetaData.java: Likewise,
* java/sql/Date.java: Likewise,
* java/sql/Driver.java: Likewise,
* java/sql/PreparedStatement.java: Likewise,
* java/sql/ResultSet.java: Likewise,
* java/sql/ResultSetMetaData.java: Likewise,
* java/sql/SQLData.java: Likewise,
* java/sql/SQLOutput.java: Likewise,
* java/sql/SQLWarning.java: Likewise,
* java/sql/Statement.java: Likewise,
* java/sql/Time.java: Likewise,
* java/sql/Timestamp.java: Likewise.
----------------------------------------------------------------------
Diffstat (limited to 'java/sql')
| -rw-r--r-- | java/sql/Array.java | 16 | ||||
| -rw-r--r-- | java/sql/Blob.java | 6 | ||||
| -rw-r--r-- | java/sql/CallableStatement.java | 42 | ||||
| -rw-r--r-- | java/sql/Clob.java | 8 | ||||
| -rw-r--r-- | java/sql/Connection.java | 28 | ||||
| -rw-r--r-- | java/sql/DatabaseMetaData.java | 46 | ||||
| -rw-r--r-- | java/sql/Date.java | 4 | ||||
| -rw-r--r-- | java/sql/Driver.java | 6 | ||||
| -rw-r--r-- | java/sql/PreparedStatement.java | 132 | ||||
| -rw-r--r-- | java/sql/ResultSet.java | 267 | ||||
| -rw-r--r-- | java/sql/ResultSetMetaData.java | 42 | ||||
| -rw-r--r-- | java/sql/SQLData.java | 4 | ||||
| -rw-r--r-- | java/sql/SQLOutput.java | 48 | ||||
| -rw-r--r-- | java/sql/SQLWarning.java | 4 | ||||
| -rw-r--r-- | java/sql/Statement.java | 18 | ||||
| -rw-r--r-- | java/sql/Time.java | 4 | ||||
| -rw-r--r-- | java/sql/Timestamp.java | 6 |
17 files changed, 339 insertions, 342 deletions
diff --git a/java/sql/Array.java b/java/sql/Array.java index 516287578..b9e3a2fb4 100644 --- a/java/sql/Array.java +++ b/java/sql/Array.java @@ -1,5 +1,5 @@ /* Array.java -- Interface for accessing SQL array object - 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. @@ -50,7 +50,7 @@ public interface Array * Returns the name of the SQL type of the elements in this * array. This name is database specific. * - * @param The name of the SQL type of the elements in this array. + * @return The name of the SQL type of the elements in this array. * @exception SQLException If an error occurs. */ String getBaseTypeName() throws SQLException; @@ -94,7 +94,7 @@ public interface Array * The object returned will be an array of Java objects of * the appropriate types. * - * @param offset The offset into this array to start returning elements from. + * @param index The offset into this array to start returning elements from. * @param count The requested number of elements to return. * @return The requested portion of the array. * @exception SQLException If an error occurs. @@ -110,7 +110,7 @@ public interface Array * <code>Map</code> will be used for overriding selected SQL type to * Java class mappings. * - * @param offset The offset into this array to start returning elements from. + * @param index The offset into this array to start returning elements from. * @param count The requested number of elements to return. * @param map A mapping of SQL types to Java classes. * @return The requested portion of the array. @@ -154,8 +154,8 @@ public interface Array * the index into the array of that row's contents. The second will be * the actual value of that array element. * - * @param offset The index into the array to start returning elements from. - * @param length The requested number of elements to return. + * @param index The index into the array to start returning elements from. + * @param count The requested number of elements to return. * @return The requested elements of this array as a <code>ResultSet</code>. * @exception SQLException If an error occurs. * @see ResultSet @@ -173,8 +173,8 @@ public interface Array * will be used to override selected default mappings of SQL types to * Java classes.</p> * - * @param offset The index into the array to start returning elements from. - * @param length The requested number of elements to return. + * @param index The index into the array to start returning elements from. + * @param count The requested number of elements to return. * @param map A mapping of SQL types to Java classes. * @return The requested elements of this array as a <code>ResultSet</code>. * @exception SQLException If an error occurs. diff --git a/java/sql/Blob.java b/java/sql/Blob.java index 616839d01..dce133b71 100644 --- a/java/sql/Blob.java +++ b/java/sql/Blob.java @@ -1,5 +1,5 @@ /* Blob.java -- Access a SQL Binary Large OBject. - 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. @@ -82,7 +82,7 @@ public interface Blob * index into the BLOB. * * @param pattern The byte pattern to search for. - * @param offset The index into the BLOB to starting searching for the pattern. + * @param start The index into the BLOB to starting searching for the pattern. * @return The offset at which the pattern is first found, or -1 if the * pattern is not found. * @exception SQLException If an error occurs. @@ -97,7 +97,7 @@ public interface Blob * * @param pattern The <code>Blob</code> containing the byte pattern to * search for. - * @param offset The index into the BLOB to starting searching for the pattern. + * @param start The index into the BLOB to starting searching for the pattern. * @return The offset at which the pattern is first found, or -1 if the * pattern is not found. * @exception SQLException If an error occurs. diff --git a/java/sql/CallableStatement.java b/java/sql/CallableStatement.java index 452294144..48c11e833 100644 --- a/java/sql/CallableStatement.java +++ b/java/sql/CallableStatement.java @@ -1,5 +1,5 @@ /* CallableStatement.java -- A statement for calling stored procedures. - 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. @@ -55,8 +55,8 @@ public interface CallableStatement extends PreparedStatement * This method registers the specified parameter as an output parameter * of the specified SQL type. * - * @param index The index of the parameter to register as output. - * @param type The SQL type value from <code>Types</code>. + * @param parameterIndex The index of the parameter to register as output. + * @param sqlType The SQL type value from <code>Types</code>. * @exception SQLException If an error occurs. */ void registerOutParameter(int parameterIndex, int sqlType) @@ -66,8 +66,8 @@ public interface CallableStatement extends PreparedStatement * This method registers the specified parameter as an output parameter * of the specified SQL type and scale. * - * @param index The index of the parameter to register as output. - * @param type The SQL type value from <code>Types</code>. + * @param parameterIndex The index of the parameter to register as output. + * @param sqlType The SQL type value from <code>Types</code>. * @param scale The scale of the value that will be returned. * @exception SQLException If an error occurs. */ @@ -88,7 +88,7 @@ public interface CallableStatement extends PreparedStatement * This method returns the value of the specified parameter as a Java * <code>String</code>. * - * @param index The index of the parameter to return. + * @param parameterIndex The index of the parameter to return. * @return The parameter value as a <code>String</code>. * @exception SQLException If an error occurs. */ @@ -98,7 +98,7 @@ public interface CallableStatement extends PreparedStatement * This method returns the value of the specified parameter as a Java * <code>boolean</code>. * - * @param index The index of the parameter to return. + * @param parameterIndex The index of the parameter to return. * @return The parameter value as a <code>boolean</code>. * @exception SQLException If an error occurs. */ @@ -108,7 +108,7 @@ public interface CallableStatement extends PreparedStatement * This method returns the value of the specified parameter as a Java * <code>byte</code>. * - * @param index The index of the parameter to return. + * @param parameterIndex The index of the parameter to return. * @return The parameter value as a <code>byte</code>. * @exception SQLException If an error occurs. */ @@ -118,7 +118,7 @@ public interface CallableStatement extends PreparedStatement * This method returns the value of the specified parameter as a Java * <code>short</code>. * - * @param index The index of the parameter to return. + * @param parameterIndex The index of the parameter to return. * @return The parameter value as a <code>short</code>. * @exception SQLException If an error occurs. */ @@ -128,7 +128,7 @@ public interface CallableStatement extends PreparedStatement * This method returns the value of the specified parameter as a Java * <code>int</code>. * - * @param index The index of the parameter to return. + * @param parameterIndex The index of the parameter to return. * @return The parameter value as a <code>int</code>. * @exception SQLException If an error occurs. */ @@ -138,7 +138,7 @@ public interface CallableStatement extends PreparedStatement * This method returns the value of the specified parameter as a Java * <code>long</code>. * - * @param index The index of the parameter to return. + * @param parameterIndex The index of the parameter to return. * @return The parameter value as a <code>long</code>. * @exception SQLException If an error occurs. */ @@ -148,7 +148,7 @@ public interface CallableStatement extends PreparedStatement * This method returns the value of the specified parameter as a Java * <code>float</code>. * - * @param index The index of the parameter to return. + * @param parameterIndex The index of the parameter to return. * @return The parameter value as a <code>float</code>. * @exception SQLException If an error occurs. */ @@ -158,7 +158,7 @@ public interface CallableStatement extends PreparedStatement * This method returns the value of the specified parameter as a Java * <code>double</code>. * - * @param index The index of the parameter to return. + * @param parameterIndex The index of the parameter to return. * @return The parameter value as a <code>double</code>. * @exception SQLException If an error occurs. */ @@ -192,7 +192,7 @@ public interface CallableStatement extends PreparedStatement * This method returns the value of the specified parameter as a Java * <code>java.sql.Date</code>. * - * @param index The index of the parameter to return. + * @param parameterIndex The index of the parameter to return. * @return The parameter value as a <code>java.sql.Date</code>. * @exception SQLException If an error occurs. */ @@ -202,7 +202,7 @@ public interface CallableStatement extends PreparedStatement * This method returns the value of the specified parameter as a Java * <code>java.sql.Time</code>. * - * @param index The index of the parameter to return. + * @param parameterIndex The index of the parameter to return. * @return The parameter value as a <code>java.sql.Time</code>. * @exception SQLException If an error occurs. */ @@ -212,7 +212,7 @@ public interface CallableStatement extends PreparedStatement * This method returns the value of the specified parameter as a Java * <code>java.sql.Timestamp</code>. * - * @param index The index of the parameter to return. + * @param parameterIndex The index of the parameter to return. * @return The parameter value as a <code>java.sql.Timestamp</code>. * @exception SQLException If an error occurs. */ @@ -289,7 +289,7 @@ public interface CallableStatement extends PreparedStatement * This method returns the value of the specified parameter as a Java * <code>Array</code>. * - * @param parameterIndex The index of the parameter to return. + * @param index The index of the parameter to return. * @return The parameter value as a <code>Array</code>. * @exception SQLException If an error occurs. * @since 1.2 @@ -324,7 +324,7 @@ public interface CallableStatement extends PreparedStatement * This method returns the value of the specified parameter as a Java * <code>java.sql.Timestamp</code>. * - * @param index The index of the parameter to return. + * @param parameterIndex The index of the parameter to return. * @return The parameter value as a <code>java.sql.Timestamp</code>. * @exception SQLException If an error occurs. * @since 1.2 @@ -336,9 +336,9 @@ public interface CallableStatement extends PreparedStatement * This method registers the specified parameter as an output parameter * of the specified SQL type. * - * @param index The index of the parameter to register as output. - * @param type The SQL type value from <code>Types</code>. - * @param name The user defined data type name. + * @param paramIndex The index of the parameter to register as output. + * @param sqlType The SQL type value from <code>Types</code>. + * @param typeName The user defined data type name. * @exception SQLException If an error occurs. * @since 1.2 */ diff --git a/java/sql/Clob.java b/java/sql/Clob.java index 8789da596..ca44d76e2 100644 --- a/java/sql/Clob.java +++ b/java/sql/Clob.java @@ -1,5 +1,5 @@ /* Clob.java -- Access Character Large OBjects - 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. @@ -63,7 +63,7 @@ public interface Clob * This method returns the specified portion of the CLOB as a * <code>String</code>. * - * @param offset The index into the CLOB (index values start at 1) to + * @param pos The index into the CLOB (index values start at 1) to * start returning characters from. * @param length The requested number of characters to return. * @return The requested CLOB section, as a <code>String</code>. @@ -99,7 +99,7 @@ public interface Clob * * @param searchstr The character pattern to search for, passed as a * <code>String</code>. - * @param start. The index into the CLOB to start search (indexes start + * @param start The index into the CLOB to start search (indexes start * at 1). * @return The index at which the pattern was found (indexes start at 1), * or -1 if the pattern was not found. @@ -115,7 +115,7 @@ public interface Clob * * @param searchstr The character pattern to search for, passed as a * <code>Clob</code>. - * @param start. The index into the CLOB to start search (indexes start + * @param start The index into the CLOB to start search (indexes start * at 1). * @return The index at which the pattern was found (indexes start at 1), * or -1 if the pattern was not found. diff --git a/java/sql/Connection.java b/java/sql/Connection.java index 48ec12dd0..58a3a81de 100644 --- a/java/sql/Connection.java +++ b/java/sql/Connection.java @@ -1,5 +1,5 @@ /* Connection.java -- Manage a database connection. - 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. @@ -101,7 +101,7 @@ public interface Connection * SQL string. This method is designed for use with parameterized * statements. The default result set type and concurrency will be used. * - * @param The SQL statement to use in creating this + * @param sql the SQL statement to use in creating this * <code>PreparedStatement</code>. * @return A new <code>PreparedStatement</code>. * @exception SQLException If an error occurs. @@ -115,7 +115,7 @@ public interface Connection * stored procedures. The default result set type and concurrency * will be used. * - * @param The SQL statement to use in creating this + * @param sql the SQL statement to use in creating this * <code>CallableStatement</code>. * @return A new <code>CallableStatement</code>. * @exception SQLException If an error occurs. @@ -127,7 +127,7 @@ public interface Connection * This method converts the specified generic SQL statement into the * native grammer of the database this object is connected to. * - * @param The JDBC generic SQL statement. + * @param sql the JDBC generic SQL statement. * @return The native SQL statement. * @exception SQLException If an error occurs. */ @@ -141,8 +141,8 @@ public interface Connection * @param autoCommit <code>true</code> to enable auto commit mode, * <code>false</code> to disable it. * @exception SQLException If an error occurs. - * @see commit - * @see rollback + * @see #commit() + * @see #rollback() */ void setAutoCommit(boolean autoCommit) throws SQLException; @@ -156,8 +156,8 @@ public interface Connection * * @exception SQLException If an error occurs. * - * @see commit - * @see rollback + * @see #commit() + * @see #rollback() */ boolean getAutoCommit() throws SQLException; @@ -283,7 +283,7 @@ public interface Connection * <code>ResultSet</code> class. * * @param resultSetType The type of result set to use for this statement. - * @param resultSetConcurrency. The type of concurrency to be used in + * @param resultSetConcurrency the type of concurrency to be used in * the result set for this statement. * @return A new <code>Statement</code> object. * @exception SQLException If an error occurs. @@ -300,10 +300,10 @@ public interface Connection * Valid values for these parameters are specified in the * <code>ResultSet</code> class. * - * @param The SQL statement to use in creating this + * @param sql the SQL statement to use in creating this * <code>PreparedStatement</code>. - * @param resultSetType The type of result set to use for this statement. - * @param resultSetConcurrency. The type of concurrency to be used in + * @param resultSetType the type of result set to use for this statement. + * @param resultSetConcurrency the type of concurrency to be used in * the result set for this statement. * @return A new <code>PreparedStatement</code>. * @exception SQLException If an error occurs. @@ -320,10 +320,10 @@ public interface Connection * will be used. Valid values for these parameters are specified in the * <code>ResultSet</code> class. * - * @param The SQL statement to use in creating this + * @param sql the SQL statement to use in creating this * <code>PreparedStatement</code>. * @param resultSetType The type of result set to use for this statement. - * @param resultSetConcurrency. The type of concurrency to be used in + * @param resultSetConcurrency the type of concurrency to be used in * the result set for this statement. * @return A new <code>CallableStatement</code>. * @exception SQLException If an error occurs. diff --git a/java/sql/DatabaseMetaData.java b/java/sql/DatabaseMetaData.java index d34c4e2f9..94103f480 100644 --- a/java/sql/DatabaseMetaData.java +++ b/java/sql/DatabaseMetaData.java @@ -1,5 +1,5 @@ /* DatabaseMetaData.java -- Information about the database itself. - Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc. + Copyright (C) 1999, 2000, 2001, 2002, 2006, Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -1395,7 +1395,7 @@ public interface DatabaseMetaData * or "" to return procedures from all catalogs. * @param schemaPattern A schema pattern for the schemas to return stored * procedures from, or "" to return procedures from all schemas. - * @param namePattern The pattern of procedures names to return. + * @param procedureNamePattern The pattern of procedures names to return. * @returns A <code>ResultSet</code> with all the requested procedures. * @exception SQLException If an error occurs. */ @@ -1436,8 +1436,8 @@ public interface DatabaseMetaData * or "" to return procedures from all catalogs. * @param schemaPattern A schema pattern for the schemas to return stored * procedures from, or "" to return procedures from all schemas. - * @param namePattern The pattern of procedures names to return. - * @param columnPattern The pattern of column names to return. + * @param procedureNamePattern The pattern of procedures names to return. + * @param columnNamePattern The pattern of column names to return. * @returns A <code>ResultSet</code> with all the requested procedures. * @exception SQLException If an error occurs. */ @@ -1462,7 +1462,7 @@ public interface DatabaseMetaData * or "" to return tables from all catalogs. * @param schemaPattern A schema pattern for the schemas to return tables * from, or "" to return tables from all schemas. - * @param namePattern The pattern of table names to return. + * @param tableNamePattern The pattern of table names to return. * @param types The list of table types to include; null returns all types. * @returns A <code>ResultSet</code> with all the requested tables. * @exception SQLException If an error occurs. @@ -1536,8 +1536,8 @@ public interface DatabaseMetaData * or "" to return tables from all catalogs. * @param schemaPattern A schema pattern for the schemas to return * tables from, or "" to return tables from all schemas. - * @param namePattern The pattern of tables names to return. - * @param columnPattern The pattern of column names to return. + * @param tableNamePattern The pattern of tables names to return. + * @param columnNamePattern The pattern of column names to return. * @returns A <code>ResultSet</code> with all the requested tables. * @exception SQLException If an error occurs. */ @@ -1569,7 +1569,8 @@ public interface DatabaseMetaData * @param schema The schema to retrieve information from, or the empty string * to return entities not associated with a schema. * @param table The table name to return information for. - * @param columnPattern A pattern of column names to return information for. + * @param columnNamePattern A pattern of column names to return information + * for. * @return A <code>ResultSet</code> with all the requested privileges. * @exception SQLException If an error occurs. */ @@ -1597,9 +1598,9 @@ public interface DatabaseMetaData * @param catalog The catalog to retrieve information from, or the empty string * to return entities not associated with a catalog, or <code>null</code> * to return information from all catalogs. - * @param schema The schema to retrieve information from, or the empty string + * @param schemaPattern The schema to retrieve information from, or the empty string * to return entities not associated with a schema. - * @param tablePattern The table name pattern of tables to return + * @param tableNamePattern The table name pattern of tables to return * information for. * @return A <code>ResultSet</code> with all the requested privileges. * @exception SQLException If an error occurs. @@ -1635,7 +1636,6 @@ public interface DatabaseMetaData * @param schema The schema to retrieve information from, or the empty string * to return entities not associated with a schema. * @param table The table name to return information for. - * @param columnPattern A pattern of column names to return information for. * @param scope One of the best row id scope constants from this class. * @param nullable <code>true</code> to include columns that are nullable, * <code>false</code> otherwise. @@ -1671,7 +1671,6 @@ public interface DatabaseMetaData * @param schema The schema to retrieve information from, or the empty string * to return entities not associated with a schema. * @param table The table name to return information for. - * @param columnPattern A pattern of column names to return information for. * @return A <code>ResultSet</code> with the version columns. * @exception SQLException If an error occurs. */ @@ -1697,7 +1696,6 @@ public interface DatabaseMetaData * @param schema The schema to retrieve information from, or the empty string * to return entities not associated with a schema. * @param table The table name to return information for. - * @param columnPattern A pattern of column names to return information for. * @return A <code>ResultSet</code> with the primary key columns. * @exception SQLException If an error occurs. */ @@ -1825,19 +1823,19 @@ public interface DatabaseMetaData * <code>importedKeyNotDeferrable</code>).</li> * </ol> * - * @param primCatalog The catalog to retrieve information from, or the empty string + * @param primaryCatalog The catalog to retrieve information from, or the empty string * to return entities not associated with a catalog, or <code>null</code> * to return information from all catalogs, on the exporting side. - * @param primSchema The schema to retrieve information from, or the empty string + * @param primarySchema The schema to retrieve information from, or the empty string * to return entities not associated with a schema, on the exporting side. - * @param primTable The table name to return information for, on the exporting + * @param primaryTable The table name to return information for, on the exporting * side. - * @param forCatalog The catalog to retrieve information from, or the empty string + * @param foreignCatalog The catalog to retrieve information from, or the empty string * to return entities not associated with a catalog, or <code>null</code> * to return information from all catalogs, on the importing side. - * @param forSchema The schema to retrieve information from, or the empty string + * @param foreignSchema The schema to retrieve information from, or the empty string * to return entities not associated with a schema on the importing side. - * @param forTable The table name to return information for on the importing + * @param foreignTable The table name to return information for on the importing * side. * @return A <code>ResultSet</code> with the requested information * @exception SQLException If an error occurs. @@ -1924,7 +1922,7 @@ public interface DatabaseMetaData * @param table The table name to return information for. * @param unique <code>true</code> to return only unique indexes, * <code>false</code> otherwise. - * @param approx <code>true</code> if data values can be approximations, + * @param approximate <code>true</code> if data values can be approximations, * <code>false</code> otherwise. * @return A <code>ResultSet</code> with the requested index information * @exception SQLException If an error occurs. @@ -1954,8 +1952,8 @@ public interface DatabaseMetaData * * @param type The desired result type, which is one of the constants * defined in <code>ResultSet</code>. - * @param concur The desired concurrency type, which is one of the constants - * defined in <code>ResultSet</code>. + * @param concurrency The desired concurrency type, which is one of the + * constants defined in <code>ResultSet</code>. * @return <code>true</code> if the result set type is supported, * <code>false</code> otherwise. * @exception SQLException If an error occurs. @@ -2108,9 +2106,9 @@ public interface DatabaseMetaData * @param catalog The catalog to retrieve information from, or the empty string * to return entities not associated with a catalog, or <code>null</code> * to return information from all catalogs. - * @param schema The schema to retrieve information from, or the empty string + * @param schemaPattern The schema to retrieve information from, or the empty string * to return entities not associated with a schema. - * @param typePattern The type name pattern to match. + * @param typeNamePattern The type name pattern to match. * @param types The type identifier patterns (from <code>Types</code>) to * match. * @return A <code>ResultSet</code> with the requested type information diff --git a/java/sql/Date.java b/java/sql/Date.java index d429cc826..b8b03c5b5 100644 --- a/java/sql/Date.java +++ b/java/sql/Date.java @@ -1,5 +1,5 @@ /* Date.java -- Wrapper around java.util.Date - Copyright (C) 1999, 2000, 2003, 2005 Free Software Foundation, Inc. + Copyright (C) 1999, 2000, 2003, 2005, 2006, Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -75,7 +75,7 @@ public class Date extends java.util.Date * specified time value representing the number of seconds since * Jan 1, 1970 at 12:00 midnight GMT. * - * @param time The time value to intialize this date to. + * @param date The time value to intialize this date to. */ public Date(long date) { diff --git a/java/sql/Driver.java b/java/sql/Driver.java index 10f83ef2f..19e66bc72 100644 --- a/java/sql/Driver.java +++ b/java/sql/Driver.java @@ -1,5 +1,5 @@ /* Driver.java -- A JDBC driver - Copyright (C) 1999, 2000 Free Software Foundation, Inc. + Copyright (C) 1999, 2000, 2006, Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -63,7 +63,7 @@ public interface Driver * in this manner. * * @param url The URL string for this connection. - * @param properties The list of database connection properties. + * @param info The list of database connection properties. * @return A <code>Connection</code> object for the newly established * connection, or <code>null</code> if the URL is not understood. * @exception SQLException If an error occurs. @@ -76,7 +76,7 @@ public interface Driver * understands and accepts the URL. It should not necessarily attempt to * probe the database for a connection. * - * @param The database URL string. + * @param url The database URL string. * @return <code>true</code> if the drivers can connect to the database, * <code>false</code> otherwise. * @exception SQLException If an error occurs. diff --git a/java/sql/PreparedStatement.java b/java/sql/PreparedStatement.java index 3aedbc593..d0f562f88 100644 --- a/java/sql/PreparedStatement.java +++ b/java/sql/PreparedStatement.java @@ -1,5 +1,5 @@ /* PreparedStatement.java -- Interface for pre-compiled statements. - Copyright (C) 1999, 2000 Free Software Foundation, Inc. + Copyright (C) 1999, 2000, 2006, Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -75,8 +75,8 @@ public interface PreparedStatement extends Statement * This method populates the specified parameter with a SQL NULL value * for the specified type. * - * @param index The index of the parameter to set. - * @param type The SQL type identifier of the parameter from <code>Types</code> + * @param parameterIndex The index of the parameter to set. + * @param sqlType The SQL type identifier of the parameter from <code>Types</code> * * @exception SQLException If an error occurs. */ @@ -86,8 +86,8 @@ public interface PreparedStatement extends Statement * This method sets the specified parameter from the given Java * <code>boolean</code> value. * - * @param index The index of the parameter value to set. - * @param value The value of the parameter. + * @param parameterIndex The index of the parameter value to set. + * @param x The value of the parameter. * @exception SQLException If an error occurs. */ void setBoolean(int parameterIndex, boolean x) throws SQLException; @@ -96,8 +96,8 @@ public interface PreparedStatement extends Statement * This method sets the specified parameter from the given Java * <code>byte</code> value. * - * @param index The index of the parameter value to set. - * @param value The value of the parameter. + * @param parameterIndex The index of the parameter value to set. + * @param x The value of the parameter. * @exception SQLException If an error occurs. */ void setByte(int parameterIndex, byte x) throws SQLException; @@ -106,8 +106,8 @@ public interface PreparedStatement extends Statement * This method sets the specified parameter from the given Java * <code>short</code> value. * - * @param index The index of the parameter value to set. - * @param value The value of the parameter. + * @param parameterIndex The index of the parameter value to set. + * @param x The value of the parameter. * @exception SQLException If an error occurs. */ void setShort(int parameterIndex, short x) throws SQLException; @@ -116,8 +116,8 @@ public interface PreparedStatement extends Statement * This method sets the specified parameter from the given Java * <code>int</code> value. * - * @param index The index of the parameter value to set. - * @param value The value of the parameter. + * @param parameterIndex The index of the parameter value to set. + * @param x The value of the parameter. * @exception SQLException If an error occurs. */ void setInt(int parameterIndex, int x) throws SQLException; @@ -126,8 +126,8 @@ public interface PreparedStatement extends Statement * This method sets the specified parameter from the given Java * <code>long</code> value. * - * @param index The index of the parameter value to set. - * @param value The value of the parameter. + * @param parameterIndex The index of the parameter value to set. + * @param x The value of the parameter. * @exception SQLException If an error occurs. */ void setLong(int parameterIndex, long x) throws SQLException; @@ -136,8 +136,8 @@ public interface PreparedStatement extends Statement * This method sets the specified parameter from the given Java * <code>float</code> value. * - * @param index The index of the parameter value to set. - * @param value The value of the parameter. + * @param parameterIndex The index of the parameter value to set. + * @param x The value of the parameter. * @exception SQLException If an error occurs. */ void setFloat(int parameterIndex, float x) throws SQLException; @@ -146,8 +146,8 @@ public interface PreparedStatement extends Statement * This method sets the specified parameter from the given Java * <code>double</code> value. * - * @param index The index of the parameter value to set. - * @param value The value of the parameter. + * @param parameterIndex The index of the parameter value to set. + * @param x The value of the parameter. * @exception SQLException If an error occurs. */ void setDouble(int parameterIndex, double x) throws SQLException; @@ -156,8 +156,8 @@ public interface PreparedStatement extends Statement * This method sets the specified parameter from the given Java * <code>java.math.BigDecimal</code> value. * - * @param index The index of the parameter value to set. - * @param value The value of the parameter. + * @param parameterIndex The index of the parameter value to set. + * @param x The value of the parameter. * @exception SQLException If an error occurs. */ void setBigDecimal(int parameterIndex, BigDecimal x) throws @@ -167,8 +167,8 @@ public interface PreparedStatement extends Statement * This method sets the specified parameter from the given Java * <code>String</code> value. * - * @param index The index of the parameter value to set. - * @param value The value of the parameter. + * @param parameterIndex The index of the parameter value to set. + * @param x The value of the parameter. * @exception SQLException If an error occurs. */ void setString(int parameterIndex, String x) throws SQLException; @@ -177,8 +177,8 @@ public interface PreparedStatement extends Statement * This method sets the specified parameter from the given Java * <code>byte</code> array value. * - * @param index The index of the parameter value to set. - * @param value The value of the parameter. + * @param parameterIndex The index of the parameter value to set. + * @param x The value of the parameter. * @exception SQLException If an error occurs. */ void setBytes(int parameterIndex, byte[] x) throws SQLException; @@ -187,8 +187,8 @@ public interface PreparedStatement extends Statement * This method sets the specified parameter from the given Java * <code>java.sql.Date</code> value. * - * @param index The index of the parameter value to set. - * @param value The value of the parameter. + * @param parameterIndex The index of the parameter value to set. + * @param x The value of the parameter. * @exception SQLException If an error occurs. */ void setDate(int parameterIndex, Date x) throws SQLException; @@ -197,8 +197,8 @@ public interface PreparedStatement extends Statement * This method sets the specified parameter from the given Java * <code>java.sql.Time</code> value. * - * @param index The index of the parameter value to set. - * @param value The value of the parameter. + * @param parameterIndex The index of the parameter value to set. + * @param x The value of the parameter. * @exception SQLException If an error occurs. */ void setTime(int parameterIndex, Time x) throws SQLException; @@ -207,8 +207,8 @@ public interface PreparedStatement extends Statement * This method sets the specified parameter from the given Java * <code>java.sql.Timestamp</code> value. * - * @param index The index of the parameter value to set. - * @param value The value of the parameter. + * @param parameterIndex The index of the parameter value to set. + * @param x The value of the parameter. * @exception SQLException If an error occurs. */ void setTimestamp(int parameterIndex, Timestamp x) @@ -218,8 +218,8 @@ public interface PreparedStatement extends Statement * This method sets the specified parameter from the given Java * ASCII <code>InputStream</code> value. * - * @param index The index of the parameter value to set. - * @param value The value of the parameter. + * @param parameterIndex The index of the parameter value to set. + * @param x The value of the parameter. * @param length The number of bytes in the stream. * @exception SQLException If an error occurs. */ @@ -230,8 +230,8 @@ public interface PreparedStatement extends Statement * This method sets the specified parameter from the given Java * Unicode UTF-8 <code>InputStream</code> value. * - * @param index The index of the parameter value to set. - * @param value The value of the parameter. + * @param parameterIndex The index of the parameter value to set. + * @param x The value of the parameter. * @param length The number of bytes in the stream. * @exception SQLException If an error occurs. * @deprecated @@ -243,8 +243,8 @@ public interface PreparedStatement extends Statement * This method sets the specified parameter from the given Java * binary <code>InputStream</code> value. * - * @param index The index of the parameter value to set. - * @param value The value of the parameter. + * @param parameterIndex The index of the parameter value to set. + * @param x The value of the parameter. * @param length The number of bytes in the stream. * @exception SQLException If an error occurs. */ @@ -263,9 +263,10 @@ public interface PreparedStatement extends Statement * This method sets the specified parameter from the given Java * <code>Object</code> value. The specified SQL object type will be used. * - * @param index The index of the parameter value to set. - * @param value The value of the parameter. - * @param type The SQL type to use for the parameter, from <code>Types</code> + * @param parameterIndex The index of the parameter value to set. + * @param x The value of the parameter. + * @param targetSqlType The SQL type to use for the parameter, from + * <code>Types</code> * @param scale The scale of the value, for numeric values only. * @exception SQLException If an error occurs. * @see Types @@ -277,9 +278,10 @@ public interface PreparedStatement extends Statement * This method sets the specified parameter from the given Java * <code>Object</code> value. The specified SQL object type will be used. * - * @param index The index of the parameter value to set. - * @param value The value of the parameter. - * @param type The SQL type to use for the parameter, from <code>Types</code> + * @param parameterIndex The index of the parameter value to set. + * @param x The value of the parameter. + * @param targetSqlType The SQL type to use for the parameter, from + * <code>Types</code> * @exception SQLException If an error occurs. * @see Types */ @@ -291,8 +293,8 @@ public interface PreparedStatement extends Statement * <code>Object</code> value. The default object type to SQL type mapping * will be used. * - * @param index The index of the parameter value to set. - * @param value The value of the parameter. + * @param parameterIndex The index of the parameter value to set. + * @param x The value of the parameter. * @exception SQLException If an error occurs. */ void setObject(int parameterIndex, Object x) throws SQLException; @@ -318,8 +320,8 @@ public interface PreparedStatement extends Statement * This method sets the specified parameter from the given Java * character <code>Reader</code> value. * - * @param index The index of the parameter value to set. - * @param value The value of the parameter. + * @param parameterIndex The index of the parameter value to set. + * @param reader The reader for the parameter. * @param length The number of bytes in the stream. * @exception SQLException If an error occurs. */ @@ -331,8 +333,8 @@ public interface PreparedStatement extends Statement * <code>Ref</code> value. The default object type to SQL type mapping * will be used. * - * @param index The index of the parameter value to set. - * @param value The value of the parameter. + * @param i The index of the parameter value to set. + * @param x The value of the parameter. * @exception SQLException If an error occurs. */ void setRef(int i, Ref x) throws SQLException; @@ -342,8 +344,8 @@ public interface PreparedStatement extends Statement * <code>Blob</code> value. The default object type to SQL type mapping * will be used. * - * @param index The index of the parameter value to set. - * @param value The value of the parameter. + * @param i The index of the parameter value to set. + * @param x The value of the parameter. * @exception SQLException If an error occurs. */ void setBlob(int i, Blob x) throws SQLException; @@ -353,8 +355,8 @@ public interface PreparedStatement extends Statement * <code>Clob</code> value. The default object type to SQL type mapping * will be used. * - * @param index The index of the parameter value to set. - * @param value The value of the parameter. + * @param i The index of the parameter value to set. + * @param x The value of the parameter. * @exception SQLException If an error occurs. */ void setClob(int i, Clob x) throws SQLException; @@ -364,8 +366,8 @@ public interface PreparedStatement extends Statement * <code>Array</code> value. The default object type to SQL type mapping * will be used. * - * @param index The index of the parameter value to set. - * @param value The value of the parameter. + * @param i The index of the parameter value to set. + * @param x The value of the parameter. * @exception SQLException If an error occurs. */ void setArray(int i, Array x) throws SQLException; @@ -382,9 +384,9 @@ public interface PreparedStatement extends Statement * This method sets the specified parameter from the given Java * <code>java.sql.Date</code> value. * - * @param index The index of the parameter value to set. - * @param value The value of the parameter. - * @param calendar The <code>Calendar</code> to use for timezone and locale. + * @param parameterIndex The index of the parameter value to set. + * @param x The value of the parameter. + * @param cal The <code>Calendar</code> to use for timezone and locale. * @exception SQLException If an error occurs. */ void setDate(int parameterIndex, Date x, Calendar cal) @@ -394,9 +396,9 @@ public interface PreparedStatement extends Statement * This method sets the specified parameter from the given Java * <code>java.sql.Time</code> value. * - * @param index The index of the parameter value to set. - * @param value The value of the parameter. - * @param calendar The <code>Calendar</code> to use for timezone and locale. + * @param parameterIndex The index of the parameter value to set. + * @param x The value of the parameter. + * @param cal The <code>Calendar</code> to use for timezone and locale. * @exception SQLException If an error occurs. */ void setTime(int parameterIndex, Time x, Calendar cal) @@ -406,9 +408,9 @@ public interface PreparedStatement extends Statement * This method sets the specified parameter from the given Java * <code>java.sql.Timestamp</code> value. * - * @param index The index of the parameter value to set. - * @param value The value of the parameter. - * @param calendar The <code>Calendar</code> to use for timezone and locale. + * @param parameterIndex The index of the parameter value to set. + * @param x The value of the parameter. + * @param cal The <code>Calendar</code> to use for timezone and locale. * @exception SQLException If an error occurs. */ void setTimestamp(int parameterIndex, Timestamp x, Calendar cal) @@ -418,9 +420,9 @@ public interface PreparedStatement extends Statement * This method populates the specified parameter with a SQL NULL value * for the specified type. * - * @param index The index of the parameter to set. - * @param type The SQL type identifier of the parameter from <code>Types</code> - * @param name The name of the data type, for user defined types. + * @param paramIndex The index of the parameter to set. + * @param sqlType The SQL type identifier of the parameter from <code>Types</code> + * @param typeName The name of the data type, for user defined types. * @exception SQLException If an error occurs. */ void setNull(int paramIndex, int sqlType, String typeName) diff --git a/java/sql/ResultSet.java b/java/sql/ResultSet.java index 97f2897d4..4006db751 100644 --- a/java/sql/ResultSet.java +++ b/java/sql/ResultSet.java @@ -1,5 +1,5 @@ /* ResultSet.java -- A SQL statement result set. - 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. @@ -138,7 +138,7 @@ public interface ResultSet * This method returns the value of the specified column as a Java * <code>String</code>. * - * @param index The index of the column to return. + * @param columnIndex The index of the column to return. * @return The column value as a <code>String</code>. * @exception SQLException If an error occurs. */ @@ -148,7 +148,7 @@ public interface ResultSet * This method returns the value of the specified column as a Java * <code>boolean</code>. * - * @param index The index of the column to return. + * @param columnIndex The index of the column to return. * @return The column value as a <code>boolean</code>. * @exception SQLException If an error occurs. */ @@ -158,7 +158,7 @@ public interface ResultSet * This method returns the value of the specified column as a Java * <code>byte</code>. * - * @param index The index of the column to return. + * @param columnIndex The index of the column to return. * @return The column value as a <code>byte</code>. * @exception SQLException If an error occurs. */ @@ -168,7 +168,7 @@ public interface ResultSet * This method returns the value of the specified column as a Java * <code>short</code>. * - * @param index The index of the column to return. + * @param columnIndex The index of the column to return. * @return The column value as a <code>short</code>. * @exception SQLException If an error occurs. */ @@ -178,7 +178,7 @@ public interface ResultSet * This method returns the value of the specified column as a Java * <code>int</code>. * - * @param index The index of the column to return. + * @param columnIndex The index of the column to return. * @return The column value as a <code>int</code>. * @exception SQLException If an error occurs. */ @@ -188,7 +188,7 @@ public interface ResultSet * This method returns the value of the specified column as a Java * <code>long</code>. * - * @param index The index of the column to return. + * @param columnIndex The index of the column to return. * @return The column value as a <code>long</code>. * @exception SQLException If an error occurs. */ @@ -198,7 +198,7 @@ public interface ResultSet * This method returns the value of the specified column as a Java * <code>float</code>. * - * @param index The index of the column to return. + * @param columnIndex The index of the column to return. * @return The column value as a <code>float</code>. * @exception SQLException If an error occurs. */ @@ -208,7 +208,7 @@ public interface ResultSet * This method returns the value of the specified column as a Java * <code>double</code>. * - * @param index The index of the column to return. + * @param columnIndex The index of the column to return. * @return The column value as a <code>double</code>. * @exception SQLException If an error occurs. */ @@ -218,7 +218,7 @@ public interface ResultSet * This method returns the value of the specified column as a Java * <code>BigDecimal</code>. * - * @param index The index of the column to return. + * @param columnIndex The index of the column to return. * @param scale The number of digits to the right of the decimal to return. * @return The column value as a <code>BigDecimal</code>. * @exception SQLException If an error occurs. @@ -231,7 +231,7 @@ public interface ResultSet * This method returns the value of the specified column as a Java * byte array. * - * @param index The index of the column to return. + * @param columnIndex The index of the column to return. * @return The column value as a byte array * @exception SQLException If an error occurs. */ @@ -241,7 +241,7 @@ public interface ResultSet * This method returns the value of the specified column as a Java * <code>java.sql.Date</code>. * - * @param index The index of the column to return. + * @param columnIndex The index of the column to return. * @return The column value as a <code>java.sql.Date</code>. * @exception SQLException If an error occurs. */ @@ -251,7 +251,7 @@ public interface ResultSet * This method returns the value of the specified column as a Java * <code>java.sql.Time</code>. * - * @param index The index of the column to return. + * @param columnIndex The index of the column to return. * @return The column value as a <code>java.sql.Time</code>. * @exception SQLException If an error occurs. */ @@ -261,7 +261,7 @@ public interface ResultSet * This method returns the value of the specified column as a Java * <code>java.sql.Timestamp</code>. * - * @param index The index of the column to return. + * @param columnIndex The index of the column to return. * @return The column value as a <code>java.sql.Timestamp</code>. * @exception SQLException If an error occurs. */ @@ -274,7 +274,7 @@ public interface ResultSet * calling <code>next()</code> or <code>close()</code> on this result set * will close this stream as well. * - * @param index The index of the column to return. + * @param columnIndex The index of the column to return. * @return The column value as an ASCII <code>InputStream</code>. * @exception SQLException If an error occurs. */ @@ -287,7 +287,7 @@ public interface ResultSet * calling <code>next()</code> or <code>close()</code> on this result set * will close this stream as well. * - * @param index The index of the column to return. + * @param columnIndex The index of the column to return. * @return The column value as a Unicode UTF-8 <code>InputStream</code>. * @exception SQLException If an error occurs. * @deprecated Use getCharacterStream instead. @@ -301,7 +301,7 @@ public interface ResultSet * calling <code>next()</code> or <code>close()</code> on this result set * will close this stream as well. * - * @param index The index of the column to return. + * @param columnIndex The index of the column to return. * @return The column value as a raw byte <code>InputStream</code>. * @exception SQLException If an error occurs. */ @@ -311,7 +311,7 @@ public interface ResultSet * This method returns the value of the specified column as a Java * <code>String</code>. * - * @param column The name of the column to return. + * @param columnName The name of the column to return. * @return The column value as a <code>String</code>. * @exception SQLException If an error occurs. */ @@ -321,7 +321,7 @@ public interface ResultSet * This method returns the value of the specified column as a Java * <code>boolean</code>. * - * @param column The name of the column to return. + * @param columnName The name of the column to return. * @return The column value as a <code>boolean</code>. * @exception SQLException If an error occurs. */ @@ -331,7 +331,7 @@ public interface ResultSet * This method returns the value of the specified column as a Java * <code>byte</code>. * - * @param column The name of the column to return. + * @param columnName The name of the column to return. * @return The column value as a <code>byte</code>. * @exception SQLException If an error occurs. */ @@ -341,7 +341,7 @@ public interface ResultSet * This method returns the value of the specified column as a Java * <code>short</code>. * - * @param column The name of the column to return. + * @param columnName The name of the column to return. * @return The column value as a <code>short</code>. * @exception SQLException If an error occurs. */ @@ -351,7 +351,7 @@ public interface ResultSet * This method returns the value of the specified column as a Java * <code>int</code>. * - * @param column The name of the column to return. + * @param columnName The name of the column to return. * @return The column value as a <code>int</code>. * @exception SQLException If an error occurs. */ @@ -361,7 +361,7 @@ public interface ResultSet * This method returns the value of the specified column as a Java * <code>long</code>. * - * @param column The name of the column to return. + * @param columnName The name of the column to return. * @return The column value as a <code>long</code>. * @exception SQLException If an error occurs. */ @@ -371,7 +371,7 @@ public interface ResultSet * This method returns the value of the specified column as a Java * <code>float</code>. * - * @param column The name of the column to return. + * @param columnName The name of the column to return. * @return The column value as a <code>float</code>. * @exception SQLException If an error occurs. */ @@ -381,7 +381,7 @@ public interface ResultSet * This method returns the value of the specified column as a Java * <code>double</code>. * - * @param column The name of the column to return. + * @param columnName The name of the column to return. * @return The column value as a <code>double</code>. * @exception SQLException If an error occurs. */ @@ -391,7 +391,7 @@ public interface ResultSet * This method returns the value of the specified column as a Java * <code>BigDecimal</code>. * - * @param index The index of the column to return. + * @param columnName The name of the column to return. * @return The column value as a <code>BigDecimal</code>. * @exception SQLException If an error occurs. * @deprecated @@ -403,7 +403,7 @@ public interface ResultSet * This method returns the value of the specified column as a Java * byte array. * - * @param column The name of the column to return. + * @param columnName The name of the column to return. * @return The column value as a byte array * @exception SQLException If an error occurs. */ @@ -413,7 +413,7 @@ public interface ResultSet * This method returns the value of the specified column as a Java * <code>java.sql.Date</code>. * - * @param column The name of the column to return. + * @param columnName The name of the column to return. * @return The column value as a <code>java.sql.Date</code>. * @exception SQLException If an error occurs. */ @@ -423,7 +423,7 @@ public interface ResultSet * This method returns the value of the specified column as a Java * <code>java.sql.Time</code>. * - * @param column The name of the column to return. + * @param columnName The name of the column to return. * @return The column value as a <code>java.sql.Time</code>. * @exception SQLException If an error occurs. */ @@ -433,7 +433,7 @@ public interface ResultSet * This method returns the value of the specified column as a Java * <code>java.sql.Timestamp</code>. * - * @param column The name of the column to return. + * @param columnName The name of the column to return. * @return The column value as a <code>java.sql.Timestamp</code>. * @exception SQLException If an error occurs. */ @@ -446,7 +446,7 @@ public interface ResultSet * calling <code>next()</code> or <code>close()</code> on this result set * will close this stream as well. * - * @param column The name of the column to return. + * @param columnName The name of the column to return. * @return The column value as an ASCII <code>InputStream</code>. * @exception SQLException If an error occurs. */ @@ -459,7 +459,7 @@ public interface ResultSet * calling <code>next()</code> or <code>close()</code> on this result set * will close this stream as well. * - * @param column The name of the column to return. + * @param columnName The name of the column to return. * @return The column value as a Unicode UTF-8 <code>InputStream</code>. * @exception SQLException If an error occurs. * @deprecated Use getCharacterStream instead. @@ -473,7 +473,7 @@ public interface ResultSet * calling <code>next()</code> or <code>close()</code> on this result set * will close this stream as well. * - * @param column The name of the column to return. + * @param columnName The name of the column to return. * @return The column value as a raw byte <code>InputStream</code>. * @exception SQLException If an error occurs. */ @@ -518,7 +518,7 @@ public interface ResultSet * This method returns the value of the specified column as a Java * <code>Object</code>. * - * @param index The index of the column to return. + * @param columnIndex The index of the column to return. * @return The column value as an <code>Object</code>. * @exception SQLException If an error occurs. */ @@ -528,7 +528,7 @@ public interface ResultSet * This method returns the value of the specified column as a Java * <code>Object</code>. * - * @param column The name of the column to return. + * @param columnName The name of the column to return. * @return The column value as an <code>Object</code>. * @exception SQLException If an error occurs. */ @@ -537,7 +537,7 @@ public interface ResultSet /** * This method returns the column index of the specified named column. * - * @param column The name of the column. + * @param columnName The name of the column. * @return The index of the column. * @exception SQLException If an error occurs. */ @@ -550,7 +550,7 @@ public interface ResultSet * calling <code>next()</code> or <code>close()</code> on this result set * will close this stream as well. * - * @param index The index of the column to return. + * @param columnIndex The index of the column to return. * @return The column value as an character <code>Reader</code>. * @exception SQLException If an error occurs. */ @@ -563,7 +563,7 @@ public interface ResultSet * calling <code>next()</code> or <code>close()</code> on this result set * will close this stream as well. * - * @param column The name of the column to return. + * @param columnName The name of the column to return. * @return The column value as an character <code>Reader</code>. * @exception SQLException If an error occurs. */ @@ -573,7 +573,7 @@ public interface ResultSet * This method returns the value of the specified column as a Java * <code>BigDecimal</code>. * - * @param index The index of the column to return. + * @param columnIndex The index of the column to return. * @return The column value as a <code>BigDecimal</code>. * @exception SQLException If an error occurs. */ @@ -583,7 +583,7 @@ public interface ResultSet * This method returns the value of the specified column as a Java * <code>BigDecimal</code>. * - * @param column The name of the column to return. + * @param columnName The name of the column to return. * @return The column value as a <code>BigDecimal</code>. * @exception SQLException If an error occurs. */ @@ -692,7 +692,7 @@ public interface ResultSet * This method moves the result set position relative to the current row. * The offset can be positive or negative. * - * @param row The relative row position to move to. + * @param rows The relative row position to move to. * @return <code>true</code> if the current position was changed, * <code>false</code> otherwise. * @exception SQLException If an error occurs. @@ -800,7 +800,7 @@ public interface ResultSet * does not update the actual database. <code>updateRow</code> must be * called in order to do that. * - * @return index The index of the column to update. + * param columnIndex The index of the column to update. * @exception SQLException If an error occurs. */ void updateNull(int columnIndex) throws SQLException; @@ -810,8 +810,8 @@ public interface ResultSet * does not update the actual database. <code>updateRow</code> must be * called in order to do that. * - * @param index The index of the column to update. - * @param value The new value of the column. + * @param columnIndex The index of the column to update. + * @param x The new value of the column. * @exception SQLException If an error occurs. */ void updateBoolean(int columnIndex, boolean x) throws SQLException; @@ -821,8 +821,8 @@ public interface ResultSet * does not update the actual database. <code>updateRow</code> must be * called in order to do that. * - * @param index The index of the column to update. - * @param value The new value of the column. + * @param columnIndex The index of the column to update. + * @param x The new value of the column. * @exception SQLException If an error occurs. */ void updateByte(int columnIndex, byte x) throws SQLException; @@ -832,8 +832,8 @@ public interface ResultSet * does not update the actual database. <code>updateRow</code> must be * called in order to do that. * - * @param index The index of the column to update. - * @param value The new value of the column. + * @param columnIndex The index of the column to update. + * @param x The new value of the column. * @exception SQLException If an error occurs. */ void updateShort(int columnIndex, short x) throws SQLException; @@ -843,8 +843,8 @@ public interface ResultSet * does not update the actual database. <code>updateRow</code> must be * called in order to do that. * - * @param index The index of the column to update. - * @param value The new value of the column. + * @param columnIndex The index of the column to update. + * @param x The new value of the column. * @exception SQLException If an error occurs. */ void updateInt(int columnIndex, int x) throws SQLException; @@ -854,8 +854,8 @@ public interface ResultSet * does not update the actual database. <code>updateRow</code> must be * called in order to do that. * - * @param index The index of the column to update. - * @param value The new value of the column. + * @param columnIndex The index of the column to update. + * @param x The new value of the column. * @exception SQLException If an error occurs. */ void updateLong(int columnIndex, long x) throws SQLException; @@ -865,8 +865,8 @@ public interface ResultSet * does not update the actual database. <code>updateRow</code> must be * called in order to do that. * - * @param index The index of the column to update. - * @param value The new value of the column. + * @param columnIndex The index of the column to update. + * @param x The new value of the column. * @exception SQLException If an error occurs. */ void updateFloat(int columnIndex, float x) throws SQLException; @@ -876,8 +876,8 @@ public interface ResultSet * does not update the actual database. <code>updateRow</code> must be * called in order to do that. * - * @param index The index of the column to update. - * @param value The new value of the column. + * @param columnIndex The index of the column to update. + * @param x The new value of the column. * @exception SQLException If an error occurs. */ void updateDouble(int columnIndex, double x) throws SQLException; @@ -887,8 +887,8 @@ public interface ResultSet * does not update the actual database. <code>updateRow</code> must be * called in order to do that. * - * @param index The index of the column to update. - * @param value The new value of the column. + * @param columnIndex The index of the column to update. + * @param x The new value of the column. * @exception SQLException If an error occurs. */ void updateBigDecimal(int columnIndex, BigDecimal x) @@ -899,8 +899,8 @@ public interface ResultSet * does not update the actual database. <code>updateRow</code> must be * called in order to do that. * - * @param index The index of the column to update. - * @param value The new value of the column. + * @param columnIndex The index of the column to update. + * @param x The new value of the column. * @exception SQLException If an error occurs. */ void updateString(int columnIndex, String x) throws SQLException; @@ -910,8 +910,8 @@ public interface ResultSet * does not update the actual database. <code>updateRow</code> must be * called in order to do that. * - * @param index The index of the column to update. - * @param value The new value of the column. + * @param columnIndex The index of the column to update. + * @param x The new value of the column. * @exception SQLException If an error occurs. */ void updateBytes(int columnIndex, byte[] x) throws SQLException; @@ -921,8 +921,8 @@ public interface ResultSet * does not update the actual database. <code>updateRow</code> must be * called in order to do that. * - * @param index The index of the column to update. - * @param value The new value of the column. + * @param columnIndex The index of the column to update. + * @param x The new value of the column. * @exception SQLException If an error occurs. */ void updateDate(int columnIndex, Date x) throws SQLException; @@ -932,8 +932,8 @@ public interface ResultSet * does not update the actual database. <code>updateRow</code> must be * called in order to do that. * - * @param index The index of the column to update. - * @param value The new value of the column. + * @param columnIndex The index of the column to update. + * @param x The new value of the column. * @exception SQLException If an error occurs. */ void updateTime(int columnIndex, Time x) throws SQLException; @@ -943,8 +943,8 @@ public interface ResultSet * This does not update the actual database. <code>updateRow</code> must be * called in order to do that. * - * @param index The index of the column to update. - * @param value The new value of the column. + * @param columnIndex The index of the column to update. + * @param x The new value of the column. * @exception SQLException If an error occurs. */ void updateTimestamp(int columnIndex, Timestamp x) @@ -955,8 +955,8 @@ public interface ResultSet * This does not update the actual database. <code>updateRow</code> must be * called in order to do that. * - * @param index The index of the column to update. - * @param value The new value of the column. + * @param columnIndex The index of the column to update. + * @param x The new value of the column. * @param length The length of the stream. * @exception SQLException If an error occurs. */ @@ -968,8 +968,8 @@ public interface ResultSet * This does not update the actual database. <code>updateRow</code> must be * called in order to do that. * - * @param index The index of the column to update. - * @param value The new value of the column. + * @param columnIndex The index of the column to update. + * @param x The new value of the column. * @param length The length of the stream. * @exception SQLException If an error occurs. */ @@ -981,8 +981,8 @@ public interface ResultSet * This does not update the actual database. <code>updateRow</code> must be * called in order to do that. * - * @param index The index of the column to update. - * @param value The new value of the column. + * @param columnIndex The index of the column to update. + * @param x The new value of the column. * @param length The length of the stream. * @exception SQLException If an error occurs. */ @@ -994,8 +994,8 @@ public interface ResultSet * This does not update the actual database. <code>updateRow</code> must be * called in order to do that. * - * @param index The index of the column to update. - * @param value The new value of the column. + * @param columnIndex The index of the column to update. + * @param x The new value of the column. * * @exception SQLException If an error occurs. */ @@ -1007,10 +1007,9 @@ public interface ResultSet * This does not update the actual database. <code>updateRow</code> must be * called in order to do that. * - * @param index The index of the column to update. - * @param value The new value of the column. - * @param scale The scale of the object in question, which is used only - * for numeric type objects. + * @param columnIndex The index of the column to update. + * @param x The new value of the column. + * @exception SQLException If an error occurs. */ void updateObject(int columnIndex, Object x) throws SQLException; @@ -1020,7 +1019,7 @@ public interface ResultSet * does not update the actual database. <code>updateRow</code> must be * called in order to do that. * - * @return name The name of the column to update. + * param columnName The name of the column to update. * @exception SQLException If an error occurs. */ void updateNull(String columnName) throws SQLException; @@ -1030,8 +1029,8 @@ public interface ResultSet * does not update the actual database. <code>updateRow</code> must be * called in order to do that. * - * @param name The name of the column to update. - * @param value The new value of the column. + * @param columnName The name of the column to update. + * @param x The new value of the column. * @exception SQLException If an error occurs. */ void updateBoolean(String columnName, boolean x) throws SQLException; @@ -1041,8 +1040,8 @@ public interface ResultSet * does not update the actual database. <code>updateRow</code> must be * called in order to do that. * - * @param name The name of the column to update. - * @param value The new value of the column. + * @param columnName The name of the column to update. + * @param x The new value of the column. * @exception SQLException If an error occurs. */ void updateByte(String columnName, byte x) throws SQLException; @@ -1052,8 +1051,8 @@ public interface ResultSet * does not update the actual database. <code>updateRow</code> must be * called in order to do that. * - * @param name The name of the column to update. - * @param value The new value of the column. + * @param columnName The name of the column to update. + * @param x The new value of the column. * @exception SQLException If an error occurs. */ void updateShort(String columnName, short x) throws SQLException; @@ -1063,8 +1062,8 @@ public interface ResultSet * does not update the actual database. <code>updateRow</code> must be * called in order to do that. * - * @param name The name of the column to update. - * @param value The new value of the column. + * @param columnName The name of the column to update. + * @param x The new value of the column. * @exception SQLException If an error occurs. */ void updateInt(String columnName, int x) throws SQLException; @@ -1074,8 +1073,8 @@ public interface ResultSet * does not update the actual database. <code>updateRow</code> must be * called in order to do that. * - * @param name The name of the column to update. - * @param value The new value of the column. + * @param columnName The name of the column to update. + * @param x The new value of the column. * @exception SQLException If an error occurs. */ void updateLong(String columnName, long x) throws SQLException; @@ -1085,8 +1084,8 @@ public interface ResultSet * does not update the actual database. <code>updateRow</code> must be * called in order to do that. * - * @param name The name of the column to update. - * @param value The new value of the column. + * @param columnName The name of the column to update. + * @param x The new value of the column. * @exception SQLException If an error occurs. */ void updateFloat(String columnName, float x) throws SQLException; @@ -1096,8 +1095,8 @@ public interface ResultSet * does not update the actual database. <code>updateRow</code> must be * called in order to do that. * - * @param name The name of the column to update. - * @param value The new value of the column. + * @param columnName The name of the column to update. + * @param x The new value of the column. * @exception SQLException If an error occurs. */ void updateDouble(String columnName, double x) throws SQLException; @@ -1107,8 +1106,8 @@ public interface ResultSet * does not update the actual database. <code>updateRow</code> must be * called in order to do that. * - * @param name The name of the column to update. - * @param value The new value of the column. + * @param columnName The name of the column to update. + * @param x The new value of the column. * @exception SQLException If an error occurs. */ void updateBigDecimal(String columnName, BigDecimal x) @@ -1119,8 +1118,8 @@ public interface ResultSet * does not update the actual database. <code>updateRow</code> must be * called in order to do that. * - * @param name The name of the column to update. - * @param value The new value of the column. + * @param columnName The name of the column to update. + * @param x The new value of the column. * @exception SQLException If an error occurs. */ void updateString(String columnName, String x) throws SQLException; @@ -1130,8 +1129,8 @@ public interface ResultSet * does not update the actual database. <code>updateRow</code> must be * called in order to do that. * - * @param name The name of the column to update. - * @param value The new value of the column. + * @param columnName The name of the column to update. + * @param x The new value of the column. * @exception SQLException If an error occurs. */ void updateBytes(String columnName, byte[] x) throws SQLException; @@ -1141,8 +1140,8 @@ public interface ResultSet * does not update the actual database. <code>updateRow</code> must be * called in order to do that. * - * @param name The name of the column to update. - * @param value The new value of the column. + * @param columnName The name of the column to update. + * @param x The new value of the column. * @exception SQLException If an error occurs. */ void updateDate(String columnName, Date x) throws SQLException; @@ -1152,8 +1151,8 @@ public interface ResultSet * does not update the actual database. <code>updateRow</code> must be * called in order to do that. * - * @param name The name of the column to update. - * @param value The new value of the column. + * @param columnName The name of the column to update. + * @param x The new value of the column. * @exception SQLException If an error occurs. */ void updateTime(String columnName, Time x) throws SQLException; @@ -1163,8 +1162,8 @@ public interface ResultSet * This does not update the actual database. <code>updateRow</code> must be * called in order to do that. * - * @param name The name of the column to update. - * @param value The new value of the column. + * @param columnName The name of the column to update. + * @param x The new value of the column. * @exception SQLException If an error occurs. */ void updateTimestamp(String columnName, Timestamp x) @@ -1175,8 +1174,8 @@ public interface ResultSet * This does not update the actual database. <code>updateRow</code> must be * called in order to do that. * - * @param name The name of the column to update. - * @param value The new value of the column. + * @param columnName The name of the column to update. + * @param x The new value of the column. * @param length The length of the stream. * @exception SQLException If an error occurs. */ @@ -1188,8 +1187,8 @@ public interface ResultSet * This does not update the actual database. <code>updateRow</code> must be * called in order to do that. * - * @param name The name of the column to update. - * @param value The new value of the column. + * @param columnName The name of the column to update. + * @param x The new value of the column. * @param length The length of the stream. * @exception SQLException If an error occurs. */ @@ -1201,8 +1200,8 @@ public interface ResultSet * This does not update the actual database. <code>updateRow</code> must be * called in order to do that. * - * @param name The name of the column to update. - * @param value The new value of the column. + * @param columnName The name of the column to update. + * @param reader The new value of the column. * @param length The length of the stream. * * @exception SQLException If an error occurs. @@ -1215,8 +1214,8 @@ public interface ResultSet * This does not update the actual database. <code>updateRow</code> must be * called in order to do that. * - * @param name The name of the column to update. - * @param value The new value of the column. + * @param columnName The name of the column to update. + * @param x The new value of the column. * @exception SQLException If an error occurs. */ void updateObject(String columnName, Object x, int scale) @@ -1227,10 +1226,8 @@ public interface ResultSet * This does not update the actual database. <code>updateRow</code> must be * called in order to do that. * - * @param name The name of the column to update. - * @param value The new value of the column. - * @param scale The scale of the object in question, which is used only - * for numeric type objects. + * @param columnName The name of the column to update. + * @param x The new value of the column. * @exception SQLException If an error occurs. */ void updateObject(String columnName, Object x) throws SQLException; @@ -1304,7 +1301,7 @@ public interface ResultSet * This method returns the value of the specified column as a Java * <code>Object</code> using the specified SQL type to Java type map. * - * @param index The index of the column to return. + * @param i The index of the column to return. * @param map The SQL type to Java type map to use. * @return The value of the column as an <code>Object</code>. * @exception SQLException If an error occurs. @@ -1315,7 +1312,7 @@ public interface ResultSet * This method returns a <code>Ref</code> for the specified column which * represents the structured type for the column. * - * @param index The index of the column to return. + * @param i The index of the column to return. * @return A <code>Ref</code> object for the column * @exception SQLException If an error occurs. */ @@ -1324,7 +1321,7 @@ public interface ResultSet /** * This method returns the specified column value as a BLOB. * - * @param index The index of the column value to return. + * @param i The index of the column value to return. * @return The value of the column as a BLOB. * @exception SQLException If an error occurs. */ @@ -1333,7 +1330,7 @@ public interface ResultSet /** * This method returns the specified column value as a CLOB. * - * @param index The index of the column value to return. + * @param i The index of the column value to return. * @return The value of the column as a CLOB. * @exception SQLException If an error occurs. */ @@ -1342,7 +1339,7 @@ public interface ResultSet /** * This method returns the specified column value as an <code>Array</code>. * - * @param index The index of the column value to return. + * @param i The index of the column value to return. * @return The value of the column as an <code>Array</code>. * @exception SQLException If an error occurs. */ @@ -1352,7 +1349,7 @@ public interface ResultSet * This method returns the value of the specified column as a Java * <code>Object</code> using the specified SQL type to Java type map. * - * @param name The name of the column to return. + * @param colName The name of the column to return. * @param map The SQL type to Java type map to use. * @return The value of the column as an <code>Object</code>. * @exception SQLException If an error occurs. @@ -1363,7 +1360,7 @@ public interface ResultSet * This method returns a <code>Ref</code> for the specified column which * represents the structured type for the column. * - * @param index The index of the column to return. + * @param colName The name of the column to return. * @return A <code>Ref</code> object for the column * @exception SQLException If an error occurs. */ @@ -1372,7 +1369,7 @@ public interface ResultSet /** * This method returns the specified column value as a BLOB. * - * @param name The name of the column value to return. + * @param colName The name of the column value to return. * @return The value of the column as a BLOB. * @exception SQLException If an error occurs. */ @@ -1381,7 +1378,7 @@ public interface ResultSet /** * This method returns the specified column value as a CLOB. * - * @param name The name of the column value to return. + * @param colName The name of the column value to return. * @return The value of the column as a CLOB. * @exception SQLException If an error occurs. */ @@ -1390,7 +1387,7 @@ public interface ResultSet /** * This method returns the specified column value as an <code>Array</code>. * - * @param name The name of the column value to return. + * @param colName The name of the column value to return. * @return The value of the column as an <code>Array</code>. * @exception SQLException If an error occurs. */ @@ -1402,7 +1399,7 @@ public interface ResultSet * to generate a value for the date if the database does not support * timezones. * - * @param index The index of the column value to return. + * @param columnIndex The index of the column value to return. * @param cal The <code>Calendar</code> to use for calculating timezones. * @return The value of the column as a <code>java.sql.Date</code>. * @exception SQLException If an error occurs. @@ -1415,7 +1412,7 @@ public interface ResultSet * to generate a value for the date if the database does not support * timezones. * - * @param name The name of the column value to return. + * @param columnName The name of the column value to return. * @param cal The <code>Calendar</code> to use for calculating timezones. * @return The value of the column as a <code>java.sql.Date</code>. * @exception SQLException If an error occurs. @@ -1428,7 +1425,7 @@ public interface ResultSet * to generate a value for the time if the database does not support * timezones. * - * @param index The index of the column value to return. + * @param columnIndex The index of the column value to return. * @param cal The <code>Calendar</code> to use for calculating timezones. * @return The value of the column as a <code>java.sql.Time</code>. * @exception SQLException If an error occurs. @@ -1441,7 +1438,7 @@ public interface ResultSet * to generate a value for the time if the database does not support * timezones. * - * @param name The name of the column value to return. + * @param columnName The name of the column value to return. * @param cal The <code>Calendar</code> to use for calculating timezones. * @return The value of the column as a <code>java.sql.Time</code>. * @exception SQLException If an error occurs. @@ -1454,7 +1451,7 @@ public interface ResultSet * to generate a value for the timestamp if the database does not support * timezones. * - * @param index The index of the column value to return. + * @param columnIndex The index of the column value to return. * @param cal The <code>Calendar</code> to use for calculating timezones. * @return The value of the column as a <code>java.sql.Timestamp</code>. * @exception SQLException If an error occurs. @@ -1468,7 +1465,7 @@ public interface ResultSet * to generate a value for the timestamp if the database does not support * timezones. * - * @param name The name of the column value to return. + * @param columnName The name of the column value to return. * @param cal The <code>Calendar</code> to use for calculating timezones. * * @return The value of the column as a <code>java.sql.Timestamp</code>. diff --git a/java/sql/ResultSetMetaData.java b/java/sql/ResultSetMetaData.java index 0086677ee..54860e5a1 100644 --- a/java/sql/ResultSetMetaData.java +++ b/java/sql/ResultSetMetaData.java @@ -1,5 +1,5 @@ /* ResultSetMetaData.java -- Returns information about the ResultSet - 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. @@ -75,7 +75,7 @@ public interface ResultSetMetaData * This method test whether or not the column is an auto-increment column. * Auto-increment columns are read-only. * - * @param index The index of the column to test. + * @param column The index of the column to test. * @return <code>true</code> if the column is auto-increment, <code>false</code> * otherwise. * @exception SQLException If an error occurs. @@ -85,7 +85,7 @@ public interface ResultSetMetaData /** * This method tests whether or not a column is case sensitive in its values. * - * @param index The index of the column to test. + * @param column The index of the column to test. * @return <code>true</code> if the column value is case sensitive, * <code>false</code> otherwise. * @exception SQLException If an error occurs. @@ -96,7 +96,7 @@ public interface ResultSetMetaData * This method tests whether not the specified column can be used in * a WHERE clause. * - * @param index The index of the column to test. + * @param column The index of the column to test. * @return <code>true</code> if the column may be used in a WHERE clause, * <code>false</code> otherwise. * @exception SQLException If an error occurs. @@ -106,7 +106,7 @@ public interface ResultSetMetaData /** * This method tests whether or not the column stores a monetary value. * - * @param index The index of the column to test. + * @param column The index of the column to test. * @return <code>true</code> if the column contains a monetary value, * <code>false</code> otherwise. * @exception SQLException If an error occurs. @@ -117,7 +117,7 @@ public interface ResultSetMetaData * This method returns a value indicating whether or not the specified * column may contain a NULL value. * - * @param index The index of the column to test. + * @param column The index of the column to test. * @return A constant indicating whether or not the column can contain NULL, * which will be one of <code>columnNoNulls</code>, * <code>columnNullable</code>, or <code>columnNullableUnknown</code>. @@ -129,7 +129,7 @@ public interface ResultSetMetaData * This method tests whether or not the value of the specified column * is signed or unsigned. * - * @param index The index of the column to test. + * @param column The index of the column to test. * @return <code>true</code> if the column value is signed, <code>false</code> * otherwise. * @exception SQLException If an error occurs. @@ -140,7 +140,7 @@ public interface ResultSetMetaData * This method returns the maximum number of characters that can be used * to display a value in this column. * - * @param index The index of the column to check. + * @param column The index of the column to check. * @return The maximum number of characters that can be used to display a * value for this column. * @exception SQLException If an error occurs. @@ -151,7 +151,7 @@ public interface ResultSetMetaData * This method returns a string that should be used as a caption for this * column for user display purposes. * - * @param index The index of the column to check. + * @param column The index of the column to check. * @return A display string for the column. * @exception SQLException If an error occurs. */ @@ -160,7 +160,7 @@ public interface ResultSetMetaData /** * This method returns the name of the specified column. * - * @param index The index of the column to return the name of. + * @param column The index of the column to return the name of. * @return The name of the column. * @exception SQLException If an error occurs. */ @@ -170,7 +170,7 @@ public interface ResultSetMetaData * This method returns the name of the schema that contains the specified * column. * - * @param index The index of the column to check the schema name for. + * @param column The index of the column to check the schema name for. * @return The name of the schema that contains the column. * @exception SQLException If an error occurs. */ @@ -180,7 +180,7 @@ public interface ResultSetMetaData * This method returns the precision of the specified column, which is the * number of decimal digits it contains. * - * @param index The index of the column to check the precision on. + * @param column The index of the column to check the precision on. * @return The precision of the specified column. * @exception SQLException If an error occurs. */ @@ -190,7 +190,7 @@ public interface ResultSetMetaData * This method returns the scale of the specified column, which is the * number of digits to the right of the decimal point. * - * @param index The index column to check the scale of. + * @param column The index column to check the scale of. * @return The scale of the column. * @exception SQLException If an error occurs. */ @@ -200,7 +200,7 @@ public interface ResultSetMetaData * This method returns the name of the table containing the specified * column. * - * @param index The index of the column to check the table name for. + * @param column The index of the column to check the table name for. * @return The name of the table containing the column. * @exception SQLException If an error occurs. */ @@ -210,7 +210,7 @@ public interface ResultSetMetaData * This method returns the name of the catalog containing the specified * column. * - * @param index The index of the column to check the catalog name for. + * @param column The index of the column to check the catalog name for. * @return The name of the catalog containing the column. * @exception SQLException If an error occurs. */ @@ -220,7 +220,7 @@ public interface ResultSetMetaData * This method returns the SQL type of the specified column. This will * be one of the constants from <code>Types</code>. * - * @param index The index of the column to check the SQL type of. + * @param column The index of the column to check the SQL type of. * @return The SQL type for this column. * @exception SQLException If an error occurs. * @see Types @@ -230,7 +230,7 @@ public interface ResultSetMetaData /** * This method returns the name of the SQL type for this column. * - * @param index The index of the column to check the SQL type name for. + * @param column The index of the column to check the SQL type name for. * @return The name of the SQL type for this column. * @exception SQLException If an error occurs. */ @@ -239,7 +239,7 @@ public interface ResultSetMetaData /** * This method tests whether or not the specified column is read only. * - * @param index The index of the column to check. + * @param column The index of the column to check. * @return <code>true</code> if the column is read only, <code>false</code> * otherwise. * @exception SQLException If an error occurs. @@ -250,7 +250,7 @@ public interface ResultSetMetaData * This method tests whether or not the column may be writable. This * does not guarantee that a write will be successful. * - * @param index The index of the column to check for writability. + * @param column The index of the column to check for writability. * @return <code>true</code> if the column may be writable, * <code>false</code> otherwise. * @exception SQLException If an error occurs. @@ -261,7 +261,7 @@ public interface ResultSetMetaData * This method tests whether or not the column is writable. This * does guarantee that a write will be successful. * - * @param index The index of the column to check for writability. + * @param column The index of the column to check for writability. * @return <code>true</code> if the column is writable, * <code>false</code> otherwise. * @exception SQLException If an error occurs. @@ -272,7 +272,7 @@ public interface ResultSetMetaData * This method returns the name of the Java class which will be used to * create objects representing the data in this column. * - * @param index The index of the column to check. + * @param column The index of the column to check. * @return The name of the Java class that will be used for values in * this column. * @exception SQLException If an error occurs. diff --git a/java/sql/SQLData.java b/java/sql/SQLData.java index 2ba1fb18d..59bb115c1 100644 --- a/java/sql/SQLData.java +++ b/java/sql/SQLData.java @@ -1,5 +1,5 @@ /* SQLData.java -- Custom mapping for a user defined datatype - Copyright (C) 1999, 2000 Free Software Foundation, Inc. + Copyright (C) 1999, 2000, 2006, Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -57,7 +57,7 @@ public interface SQLData * This method populates the data in the object from the specified stream. * * @param stream The stream to read the data from. - * @param name The data type name of the data on the stream. + * @param typeName The data type name of the data on the stream. * @exception SQLException If an error occurs. */ void readSQL(SQLInput stream, String typeName) throws SQLException; diff --git a/java/sql/SQLOutput.java b/java/sql/SQLOutput.java index 8e6c88f8c..ae5523101 100644 --- a/java/sql/SQLOutput.java +++ b/java/sql/SQLOutput.java @@ -1,5 +1,5 @@ /* SQLOutput.java -- Write SQL values to a stream - 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. @@ -59,7 +59,7 @@ public interface SQLOutput * @param value The value to write to the stream. * @exception SQLException If an error occurs. */ - void writeString(String x) throws SQLException; + void writeString(String value) throws SQLException; /** * This method writes the specified Java <code>boolean</code> @@ -68,7 +68,7 @@ public interface SQLOutput * @param value The value to write to the stream. * @exception SQLException If an error occurs. */ - void writeBoolean(boolean x) throws SQLException; + void writeBoolean(boolean value) throws SQLException; /** * This method writes the specified Java <code>byte</code> @@ -77,7 +77,7 @@ public interface SQLOutput * @param value The value to write to the stream. * @exception SQLException If an error occurs. */ - void writeByte(byte x) throws SQLException; + void writeByte(byte value) throws SQLException; /** * This method writes the specified Java <code>short</code> @@ -86,7 +86,7 @@ public interface SQLOutput * @param value The value to write to the stream. * @exception SQLException If an error occurs. */ - void writeShort(short x) throws SQLException; + void writeShort(short value) throws SQLException; /** * This method writes the specified Java <code>int</code> @@ -95,7 +95,7 @@ public interface SQLOutput * @param value The value to write to the stream. * @exception SQLException If an error occurs. */ - void writeInt(int x) throws SQLException; + void writeInt(int value) throws SQLException; /** * This method writes the specified Java <code>long</code> @@ -104,7 +104,7 @@ public interface SQLOutput * @param value The value to write to the stream. * @exception SQLException If an error occurs. */ - void writeLong(long x) throws SQLException; + void writeLong(long value) throws SQLException; /** * This method writes the specified Java <code>float</code> @@ -113,7 +113,7 @@ public interface SQLOutput * @param value The value to write to the stream. * @exception SQLException If an error occurs. */ - void writeFloat(float x) throws SQLException; + void writeFloat(float value) throws SQLException; /** * This method writes the specified Java <code>double</code> @@ -122,7 +122,7 @@ public interface SQLOutput * @param value The value to write to the stream. * @exception SQLException If an error occurs. */ - void writeDouble(double x) throws SQLException; + void writeDouble(double value) throws SQLException; /** * This method writes the specified Java <code>BigDecimal</code> @@ -131,7 +131,7 @@ public interface SQLOutput * @param value The value to write to the stream. * @exception SQLException If an error occurs. */ - void writeBigDecimal(BigDecimal x) throws SQLException; + void writeBigDecimal(BigDecimal value) throws SQLException; /** * This method writes the specified Java <code>byte</code> array @@ -140,7 +140,7 @@ public interface SQLOutput * @param value The value to write to the stream. * @exception SQLException If an error occurs. */ - void writeBytes(byte[] x) throws SQLException; + void writeBytes(byte[] value) throws SQLException; /** * This method writes the specified Java <code>java.sql.Date</code> @@ -149,7 +149,7 @@ public interface SQLOutput * @param value The value to write to the stream. * @exception SQLException If an error occurs. */ - void writeDate(Date x) throws SQLException; + void writeDate(Date value) throws SQLException; /** * This method writes the specified Java <code>java.sql.Time</code> @@ -158,7 +158,7 @@ public interface SQLOutput * @param value The value to write to the stream. * @exception SQLException If an error occurs. */ - void writeTime(Time x) throws SQLException; + void writeTime(Time value) throws SQLException; /** * This method writes the specified Java <code>java.sql.Timestamp</code> @@ -167,7 +167,7 @@ public interface SQLOutput * @param value The value to write to the stream. * @exception SQLException If an error occurs. */ - void writeTimestamp(Timestamp x) throws SQLException; + void writeTimestamp(Timestamp value) throws SQLException; /** * This method writes the specified Java character stream @@ -176,7 +176,7 @@ public interface SQLOutput * @param value The value to write to the stream. * @exception SQLException If an error occurs. */ - void writeCharacterStream(Reader x) throws SQLException; + void writeCharacterStream(Reader value) throws SQLException; /** * This method writes the specified ASCII text stream @@ -185,7 +185,7 @@ public interface SQLOutput * @param value The value to write to the stream. * @exception SQLException If an error occurs. */ - void writeAsciiStream(InputStream x) throws SQLException; + void writeAsciiStream(InputStream value) throws SQLException; /** * This method writes the specified uninterpreted binary byte stream @@ -194,7 +194,7 @@ public interface SQLOutput * @param value The value to write to the stream. * @exception SQLException If an error occurs. */ - void writeBinaryStream(InputStream x) throws SQLException; + void writeBinaryStream(InputStream value) throws SQLException; /** * This method writes the specified Java <code>SQLData</code> object @@ -203,7 +203,7 @@ public interface SQLOutput * @param value The value to write to the stream. * @exception SQLException If an error occurs. */ - void writeObject(SQLData x) throws SQLException; + void writeObject(SQLData value) throws SQLException; /** * This method writes the specified Java SQL <code>Ref</code> object @@ -212,7 +212,7 @@ public interface SQLOutput * @param value The value to write to the stream. * @exception SQLException If an error occurs. */ - void writeRef(Ref x) throws SQLException; + void writeRef(Ref value) throws SQLException; /** * This method writes the specified Java SQL <code>Blob</code> object @@ -221,7 +221,7 @@ public interface SQLOutput * @param value The value to write to the stream. * @exception SQLException If an error occurs. */ - void writeBlob(Blob x) throws SQLException; + void writeBlob(Blob value) throws SQLException; /** * This method writes the specified Java SQL <code>Clob</code> object @@ -230,7 +230,7 @@ public interface SQLOutput * @param value The value to write to the stream. * @exception SQLException If an error occurs. */ - void writeClob(Clob x) throws SQLException; + void writeClob(Clob value) throws SQLException; /** * This method writes the specified Java SQL <code>Struct</code> object @@ -239,7 +239,7 @@ public interface SQLOutput * @param value The value to write to the stream. * @exception SQLException If an error occurs. */ - void writeStruct(Struct x) throws SQLException; + void writeStruct(Struct value) throws SQLException; /** * This method writes the specified Java SQL <code>Array</code> object @@ -248,10 +248,10 @@ public interface SQLOutput * @param value The value to write to the stream. * @exception SQLException If an error occurs. */ - void writeArray(Array x) throws SQLException; + void writeArray(Array value) throws SQLException; /** * @since 1.4 */ - void writeURL(URL x) throws SQLException; + void writeURL(URL value) throws SQLException; } diff --git a/java/sql/SQLWarning.java b/java/sql/SQLWarning.java index 841d137e1..15f439b24 100644 --- a/java/sql/SQLWarning.java +++ b/java/sql/SQLWarning.java @@ -1,5 +1,5 @@ /* SQLWarning.java -- Database access warnings. - 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. @@ -52,7 +52,7 @@ public class SQLWarning extends SQLException * with the specified descriptive error message, SQL state string, and * vendor code. * - * @param message A string describing the nature of the error. + * @param reason A string describing the nature of the error. * @param SQLState A string containing the SQL state of the error. * @param vendorCode The vendor error code associated with this error. */ diff --git a/java/sql/Statement.java b/java/sql/Statement.java index 42e8e8e88..762156271 100644 --- a/java/sql/Statement.java +++ b/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,7 +91,7 @@ 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 max The new maximum length of any column in bytes. * @exception SQLException If an error occurs. */ void setMaxFieldSize(int max) throws SQLException; @@ -108,7 +108,7 @@ 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 max The maximum possible number of rows in a result set. * @exception SQLException If an error occurs. */ void setMaxRows(int max) throws SQLException; @@ -117,7 +117,7 @@ public interface Statement * 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, + * @param enable <code>true</code> to enable local escape processing, * <code>false</code> to disable it. * @exception SQLException If an error occurs. */ @@ -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,7 @@ 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) */ ResultSet getResultSet() throws SQLException; @@ -203,7 +203,7 @@ 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) */ int getUpdateCount() throws SQLException; @@ -215,7 +215,7 @@ 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) */ boolean getMoreResults() throws SQLException; @@ -241,7 +241,7 @@ 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 + * @param rows The number of rows the driver should fetch at a time * to populate the result set. * @exception SQLException If an error occurs. */ diff --git a/java/sql/Time.java b/java/sql/Time.java index 57551528b..43e6f446e 100644 --- a/java/sql/Time.java +++ b/java/sql/Time.java @@ -1,5 +1,5 @@ /* Time.java -- Wrapper around java.util.Date - Copyright (C) 1999, 2000, 2002, 2003, 2005 Free Software Foundation, Inc. + Copyright (C) 1999, 2000, 2002, 2003, 2005, 2006, Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -180,7 +180,7 @@ public class Time extends java.util.Date * specified time value representing the number of seconds since * Jan 1, 1970 at 12:00 midnight GMT. * - * @param time The time value to intialize this <code>Time</code> to. + * @param date The time value to intialize this <code>Time</code> to. */ public Time(long date) { diff --git a/java/sql/Timestamp.java b/java/sql/Timestamp.java index f3459b22f..23c9f1992 100644 --- a/java/sql/Timestamp.java +++ b/java/sql/Timestamp.java @@ -1,5 +1,5 @@ /* Time.java -- Wrapper around java.util.Date - Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc. + Copyright (C) 1999, 2000, 2003, 2004, 2006, Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -143,7 +143,7 @@ public class Timestamp extends java.util.Date * specified time value representing the number of milliseconds since * Jan 1, 1970 at 12:00 midnight GMT. * - * @param time The time value to intialize this <code>Time</code> to. + * @param date The time value to intialize this <code>Time</code> to. */ public Timestamp(long date) { @@ -280,7 +280,7 @@ public class Timestamp extends java.util.Date /** * Compare two Timestamp - * @param when the other Timestamp. + * @param ts the other Timestamp. * @return 0, if the date represented * by obj is exactly the same as the time represented by this * object, a negative if this Timestamp is before the other Timestamp, and |