diff options
Diffstat (limited to 'libjava/classpath/java/sql')
29 files changed, 344 insertions, 346 deletions
diff --git a/libjava/classpath/java/sql/Array.java b/libjava/classpath/java/sql/Array.java index cdd60a4..5cea23e 100644 --- a/libjava/classpath/java/sql/Array.java +++ b/libjava/classpath/java/sql/Array.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -44,7 +44,7 @@ import java.util.Map; * * @author Aaron M. Renn (arenn@urbanophile.com) */ -public interface Array +public interface Array { /** * Returns the name of the SQL type of the elements in this @@ -57,7 +57,7 @@ public interface Array /** * Returns the JDBC type identifier of the elements in this - * array. This will be one of the values defined in the + * array. This will be one of the values defined in the * <code>Types</code> class. * * @return The JDBC type of the elements in this array. @@ -77,9 +77,9 @@ public interface Array /** * Returns the contents of this array. The specified - * <code>Map</code> will be used to override selected mappings + * <code>Map</code> will be used to override selected mappings * between SQL types and Java classes. - * + * * @param map A mapping of SQL types to Java classes. * @return The contents of the array as an array of Java objects. * @exception SQLException If an error occurs. @@ -162,7 +162,7 @@ public interface Array * @see ResultSet */ ResultSet getResultSet(long start, int count) throws SQLException; - + /** * This method returns a portion of the array as a <code>ResultSet</code>. * The returned portion will start at <code>start</code> into the @@ -180,7 +180,7 @@ public interface Array * @return The requested elements of this array as a <code>ResultSet</code>. * @exception SQLException If an error occurs. * @see ResultSet - */ + */ ResultSet getResultSet(long start, int count, Map<String, Class<?>> map) throws SQLException; } diff --git a/libjava/classpath/java/sql/BatchUpdateException.java b/libjava/classpath/java/sql/BatchUpdateException.java index c2e1865..6b88bba 100644 --- a/libjava/classpath/java/sql/BatchUpdateException.java +++ b/libjava/classpath/java/sql/BatchUpdateException.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -39,12 +39,12 @@ package java.sql; /** * This class extends <code>SQLException</code> to count the successful - * updates in each statement in a batch that was successfully updated prior + * updates in each statement in a batch that was successfully updated prior * to the error. * * @author Aaron M. Renn (arenn@urbanophile.com) */ -public class BatchUpdateException extends SQLException +public class BatchUpdateException extends SQLException { static final long serialVersionUID = 5977529877145521757L; @@ -84,7 +84,7 @@ public class BatchUpdateException extends SQLException int[] updateCounts) { super(message, SQLState); - this.updateCounts = updateCounts; + this.updateCounts = updateCounts; } /** @@ -118,7 +118,7 @@ public class BatchUpdateException extends SQLException /** * Initializes a new instance of <code>BatchUpdateException</code> * with no descriptive error message. The SQL state and update count will - * be initialized to <code>null</code> and the vendor specific error code will + * be initialized to <code>null</code> and the vendor specific error code will * initialized to 0. */ public BatchUpdateException() diff --git a/libjava/classpath/java/sql/Blob.java b/libjava/classpath/java/sql/Blob.java index c662aad..00fe49f 100644 --- a/libjava/classpath/java/sql/Blob.java +++ b/libjava/classpath/java/sql/Blob.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -43,7 +43,7 @@ import java.io.OutputStream; /** * This interface specified methods for accessing a SQL BLOB (Binary Large * OBject) type. - * + * * @author Aaron M. Renn (arenn@urbanophile.com) * @since 1.2 */ @@ -51,7 +51,7 @@ public interface Blob { /** * This method returns the number of bytes in this <code>Blob</code>. - * + * * @return The number of bytes in this <code>Blob</code>. * @exception SQLException If an error occurs. */ @@ -60,7 +60,7 @@ public interface Blob /** * This method returns up to the requested bytes of this <code>Blob</code> * as a <code>byte</code> array. - * + * * @param start The index into this <code>Blob</code> to start returning * bytes from. * @param count The requested number of bytes to return. @@ -72,7 +72,7 @@ public interface Blob /** * This method returns a stream that will read the bytes of this * <code>Blob</code>. - * + * * @return A stream that will read the bytes of this <code>Blob</code>. * @exception SQLException If an error occurs. */ @@ -82,7 +82,7 @@ public interface Blob * This method returns the index into this <code>Blob</code> at which the * first instance of the specified bytes occur. The searching starts at the * specified index into this <code>Blob</code>. - * + * * @param pattern The byte pattern to search for. * @param start The index into this <code>Blob</code> to start searching for * the pattern. @@ -97,7 +97,7 @@ public interface Blob * first instance of the specified pattern occurs. The searching starts at the * specified index into this <code>Blob</code>. The bytes in the specified * <code>Blob</code> are used as the search pattern. - * + * * @param pattern The <code>Blob</code> containing the byte pattern to * search for. * @param start The index into this <code>Blob</code> to start searching for @@ -111,7 +111,7 @@ public interface Blob /** * Writes the specified data into this <code>Blob</code>, starting at the * specified index. - * + * * @param start The index at which the writing starts. * @param bytes The data to write. * @exception SQLException If an error occurs. @@ -122,7 +122,7 @@ public interface Blob /** * Writes a portion of the specified data into this <code>Blob</code>, * starting at the specified index. - * + * * @param startWrite The index into this <code>Blob</code> at which writing * starts. * @param bytes The data to write a portion of. @@ -137,7 +137,7 @@ public interface Blob /** * Returns a binary stream that writes into this <code>Blob</code>, * starting at the specified index. - * + * * @param start The index at which the writing starts. * @return A binary stream to write into this <code>Blob</code>. * @exception SQLException If an error occurs. @@ -148,7 +148,7 @@ public interface Blob /** * Truncates this <code>Blob</code> to be at most the specified number of * bytes long. - * + * * @param count The length this <code>Blob</code> is truncated to. * @exception SQLException If an error occurs. * @since 1.4 diff --git a/libjava/classpath/java/sql/CallableStatement.java b/libjava/classpath/java/sql/CallableStatement.java index e605b38..09d5870 100644 --- a/libjava/classpath/java/sql/CallableStatement.java +++ b/libjava/classpath/java/sql/CallableStatement.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -49,7 +49,7 @@ import java.util.Map; * * @author Aaron M. Renn (arenn@urbanophile.com) */ -public interface CallableStatement extends PreparedStatement +public interface CallableStatement extends PreparedStatement { /** * This method registers the specified parameter as an output parameter @@ -58,7 +58,7 @@ public interface CallableStatement extends PreparedStatement * @param index 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 index, int sqlType) throws SQLException; @@ -70,7 +70,7 @@ public interface CallableStatement extends PreparedStatement * @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. - */ + */ void registerOutParameter(int index, int sqlType, int scale) throws SQLException; @@ -271,7 +271,7 @@ public interface CallableStatement extends PreparedStatement * @return The parameter value as a <code>Blob</code>. * @exception SQLException If an error occurs. * @since 1.2 - */ + */ Blob getBlob(int index) throws SQLException; /** @@ -359,7 +359,7 @@ public interface CallableStatement extends PreparedStatement /** * This method registers the specified parameter as an output parameter - * of the specified SQL type. This version of registerOutParameter is used + * of the specified SQL type. This version of registerOutParameter is used * for NUMERIC or DECIMAL types. * * @param name The name of the parameter to register as output. @@ -374,7 +374,7 @@ public interface CallableStatement extends PreparedStatement /** * This method registers the specified parameter as an output parameter - * of the specified SQL type. This version of registerOutParameter is used + * of the specified SQL type. This version of registerOutParameter is used * for user-named or REF types. If the type of the output parameter does * not have such a type, the typeName argument is ignored. * @@ -384,7 +384,7 @@ public interface CallableStatement extends PreparedStatement * @exception SQLException If an error occurs. * @since 1.4 */ - void registerOutParameter(String name, int sqlType, String typeName) + void registerOutParameter(String name, int sqlType, String typeName) throws SQLException; /** @@ -401,7 +401,7 @@ public interface CallableStatement extends PreparedStatement /** * This method sets the value of the specified parameter to the specified * <code>java.net.URL</code> - * + * * @param name The name of the parameter to set. * @param value The value the parameter. * @since 1.4 @@ -413,7 +413,7 @@ public interface CallableStatement extends PreparedStatement * for the specified type. * * @param name The name of the parameter to set. - * @param sqlType The SQL type identifier of the parameter from + * @param sqlType The SQL type identifier of the parameter from * <code>Types</code> * @exception SQLException If an error occurs. * @since 1.4 @@ -597,7 +597,7 @@ public interface CallableStatement extends PreparedStatement * * @param name The name of the parameter value to set. * @param value The value of the parameter. - * @param sqlType The SQL type to use for the parameter, from + * @param sqlType 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. @@ -613,7 +613,7 @@ public interface CallableStatement extends PreparedStatement * * @param name The name of the parameter value to set. * @param value The value of the parameter. - * @param sqlType The SQL type to use for the parameter, from + * @param sqlType The SQL type to use for the parameter, from * <code>Types</code> * @exception SQLException If an error occurs. * @see Types diff --git a/libjava/classpath/java/sql/Clob.java b/libjava/classpath/java/sql/Clob.java index 53bf639..483276e 100644 --- a/libjava/classpath/java/sql/Clob.java +++ b/libjava/classpath/java/sql/Clob.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -46,14 +46,14 @@ import java.io.Writer; /** * This interface contains methods for accessing a SQL CLOB (Character Large * OBject) type. - * + * * @author Aaron M. Renn (arenn@urbanophile.com) */ public interface Clob { /** * This method returns the number of characters in this <code>Clob</code>. - * + * * @return The number of characters in this <code>Clob</code>. * @exception SQLException If an error occurs. * @since 1.2 @@ -63,7 +63,7 @@ public interface Clob /** * This method returns the specified portion of this <code>Clob</code> as a * <code>String</code>. - * + * * @param start The index into this <code>Clob</code> (index values * start at 1) to start returning characters from. * @param count The requested number of characters to return. @@ -76,7 +76,7 @@ public interface Clob /** * This method returns a character stream that reads the contents of this * <code>Clob</code>. - * + * * @return A character stream to read this <code>Clob</code>'s contents. * @exception SQLException If an error occurs. * @since 1.2 @@ -86,7 +86,7 @@ public interface Clob /** * This method returns a byte stream that reads the contents of this * <code>Clob</code> as a series of ASCII bytes. - * + * * @return A stream to read this <code>Clob</code>'s contents. * @exception SQLException If an error occurs. * @since 1.2 @@ -97,7 +97,7 @@ public interface Clob * This method returns the index into this <code>Clob</code> of the first * occurrence of the specified character pattern (supplied by the caller as a * <code>String</code>). The search begins at the specified index. - * + * * @param pattern The character pattern to search for, passed as a * <code>String</code>. * @param start The index into this <code>Clob</code> to start searching @@ -113,7 +113,7 @@ public interface Clob * This method returns the index into this <code>Clob</code> of the first * occurrence of the specified character pattern (supplied by the caller as a * <code>Clob</code>). The search begins at the specified index. - * + * * @param pattern The character pattern to search for, passed as a * <code>Clob</code>. * @param start The index into this <code>Clob</code> to start searching @@ -128,7 +128,7 @@ public interface Clob /** * Writes the specified string into this <code>Clob</code>, starting at the * specified index. - * + * * @param start The index at which the writing starts. * @param value The string to write. * @return The number of characters written. @@ -140,7 +140,7 @@ public interface Clob /** * Writes the specified portion of a string into this <code>Clob</code>, * starting at the specified index. - * + * * @param startWrite The index at which the writing starts. * @param value The string to write a portion of. * @param startRead The offset into the string where the portion to copy @@ -156,7 +156,7 @@ public interface Clob /** * Returns an ASCII text stream that writes into this <code>Clob</code>, * starting at the specified index. - * + * * @param start The index at which the writing starts. * @return An ASCII text stream to write into this <code>Clob</code>. * @exception SQLException If an error occurs. @@ -167,7 +167,7 @@ public interface Clob /** * Returns a character stream that writes into this <code>Clob</code>, * starting at the specified index. - * + * * @param start The index at which the writing starts. * @return A character stream to write into this <code>Clob</code>. * @exception SQLException If an error occurs. @@ -178,7 +178,7 @@ public interface Clob /** * Truncates this <code>Clob</code> to be at most the specified number of * characters long. - * + * * @param count The length this <code>Clob</code> is truncated to. * @exception SQLException If an error occurs. * @since 1.4 diff --git a/libjava/classpath/java/sql/Connection.java b/libjava/classpath/java/sql/Connection.java index 8dc7544..f375276 100644 --- a/libjava/classpath/java/sql/Connection.java +++ b/libjava/classpath/java/sql/Connection.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -45,7 +45,7 @@ import java.util.Map; * * @author Aaron M. Renn (arenn@urbanophile.com) */ -public interface Connection +public interface Connection { /** * This transaction isolation level indicates that transactions are not @@ -90,7 +90,7 @@ public interface Connection * This method creates a new SQL statement. The default result set type * and concurrency will be used. * - * @return A new <code>Statement</code> object. + * @return A new <code>Statement</code> object. * @exception SQLException If an error occurs. * @see Statement */ @@ -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 sql 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. @@ -110,12 +110,12 @@ public interface Connection PreparedStatement prepareStatement(String sql) throws SQLException; /** - * This method creates a new <code>CallableStatement</code> for the + * This method creates a new <code>CallableStatement</code> for the * specified SQL string. Thie method is designed to be used with * stored procedures. The default result set type and concurrency * will be used. * - * @param sql 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. @@ -151,7 +151,7 @@ public interface Connection * In auto commit mode, every SQL statement is committed its own transaction. * Otherwise a transaction must be explicitly committed or rolled back. * - * @return <code>true</code> if auto commit mode is enabled, + * @return <code>true</code> if auto commit mode is enabled, * <code>false</code> otherwise. * @exception SQLException If an error occurs. * @see #commit() @@ -160,7 +160,7 @@ public interface Connection boolean getAutoCommit() throws SQLException; /** - * This method commits any SQL statements executed on this connection since + * This method commits any SQL statements executed on this connection since * the last commit or rollback. * * @exception SQLException If an error occurs. @@ -183,7 +183,7 @@ public interface Connection void close() throws SQLException; /** - * This method tests whether or not this connection has been closed. + * This method tests whether or not this connection has been closed. * * @return <code>true</code> if the connection is closed, <code>false</code> * otherwise. @@ -233,7 +233,7 @@ public interface Connection * This method returns the name of the catalog in use by this connection, * if any. * - * @return The name of the catalog, or <code>null</code> if none + * @return The name of the catalog, or <code>null</code> if none * exists or catalogs are not supported by this database. * @exception SQLException If an error occurs. */ @@ -262,7 +262,7 @@ public interface Connection * if any. If there were any subsequence warnings, they will be chained * to the first one. * - * @return The first <code>SQLWarning</code> that occurred, or + * @return The first <code>SQLWarning</code> that occurred, or * <code>null</code> if there have been no warnings. * @exception SQLException If an error occurs. */ @@ -298,7 +298,7 @@ public interface Connection * Valid values for these parameters are specified in the * <code>ResultSet</code> class. * - * @param sql 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 @@ -308,17 +308,17 @@ public interface Connection * @see PreparedStatement * @see ResultSet */ - PreparedStatement prepareStatement(String sql, int resultSetType, + PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency) throws SQLException; /** - * This method creates a new <code>CallableStatement</code> for the + * This method creates a new <code>CallableStatement</code> for the * specified SQL string. Thie method is designed to be used with * stored procedures. The specified result set type and concurrency * will be used. Valid values for these parameters are specified in the * <code>ResultSet</code> class. * - * @param sql 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 @@ -353,7 +353,7 @@ public interface Connection /** * Sets the default holdability of <code>ResultSet</code>S that are created * from <code>Statement</code>S using this <code>Connection</code>. - * + * * @param holdability The default holdability value to set, this must be one * of <code>ResultSet.HOLD_CURSORS_OVER_COMMIT</code> or * <code>ResultSet.CLOSE_CURSORS_AT_COMMIT</code>. @@ -366,7 +366,7 @@ public interface Connection /** * Gets the default holdability of <code>ResultSet</code>S that are created * from <code>Statement</code>S using this <code>Connection</code>. - * + * * @return The current default holdability value, this must be one of * <code>ResultSet.HOLD_CURSORS_OVER_COMMIT</code> or * <code>ResultSet.CLOSE_CURSORS_AT_COMMIT</code>. @@ -378,7 +378,7 @@ public interface Connection /** * Creates a new unnamed savepoint for this <code>Connection</code> - * + * * @return The <code>Savepoint</code> object representing the savepoint. * @exception SQLException If an error occurs. * @since 1.4 @@ -388,7 +388,7 @@ public interface Connection /** * Creates a new savepoint with the specifiend name for this * <code>Connection</code>. - * + * * @param name The name of the savepoint. * @return The <code>Savepoint</code> object representing the savepoint. * @exception SQLException If an error occurs. @@ -398,7 +398,7 @@ public interface Connection /** * Undoes all changes made after the specified savepoint was set. - * + * * @param savepoint The safepoint to roll back to. * @exception SQLException If an error occurs. * @since 1.4 @@ -409,7 +409,7 @@ public interface Connection * Removes the specified savepoint from this <code>Connection</code>. * Refering to a savepoint after it was removed is an error and will throw an * SQLException. - * + * * @param savepoint The savepoint to release. * @exception SQLException If an error occurs. * @since 1.4 @@ -420,7 +420,7 @@ public interface Connection * This method creates a new SQL statement with the specified type, * concurrency and holdability, instead of using the defaults. Valid values * for these parameters are specified in the <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 * the result set for this statement. @@ -441,7 +441,7 @@ public interface Connection * will be used. Valid values for these parameters are specified in the * <code>ResultSet</code> class. * - * @param sql 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 @@ -458,13 +458,13 @@ public interface Connection resultSetConcurrency, int resultSetHoldability) throws SQLException; /** - * This method creates a new <code>CallableStatement</code> for the + * This method creates a new <code>CallableStatement</code> for the * specified SQL string. Thie method is designed to be used with * stored procedures. The specified result set type, concurrency and * holdability will be used. Valid values for these parameters are specified * in the <code>ResultSet</code> class. * - * @param sql 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 diff --git a/libjava/classpath/java/sql/DataTruncation.java b/libjava/classpath/java/sql/DataTruncation.java index ec522c0..efa4487 100644 --- a/libjava/classpath/java/sql/DataTruncation.java +++ b/libjava/classpath/java/sql/DataTruncation.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -38,12 +38,12 @@ exception statement from your version. */ package java.sql; /** - * This exception is thrown when a piece of data is unexpectedly + * This exception is thrown when a piece of data is unexpectedly * truncated in JDBC. * * @author Aaron M. Renn (arenn@urbanophile.com) */ -public class DataTruncation extends SQLWarning +public class DataTruncation extends SQLWarning { static final long serialVersionUID = 6464298989504059473L; @@ -74,7 +74,7 @@ public class DataTruncation extends SQLWarning /** * This method initializes a new instance of <code>DataTruncation</code> - * with the specified values. The descriptive error message for this + * with the specified values. The descriptive error message for this * exception will be "Data truncation", the SQL state will be "01004" * and the vendor specific error code will be set to 0. * diff --git a/libjava/classpath/java/sql/DatabaseMetaData.java b/libjava/classpath/java/sql/DatabaseMetaData.java index 48c2d9a..3ffd5b0 100644 --- a/libjava/classpath/java/sql/DatabaseMetaData.java +++ b/libjava/classpath/java/sql/DatabaseMetaData.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -37,7 +37,7 @@ exception statement from your version. */ package java.sql; -public interface DatabaseMetaData +public interface DatabaseMetaData { /** * It is unknown whether or not the procedure returns a result. @@ -409,7 +409,7 @@ public interface DatabaseMetaData * This method tests whether or not the database uses local files to * store tables. * - * @return <code>true</code> if the database uses local files, + * @return <code>true</code> if the database uses local files, * <code>false</code> otherwise. * * @exception SQLException If an error occurs. @@ -459,7 +459,7 @@ public interface DatabaseMetaData boolean storesLowerCaseIdentifiers() throws SQLException; /** - * This method tests whether or not the database stores mixed case + * This method tests whether or not the database stores mixed case * identifers even if it treats them as case insensitive. * * @return <code>true</code> if the database stores mixed case identifiers, @@ -482,7 +482,7 @@ public interface DatabaseMetaData * This method tests whether or not the database treats mixed case * quoted identifiers as all upper case. * - * @return <code>true</code> if the database treats all quoted identifiers + * @return <code>true</code> if the database treats all quoted identifiers * as upper case, <code>false</code> otherwise. * @exception SQLException If an error occurs. */ @@ -492,17 +492,17 @@ public interface DatabaseMetaData * This method tests whether or not the database treats mixed case * quoted identifiers as all lower case. * - * @return <code>true</code> if the database treats all quoted identifiers + * @return <code>true</code> if the database treats all quoted identifiers * as lower case, <code>false</code> otherwise. * @exception SQLException If an error occurs. */ boolean storesLowerCaseQuotedIdentifiers() throws SQLException; /** - * This method tests whether or not the database stores mixed case + * This method tests whether or not the database stores mixed case * quoted identifers even if it treats them as case insensitive. * - * @return <code>true</code> if the database stores mixed case quoted + * @return <code>true</code> if the database stores mixed case quoted * identifiers, <code>false</code> otherwise. * @exception SQLException If an error occurs. */ @@ -552,7 +552,7 @@ public interface DatabaseMetaData /** * This method returns comma separated list of time/date functions. - * + * * @return The list of time/date functions. * @exception SQLException If an error occurs. */ @@ -567,7 +567,7 @@ public interface DatabaseMetaData String getSearchStringEscape() throws SQLException; /** - * This methods returns non-standard characters that can appear in + * This methods returns non-standard characters that can appear in * unquoted identifiers. * * @return Non-standard characters that can appear in unquoted identifiers. @@ -638,7 +638,7 @@ public interface DatabaseMetaData SQLException; /** - * This method tests whether or not table correlation names are + * This method tests whether or not table correlation names are * supported. This will be always be <code>true</code> in a fully JDBC * compliant driver. * @@ -722,7 +722,7 @@ public interface DatabaseMetaData * This method tests whether multiple result sets for a single statement are * supported. * - * @return <code>true</code> if multiple result sets are supported for a + * @return <code>true</code> if multiple result sets are supported for a * single statement, <code>false</code> otherwise. * @exception SQLException If an error occurs. */ @@ -789,7 +789,7 @@ public interface DatabaseMetaData /** * This method tests whether or not the ANSI92 intermediate SQL - * grammar is supported. + * grammar is supported. * * @return <code>true</code> if the ANSI92 intermediate SQL grammar is * supported, <code>false</code> otherwise. @@ -799,7 +799,7 @@ public interface DatabaseMetaData /** * This method tests whether or not the ANSI92 full SQL - * grammar is supported. + * grammar is supported. * * @return <code>true</code> if the ANSI92 full SQL grammar is * supported, <code>false</code> otherwise. @@ -829,7 +829,7 @@ public interface DatabaseMetaData /** * This method tests whether or not the database supports full outer joins. * - * @return <code>true</code> if full outer joins are supported, + * @return <code>true</code> if full outer joins are supported, * <code>false</code> otherwise. * @exception SQLException If an error occurs. */ @@ -838,7 +838,7 @@ public interface DatabaseMetaData /** * This method tests whether or not the database supports limited outer joins. * - * @return <code>true</code> if limited outer joins are supported, + * @return <code>true</code> if limited outer joins are supported, * <code>false</code> otherwise. * @exception SQLException If an error occurs. */ @@ -1005,7 +1005,7 @@ public interface DatabaseMetaData * This method tests whether or not SELECT FOR UPDATE is supported by the * database. * - * @return <code>true</code> if SELECT FOR UPDATE is supported + * @return <code>true</code> if SELECT FOR UPDATE is supported * <code>false</code> otherwise. * @exception SQLException If an error occurs. */ @@ -1036,7 +1036,7 @@ public interface DatabaseMetaData * expressions. A fully JDBC compliant driver will always return * <code>true</code>. * - * @return <code>true</code> if subqueries are allowed in exists + * @return <code>true</code> if subqueries are allowed in exists * expressions, <code>false</code> otherwise. * @exception SQLException If an error occurs. */ @@ -1057,7 +1057,7 @@ public interface DatabaseMetaData * expressions. A fully JDBC compliant driver will always return * <code>true</code>. * - * @return <code>true</code> if subqueries are allowed in quantified + * @return <code>true</code> if subqueries are allowed in quantified * expressions, <code>false</code> otherwise. * @exception SQLException If an error occurs. */ @@ -1143,7 +1143,7 @@ public interface DatabaseMetaData /** * This method returns the maximum length of a character literal. - * + * * @return The maximum length of a character literal. * @exception SQLException If an error occurs. */ @@ -1338,7 +1338,7 @@ public interface DatabaseMetaData SQLException; /** - * This method tests whether or not DDL and DML statements allowed within + * This method tests whether or not DDL and DML statements allowed within * the same transaction. * * @return <code>true</code> if DDL and DML statements are allowed in the @@ -1385,7 +1385,7 @@ public interface DatabaseMetaData * a <code>ResultSet</code> with the following columns: * <p> * <ol> - * <li>PROCEDURE_CAT - The catalog the procedure is in, which may be + * <li>PROCEDURE_CAT - The catalog the procedure is in, which may be * <code>null</code>.</li> * <li>PROCEDURE_SCHEM - The schema the procedures is in, which may be * <code>null</code>.</li> @@ -1394,8 +1394,8 @@ public interface DatabaseMetaData * <li>Unused</li> * <li>Unused</li> * <li>REMARKS - A description of the procedure</li> - * <li>PROCEDURE_TYPE - Indicates the return type of the procedure, which - * is one of the contstants defined in this class + * <li>PROCEDURE_TYPE - Indicates the return type of the procedure, which + * is one of the contstants defined in this class * (<code>procedureResultUnknown</code>, <code>procedureNoResult</code>, or * <code>procedureReturnsResult</code>).</li> * </ol> @@ -1417,7 +1417,7 @@ public interface DatabaseMetaData * <code>ResultSet</code> with the following columns: * <p> * <ol> - * <li>PROCEDURE_CAT - The catalog the procedure is in, which may be + * <li>PROCEDURE_CAT - The catalog the procedure is in, which may be * <code>null</code>.</li> * <li>PROCEDURE_SCHEM - The schema the procedures is in, which may be * <code>null</code>.</li> @@ -1455,7 +1455,7 @@ public interface DatabaseMetaData SQLException; /** - * This method returns a list of the requested table as a + * This method returns a list of the requested table as a * <code>ResultSet</code> with the following columns: * * <ol> @@ -1466,7 +1466,7 @@ public interface DatabaseMetaData * of the values returned by the <code>getTableTypes()</code> method.</li> * <li>REMARKS - Comments about the table.</li> * </ol> - * + * * @param catalog The name of the catalog to return tables from, * or "" to return tables from all catalogs. * @param schemaPattern A schema pattern for the schemas to return tables @@ -1480,7 +1480,7 @@ public interface DatabaseMetaData tablePattern, String[] types) throws SQLException; /** - * This method returns the list of database schemas as a + * This method returns the list of database schemas as a * <code>ResultSet</code>, with one column - TABLE_SCHEM - that is the * name of the schema. * @@ -1515,7 +1515,7 @@ public interface DatabaseMetaData * <code>ResultSet</code> with the following columns: * <p> * <ol> - * <li>TABLE_CAT - The catalog the table is in, which may be + * <li>TABLE_CAT - The catalog the table is in, which may be * <code>null</code>.</li> * <li>TABLE_SCHEM - The schema the tables is in, which may be * <code>null</code>.</li> @@ -1543,7 +1543,7 @@ public interface DatabaseMetaData * * @param catalog The name of the catalog to return table from, * or "" to return tables from all catalogs. - * @param schemaPattern A schema pattern for the schemas to return + * @param schemaPattern A schema pattern for the schemas to return * tables from, or "" to return tables from all schemas. * @param tablePattern The pattern of table names to return. * @param columnPattern The pattern of column names to return. @@ -1559,7 +1559,7 @@ public interface DatabaseMetaData * with the following columns: * * <ol> - * <li>TABLE_CAT - The catalog the table is in, which may be + * <li>TABLE_CAT - The catalog the table is in, which may be * <code>null</code>.</li> * <li>TABLE_SCHEM - The schema the tables is in, which may be * <code>null</code>.</li> @@ -1591,7 +1591,7 @@ public interface DatabaseMetaData * with the following columns: * * <ol> - * <li>TABLE_CAT - The catalog the table is in, which may be + * <li>TABLE_CAT - The catalog the table is in, which may be * <code>null</code>.</li> * <li>TABLE_SCHEM - The schema the tables is in, which may be * <code>null</code>.</li> @@ -1608,7 +1608,7 @@ public interface DatabaseMetaData * to return information from all catalogs. * @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 tablePattern 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. @@ -1622,7 +1622,7 @@ public interface DatabaseMetaData * the following columns: * * <ol> - * <li>SCOPE - The scope of the results returned. This is one of the + * <li>SCOPE - The scope of the results returned. This is one of the * constants defined in this class (<code>bestRowTemporary</code>, * <code>bestRowTransaction</code>, or <code>bestRowSession</code>).</li> * <li>COLUMN_NAME - The name of the column.</li> @@ -1633,7 +1633,7 @@ public interface DatabaseMetaData * <li>BUFFER_LENGTH - Unused</li> * <li>DECIMAL_DIGITS - The scale of the column.</li> * <li>PSEUDO_COLUMN - Whether or not the best row identifier is a - * pseudo_column. This is one of the constants defined in this class + * pseudo_column. This is one of the constants defined in this class * (<code>bestRowUnknown</code>, <code>bestRowNotPseudo</code>, or * <code>bestRowPseudo</code>).</li> * </ol> @@ -1655,7 +1655,7 @@ public interface DatabaseMetaData /** * This method returns the set of columns that are automatically updated - * when the row is update. It returns this information as a + * when the row is update. It returns this information as a * <code>ResultSet</code> with the following columns: * * <ol> @@ -1668,7 +1668,7 @@ public interface DatabaseMetaData * <li>BUFFER_LENGTH - Unused</li> * <li>DECIMAL_DIGITS - The scale of the column.</li> * <li>PSEUDO_COLUMN - Whether or not the best row identifier is a - * pseudo_column. This is one of the constants defined in this class + * pseudo_column. This is one of the constants defined in this class * (<code>versionRowUnknown</code>, <code>versionRowNotPseudo</code>, or * <code>versionRowPseudo</code>).</li> * </ol> @@ -1725,12 +1725,12 @@ public interface DatabaseMetaData * <li>FKCOLUMN_NAME - The foreign key column name.</li> * <li>KEY_SEQ - The sequence number of the column within the foreign key.</li> * <li>UPDATE_RULE - How the foreign key behaves when the primary key is - * updated. This is one of the constants defined in this class + * updated. This is one of the constants defined in this class * (<code>importedNoAction</code>, <code>importedKeyCascade</code>, * <code>importedKeySetNull</code>, <code>importedKeySetDefault</code>, or * <code>importedKeyRestrict</code>).</li> * <li>DELETE_RULE - How the foreign key behaves when the primary key is - * deleted. This is one of the constants defined in this class + * deleted. This is one of the constants defined in this class * (<code>importedNoAction</code>, <code>importedKeyCascade</code>, * <code>importedKeySetNull</code>, or <code>importedKeySetDefault</code>)</li> * <li>FK_NAME - The name of the foreign key.</li> @@ -1769,12 +1769,12 @@ public interface DatabaseMetaData * <li>FKCOLUMN_NAME - The foreign key column name.</li> * <li>KEY_SEQ - The sequence number of the column within the foreign key.</li> * <li>UPDATE_RULE - How the foreign key behaves when the primary key is - * updated. This is one of the constants defined in this class + * updated. This is one of the constants defined in this class * (<code>importedNoAction</code>, <code>importedKeyCascade</code>, * <code>importedKeySetNull</code>, <code>importedKeySetDefault</code>, or * <code>importedKeyRestrict</code>).</li> * <li>DELETE_RULE - How the foreign key behaves when the primary key is - * deleted. This is one of the constants defined in this class + * deleted. This is one of the constants defined in this class * (<code>importedNoAction</code>, <code>importedKeyCascade</code>, * <code>importedKeySetNull</code>, or <code>importedKeySetDefault</code>)</li> * <li>FK_NAME - The name of the foreign key.</li> @@ -1813,12 +1813,12 @@ public interface DatabaseMetaData * <li>FKCOLUMN_NAME - The foreign key column name.</li> * <li>KEY_SEQ - The sequence number of the column within the foreign key.</li> * <li>UPDATE_RULE - How the foreign key behaves when the primary key is - * updated. This is one of the constants defined in this class + * updated. This is one of the constants defined in this class * (<code>importedNoAction</code>, <code>importedKeyCascade</code>, * <code>importedKeySetNull</code>, <code>importedKeySetDefault</code>, or * <code>importedKeyRestrict</code>).</li> * <li>DELETE_RULE - How the foreign key behaves when the primary key is - * deleted. This is one of the constants defined in this class + * deleted. This is one of the constants defined in this class * (<code>importedNoAction</code>, <code>importedKeyCascade</code>, * <code>importedKeySetNull</code>, or <code>importedKeySetDefault</code>)</li> * <li>FK_NAME - The name of the foreign key.</li> @@ -1871,7 +1871,7 @@ public interface DatabaseMetaData * <li>CREATE_PARAMS - The parameters used to create the type, which may be * <code>null</code>.</li> * <li>NULLABLE - Whether or not this type supports NULL values. This will - * be one of the constants defined in this interface + * be one of the constants defined in this interface * (<code>typeNoNulls</code>, <code>typeNullable</code>, or * <code>typeNullableUnknown</code>).</li> * <li>CASE_SENSITIVE - Whether or not the value is case sensitive.</li> @@ -1889,7 +1889,7 @@ public interface DatabaseMetaData * <li>SQL_DATETIME_SUB - Unused.</li> * <li>NUM_PREC_RADIX - The radix of this data type.</li> * </ol> - * + * * @return A <code>ResultSet</code> with the list of available data types. * @exception SQLException If an error occurs. */ @@ -1925,12 +1925,12 @@ public interface DatabaseMetaData * </ol> * * @param catalog The catalog to retrieve information from, or the empty string - * to return entities not associated with a catalog, or + * 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 * to return entities not associated with a schema. * @param tableName The table name to return information for. - * @param unique <code>true</code> to return only unique indexes, + * @param unique <code>true</code> to return only unique indexes, * <code>false</code> otherwise. * @param approximate <code>true</code> if data values can be approximations, * <code>false</code> otherwise. @@ -2012,7 +2012,7 @@ public interface DatabaseMetaData boolean ownInsertsAreVisible(int type) throws SQLException; /** - * This method tests whether or not the specified result set type sees + * This method tests whether or not the specified result set type sees * updates committed by others. * * @param type The desired result type, which is one of the constants @@ -2025,7 +2025,7 @@ public interface DatabaseMetaData boolean othersUpdatesAreVisible(int type) throws SQLException; /** - * This method tests whether or not the specified result set type sees + * This method tests whether or not the specified result set type sees * deletes committed by others. * * @param type The desired result type, which is one of the constants @@ -2038,7 +2038,7 @@ public interface DatabaseMetaData boolean othersDeletesAreVisible(int type) throws SQLException; /** - * This method tests whether or not the specified result set type sees + * This method tests whether or not the specified result set type sees * inserts committed by others. * * @param type The desired result type, which is one of the constants @@ -2075,7 +2075,7 @@ public interface DatabaseMetaData * @see ResultSet */ boolean deletesAreDetected(int type) throws SQLException; - + /** * This method tests whether or not the specified result set type can detect * a visible insert by calling the <code>rowUpdated</code> method. @@ -2138,7 +2138,7 @@ public interface DatabaseMetaData /** * This method tests whether the databse supports savepoints. - * + * * @return <code>true</code> if the database supports savepoints, * <code>false</code> if it does not. * @exception SQLException If an error occurs. @@ -2149,7 +2149,7 @@ public interface DatabaseMetaData /** * This method tests whether the database supports named parameters. - * + * * @return <code>true</code> if the database supports named parameters, * <code>false</code> if it does not. * @exception SQLException If an error occurs. @@ -2160,7 +2160,7 @@ public interface DatabaseMetaData /** * This method tests whether the database supports returning multiple * <code>ResultSet</code>S from a <code>CallableStatement</code> at once. - * + * * @return <code>true</code> if the database supports returnig multiple * results at once, <code>false</code> if it does not. * @exception SQLException If an error occurs. @@ -2195,7 +2195,7 @@ public interface DatabaseMetaData * This method tests if the database supports the specified holdability type. * Valid values for this parameter are specified in the * <code>ResultSet</code> class. - * + * * @param holdability The holdability type to test. * @return <code>true</code> if the database supports the holdability type, * <code>false</code> if it does not. @@ -2210,7 +2210,7 @@ public interface DatabaseMetaData * This method returns the default holdability type of <code>ResultSet</code>S * retrieved from this database. The possible values are specified in the * <code>ResultSet</code> class. - * + * * @return The default holdability type. * @exception SQLException If an error occurs. * @since 1.4 @@ -2219,7 +2219,7 @@ public interface DatabaseMetaData /** * This method returns the major version number of the database. - * + * * @return The major version number of the database. * @exception SQLException If an error occurs. * @since 1.4 @@ -2228,7 +2228,7 @@ public interface DatabaseMetaData /** * This method returns the minor version number of the database. - * + * * @return The minor version number of the database. * @exception SQLException If an error occurs. * @since 1.4 @@ -2237,7 +2237,7 @@ public interface DatabaseMetaData /** * This method returns the major version number of the JDBC driver. - * + * * @return The major version number of the JDBC driver. * @exception SQLException If an error occurs. * @since 1.4 @@ -2246,7 +2246,7 @@ public interface DatabaseMetaData /** * This method returns the minor version number of the JDBC driver. - * + * * @return The minor version number of the database. * @exception SQLException If an error occurs. * @since 1.4 diff --git a/libjava/classpath/java/sql/Date.java b/libjava/classpath/java/sql/Date.java index f4c3307..f5eea1a 100644 --- a/libjava/classpath/java/sql/Date.java +++ b/libjava/classpath/java/sql/Date.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -46,7 +46,7 @@ import java.text.SimpleDateFormat; * * @author Aaron M. Renn (arenn@urbanophile.com) */ -public class Date extends java.util.Date +public class Date extends java.util.Date { static final long serialVersionUID = 1511598038487230103L; @@ -67,12 +67,12 @@ public class Date extends java.util.Date */ public Date(int year, int month, int day) { - super(year, month, day); + super(year, month, day); } /** * This method initializes a new instance of this class with the - * specified time value representing the number of milliseconds since + * specified time value representing the number of milliseconds since * Jan 1, 1970 at 12:00 midnight GMT. * * @param date The time value to intialize this date to. @@ -157,18 +157,18 @@ public class Date extends java.util.Date */ public static Date valueOf (String str) { - try + try { - java.util.Date d = (java.util.Date) sdf.parseObject(str); + java.util.Date d = (java.util.Date) sdf.parseObject(str); - if (d == null) - throw new IllegalArgumentException(str); - else - return new Date(d.getTime()); + if (d == null) + throw new IllegalArgumentException(str); + else + return new Date(d.getTime()); } catch (ParseException e) { - throw new IllegalArgumentException(str); + throw new IllegalArgumentException(str); } } diff --git a/libjava/classpath/java/sql/Driver.java b/libjava/classpath/java/sql/Driver.java index 277dd17..d7b2e8a 100644 --- a/libjava/classpath/java/sql/Driver.java +++ b/libjava/classpath/java/sql/Driver.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -43,17 +43,17 @@ import java.util.Properties; * This interface specifies a mechanism for accessing a JDBC database * driver. When the class implementing this method is loaded, it should * register an instance of itself with the <code>DriverManager</code> in - * a static initializer. + * a static initializer. * <p> * Because the <code>DriverManager</code> might attempt to use several - * drivers to find one that can connect to the requested database, + * drivers to find one that can connect to the requested database, * this driver should not cause large numbers of classes and code to * be loaded. If another driver is the one that ends up performing the * request, any loading done by this driver would be wasted. * * @author Aaron M. Renn (arenn@urbanophile.com) */ -public interface Driver +public interface Driver { /** * This method connects to the specified database using the connection @@ -61,7 +61,7 @@ public interface Driver * URL, it should return <code>null</code> instead of throwing an * exception since the <code>DriverManager</code> will probe a driver * in this manner. - * + * * @param url The URL string for this connection. * @param properties The list of database connection properties. * @return A <code>Connection</code> object for the newly established @@ -72,12 +72,12 @@ public interface Driver /** * This method tests whether or not the driver believes it can connect to - * the specified database. The driver should only test whether it - * understands and accepts the URL. It should not necessarily attempt to + * the specified database. The driver should only test whether it + * understands and accepts the URL. It should not necessarily attempt to * probe the database for a connection. * * @param url The database URL string. - * @return <code>true</code> if the drivers can connect to the database, + * @return <code>true</code> if the drivers can connect to the database, * <code>false</code> otherwise. * @exception SQLException If an error occurs. */ @@ -101,7 +101,7 @@ public interface Driver * This method returns the major version number of the driver. * * @return The major version number of the driver. - */ + */ int getMajorVersion(); /** diff --git a/libjava/classpath/java/sql/DriverManager.java b/libjava/classpath/java/sql/DriverManager.java index 7d1ef07..86ed029 100644 --- a/libjava/classpath/java/sql/DriverManager.java +++ b/libjava/classpath/java/sql/DriverManager.java @@ -8,7 +8,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -55,7 +55,7 @@ import java.util.Vector; * property should be a colon separated list of fully qualified driver * class names. Additional drivers can be loaded at any time by * simply loading the driver class with <code>class.forName(String)</code>. - * The driver should automatically register itself in a static + * The driver should automatically register itself in a static * initializer. * <p> * The methods in this class are all <code>static</code>. This class @@ -63,7 +63,7 @@ import java.util.Vector; * * @author Aaron M. Renn (arenn@urbanophile.com) */ -public class DriverManager +public class DriverManager { /** * This is the log stream for JDBC drivers. @@ -95,19 +95,19 @@ public class DriverManager String driver_string = System.getProperty("jdbc.drivers"); if (driver_string != null) { - StringTokenizer st = new StringTokenizer(driver_string); - while (st.hasMoreTokens()) + StringTokenizer st = new StringTokenizer(driver_string); + while (st.hasMoreTokens()) { String driver_classname = st.nextToken(); try { - Class.forName(driver_classname); // The driver registers itself + Class.forName(driver_classname); // The driver registers itself } catch (Exception e) - { - // Ignore not founds - } + { + // Ignore not founds + } } } @@ -129,11 +129,11 @@ public class DriverManager { return log_writer; } - + /** * This method sets the log writer being used by JDBC drivers. This is a * system-wide parameter that affects all drivers. Note that since there - * is no way to retrieve a <code>PrintStream</code> from a + * is no way to retrieve a <code>PrintStream</code> from a * <code>PrintWriter</code>, this method cannot set the log stream in * use by JDBC. Thus any older drivers may not see this setting. * @@ -223,8 +223,8 @@ public class DriverManager Enumeration e = drivers.elements(); while(e.hasMoreElements()) { - Driver d = (Driver)e.nextElement(); - if (d.acceptsURL(url)) + Driver d = (Driver)e.nextElement(); + if (d.acceptsURL(url)) return d; } @@ -242,7 +242,7 @@ public class DriverManager public static void registerDriver(Driver driver) throws SQLException { if (! drivers.contains(driver)) - drivers.addElement(driver); + drivers.addElement(driver); } /** @@ -274,17 +274,17 @@ public class DriverManager while(e.hasMoreElements()) { - Object obj = e.nextElement(); + Object obj = e.nextElement(); - ClassLoader loader = obj.getClass().getClassLoader(); + ClassLoader loader = obj.getClass().getClassLoader(); - if (loader == null) - loader = ClassLoader.getSystemClassLoader(); - if (! loader.equals(cl)) - continue; + if (loader == null) + loader = ClassLoader.getSystemClassLoader(); + if (! loader.equals(cl)) + continue; - v.addElement(obj); - } + v.addElement(obj); + } return v.elements(); } @@ -297,7 +297,7 @@ public class DriverManager */ public static void setLoginTimeout(int seconds) { - DriverManager.login_timeout = seconds; + DriverManager.login_timeout = seconds; } /** diff --git a/libjava/classpath/java/sql/DriverPropertyInfo.java b/libjava/classpath/java/sql/DriverPropertyInfo.java index 34e40fa..c191fa5 100644 --- a/libjava/classpath/java/sql/DriverPropertyInfo.java +++ b/libjava/classpath/java/sql/DriverPropertyInfo.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -44,7 +44,7 @@ package java.sql; * * @author Aaron M. Renn (arenn@urbanophile.com) */ -public class DriverPropertyInfo +public class DriverPropertyInfo { /** * The name of the property. diff --git a/libjava/classpath/java/sql/ParameterMetaData.java b/libjava/classpath/java/sql/ParameterMetaData.java index b3a75fd..722d78b 100644 --- a/libjava/classpath/java/sql/ParameterMetaData.java +++ b/libjava/classpath/java/sql/ParameterMetaData.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -40,7 +40,7 @@ package java.sql; /** * @since 1.4 */ -public interface ParameterMetaData +public interface ParameterMetaData { int parameterNoNulls = 0; diff --git a/libjava/classpath/java/sql/PreparedStatement.java b/libjava/classpath/java/sql/PreparedStatement.java index ca7eb2c..4490b5b 100644 --- a/libjava/classpath/java/sql/PreparedStatement.java +++ b/libjava/classpath/java/sql/PreparedStatement.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -48,12 +48,12 @@ import java.util.Calendar; * statements. This provides greater efficiency when calling the same * statement multiple times. Parameters are allowed in a statement, * providings for maximum reusability. - * + * * <p> Note that in this class parameter indices start at 1, not 0.</p> * * @author Aaron M. Renn (arenn@urbanophile.com) */ -public interface PreparedStatement extends Statement +public interface PreparedStatement extends Statement { /** * This method executes a prepared SQL query and returns its ResultSet. @@ -78,7 +78,7 @@ public interface PreparedStatement extends Statement * for the specified type. * * @param index The index of the parameter to set. - * @param sqlType The SQL type identifier of the parameter from + * @param sqlType The SQL type identifier of the parameter from * <code>Types</code> * * @exception SQLException If an error occurs. @@ -268,7 +268,7 @@ public interface PreparedStatement extends Statement * * @param index The index of the parameter value to set. * @param value The value of the parameter. - * @param sqlType The SQL type to use for the parameter, from + * @param sqlType 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. @@ -283,7 +283,7 @@ public interface PreparedStatement extends Statement * * @param index The index of the parameter value to set. * @param value The value of the parameter. - * @param sqlType The SQL type to use for the parameter, from + * @param sqlType The SQL type to use for the parameter, from * <code>Types</code> * @exception SQLException If an error occurs. * @see Types @@ -348,7 +348,7 @@ public interface PreparedStatement extends Statement * will be used. * * @param index The index of the parameter value to set. - * @param value The <code>Blob</code> used to set the + * @param value The <code>Blob</code> used to set the * value of the parameter. * @exception SQLException If an error occurs. */ @@ -437,7 +437,7 @@ public interface PreparedStatement extends Statement /** * This method sets the specified parameter from the given Java * <code>java.net.URL</code> value. - * + * * @param index The index of the parameter to set. * @param value The value of the parameter. * @exception SQLException If an error occurs. @@ -446,10 +446,10 @@ public interface PreparedStatement extends Statement void setURL(int index, URL value) throws SQLException; /** - * Returns information about the parameters set on this + * Returns information about the parameters set on this * <code>PreparedStatement</code> (see {@link ParameterMetaData} for a * detailed description of the provided information). - * + * * @return Meta data for the parameters of this statement. * @see ParameterMetaData * @since 1.4 diff --git a/libjava/classpath/java/sql/Ref.java b/libjava/classpath/java/sql/Ref.java index c5c54ee..f37c8fe 100644 --- a/libjava/classpath/java/sql/Ref.java +++ b/libjava/classpath/java/sql/Ref.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -46,7 +46,7 @@ import java.util.Map; * @author Aaron M. Renn (arenn@urbanophile.com) * @since 1.2 */ -public interface Ref +public interface Ref { /** * This method returns the fully qualified name of the SQL structured diff --git a/libjava/classpath/java/sql/ResultSet.java b/libjava/classpath/java/sql/ResultSet.java index 573deb3..3b49a6a 100644 --- a/libjava/classpath/java/sql/ResultSet.java +++ b/libjava/classpath/java/sql/ResultSet.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -59,7 +59,7 @@ import java.util.Map; * * @author Aaron M. Renn (arenn@urbanophile.com) */ -public interface ResultSet +public interface ResultSet { /** * The rows will be processed in order from first to last. @@ -119,7 +119,7 @@ public interface ResultSet /** * This method closes the result set and frees any associated resources. - * + * * @exception SQLException If an error occurs. */ void close() throws SQLException; @@ -268,9 +268,9 @@ public interface ResultSet Timestamp getTimestamp(int columnIndex) throws SQLException; /** - * This method returns the value of the specified column as an ASCII + * This method returns the value of the specified column as an ASCII * stream. Note that all the data from this stream must be read before - * fetching the value of any other column. Please also be aware that + * fetching the value of any other column. Please also be aware that * calling <code>next()</code> or <code>close()</code> on this result set * will close this stream as well. * @@ -283,7 +283,7 @@ public interface ResultSet /** * This method returns the value of the specified column as a Unicode UTF-8 * stream. Note that all the data from this stream must be read before - * fetching the value of any other column. Please also be aware that + * fetching the value of any other column. Please also be aware that * calling <code>next()</code> or <code>close()</code> on this result set * will close this stream as well. * @@ -297,7 +297,7 @@ public interface ResultSet /** * This method returns the value of the specified column as a raw byte * stream. Note that all the data from this stream must be read before - * fetching the value of any other column. Please also be aware that + * fetching the value of any other column. Please also be aware that * calling <code>next()</code> or <code>close()</code> on this result set * will close this stream as well. * @@ -440,9 +440,9 @@ public interface ResultSet Timestamp getTimestamp(String columnName) throws SQLException; /** - * This method returns the value of the specified column as an ASCII + * This method returns the value of the specified column as an ASCII * stream. Note that all the data from this stream must be read before - * fetching the value of any other column. Please also be aware that + * fetching the value of any other column. Please also be aware that * calling <code>next()</code> or <code>close()</code> on this result set * will close this stream as well. * @@ -455,7 +455,7 @@ public interface ResultSet /** * This method returns the value of the specified column as a Unicode UTF-8 * stream. Note that all the data from this stream must be read before - * fetching the value of any other column. Please also be aware that + * fetching the value of any other column. Please also be aware that * calling <code>next()</code> or <code>close()</code> on this result set * will close this stream as well. * @@ -469,7 +469,7 @@ public interface ResultSet /** * This method returns the value of the specified column as a raw byte * stream. Note that all the data from this stream must be read before - * fetching the value of any other column. Please also be aware that + * fetching the value of any other column. Please also be aware that * calling <code>next()</code> or <code>close()</code> on this result set * will close this stream as well. * @@ -546,7 +546,7 @@ public interface ResultSet /** * This method returns the value of the specified column as a character * stream. Note that all the data from this stream must be read before - * fetching the value of any other column. Please also be aware that + * fetching the value of any other column. Please also be aware that * calling <code>next()</code> or <code>close()</code> on this result set * will close this stream as well. * @@ -559,7 +559,7 @@ public interface ResultSet /** * This method returns the value of the specified column as a character * stream. Note that all the data from this stream must be read before - * fetching the value of any other column. Please also be aware that + * fetching the value of any other column. Please also be aware that * calling <code>next()</code> or <code>close()</code> on this result set * will close this stream as well. * @@ -632,7 +632,7 @@ public interface ResultSet /** * This method repositions the cursor to before the first row in the * result set. - * + * * @exception SQLException If an error occurs. */ void beforeFirst() throws SQLException; @@ -640,7 +640,7 @@ public interface ResultSet /** * This method repositions the cursor to after the last row in the result * set. - * + * * @exception SQLException If an error occurs. */ void afterLast() throws SQLException; @@ -658,7 +658,7 @@ public interface ResultSet /** * This method repositions the cursor on the last row in the result * set. - * + * * @return <code>true</code> if the cursor is on a valid row; * <code>false</code> if there are no rows in the result set. * @exception SQLException If an error occurs. @@ -711,7 +711,7 @@ public interface ResultSet /** * This method provides a hint to the driver about which direction the - * result set will be processed in. + * result set will be processed in. * * @param direction The direction in which rows will be processed. The * allowed values are the <code>FETCH_*</code> constants @@ -738,7 +738,7 @@ public interface ResultSet void setFetchSize(int rows) throws SQLException; /** - * This method returns the current number of rows that will be fetched + * This method returns the current number of rows that will be fetched * from the database at a time. * * @return The current fetch size for this result set. @@ -941,7 +941,7 @@ public interface ResultSet void updateTime(int columnIndex, Time value) throws SQLException; /** - * This method updates the specified column to have a java.sql.Timestamp value. + * This method updates the specified column to have a java.sql.Timestamp value. * This does not update the actual database. <code>updateRow</code> must be * called in order to do that. * @@ -992,7 +992,7 @@ public interface ResultSet throws SQLException; /** - * This method updates the specified column to have an Object value. + * This method updates the specified column to have an Object value. * This does not update the actual database. <code>updateRow</code> must be * called in order to do that. * @@ -1006,7 +1006,7 @@ public interface ResultSet throws SQLException; /** - * This method updates the specified column to have an Object value. + * This method updates the specified column to have an Object value. * This does not update the actual database. <code>updateRow</code> must be * called in order to do that. * @@ -1160,7 +1160,7 @@ public interface ResultSet void updateTime(String columnName, Time value) throws SQLException; /** - * This method updates the specified column to have a java.sql.Timestamp value. + * This method updates the specified column to have a java.sql.Timestamp value. * This does not update the actual database. <code>updateRow</code> must be * called in order to do that. * @@ -1211,7 +1211,7 @@ public interface ResultSet throws SQLException; /** - * This method updates the specified column to have an Object value. + * This method updates the specified column to have an Object value. * This does not update the actual database. <code>updateRow</code> must be * called in order to do that. * @@ -1225,7 +1225,7 @@ public interface ResultSet throws SQLException; /** - * This method updates the specified column to have an Object value. + * This method updates the specified column to have an Object value. * This does not update the actual database. <code>updateRow</code> must be * called in order to do that. * @@ -1266,7 +1266,7 @@ public interface ResultSet void refreshRow() throws SQLException; /** - * This method cancels any changes that have been made to a row. If + * This method cancels any changes that have been made to a row. If * the <code>rowUpdate</code> method has been called, then the changes * cannot be undone. * @@ -1358,7 +1358,7 @@ public interface ResultSet * @return The value of the column as an <code>Object</code>. * @exception SQLException If an error occurs. */ - Object getObject(String columnName, Map<String, Class<?>> map) + Object getObject(String columnName, Map<String, Class<?>> map) throws SQLException; /** @@ -1399,7 +1399,7 @@ public interface ResultSet Array getArray(String columnName) throws SQLException; /** - * This method returns the specified column value as a + * This method returns the specified column value as a * <code>java.sql.Date</code>. The specified <code>Calendar</code> is used * to generate a value for the date if the database does not support * timezones. @@ -1412,7 +1412,7 @@ public interface ResultSet Date getDate(int columnIndex, Calendar cal) throws SQLException; /** - * This method returns the specified column value as a + * This method returns the specified column value as a * <code>java.sql.Date</code>. The specified <code>Calendar</code> is used * to generate a value for the date if the database does not support * timezones. @@ -1425,7 +1425,7 @@ public interface ResultSet Date getDate(String columnName, Calendar cal) throws SQLException; /** - * This method returns the specified column value as a + * This method returns the specified column value as a * <code>java.sql.Time</code>. The specified <code>Calendar</code> is used * to generate a value for the time if the database does not support * timezones. @@ -1438,7 +1438,7 @@ public interface ResultSet Time getTime(int columnIndex, Calendar cal) throws SQLException; /** - * This method returns the specified column value as a + * This method returns the specified column value as a * <code>java.sql.Time</code>. The specified <code>Calendar</code> is used * to generate a value for the time if the database does not support * timezones. @@ -1451,7 +1451,7 @@ public interface ResultSet Time getTime(String columnName, Calendar cal) throws SQLException; /** - * This method returns the specified column value as a + * This method returns the specified column value as a * <code>java.sql.Timestamp</code>. The specified <code>Calendar</code> is used * to generate a value for the timestamp if the database does not support * timezones. @@ -1465,7 +1465,7 @@ public interface ResultSet throws SQLException; /** - * This method returns the specified column value as a + * This method returns the specified column value as a * <code>java.sql.Timestamp</code>. The specified <code>Calendar</code> is used * to generate a value for the timestamp if the database does not support * timezones. @@ -1481,9 +1481,9 @@ public interface ResultSet throws SQLException; /** - * This method returns the specified column value as a + * This method returns the specified column value as a * <code>java.net.URL</code>. - * + * * @param columnIndex The index of the column value to return. * @exception SQLException If an error occurs. * @since 1.4 @@ -1493,7 +1493,7 @@ public interface ResultSet /** * This method returns the specified column value as a * <code>java.net.URL</code>. - * + * * @param columnName The name of the column value to return. * @exception SQLException If an error occurs. * @since 1.4 @@ -1501,13 +1501,13 @@ public interface ResultSet URL getURL(String columnName) throws SQLException; /** - * This method updates the specified column to have a - * <code>java.sql.Ref</code> value. + * This method updates the specified column to have a + * <code>java.sql.Ref</code> value. * This does not update the actual database. <code>updateRow</code> must be * called in order to do that. - * + * * @parm columnIndex The index of the column value to update. - * @parm value The <code>java.sql.Ref</code> used to set the new value + * @parm value The <code>java.sql.Ref</code> used to set the new value * of the column. * @exception SQLException If an error occurs. * @since 1.4 @@ -1515,13 +1515,13 @@ public interface ResultSet void updateRef(int columnIndex, Ref value) throws SQLException; /** - * This method updates the specified column to have a - * <code>java.sql.Ref</code> value. + * This method updates the specified column to have a + * <code>java.sql.Ref</code> value. * This does not update the actual database. <code>updateRow</code> must be * called in order to do that. - * + * * @parm columnName The name of the column value to update. - * @parm value The <code>java.sql.Ref</code> used to set the new value + * @parm value The <code>java.sql.Ref</code> used to set the new value * of the column. * @exception SQLException If an error occurs. * @since 1.4 @@ -1529,13 +1529,13 @@ public interface ResultSet void updateRef(String columnName, Ref value) throws SQLException; /** - * This method updates the specified column to have a - * <code>java.sql.Blob</code> value. + * This method updates the specified column to have a + * <code>java.sql.Blob</code> value. * This does not update the actual database. <code>updateRow</code> must be * called in order to do that. - * + * * @parm columnIndex The index of the column value to update. - * @parm value The <code>java.sql.Blob</code> used to set the new value + * @parm value The <code>java.sql.Blob</code> used to set the new value * of the column. * @exception SQLException If an error occurs. * @since 1.4 @@ -1543,13 +1543,13 @@ public interface ResultSet void updateBlob(int columnIndex, Blob value) throws SQLException; /** - * This method updates the specified column to have a - * <code>java.sql.Blob</code> value. + * This method updates the specified column to have a + * <code>java.sql.Blob</code> value. * This does not update the actual database. <code>updateRow</code> must be * called in order to do that. - * + * * @parm columnName The name of the column value to update. - * @parm value The <code>java.sql.Blob</code> used to set the new value + * @parm value The <code>java.sql.Blob</code> used to set the new value * of the column. * @exception SQLException If an error occurs. * @since 1.4 @@ -1557,13 +1557,13 @@ public interface ResultSet void updateBlob(String columnName, Blob value) throws SQLException; /** - * This method updates the specified column to have a - * <code>java.sql.Clob</code> value. + * This method updates the specified column to have a + * <code>java.sql.Clob</code> value. * This does not update the actual database. <code>updateRow</code> must be * called in order to do that. - * + * * @parm columnIndex The index of the column value to update. - * @parm value The <code>java.sql.Clob</code> used to set the new value + * @parm value The <code>java.sql.Clob</code> used to set the new value * of the column. * @exception SQLException If an error occurs. * @since 1.4 @@ -1571,13 +1571,13 @@ public interface ResultSet void updateClob(int columnIndex, Clob value) throws SQLException; /** - * This method updates the specified column to have a - * <code>java.sql.Clob</code> value. + * This method updates the specified column to have a + * <code>java.sql.Clob</code> value. * This does not update the actual database. <code>updateRow</code> must be * called in order to do that. - * + * * @parm columnName The name of the column value to update. - * @parm value The <code>java.sql.Clob</code> used to set the new value + * @parm value The <code>java.sql.Clob</code> used to set the new value * of the column. * @exception SQLException If an error occurs. * @since 1.4 @@ -1585,11 +1585,11 @@ public interface ResultSet void updateClob(String columnName, Clob value) throws SQLException; /** - * This method updates the specified column to have a - * <code>java.sqlArray</code> value. + * This method updates the specified column to have a + * <code>java.sqlArray</code> value. * This does not update the actual database. <code>updateRow</code> must be * called in order to do that. - * + * * @parm columnIndex The index of the column value to update. * @parm value The new value of the column. * @exception SQLException If an error occurs. @@ -1598,11 +1598,11 @@ public interface ResultSet void updateArray(int columnIndex, Array value) throws SQLException; /** - * This method updates the specified column to have a - * <code>java.sqlArray</code> value. + * This method updates the specified column to have a + * <code>java.sqlArray</code> value. * This does not update the actual database. <code>updateRow</code> must be * called in order to do that. - * + * * @parm columnName The name of the column value to update. * @parm value The new value of the column. * @exception SQLException If an error occurs. diff --git a/libjava/classpath/java/sql/ResultSetMetaData.java b/libjava/classpath/java/sql/ResultSetMetaData.java index 5a62c54..98485e3 100644 --- a/libjava/classpath/java/sql/ResultSetMetaData.java +++ b/libjava/classpath/java/sql/ResultSetMetaData.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -41,12 +41,12 @@ package java.sql; /** * This interface provides a mechanism for obtaining information about * the columns that are present in a <code>ResultSet</code>. - * + * * <p> Note that in this class column indices start at 1, not 0.</p> * * @author Aaron M. Renn (arenn@urbanophile.com) */ -public interface ResultSetMetaData +public interface ResultSetMetaData { /** * The column does not allow NULL's. @@ -93,7 +93,7 @@ public interface ResultSetMetaData boolean isCaseSensitive(int columnIndex) throws SQLException; /** - * This method tests whether not the specified column can be used in + * This method tests whether not the specified column can be used in * a WHERE clause. * * @param columnIndex The index of the column to test. diff --git a/libjava/classpath/java/sql/SQLData.java b/libjava/classpath/java/sql/SQLData.java index cf006e1..97a42a4 100644 --- a/libjava/classpath/java/sql/SQLData.java +++ b/libjava/classpath/java/sql/SQLData.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -43,7 +43,7 @@ package java.sql; * * @author Aaron M. Renn (arenn@urbanophile.com) */ -public interface SQLData +public interface SQLData { /** * This method returns the user defined datatype name for this object. diff --git a/libjava/classpath/java/sql/SQLException.java b/libjava/classpath/java/sql/SQLException.java index 8c502f2..d8d845c 100644 --- a/libjava/classpath/java/sql/SQLException.java +++ b/libjava/classpath/java/sql/SQLException.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -43,7 +43,7 @@ package java.sql; * * @author Aaron M. Renn (arenn@urbanophile.com) */ -public class SQLException extends Exception +public class SQLException extends Exception { static final long serialVersionUID = 2135244094396331484L; @@ -75,7 +75,7 @@ public class SQLException extends Exception { super(message); this.SQLState = SQLState; - this.vendorCode = vendorCode; + this.vendorCode = vendorCode; } /** @@ -100,7 +100,7 @@ public class SQLException extends Exception */ public SQLException(String message) { - this(message, null, 0); + this(message, null, 0); } /** @@ -110,7 +110,7 @@ public class SQLException extends Exception */ public SQLException() { - this(null, null, 0); + this(null, null, 0); } /** @@ -126,7 +126,7 @@ public class SQLException extends Exception } /** - * This method returns the vendor specific error code associated with + * This method returns the vendor specific error code associated with * this error. * * @return The vendor specific error code associated with this error. @@ -139,7 +139,7 @@ public class SQLException extends Exception /** * This method returns the exception that is chained to this object. * - * @return The exception chained to this object, which may be + * @return The exception chained to this object, which may be * <code>null</code>. */ public SQLException getNextException() diff --git a/libjava/classpath/java/sql/SQLInput.java b/libjava/classpath/java/sql/SQLInput.java index 730627d..e277a50 100644 --- a/libjava/classpath/java/sql/SQLInput.java +++ b/libjava/classpath/java/sql/SQLInput.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -50,7 +50,7 @@ import java.net.URL; * * @author Aaron M. Renn (arenn@urbanophile.com) */ -public interface SQLInput +public interface SQLInput { /** * This method reads the next item from the stream a Java @@ -137,7 +137,7 @@ public interface SQLInput * This method reads the next item from the stream a Java * byte array * - * @return The value read from the stream as a byte array. + * @return The value read from the stream as a byte array. * @exception SQLException If an error occurs. */ byte[] readBytes() throws SQLException; @@ -256,4 +256,3 @@ public interface SQLInput */ URL readURL() throws SQLException; } - diff --git a/libjava/classpath/java/sql/SQLOutput.java b/libjava/classpath/java/sql/SQLOutput.java index e210258..cd075f1 100644 --- a/libjava/classpath/java/sql/SQLOutput.java +++ b/libjava/classpath/java/sql/SQLOutput.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -50,7 +50,7 @@ import java.net.URL; * * @author Aaron M. Renn (arenn@urbanophile.com) */ -public interface SQLOutput +public interface SQLOutput { /** * This method writes the specified Java <code>String</code> @@ -143,7 +143,7 @@ public interface SQLOutput void writeBytes(byte[] value) throws SQLException; /** - * This method writes the specified Java <code>java.sql.Date</code> + * This method writes the specified Java <code>java.sql.Date</code> * to the SQL stream. * * @param value The value to write to the stream. @@ -152,7 +152,7 @@ public interface SQLOutput void writeDate(Date value) throws SQLException; /** - * This method writes the specified Java <code>java.sql.Time</code> + * This method writes the specified Java <code>java.sql.Time</code> * to the SQL stream. * * @param value The value to write to the stream. @@ -161,7 +161,7 @@ public interface SQLOutput void writeTime(Time value) throws SQLException; /** - * This method writes the specified Java <code>java.sql.Timestamp</code> + * This method writes the specified Java <code>java.sql.Timestamp</code> * to the SQL stream. * * @param value The value to write to the stream. @@ -256,9 +256,9 @@ public interface SQLOutput void writeArray(Array value) throws SQLException; /** - * This method writes the specified <code>java.net.URL</code> object to the + * This method writes the specified <code>java.net.URL</code> object to the * SQL stream. - * + * * @param value The value to write to the stream. * @exception SQLException If an error occurs. * @since 1.4 diff --git a/libjava/classpath/java/sql/SQLPermission.java b/libjava/classpath/java/sql/SQLPermission.java index 101fa01..ed3dd7f 100644 --- a/libjava/classpath/java/sql/SQLPermission.java +++ b/libjava/classpath/java/sql/SQLPermission.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -43,7 +43,7 @@ import java.security.BasicPermission; /** * @since 1.3 */ -public final class SQLPermission extends BasicPermission +public final class SQLPermission extends BasicPermission { public SQLPermission(String name) { diff --git a/libjava/classpath/java/sql/SQLWarning.java b/libjava/classpath/java/sql/SQLWarning.java index d9c7e35..c2cee0a 100644 --- a/libjava/classpath/java/sql/SQLWarning.java +++ b/libjava/classpath/java/sql/SQLWarning.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -43,7 +43,7 @@ package java.sql; * * @author Aaron M. Renn (arenn@urbanophile.com) */ -public class SQLWarning extends SQLException +public class SQLWarning extends SQLException { static final long serialVersionUID = 3917336774604784856L; @@ -99,7 +99,7 @@ public class SQLWarning extends SQLException /** * This method returns the exception that is chained to this object. * - * @return The exception chained to this object, which may be + * @return The exception chained to this object, which may be * <code>null</code>. */ public SQLWarning getNextWarning() diff --git a/libjava/classpath/java/sql/Savepoint.java b/libjava/classpath/java/sql/Savepoint.java index a4d89ae..6526dfb 100644 --- a/libjava/classpath/java/sql/Savepoint.java +++ b/libjava/classpath/java/sql/Savepoint.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -41,7 +41,7 @@ package java.sql; /** * @since 1.4 */ -public interface Savepoint +public interface Savepoint { /** * @since 1.4 diff --git a/libjava/classpath/java/sql/Statement.java b/libjava/classpath/java/sql/Statement.java index 195600ea..1b57fb3 100644 --- a/libjava/classpath/java/sql/Statement.java +++ b/libjava/classpath/java/sql/Statement.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -43,7 +43,7 @@ package java.sql; * * @author Aaron M. Renn (arenn@urbanophile.com) */ -public interface Statement +public interface Statement { int CLOSE_CURRENT_RESULT = 1; int KEEP_CURRENT_RESULT = 2; @@ -66,7 +66,7 @@ public interface Statement /** * This method executes the specified SQL INSERT, UPDATE, or DELETE statement * and returns the number of rows affected, which may be 0. - * + * * @param sql The SQL statement to execute. * @return The number of rows affected by the SQL statement. * @exception SQLException If an error occurs. @@ -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 escape <code>true</code> to enable local escape processing, * <code>false</code> to disable it. * @exception SQLException If an error occurs. */ @@ -214,10 +214,10 @@ public interface Statement int getUpdateCount() throws SQLException; /** - * This method advances the result set pointer to the next result set, + * This method advances the result set pointer to the next result set, * which can then be retrieved using <code>getResultSet</code> * - * @return <code>true</code> if there is another result set, + * @return <code>true</code> if there is another result set, * <code>false</code> otherwise (for example, the next result is an * update count). * @exception SQLException If an error occurs. diff --git a/libjava/classpath/java/sql/Struct.java b/libjava/classpath/java/sql/Struct.java index ce8db22..897344b 100644 --- a/libjava/classpath/java/sql/Struct.java +++ b/libjava/classpath/java/sql/Struct.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -41,12 +41,12 @@ package java.sql; import java.util.Map; /** - * This interface implements the standard type mapping for a SQL + * This interface implements the standard type mapping for a SQL * structured type. * * @author Aaron M. Renn (arenn@urbanophile.com) */ -public interface Struct +public interface Struct { /** * This method returns the name of the SQL structured type for this diff --git a/libjava/classpath/java/sql/Time.java b/libjava/classpath/java/sql/Time.java index 2d1a433..8de1636 100644 --- a/libjava/classpath/java/sql/Time.java +++ b/libjava/classpath/java/sql/Time.java @@ -8,7 +8,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -145,16 +145,16 @@ public class Time extends java.util.Date { try { - java.util.Date d = (java.util.Date) sdf.parseObject(str); + java.util.Date d = (java.util.Date) sdf.parseObject(str); - if (d == null) - throw new IllegalArgumentException(str); - else - return new Time(d.getTime()); + if (d == null) + throw new IllegalArgumentException(str); + else + return new Time(d.getTime()); } catch (ParseException e) { - throw new IllegalArgumentException(str); + throw new IllegalArgumentException(str); } } @@ -178,7 +178,7 @@ public class Time extends java.util.Date /** * This method initializes a new instance of this class with the - * specified time value representing the number of milliseconds since + * specified time value representing the number of milliseconds since * Jan 1, 1970 at 12:00 midnight GMT. * * @param date The time value to intialize this <code>Time</code> to. @@ -199,4 +199,3 @@ public class Time extends java.util.Date } } - diff --git a/libjava/classpath/java/sql/Timestamp.java b/libjava/classpath/java/sql/Timestamp.java index 18ccda5..9488f8e 100644 --- a/libjava/classpath/java/sql/Timestamp.java +++ b/libjava/classpath/java/sql/Timestamp.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -45,7 +45,7 @@ import java.text.SimpleDateFormat; /** * This class is a wrapper around java.util.Date to allow the JDBC * driver to identify the value as a SQL Timestamp. Note that this - * class also adds an additional field for nano-seconds, and so + * class also adds an additional field for nano-seconds, and so * is not completely identical to <code>java.util.Date</code> as * the <code>java.sql.Date</code> and <code>java.sql.Time</code> * classes are. @@ -74,7 +74,7 @@ public class Timestamp extends java.util.Date * date in JDBC format into a Java date. * * @param str The string to parse. - * @return The resulting <code>java.sql.Timestamp</code> value. + * @return The resulting <code>java.sql.Timestamp</code> value. */ public static Timestamp valueOf(String str) { @@ -82,18 +82,18 @@ public class Timestamp extends java.util.Date int dot = str.indexOf('.'); if (dot != -1) { - if (str.lastIndexOf('.') != dot) - throw new IllegalArgumentException(str); + if (str.lastIndexOf('.') != dot) + throw new IllegalArgumentException(str); + + int len = str.length() - dot - 1; + if (len < 1 || len > 9) + throw new IllegalArgumentException(str); - int len = str.length() - dot - 1; - if (len < 1 || len > 9) - throw new IllegalArgumentException(str); + nanos = Integer.parseInt(str.substring(dot + 1)); + for (int i = len; i < 9; i++) + nanos *= 10; - nanos = Integer.parseInt(str.substring(dot + 1)); - for (int i = len; i < 9; i++) - nanos *= 10; - - str = str.substring(0, dot); + str = str.substring(0, dot); } @@ -101,20 +101,20 @@ public class Timestamp extends java.util.Date { java.util.Date d; synchronized (dateFormat) - { - d = (java.util.Date) dateFormat.parseObject(str); - } + { + d = (java.util.Date) dateFormat.parseObject(str); + } - if (d == null) - throw new IllegalArgumentException(str); + if (d == null) + throw new IllegalArgumentException(str); - Timestamp ts = new Timestamp(d.getTime() + nanos / 1000000); - ts.nanos = nanos; - return ts; + Timestamp ts = new Timestamp(d.getTime() + nanos / 1000000); + ts.nanos = nanos; + return ts; } catch (ParseException e) { - throw new IllegalArgumentException(str); + throw new IllegalArgumentException(str); } } @@ -131,7 +131,7 @@ public class Timestamp extends java.util.Date * @param nanos The nanosecond value for this Timestamp (0 to 999,999,9999) * @deprecated */ - public Timestamp(int year, int month, int day, int hour, int minute, + public Timestamp(int year, int month, int day, int hour, int minute, int second, int nanos) { super(year, month, day, hour, minute, second); @@ -140,7 +140,7 @@ public class Timestamp extends java.util.Date /** * This method initializes a new instance of this class with the - * specified time value representing the number of milliseconds since + * specified time value representing the number of milliseconds since * Jan 1, 1970 at 12:00 midnight GMT. * * @param date The time value to intialize this <code>Time</code> to. @@ -152,7 +152,7 @@ public class Timestamp extends java.util.Date } /** - * Return the value of this Timestamp as the number of milliseconds + * Return the value of this Timestamp as the number of milliseconds * since Jan 1, 1970 at 12:00 midnight GMT. */ public long getTime() @@ -170,13 +170,13 @@ public class Timestamp extends java.util.Date synchronized (dateFormat) { sbuf.setLength(0); - dateFormat.format(this, sbuf, null); - sbuf.append('.'); - decimalFormat.format(nanos, sbuf, null); - int end = sbuf.length() - 1; - while (end > 20 && sbuf.charAt(end) == '0') - end--; - return sbuf.substring(0, end + 1); + dateFormat.format(this, sbuf, null); + sbuf.append('.'); + decimalFormat.format(nanos, sbuf, null); + int end = sbuf.length() - 1; + while (end > 20 && sbuf.charAt(end) == '0') + end--; + return sbuf.substring(0, end + 1); } } @@ -280,7 +280,7 @@ public class Timestamp extends java.util.Date /** * Compares this <code>Timestamp</code> to another one. - * + * * @param ts The other Timestamp. * @return <code>0</code>, if both <code>Timestamp</code>'s represent exactly * the same date, a negative value if this <code>Timestamp</code> is @@ -302,7 +302,7 @@ public class Timestamp extends java.util.Date * <code>compareTo(Timestamp)</code>, but it may throw a * <code>ClassCastException</code>, if the specified object is not of type * <code>Timestamp</code>. - * + * * @param obj The object to compare with. * @return <code>0</code>, if both <code>Timestamp</code>'s represent exactly * the same date, a negative value if this <code>Timestamp</code> is diff --git a/libjava/classpath/java/sql/Types.java b/libjava/classpath/java/sql/Types.java index 7dd4141..c07ef13 100644 --- a/libjava/classpath/java/sql/Types.java +++ b/libjava/classpath/java/sql/Types.java @@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. - + GNU Classpath is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU @@ -43,7 +43,7 @@ package java.sql; * * @author Aaron M. Renn (arenn@urbanophile.com) */ -public class Types +public class Types { // These should be self explanatory. People need a SQL book, not // Javadoc comments for these. |