diff options
29 files changed, 874 insertions, 1102 deletions
@@ -1,6 +1,40 @@ 2003-10-12 Michael Koch <konqueror@gmx.de> * java/sql/Array.java, + java/sql/Blob.java, + java/sql/CallableStatement.java, + java/sql/Clob.java, + java/sql/Connection.java, + java/sql/DatabaseMetaData.java, + java/sql/Driver.java, + java/sql/ParameterMetaData.java, + java/sql/PreparedStatement.java, + java/sql/Ref.java, + java/sql/ResultSet.java, + java/sql/ResultSetMetaData.java, + java/sql/SQLData.java, + java/sql/SQLInput.java, + java/sql/SQLOutput.java, + java/sql/Savepoint.java, + java/sql/Statement.java, + java/sql/Struct.java, + javax/sql/ConnectionEventListener.java, + javax/sql/ConnectionPoolDataSource.java, + javax/sql/DataSource.java, + javax/sql/PooledConnection.java, + javax/sql/RowSet.java, + javax/sql/RowSetInternal.java, + javax/sql/RowSetListener.java, + javax/sql/RowSetMetaData.java, + javax/sql/RowSetReader.java, + javax/sql/RowSetWriter.java, + javax/sql/XAConnection.java, + javax/sql/XADataSource.java: + Removed redundant modifiers. + +2003-10-12 Michael Koch <konqueror@gmx.de> + + * java/sql/Array.java, java/sql/Blob.java: Removed redundant modifiers. diff --git a/java/sql/CallableStatement.java b/java/sql/CallableStatement.java index e706ba401..68a22d03a 100644 --- a/java/sql/CallableStatement.java +++ b/java/sql/CallableStatement.java @@ -59,7 +59,7 @@ public interface CallableStatement extends PreparedStatement * @param type The SQL type value from <code>Types</code>. * @exception SQLException If an error occurs. */ - public void registerOutParameter(int parameterIndex, int sqlType) + void registerOutParameter(int parameterIndex, int sqlType) throws SQLException; /** @@ -71,7 +71,7 @@ public interface CallableStatement extends PreparedStatement * @param scale The scale of the value that will be returned. * @exception SQLException If an error occurs. */ - public void registerOutParameter(int parameterIndex, int sqlType, int scale) + void registerOutParameter(int parameterIndex, int sqlType, int scale) throws SQLException; /** @@ -82,7 +82,7 @@ public interface CallableStatement extends PreparedStatement * <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean wasNull() throws SQLException; + boolean wasNull() throws SQLException; /** * This method returns the value of the specified parameter as a Java @@ -92,7 +92,7 @@ public interface CallableStatement extends PreparedStatement * @return The parameter value as a <code>String</code>. * @exception SQLException If an error occurs. */ - public String getString(int parameterIndex) throws SQLException; + String getString(int parameterIndex) throws SQLException; /** * This method returns the value of the specified parameter as a Java @@ -102,7 +102,7 @@ public interface CallableStatement extends PreparedStatement * @return The parameter value as a <code>boolean</code>. * @exception SQLException If an error occurs. */ - public boolean getBoolean(int parameterIndex) throws SQLException; + boolean getBoolean(int parameterIndex) throws SQLException; /** * This method returns the value of the specified parameter as a Java @@ -112,7 +112,7 @@ public interface CallableStatement extends PreparedStatement * @return The parameter value as a <code>byte</code>. * @exception SQLException If an error occurs. */ - public byte getByte(int parameterIndex) throws SQLException; + byte getByte(int parameterIndex) throws SQLException; /** * This method returns the value of the specified parameter as a Java @@ -122,7 +122,7 @@ public interface CallableStatement extends PreparedStatement * @return The parameter value as a <code>short</code>. * @exception SQLException If an error occurs. */ - public short getShort(int parameterIndex) throws SQLException; + short getShort(int parameterIndex) throws SQLException; /** * This method returns the value of the specified parameter as a Java @@ -132,7 +132,7 @@ public interface CallableStatement extends PreparedStatement * @return The parameter value as a <code>int</code>. * @exception SQLException If an error occurs. */ - public int getInt(int parameterIndex) throws SQLException; + int getInt(int parameterIndex) throws SQLException; /** * This method returns the value of the specified parameter as a Java @@ -142,7 +142,7 @@ public interface CallableStatement extends PreparedStatement * @return The parameter value as a <code>long</code>. * @exception SQLException If an error occurs. */ - public long getLong(int parameterIndex) throws SQLException; + long getLong(int parameterIndex) throws SQLException; /** * This method returns the value of the specified parameter as a Java @@ -152,7 +152,7 @@ public interface CallableStatement extends PreparedStatement * @return The parameter value as a <code>float</code>. * @exception SQLException If an error occurs. */ - public float getFloat(int parameterIndex) throws SQLException; + float getFloat(int parameterIndex) throws SQLException; /** * This method returns the value of the specified parameter as a Java @@ -162,7 +162,7 @@ public interface CallableStatement extends PreparedStatement * @return The parameter value as a <code>double</code>. * @exception SQLException If an error occurs. */ - public double getDouble(int parameterIndex) throws SQLException; + double getDouble(int parameterIndex) throws SQLException; /** * This method returns the value of the specified parameter as a Java @@ -175,7 +175,7 @@ public interface CallableStatement extends PreparedStatement * @deprecated Use getBigDecimal(int parameterIndex) * or getBigDecimal(String parameterName) instead. */ - public BigDecimal getBigDecimal(int parameterIndex, int scale) + BigDecimal getBigDecimal(int parameterIndex, int scale) throws SQLException; /** @@ -186,7 +186,7 @@ public interface CallableStatement extends PreparedStatement * @return The parameter value as a byte array * @exception SQLException If an error occurs. */ - public byte[] getBytes(int parameterIndex) throws SQLException; + byte[] getBytes(int parameterIndex) throws SQLException; /** * This method returns the value of the specified parameter as a Java @@ -196,7 +196,7 @@ public interface CallableStatement extends PreparedStatement * @return The parameter value as a <code>java.sql.Date</code>. * @exception SQLException If an error occurs. */ - public Date getDate(int parameterIndex) throws SQLException; + Date getDate(int parameterIndex) throws SQLException; /** * This method returns the value of the specified parameter as a Java @@ -206,7 +206,7 @@ public interface CallableStatement extends PreparedStatement * @return The parameter value as a <code>java.sql.Time</code>. * @exception SQLException If an error occurs. */ - public Time getTime(int parameterIndex) throws SQLException; + Time getTime(int parameterIndex) throws SQLException; /** * This method returns the value of the specified parameter as a Java @@ -216,7 +216,7 @@ public interface CallableStatement extends PreparedStatement * @return The parameter value as a <code>java.sql.Timestamp</code>. * @exception SQLException If an error occurs. */ - public Timestamp getTimestamp(int parameterIndex) throws SQLException; + Timestamp getTimestamp(int parameterIndex) throws SQLException; /** * This method returns the value of the specified parameter as a Java @@ -227,7 +227,7 @@ public interface CallableStatement extends PreparedStatement * @exception SQLException If an error occurs. * @since 1.2 */ - public Object getObject(int parameterIndex) throws SQLException; + Object getObject(int parameterIndex) throws SQLException; /** * This method returns the value of the specified parameter as a Java @@ -238,7 +238,7 @@ public interface CallableStatement extends PreparedStatement * @exception SQLException If an error occurs. * @since 1.2 */ - public BigDecimal getBigDecimal(int parameterIndex) throws SQLException; + BigDecimal getBigDecimal(int parameterIndex) throws SQLException; /** * This method returns the value of the specified parameter as a Java @@ -250,7 +250,7 @@ public interface CallableStatement extends PreparedStatement * @exception SQLException If an error occurs. * @since 1.2 */ - public Object getObject(int index, Map map) throws SQLException; + Object getObject(int index, Map map) throws SQLException; /** * This method returns the value of the specified parameter as a Java @@ -261,7 +261,7 @@ public interface CallableStatement extends PreparedStatement * @exception SQLException If an error occurs. * @since 1.2 */ - public Ref getRef(int index) throws SQLException; + Ref getRef(int index) throws SQLException; /** * This method returns the value of the specified parameter as a Java @@ -272,7 +272,7 @@ public interface CallableStatement extends PreparedStatement * @exception SQLException If an error occurs. * @since 1.2 */ - public Blob getBlob(int index) throws SQLException; + Blob getBlob(int index) throws SQLException; /** * This method returns the value of the specified parameter as a Java @@ -283,7 +283,7 @@ public interface CallableStatement extends PreparedStatement * @exception SQLException If an error occurs. * @since 1.2 */ - public Clob getClob(int index) throws SQLException; + Clob getClob(int index) throws SQLException; /** * This method returns the value of the specified parameter as a Java @@ -294,7 +294,7 @@ public interface CallableStatement extends PreparedStatement * @exception SQLException If an error occurs. * @since 1.2 */ - public Array getArray(int index) throws SQLException; + Array getArray(int index) throws SQLException; /** * This method returns the value of the specified parameter as a Java @@ -306,7 +306,7 @@ public interface CallableStatement extends PreparedStatement * @exception SQLException If an error occurs. * @since 1.2 */ - public Date getDate(int parameterIndex, Calendar cal) throws SQLException; + Date getDate(int parameterIndex, Calendar cal) throws SQLException; /** * This method returns the value of the specified parameter as a Java @@ -318,7 +318,7 @@ public interface CallableStatement extends PreparedStatement * @exception SQLException If an error occurs. * @since 1.2 */ - public Time getTime(int parameterIndex, Calendar cal) throws SQLException; + Time getTime(int parameterIndex, Calendar cal) throws SQLException; /** * This method returns the value of the specified parameter as a Java @@ -329,7 +329,7 @@ public interface CallableStatement extends PreparedStatement * @exception SQLException If an error occurs. * @since 1.2 */ - public Timestamp getTimestamp(int parameterIndex, Calendar cal) + Timestamp getTimestamp(int parameterIndex, Calendar cal) throws SQLException; /** @@ -342,7 +342,7 @@ public interface CallableStatement extends PreparedStatement * @exception SQLException If an error occurs. * @since 1.2 */ - public void registerOutParameter(int paramIndex, int sqlType, + void registerOutParameter(int paramIndex, int sqlType, String typeName) throws SQLException; @@ -355,7 +355,7 @@ public interface CallableStatement extends PreparedStatement * @exception SQLException If an error occurs. * @since 1.4 */ - public void registerOutParameter(String parameterName, int sqlType) + void registerOutParameter(String parameterName, int sqlType) throws SQLException; /** @@ -369,7 +369,7 @@ public interface CallableStatement extends PreparedStatement * @exception SQLException If an error occurs. * @since 1.4 */ - public void registerOutParameter(String parameterName, int sqlType, + void registerOutParameter(String parameterName, int sqlType, int scale) throws SQLException; @@ -386,266 +386,266 @@ public interface CallableStatement extends PreparedStatement * @exception SQLException If an error occurs. * @since 1.4 */ - public void registerOutParameter(String parameterName, int sqlType, + void registerOutParameter(String parameterName, int sqlType, String typeName) throws SQLException; /** * @since 1.4 */ - public URL getURL(int parameterIndex) throws SQLException; + URL getURL(int parameterIndex) throws SQLException; /** * @since 1.4 */ - public void setURL(String parameterName, URL val) throws SQLException; + void setURL(String parameterName, URL val) throws SQLException; /** * @since 1.4 */ - public void setNull(String parameterName, int sqlType) throws SQLException; + void setNull(String parameterName, int sqlType) throws SQLException; /** * @since 1.4 */ - public void setBoolean(String parameterName, boolean x) throws SQLException; + void setBoolean(String parameterName, boolean x) throws SQLException; /** * @since 1.4 */ - public void setByte(String parameterName, byte x) throws SQLException; + void setByte(String parameterName, byte x) throws SQLException; /** * @since 1.4 */ - public void setShort(String parameterName, short x) throws SQLException; + void setShort(String parameterName, short x) throws SQLException; /** * @since 1.4 */ - public void setInt(String parameterName, int x) throws SQLException; + void setInt(String parameterName, int x) throws SQLException; /** * @since 1.4 */ - public void setLong(String parameterName, long x) throws SQLException; + void setLong(String parameterName, long x) throws SQLException; /** * @since 1.4 */ - public void setFloat(String parameterName, float x) throws SQLException; + void setFloat(String parameterName, float x) throws SQLException; /** * @since 1.4 */ - public void setDouble(String parameterName, double x) throws SQLException; + void setDouble(String parameterName, double x) throws SQLException; /** * @since 1.4 */ - public void setBigDecimal(String parameterName, BigDecimal x) + void setBigDecimal(String parameterName, BigDecimal x) throws SQLException; /** * @since 1.4 */ - public void setString(String parameterName, String x) throws SQLException; + void setString(String parameterName, String x) throws SQLException; /** * @since 1.4 */ - public void setBytes(String parameterName, byte[] x) throws SQLException; + void setBytes(String parameterName, byte[] x) throws SQLException; /** * @since 1.4 */ - public void setDate(String parameterName, Date x) throws SQLException; + void setDate(String parameterName, Date x) throws SQLException; /** * @since 1.4 */ - public void setTime(String parameterName, Time x) throws SQLException; + void setTime(String parameterName, Time x) throws SQLException; /** * @since 1.4 */ - public void setTimestamp(String parameterName, Timestamp x) + void setTimestamp(String parameterName, Timestamp x) throws SQLException; /** * @since 1.4 */ - public void setAsciiStream(String parameterName, InputStream x, int length) + void setAsciiStream(String parameterName, InputStream x, int length) throws SQLException; /** * @since 1.4 */ - public void setBinaryStream(String parameterName, InputStream x, int length) + void setBinaryStream(String parameterName, InputStream x, int length) throws SQLException; /** * @since 1.4 */ - public void setObject(String parameterName, Object x, int targetSqlType, + void setObject(String parameterName, Object x, int targetSqlType, int scale) throws SQLException; /** * @since 1.4 */ - public void setObject(String parameterName, Object x, int targetSqlType) + void setObject(String parameterName, Object x, int targetSqlType) throws SQLException; /** * @since 1.4 */ - public void setObject(String parameterName, Object x) throws SQLException; + void setObject(String parameterName, Object x) throws SQLException; /** * @since 1.4 */ - public void setCharacterStream(String parameterName, Reader reader, + void setCharacterStream(String parameterName, Reader reader, int length) throws SQLException; /** * @since 1.4 */ - public void setDate(String parameterName, Date x, Calendar cal) + void setDate(String parameterName, Date x, Calendar cal) throws SQLException; /** * @since 1.4 */ - public void setTime(String parameterName, Time x, Calendar cal) + void setTime(String parameterName, Time x, Calendar cal) throws SQLException; /** * @since 1.4 */ - public void setTimestamp(String parameterName, Timestamp x, Calendar cal) + void setTimestamp(String parameterName, Timestamp x, Calendar cal) throws SQLException; /** * @since 1.4 */ - public void setNull(String parameterName, int sqlType, String typeName) + void setNull(String parameterName, int sqlType, String typeName) throws SQLException; /** * @since 1.4 */ - public String getString(String parameterName) throws SQLException; + String getString(String parameterName) throws SQLException; /** * @since 1.4 */ - public boolean getBoolean(String parameterName) throws SQLException; + boolean getBoolean(String parameterName) throws SQLException; /** * @since 1.4 */ - public byte getByte(String parameterName) throws SQLException; + byte getByte(String parameterName) throws SQLException; /** * @since 1.4 */ - public short getShort(String parameterName) throws SQLException; + short getShort(String parameterName) throws SQLException; /** * @since 1.4 */ - public int getInt(String parameterName) throws SQLException; + int getInt(String parameterName) throws SQLException; /** * @since 1.4 */ - public long getLong(String parameterName) throws SQLException; + long getLong(String parameterName) throws SQLException; /** * @since 1.4 */ - public float getFloat(String parameterName) throws SQLException; + float getFloat(String parameterName) throws SQLException; /** * @since 1.4 */ - public double getDouble(String parameterName) throws SQLException; + double getDouble(String parameterName) throws SQLException; /** * @since 1.4 */ - public byte[] getBytes(String parameterName) throws SQLException; + byte[] getBytes(String parameterName) throws SQLException; /** * @since 1.4 */ - public Date getDate(String parameterName) throws SQLException; + Date getDate(String parameterName) throws SQLException; /** * @since 1.4 */ - public Time getTime(String parameterName) throws SQLException; + Time getTime(String parameterName) throws SQLException; /** * @since 1.4 */ - public Timestamp getTimestamp(String parameterName) throws SQLException; + Timestamp getTimestamp(String parameterName) throws SQLException; /** * @since 1.4 */ - public Object getObject(String parameterName) throws SQLException; + Object getObject(String parameterName) throws SQLException; /** * @since 1.4 */ - public BigDecimal getBigDecimal(String parameterName) throws SQLException; + BigDecimal getBigDecimal(String parameterName) throws SQLException; /** * @since 1.4 */ - public Object getObject(String parameterName, Map map) throws SQLException; + Object getObject(String parameterName, Map map) throws SQLException; /** * @since 1.4 */ - public Ref getRef(String parameterName) throws SQLException; + Ref getRef(String parameterName) throws SQLException; /** * @since 1.4 */ - public Blob getBlob(String parameterName) throws SQLException; + Blob getBlob(String parameterName) throws SQLException; /** * @since 1.4 */ - public Clob getClob(String parameterName) throws SQLException; + Clob getClob(String parameterName) throws SQLException; /** * @since 1.4 */ - public Array getArray(String parameterName) throws SQLException; + Array getArray(String parameterName) throws SQLException; /** * @since 1.4 */ - public Date getDate(String parameterName, Calendar cal) throws SQLException; + Date getDate(String parameterName, Calendar cal) throws SQLException; /** * @since 1.4 */ - public Time getTime(String parameterName, Calendar cal) throws SQLException; + Time getTime(String parameterName, Calendar cal) throws SQLException; /** * @since 1.4 */ - public Timestamp getTimestamp(String parameterName, Calendar cal) + Timestamp getTimestamp(String parameterName, Calendar cal) throws SQLException; /** * @since 1.4 */ - public URL getURL(String parameterName) throws SQLException; + URL getURL(String parameterName) throws SQLException; } diff --git a/java/sql/Clob.java b/java/sql/Clob.java index a25651255..f764f5cfc 100644 --- a/java/sql/Clob.java +++ b/java/sql/Clob.java @@ -57,7 +57,7 @@ public interface Clob * @exception SQLException If an error occurs. * @since 1.2 */ - public long length() throws SQLException; + long length() throws SQLException; /** * This method returns the specified portion of the CLOB as a @@ -70,7 +70,7 @@ public interface Clob * @exception SQLException If an error occurs. * @since 1.2 */ - public String getSubString(long pos, int length) throws SQLException; + String getSubString(long pos, int length) throws SQLException; /** * This method returns a character stream that reads the contents of the @@ -80,7 +80,7 @@ public interface Clob * @exception SQLException If an error occurs. * @since 1.2 */ - public Reader getCharacterStream() throws SQLException; + Reader getCharacterStream() throws SQLException; /** * This method returns a byte stream that reads the contents of the @@ -90,7 +90,7 @@ public interface Clob * @exception SQLException If an error occurs. * @since 1.2 */ - public InputStream getAsciiStream() throws SQLException; + InputStream getAsciiStream() throws SQLException; /** * This method returns the index into the CLOB of the first occurrence of @@ -106,7 +106,7 @@ public interface Clob * @exception SQLException If an error occurs. * @since 1.2 */ - public long position(String searchstr, long start) throws SQLException; + long position(String searchstr, long start) throws SQLException; /** * This method returns the index into the CLOB of the first occurrence of @@ -122,31 +122,31 @@ public interface Clob * @exception SQLException If an error occurs. * @since 1.2 */ - public long position(Clob searchstr, long start) throws SQLException; + long position(Clob searchstr, long start) throws SQLException; /** * @since 1.4 */ - public int setString(long pos, String str) throws SQLException; + int setString(long pos, String str) throws SQLException; /** * @since 1.4 */ - public int setString(long pos, String str, int offset, int len) + int setString(long pos, String str, int offset, int len) throws SQLException; /** * @since 1.4 */ - public OutputStream setAsciiStream(long pos) throws SQLException; + OutputStream setAsciiStream(long pos) throws SQLException; /** * @since 1.4 */ - public Writer setCharacterStream(long pos) throws SQLException; + Writer setCharacterStream(long pos) throws SQLException; /** * @since 1.4 */ - public void truncate(long len) throws SQLException; + void truncate(long len) throws SQLException; } diff --git a/java/sql/Connection.java b/java/sql/Connection.java index 3f4d7deea..af7c987d1 100644 --- a/java/sql/Connection.java +++ b/java/sql/Connection.java @@ -51,14 +51,14 @@ public interface Connection * This transaction isolation level indicates that transactions are not * supported. */ - public static final int TRANSACTION_NONE = 0; + int TRANSACTION_NONE = 0; /** * This transaction isolation level indicates that one transaction can * read modifications by other transactions before the other transactions * have committed their changes. This could result in invalid reads. */ - public static final int TRANSACTION_READ_UNCOMMITTED = 1; + int TRANSACTION_READ_UNCOMMITTED = 1; /** * This transaction isolation leve indicates that only committed data from @@ -66,7 +66,7 @@ public interface Connection * another transaction commits a change to that row, the first transaction * would retrieve the changed row on subsequent reads of the same row. */ - public static final int TRANSACTION_READ_COMMITTED = 2; + int TRANSACTION_READ_COMMITTED = 2; /** * This transaction isolation level indicates that only committed data from @@ -74,7 +74,7 @@ public interface Connection * a row will not be different on a subsequent read even if another * transaction commits a change. */ - public static final int TRANSACTION_REPEATABLE_READ = 4; + int TRANSACTION_REPEATABLE_READ = 4; /** * This transaction isolation level indicates that only committed data from @@ -84,7 +84,7 @@ public interface Connection * transactions will not affect the result set returned during subsequent * executions of the same WHERE clause in this transaction. */ - public static final int TRANSACTION_SERIALIZABLE = 8; + int TRANSACTION_SERIALIZABLE = 8; /** * This method creates a new SQL statement. The default result set type @@ -94,7 +94,7 @@ public interface Connection * @exception SQLException If an error occurs. * @see Statement */ - public Statement createStatement() throws SQLException; + Statement createStatement() throws SQLException; /** * This method creates a new <code>PreparedStatement</code> for the specified @@ -107,7 +107,7 @@ public interface Connection * @exception SQLException If an error occurs. * @see PreparedStatement */ - public PreparedStatement prepareStatement(String sql) throws SQLException; + PreparedStatement prepareStatement(String sql) throws SQLException; /** * This method creates a new <code>CallableStatement</code> for the @@ -121,7 +121,7 @@ public interface Connection * @exception SQLException If an error occurs. * @see CallableStatement */ - public CallableStatement prepareCall(String sql) throws SQLException; + CallableStatement prepareCall(String sql) throws SQLException; /** * This method converts the specified generic SQL statement into the @@ -131,7 +131,7 @@ public interface Connection * @return The native SQL statement. * @exception SQLException If an error occurs. */ - public String nativeSQL(String sql) throws SQLException; + String nativeSQL(String sql) throws SQLException; /** * This method turns auto commit mode on or off. In auto commit mode, @@ -144,7 +144,7 @@ public interface Connection * @see commit * @see rollback */ - public void setAutoCommit(boolean autoCommit) throws SQLException; + void setAutoCommit(boolean autoCommit) throws SQLException; /** * This method tests whether or not auto commit mode is currently enabled. @@ -159,7 +159,7 @@ public interface Connection * @see commit * @see rollback */ - public boolean getAutoCommit() throws SQLException; + boolean getAutoCommit() throws SQLException; /** * This method commits any SQL statements executed on this connection since @@ -167,7 +167,7 @@ public interface Connection * * @exception SQLException If an error occurs. */ - public void commit() throws SQLException; + void commit() throws SQLException; /** * This method rolls back any SQL statements executed on this connection @@ -175,14 +175,14 @@ public interface Connection * * @exception SQLException If an error occurs. */ - public void rollback() throws SQLException; + void rollback() throws SQLException; /** * This method immediately closes this database connection. * * @exception SQLException If an error occurs. */ - public void close() throws SQLException; + void close() throws SQLException; /** * This method tests whether or not this connection has been closed. @@ -191,7 +191,7 @@ public interface Connection * otherwise. * @exception SQLException If an error occurs. */ - public boolean isClosed() throws SQLException; + boolean isClosed() throws SQLException; /** * This method returns the meta data for this database connection. @@ -200,7 +200,7 @@ public interface Connection * @exception SQLException If an error occurs. * @see DatabaseMetaData */ - public DatabaseMetaData getMetaData() throws SQLException; + DatabaseMetaData getMetaData() throws SQLException; /** * This method turns read only mode on or off. It may not be called while @@ -210,7 +210,7 @@ public interface Connection * <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public void setReadOnly(boolean readOnly) throws SQLException; + void setReadOnly(boolean readOnly) throws SQLException; /** * This method tests whether or not this connection is in read only mode. @@ -219,7 +219,7 @@ public interface Connection * otherwise. * @exception SQLException If an error occurs. */ - public boolean isReadOnly() throws SQLException; + boolean isReadOnly() throws SQLException; /** * This method sets the name of the catalog in use by this connection. @@ -229,7 +229,7 @@ public interface Connection * @param catalog The name of the catalog to use for this connection. * @exception SQLException If an error occurs. */ - public void setCatalog(String catalog) throws SQLException; + void setCatalog(String catalog) throws SQLException; /** * This method returns the name of the catalog in use by this connection, @@ -239,7 +239,7 @@ public interface Connection * exist or catalogs are not supported by this database. * @exception SQLException If an error occurs. */ - public String getCatalog() throws SQLException; + String getCatalog() throws SQLException; /** * This method sets the current transaction isolation mode. This must @@ -248,7 +248,7 @@ public interface Connection * @param level The transaction isolation level. * @exception SQLException If an error occurs. */ - public void setTransactionIsolation(int level) throws SQLException; + void setTransactionIsolation(int level) throws SQLException; /** * This method returns the current transaction isolation mode. This will @@ -257,7 +257,7 @@ public interface Connection * @return The transaction isolation level. * @exception SQLException If an error occurs. */ - public int getTransactionIsolation() throws SQLException; + int getTransactionIsolation() throws SQLException; /** * This method returns the first warning that occurred on this connection, @@ -268,14 +268,14 @@ public interface Connection * <code>null</code> if there have been no warnings. * @exception SQLException If an error occurs. */ - public SQLWarning getWarnings() throws SQLException; + SQLWarning getWarnings() throws SQLException; /** * This method clears all warnings that have occurred on this connection. * * @exception SQLException If an error occurs. */ - public void clearWarnings() throws SQLException; + void clearWarnings() throws SQLException; /** * This method creates a new SQL statement with the specified type and @@ -290,7 +290,7 @@ public interface Connection * @see Statement * @see ResultSet */ - public Statement createStatement(int resultSetType, int resultSetConcurrency) + Statement createStatement(int resultSetType, int resultSetConcurrency) throws SQLException; /** @@ -310,7 +310,7 @@ public interface Connection * @see PreparedStatement * @see ResultSet */ - public PreparedStatement prepareStatement(String sql, int resultSetType, + PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency) throws SQLException; /** @@ -330,7 +330,7 @@ public interface Connection * @see CallableStatement * @see ResultSet */ - public CallableStatement prepareCall(String sql, int resultSetType, int + CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency) throws SQLException; /** @@ -341,7 +341,7 @@ public interface Connection * @return The SQL type to Java class mapping. * @exception SQLException If an error occurs. */ - public Map getTypeMap() throws SQLException; + Map getTypeMap() throws SQLException; /** * This method sets the mapping table for SQL types to Java classes. @@ -350,71 +350,71 @@ public interface Connection * @param map The new SQL mapping table. * @exception SQLException If an error occurs. */ - public void setTypeMap(Map map) throws SQLException; + void setTypeMap(Map map) throws SQLException; /** * @since 1.4 */ - public void setHoldability(int holdability) throws SQLException; + void setHoldability(int holdability) throws SQLException; /** * @since 1.4 */ - public int getHoldability() throws SQLException; + int getHoldability() throws SQLException; /** * @since 1.4 */ - public Savepoint setSavepoint() throws SQLException; + Savepoint setSavepoint() throws SQLException; /** * @since 1.4 */ - public Savepoint setSavepoint(String name) throws SQLException; + Savepoint setSavepoint(String name) throws SQLException; /** * @since 1.4 */ - public void rollback(Savepoint savepoint) throws SQLException; + void rollback(Savepoint savepoint) throws SQLException; /** * @since 1.4 */ - public void releaseSavepoint(Savepoint savepoint) throws SQLException; + void releaseSavepoint(Savepoint savepoint) throws SQLException; /** * @since 1.4 */ - public Statement createStatement(int resultSetType, int + Statement createStatement(int resultSetType, int resultSetConcurrency, int resultSetHoldability) throws SQLException; /** * @since 1.4 */ - public PreparedStatement prepareStatement(String sql, int resultSetType, int + PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency, int resultSetHoldability) throws SQLException; /** * @since 1.4 */ - public CallableStatement prepareCall(String sql, int resultSetType, int + CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency, int resultSetHoldability) throws SQLException; /** * @since 1.4 */ - public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) + PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) throws SQLException; /** * @since 1.4 */ - public PreparedStatement prepareStatement(String sql, int[] columnIndexes) + PreparedStatement prepareStatement(String sql, int[] columnIndexes) throws SQLException; /** * @since 1.4 */ - public PreparedStatement prepareStatement(String sql, String[] columnNames) + PreparedStatement prepareStatement(String sql, String[] columnNames) throws SQLException; } diff --git a/java/sql/DatabaseMetaData.java b/java/sql/DatabaseMetaData.java index 58d724163..056c8ba58 100644 --- a/java/sql/DatabaseMetaData.java +++ b/java/sql/DatabaseMetaData.java @@ -37,234 +37,234 @@ exception statement from your version. */ package java.sql; -public interface DatabaseMetaData +interface DatabaseMetaData { /** * It is unknown whether or not the procedure returns a result. */ - public static final int procedureResultUnknown = 0; + int procedureResultUnknown = 0; /** * The procedure does not return a result. */ - public static final int procedureNoResult = 1; + int procedureNoResult = 1; /** * The procedure returns a result. */ - public static final int procedureReturnsResult = 2; + int procedureReturnsResult = 2; /** * The column type is unknown. */ - public static final int procedureColumnUnknown = 0; + int procedureColumnUnknown = 0; /** * The column type is input. */ - public static final int procedureColumnIn = 1; + int procedureColumnIn = 1; /** * The column type is input/output. */ - public static final int procedureColumnInOut = 2; + int procedureColumnInOut = 2; /** * The column type is output */ - public static final int procedureColumnOut = 4; + int procedureColumnOut = 4; /** * The column is used for return values. */ - public static final int procedureColumnReturn = 5; + int procedureColumnReturn = 5; /** * The column is used for storing results */ - public static final int procedureColumnResult = 3; + int procedureColumnResult = 3; /** * NULL values are not allowed. */ - public static final int procedureNoNulls = 0; + int procedureNoNulls = 0; /** * NULL values are allowed. */ - public static final int procedureNullable = 1; + int procedureNullable = 1; /** * It is unknown whether or not NULL values are allowed. */ - public static final int procedureNullableUnknown = 2; + int procedureNullableUnknown = 2; /** * The column does not allow NULL */ - public static final int columnNoNulls = 0; + int columnNoNulls = 0; /** * The column does allow NULL */ - public static final int columnNullable = 1; + int columnNullable = 1; /** * It is unknown whether or not the column allows NULL */ - public static final int columnNullableUnknown = 2; + int columnNullableUnknown = 2; /** * The best row's scope is only guaranteed to be valid so long as the * row is actually being used. */ - public static final int bestRowTemporary = 0; + int bestRowTemporary = 0; /** * The best row identifier is valid to the end of the transaction. */ - public static final int bestRowTransaction = 1; + int bestRowTransaction = 1; /** * The best row identifier is valid to the end of the session. */ - public static final int bestRowSession = 2; + int bestRowSession = 2; /** * The best row may or may not be a pseudo-column. */ - public static final int bestRowUnknown = 0; + int bestRowUnknown = 0; /** * The best row identifier is not a pseudo-column. */ - public static final int bestRowNotPseudo = 1; + int bestRowNotPseudo = 1; /** * The best row identifier is a pseudo-column. */ - public static final int bestRowPseudo = 2; + int bestRowPseudo = 2; /** * It is unknown whether or not the version column is a pseudo-column. */ - public static final int versionColumnUnknown = 0; + int versionColumnUnknown = 0; /** * The version column is not a pseudo-column */ - public static final int versionColumnNotPseudo = 1; + int versionColumnNotPseudo = 1; /** * The version column is a pseudo-column */ - public static final int versionColumnPseudo = 2; + int versionColumnPseudo = 2; /** * Foreign key changes are cascaded in updates or deletes. */ - public static final int importedKeyCascade = 0; + int importedKeyCascade = 0; /** * Column may not be updated or deleted in use as a foreign key. */ - public static final int importedKeyRestrict = 1; + int importedKeyRestrict = 1; /** * When primary key is updated or deleted, the foreign key is set to NULL. */ - public static final int importedKeySetNull = 2; + int importedKeySetNull = 2; /** * If the primary key is a foreign key, it cannot be udpated or deleted. */ - public static final int importedKeyNoAction = 3; + int importedKeyNoAction = 3; /** * If the primary key is updated or deleted, the foreign key is set to * a default value. */ - public static final int importedKeySetDefault = 4; + int importedKeySetDefault = 4; /** * Wish I knew what this meant. */ - public static final int importedKeyInitiallyDeferred = 5; + int importedKeyInitiallyDeferred = 5; /** * Wish I knew what this meant. */ - public static final int importedKeyInitiallyImmediate = 6; + int importedKeyInitiallyImmediate = 6; /** * Wish I knew what this meant. */ - public static final int importedKeyNotDeferrable = 7; + int importedKeyNotDeferrable = 7; /** * A NULL value is not allowed for this data type. */ - public static final int typeNoNulls = 0; + int typeNoNulls = 0; /** * A NULL value is allowed for this data type. */ - public static final int typeNullable = 1; + int typeNullable = 1; /** * It is unknown whether or not NULL values are allowed for this data type. */ - public static final int typeNullableUnknown = 2; + int typeNullableUnknown = 2; /** * Where clauses are not supported for this type. */ - public static final int typePredNone = 0; + int typePredNone = 0; /** * Only "WHERE..LIKE" style WHERE clauses are allowed on this data type. */ - public static final int typePredChar = 1; + int typePredChar = 1; /** * All WHERE clauses except "WHERE..LIKE" style are allowed on this data type. */ - public static final int typePredBasic = 2; + int typePredBasic = 2; /** * Any type of WHERE clause is allowed for this data type. */ - public static final int typeSearchable = 3; + int typeSearchable = 3; /** * This column contains table statistics. */ - public static final short tableIndexStatistic = 0; + short tableIndexStatistic = 0; /** * This table index is clustered. */ - public static final short tableIndexClustered = 1; + short tableIndexClustered = 1; /** * This table index is hashed. */ - public static final short tableIndexHashed = 2; + short tableIndexHashed = 2; /** * This table index is of another type. */ - public static final short tableIndexOther = 3; + short tableIndexOther = 3; - public static final short attributeNoNulls = 0; + short attributeNoNulls = 0; - public static final short attributeNullable = 1; + short attributeNullable = 1; - public static final short attributeNullableUnknown = 2; + short attributeNullableUnknown = 2; - public static final int sqlStateXOpen = 1; + int sqlStateXOpen = 1; - public static final int sqlStateSQL99 = 2; + int sqlStateSQL99 = 2; /** * This method tests whether or not all the procedures returned by @@ -274,7 +274,7 @@ public interface DatabaseMetaData * <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean allProceduresAreCallable() throws SQLException; + boolean allProceduresAreCallable() throws SQLException; /** * This method tests whether or not all the table returned by the @@ -285,7 +285,7 @@ public interface DatabaseMetaData * * @exception SQLException If an error occurs. */ - public boolean allTablesAreSelectable() throws SQLException; + boolean allTablesAreSelectable() throws SQLException; /** * This method returns the URL for this database. @@ -294,7 +294,7 @@ public interface DatabaseMetaData * is not known. * @exception SQLException If an error occurs. */ - public String getURL() throws SQLException; + String getURL() throws SQLException; /** * This method returns the database username for this connection. @@ -302,7 +302,7 @@ public interface DatabaseMetaData * @return The database username. * @exception SQLException If an error occurs. */ - public String getUserName() throws SQLException; + String getUserName() throws SQLException; /** * This method tests whether or not the database is in read only mode. @@ -311,7 +311,7 @@ public interface DatabaseMetaData * <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean isReadOnly() throws SQLException; + boolean isReadOnly() throws SQLException; /** * This method tests whether or not NULL's sort as high values. @@ -320,7 +320,7 @@ public interface DatabaseMetaData * otherwise. * @exception SQLException If an error occurs. */ - public boolean nullsAreSortedHigh() throws SQLException; + boolean nullsAreSortedHigh() throws SQLException; /** * This method tests whether or not NULL's sort as low values. @@ -329,7 +329,7 @@ public interface DatabaseMetaData * otherwise. * @exception SQLException If an error occurs. */ - public boolean nullsAreSortedLow() throws SQLException; + boolean nullsAreSortedLow() throws SQLException; /** * This method tests whether or not NULL's sort as high values. @@ -338,7 +338,7 @@ public interface DatabaseMetaData * otherwise. * @exception SQLException If an error occurs. */ - public boolean nullsAreSortedAtStart() throws SQLException; + boolean nullsAreSortedAtStart() throws SQLException; /** * This method test whether or not NULL's are sorted to the end @@ -348,7 +348,7 @@ public interface DatabaseMetaData * <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean nullsAreSortedAtEnd() throws SQLException; + boolean nullsAreSortedAtEnd() throws SQLException; /** * This method returns the name of the database product. @@ -356,7 +356,7 @@ public interface DatabaseMetaData * @return The database product. * @exception SQLException If an error occurs. */ - public String getDatabaseProductName() throws SQLException; + String getDatabaseProductName() throws SQLException; /** * This method returns the version of the database product. @@ -364,7 +364,7 @@ public interface DatabaseMetaData * @return The version of the database product. * @exception SQLException If an error occurs. */ - public String getDatabaseProductVersion() throws SQLException; + String getDatabaseProductVersion() throws SQLException; /** * This method returns the name of the JDBC driver. @@ -372,7 +372,7 @@ public interface DatabaseMetaData * @return The name of the JDBC driver. * @exception SQLException If an error occurs. */ - public String getDriverName() throws SQLException; + String getDriverName() throws SQLException; /** * This method returns the version of the JDBC driver. @@ -380,21 +380,21 @@ public interface DatabaseMetaData * @return The version of the JDBC driver. * @exception SQLException If an error occurs. */ - public String getDriverVersion() throws SQLException; + String getDriverVersion() throws SQLException; /** * This method returns the major version number of the JDBC driver. * * @return The major version number of the JDBC driver. */ - public int getDriverMajorVersion(); + int getDriverMajorVersion(); /** * This method returns the minor version number of the JDBC driver. * * @return The minor version number of the JDBC driver. */ - public int getDriverMinorVersion(); + int getDriverMinorVersion(); /** * This method tests whether or not the database uses local files to @@ -405,7 +405,7 @@ public interface DatabaseMetaData * * @exception SQLException If an error occurs. */ - public boolean usesLocalFiles() throws SQLException; + boolean usesLocalFiles() throws SQLException; /** * This method tests whether or not the database uses a separate file for @@ -416,7 +416,7 @@ public interface DatabaseMetaData * * @exception SQLException If an error occurs. */ - public boolean usesLocalFilePerTable() throws SQLException; + boolean usesLocalFilePerTable() throws SQLException; /** * This method tests whether or not the database supports identifiers @@ -427,7 +427,7 @@ public interface DatabaseMetaData * * @exception SQLException If an error occurs. */ - public boolean supportsMixedCaseIdentifiers() throws SQLException; + boolean supportsMixedCaseIdentifiers() throws SQLException; /** * This method tests whether or not the database treats mixed case @@ -437,7 +437,7 @@ public interface DatabaseMetaData * upper case, <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean storesUpperCaseIdentifiers() throws SQLException; + boolean storesUpperCaseIdentifiers() throws SQLException; /** * This method tests whether or not the database treats mixed case @@ -447,7 +447,7 @@ public interface DatabaseMetaData * lower case, <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean storesLowerCaseIdentifiers() throws SQLException; + boolean storesLowerCaseIdentifiers() throws SQLException; /** * This method tests whether or not the database stores mixed case @@ -457,7 +457,7 @@ public interface DatabaseMetaData * <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean storesMixedCaseIdentifiers() throws SQLException; + boolean storesMixedCaseIdentifiers() throws SQLException; /** * This method tests whether or not the database supports quoted identifiers @@ -467,7 +467,7 @@ public interface DatabaseMetaData * identifiers, <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean supportsMixedCaseQuotedIdentifiers() throws SQLException; + boolean supportsMixedCaseQuotedIdentifiers() throws SQLException; /** * This method tests whether or not the database treats mixed case @@ -477,7 +477,7 @@ public interface DatabaseMetaData * as upper case, <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean storesUpperCaseQuotedIdentifiers() throws SQLException; + boolean storesUpperCaseQuotedIdentifiers() throws SQLException; /** * This method tests whether or not the database treats mixed case @@ -487,7 +487,7 @@ public interface DatabaseMetaData * as lower case, <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean storesLowerCaseQuotedIdentifiers() throws SQLException; + boolean storesLowerCaseQuotedIdentifiers() throws SQLException; /** * This method tests whether or not the database stores mixed case @@ -497,7 +497,7 @@ public interface DatabaseMetaData * identifiers, <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean storesMixedCaseQuotedIdentifiers() throws SQLException; + boolean storesMixedCaseQuotedIdentifiers() throws SQLException; /** * This metohd returns the quote string for SQL identifiers. @@ -506,7 +506,7 @@ public interface DatabaseMetaData * is not supported. * @exception SQLException If an error occurs. */ - public String getIdentifierQuoteString() throws SQLException; + String getIdentifierQuoteString() throws SQLException; /** * This method returns a comma separated list of all the SQL keywords in @@ -515,7 +515,7 @@ public interface DatabaseMetaData * @return The list of SQL keywords not in SQL92. * @exception SQLException If an error occurs. */ - public String getSQLKeywords() throws SQLException; + String getSQLKeywords() throws SQLException; /** * This method returns a comma separated list of math functions. @@ -523,7 +523,7 @@ public interface DatabaseMetaData * @return The list of math functions. * @exception SQLException If an error occurs. */ - public String getNumericFunctions() throws SQLException; + String getNumericFunctions() throws SQLException; /** * This method returns a comma separated list of string functions. @@ -531,7 +531,7 @@ public interface DatabaseMetaData * @return The list of string functions. * @exception SQLException If an error occurs. */ - public String getStringFunctions() throws SQLException; + String getStringFunctions() throws SQLException; /** * This method returns a comma separated list of of system functions. @@ -539,7 +539,7 @@ public interface DatabaseMetaData * @return A comma separated list of system functions. * @exception SQLException If an error occurs. */ - public String getSystemFunctions() throws SQLException; + String getSystemFunctions() throws SQLException; /** * This method returns comma separated list of time/date functions. @@ -547,7 +547,7 @@ public interface DatabaseMetaData * @return The list of time/date functions. * @exception SQLException If an error occurs. */ - public String getTimeDateFunctions() throws SQLException; + String getTimeDateFunctions() throws SQLException; /** * This method returns the string used to escape wildcards in search strings. @@ -555,7 +555,7 @@ public interface DatabaseMetaData * @return The string used to escape wildcards in search strings. * @exception SQLException If an error occurs. */ - public String getSearchStringEscape() throws SQLException; + String getSearchStringEscape() throws SQLException; /** * This methods returns non-standard characters that can appear in @@ -564,7 +564,7 @@ public interface DatabaseMetaData * @return Non-standard characters that can appear in unquoted identifiers. * @exception SQLException If an error occurs. */ - public String getExtraNameCharacters() throws SQLException; + String getExtraNameCharacters() throws SQLException; /** * This method tests whether or not the database supports @@ -574,7 +574,7 @@ public interface DatabaseMetaData * otherwise. * @exception SQLException If an error occurs. */ - public boolean supportsAlterTableWithAddColumn() throws SQLException; + boolean supportsAlterTableWithAddColumn() throws SQLException; /** * This method tests whether or not the database supports @@ -584,7 +584,7 @@ public interface DatabaseMetaData * otherwise. * @exception SQLException If an error occurs. */ - public boolean supportsAlterTableWithDropColumn() throws SQLException; + boolean supportsAlterTableWithDropColumn() throws SQLException; /** * This method tests whether or not column aliasing is supported. @@ -593,7 +593,7 @@ public interface DatabaseMetaData * <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean supportsColumnAliasing() throws SQLException; + boolean supportsColumnAliasing() throws SQLException; /** * This method tests whether the concatenation of a NULL and non-NULL @@ -604,7 +604,7 @@ public interface DatabaseMetaData * returns a NULL, <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean nullPlusNonNullIsNull() throws SQLException; + boolean nullPlusNonNullIsNull() throws SQLException; /** * Tests whether or not CONVERT is supported. @@ -613,7 +613,7 @@ public interface DatabaseMetaData * otherwise. * @exception SQLException If an error occurs. */ - public boolean supportsConvert() throws SQLException; + boolean supportsConvert() throws SQLException; /** * This method tests whether or not CONVERT can be performed between the @@ -625,7 +625,7 @@ public interface DatabaseMetaData * <code>false</code> otherwise. * @see Types */ - public boolean supportsConvert(int fromType, int toType) throws + boolean supportsConvert(int fromType, int toType) throws SQLException; /** @@ -637,7 +637,7 @@ public interface DatabaseMetaData * <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean supportsTableCorrelationNames() throws SQLException; + boolean supportsTableCorrelationNames() throws SQLException; /** * This method tests whether correlation names must be different from the @@ -647,7 +647,7 @@ public interface DatabaseMetaData * the table name, <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean supportsDifferentTableCorrelationNames() throws SQLException; + boolean supportsDifferentTableCorrelationNames() throws SQLException; /** * This method tests whether or not expressions are allowed in an @@ -657,7 +657,7 @@ public interface DatabaseMetaData * lists, <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean supportsExpressionsInOrderBy() throws SQLException; + boolean supportsExpressionsInOrderBy() throws SQLException; /** * This method tests whether or ORDER BY on a non-selected column is @@ -667,7 +667,7 @@ public interface DatabaseMetaData * ORDER BY, <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean supportsOrderByUnrelated() throws SQLException; + boolean supportsOrderByUnrelated() throws SQLException; /** * This method tests whether or not GROUP BY is supported. @@ -676,7 +676,7 @@ public interface DatabaseMetaData * otherwise. * @exception SQLException If an error occurs. */ - public boolean supportsGroupBy() throws SQLException; + boolean supportsGroupBy() throws SQLException; /** * This method tests whether GROUP BY on a non-selected column is @@ -686,7 +686,7 @@ public interface DatabaseMetaData * GROUP BY, <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean supportsGroupByUnrelated() throws SQLException; + boolean supportsGroupByUnrelated() throws SQLException; /** * This method tests whether or not a GROUP BY can add columns not in the @@ -696,7 +696,7 @@ public interface DatabaseMetaData * all columns in the select, <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean supportsGroupByBeyondSelect() throws SQLException; + boolean supportsGroupByBeyondSelect() throws SQLException; /** * This method tests whether or not the escape character is supported in @@ -707,7 +707,7 @@ public interface DatabaseMetaData * <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean supportsLikeEscapeClause() throws SQLException; + boolean supportsLikeEscapeClause() throws SQLException; /** * This method tests whether multiple result sets for a single statement are @@ -717,7 +717,7 @@ public interface DatabaseMetaData * single statement, <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean supportsMultipleResultSets() throws SQLException; + boolean supportsMultipleResultSets() throws SQLException; /** * This method test whether or not multiple transactions may be open @@ -727,7 +727,7 @@ public interface DatabaseMetaData * connections are supported, <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean supportsMultipleTransactions() throws SQLException; + boolean supportsMultipleTransactions() throws SQLException; /** * This method tests whether or not columns can be defined as NOT NULL. A @@ -737,7 +737,7 @@ public interface DatabaseMetaData * <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean supportsNonNullableColumns() throws SQLException; + boolean supportsNonNullableColumns() throws SQLException; /** * This method tests whether or not the minimum grammer for ODBC is supported. @@ -747,7 +747,7 @@ public interface DatabaseMetaData * <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean supportsMinimumSQLGrammar() throws SQLException; + boolean supportsMinimumSQLGrammar() throws SQLException; /** * This method tests whether or not the core grammer for ODBC is supported. @@ -756,7 +756,7 @@ public interface DatabaseMetaData * <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean supportsCoreSQLGrammar() throws SQLException; + boolean supportsCoreSQLGrammar() throws SQLException; /** * This method tests whether or not the extended grammer for ODBC is supported. @@ -765,7 +765,7 @@ public interface DatabaseMetaData * <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean supportsExtendedSQLGrammar() throws SQLException; + boolean supportsExtendedSQLGrammar() throws SQLException; /** * This method tests whether or not the ANSI92 entry level SQL @@ -776,7 +776,7 @@ public interface DatabaseMetaData * supported, <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean supportsANSI92EntryLevelSQL() throws SQLException; + boolean supportsANSI92EntryLevelSQL() throws SQLException; /** * This method tests whether or not the ANSI92 intermediate SQL @@ -786,7 +786,7 @@ public interface DatabaseMetaData * supported, <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean supportsANSI92IntermediateSQL() throws SQLException; + boolean supportsANSI92IntermediateSQL() throws SQLException; /** * This method tests whether or not the ANSI92 full SQL @@ -796,7 +796,7 @@ public interface DatabaseMetaData * supported, <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean supportsANSI92FullSQL() throws SQLException; + boolean supportsANSI92FullSQL() throws SQLException; /** * This method tests whether or not the SQL integrity enhancement @@ -806,7 +806,7 @@ public interface DatabaseMetaData * supported, <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean supportsIntegrityEnhancementFacility() throws SQLException; + boolean supportsIntegrityEnhancementFacility() throws SQLException; /** * This method tests whether or not the database supports outer joins. @@ -815,7 +815,7 @@ public interface DatabaseMetaData * otherwise. * @exception SQLException If an error occurs. */ - public boolean supportsOuterJoins() throws SQLException; + boolean supportsOuterJoins() throws SQLException; /** * This method tests whether or not the database supports full outer joins. @@ -824,7 +824,7 @@ public interface DatabaseMetaData * <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean supportsFullOuterJoins() throws SQLException; + boolean supportsFullOuterJoins() throws SQLException; /** * This method tests whether or not the database supports limited outer joins. @@ -833,7 +833,7 @@ public interface DatabaseMetaData * <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean supportsLimitedOuterJoins() throws SQLException; + boolean supportsLimitedOuterJoins() throws SQLException; /** * This method returns the vendor's term for "schema". @@ -841,7 +841,7 @@ public interface DatabaseMetaData * @return The vendor's term for schema. * @exception SQLException if an error occurs. */ - public String getSchemaTerm() throws SQLException; + String getSchemaTerm() throws SQLException; /** * This method returns the vendor's term for "procedure". @@ -849,7 +849,7 @@ public interface DatabaseMetaData * @return The vendor's term for procedure. * @exception SQLException if an error occurs. */ - public String getProcedureTerm() throws SQLException; + String getProcedureTerm() throws SQLException; /** * This method returns the vendor's term for "catalog". @@ -857,7 +857,7 @@ public interface DatabaseMetaData * @return The vendor's term for catalog. * @exception SQLException if an error occurs. */ - public String getCatalogTerm() throws SQLException; + String getCatalogTerm() throws SQLException; /** * This method tests whether a catalog name appears at the beginning of @@ -867,7 +867,7 @@ public interface DatabaseMetaData * <code>false</code> if it appears at the end. * @exception SQLException If an error occurs. */ - public boolean isCatalogAtStart() throws SQLException; + boolean isCatalogAtStart() throws SQLException; /** * This method returns the separator between the catalog name and the @@ -876,7 +876,7 @@ public interface DatabaseMetaData * @return The separator between the catalog name and the table name. * @exception SQLException If an error occurs. */ - public String getCatalogSeparator() throws SQLException; + String getCatalogSeparator() throws SQLException; /** * This method tests whether a catalog name can appear in a data @@ -886,7 +886,7 @@ public interface DatabaseMetaData * manipulation statement, <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean supportsSchemasInDataManipulation() throws SQLException; + boolean supportsSchemasInDataManipulation() throws SQLException; /** * This method tests whether a catalog name can appear in a procedure @@ -896,7 +896,7 @@ public interface DatabaseMetaData * call, <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean supportsSchemasInProcedureCalls() throws SQLException; + boolean supportsSchemasInProcedureCalls() throws SQLException; /** * This method tests whether a catalog name can appear in a table definition. @@ -905,7 +905,7 @@ public interface DatabaseMetaData * definition, <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean supportsSchemasInTableDefinitions() throws SQLException; + boolean supportsSchemasInTableDefinitions() throws SQLException; /** * This method tests whether a catalog name can appear in an index definition. @@ -914,7 +914,7 @@ public interface DatabaseMetaData * definition, <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean supportsSchemasInIndexDefinitions() throws SQLException; + boolean supportsSchemasInIndexDefinitions() throws SQLException; /** * This method tests whether a catalog name can appear in privilege definitions. @@ -923,7 +923,7 @@ public interface DatabaseMetaData * definition, <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean supportsSchemasInPrivilegeDefinitions() throws SQLException; + boolean supportsSchemasInPrivilegeDefinitions() throws SQLException; /** * This method tests whether a catalog name can appear in a data @@ -933,7 +933,7 @@ public interface DatabaseMetaData * manipulation statement, <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean supportsCatalogsInDataManipulation() throws SQLException; + boolean supportsCatalogsInDataManipulation() throws SQLException; /** * This method tests whether a catalog name can appear in a procedure @@ -943,7 +943,7 @@ public interface DatabaseMetaData * call, <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean supportsCatalogsInProcedureCalls() throws SQLException; + boolean supportsCatalogsInProcedureCalls() throws SQLException; /** * This method tests whether a catalog name can appear in a table definition. @@ -952,7 +952,7 @@ public interface DatabaseMetaData * definition, <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean supportsCatalogsInTableDefinitions() throws SQLException; + boolean supportsCatalogsInTableDefinitions() throws SQLException; /** * This method tests whether a catalog name can appear in an index definition. @@ -961,7 +961,7 @@ public interface DatabaseMetaData * definition, <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean supportsCatalogsInIndexDefinitions() throws SQLException; + boolean supportsCatalogsInIndexDefinitions() throws SQLException; /** * This method tests whether a catalog name can appear in privilege definitions. @@ -970,7 +970,7 @@ public interface DatabaseMetaData * definition, <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean supportsCatalogsInPrivilegeDefinitions() throws SQLException; + boolean supportsCatalogsInPrivilegeDefinitions() throws SQLException; /** * This method tests whether or not that database supports positioned @@ -980,7 +980,7 @@ public interface DatabaseMetaData * <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean supportsPositionedDelete() throws SQLException; + boolean supportsPositionedDelete() throws SQLException; /** * This method tests whether or not that database supports positioned @@ -990,7 +990,7 @@ public interface DatabaseMetaData * <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean supportsPositionedUpdate() throws SQLException; + boolean supportsPositionedUpdate() throws SQLException; /** * This method tests whether or not SELECT FOR UPDATE is supported by the @@ -1000,7 +1000,7 @@ public interface DatabaseMetaData * <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean supportsSelectForUpdate() throws SQLException; + boolean supportsSelectForUpdate() throws SQLException; /** * This method tests whether or not stored procedures are supported on @@ -1010,7 +1010,7 @@ public interface DatabaseMetaData * <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean supportsStoredProcedures() throws SQLException; + boolean supportsStoredProcedures() throws SQLException; /** * This method tests whether or not subqueries are allowed in comparisons. @@ -1020,7 +1020,7 @@ public interface DatabaseMetaData * <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean supportsSubqueriesInComparisons() throws SQLException; + boolean supportsSubqueriesInComparisons() throws SQLException; /** * This method tests whether or not subqueries are allowed in exists @@ -1031,7 +1031,7 @@ public interface DatabaseMetaData * expressions, <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean supportsSubqueriesInExists() throws SQLException; + boolean supportsSubqueriesInExists() throws SQLException; /** * This method tests whether subqueries are allowed in IN statements. @@ -1041,7 +1041,7 @@ public interface DatabaseMetaData * statements, <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean supportsSubqueriesInIns() throws SQLException; + boolean supportsSubqueriesInIns() throws SQLException; /** * This method tests whether or not subqueries are allowed in quantified @@ -1052,7 +1052,7 @@ public interface DatabaseMetaData * expressions, <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean supportsSubqueriesInQuantifieds() throws SQLException; + boolean supportsSubqueriesInQuantifieds() throws SQLException; /** * This method test whether or not correlated subqueries are allowed. A @@ -1062,7 +1062,7 @@ public interface DatabaseMetaData * <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean supportsCorrelatedSubqueries() throws SQLException; + boolean supportsCorrelatedSubqueries() throws SQLException; /** * This method tests whether or not the UNION statement is supported. @@ -1071,7 +1071,7 @@ public interface DatabaseMetaData * otherwise. * @exception SQLException If an error occurs. */ - public boolean supportsUnion() throws SQLException; + boolean supportsUnion() throws SQLException; /** * This method tests whether or not the UNION ALL statement is supported. @@ -1080,7 +1080,7 @@ public interface DatabaseMetaData * otherwise. * @exception SQLException If an error occurs. */ - public boolean supportsUnionAll() throws SQLException; + boolean supportsUnionAll() throws SQLException; /** * This method tests whether or not the database supports cursors @@ -1090,7 +1090,7 @@ public interface DatabaseMetaData * <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean supportsOpenCursorsAcrossCommit() throws SQLException; + boolean supportsOpenCursorsAcrossCommit() throws SQLException; /** * This method tests whether or not the database supports cursors @@ -1100,7 +1100,7 @@ public interface DatabaseMetaData * <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean supportsOpenCursorsAcrossRollback() throws SQLException; + boolean supportsOpenCursorsAcrossRollback() throws SQLException; /** * This method tests whether or not the database supports statements @@ -1110,7 +1110,7 @@ public interface DatabaseMetaData * <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean supportsOpenStatementsAcrossCommit() throws SQLException; + boolean supportsOpenStatementsAcrossCommit() throws SQLException; /** * This method tests whether or not the database supports statements @@ -1120,7 +1120,7 @@ public interface DatabaseMetaData * <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean supportsOpenStatementsAcrossRollback() throws SQLException; + boolean supportsOpenStatementsAcrossRollback() throws SQLException; /** * This method returns the number of hex characters allowed in an inline @@ -1130,7 +1130,7 @@ public interface DatabaseMetaData * either an unknown or unlimited number. * @exception SQLException If an error occurs. */ - public int getMaxBinaryLiteralLength() throws SQLException; + int getMaxBinaryLiteralLength() throws SQLException; /** * This method returns the maximum length of a character literal. @@ -1138,7 +1138,7 @@ public interface DatabaseMetaData * @return The maximum length of a character literal. * @exception SQLException If an error occurs. */ - public int getMaxCharLiteralLength() throws SQLException; + int getMaxCharLiteralLength() throws SQLException; /** * This method returns the maximum length of a column name. @@ -1146,7 +1146,7 @@ public interface DatabaseMetaData * @return The maximum length of a column name. * @exception SQLException If an error occurs. */ - public int getMaxColumnNameLength() throws SQLException; + int getMaxColumnNameLength() throws SQLException; /** * This method returns the maximum number of columns in a GROUP BY statement. @@ -1154,7 +1154,7 @@ public interface DatabaseMetaData * @return The maximum number of columns in a GROUP BY statement. * @exception SQLException If an error occurs. */ - public int getMaxColumnsInGroupBy() throws SQLException; + int getMaxColumnsInGroupBy() throws SQLException; /** * This method returns the maximum number of columns in an index. @@ -1162,7 +1162,7 @@ public interface DatabaseMetaData * @return The maximum number of columns in an index. * @exception SQLException If an error occurs. */ - public int getMaxColumnsInIndex() throws SQLException; + int getMaxColumnsInIndex() throws SQLException; /** * This method returns the maximum number of columns in an ORDER BY statement. @@ -1170,7 +1170,7 @@ public interface DatabaseMetaData * @return The maximum number of columns in an ORDER BY statement. * @exception SQLException If an error occurs. */ - public int getMaxColumnsInOrderBy() throws SQLException; + int getMaxColumnsInOrderBy() throws SQLException; /** * This method returns the maximum number of columns in a SELECT statement. @@ -1178,7 +1178,7 @@ public interface DatabaseMetaData * @return The maximum number of columns in a SELECT statement. * @exception SQLException If an error occurs. */ - public int getMaxColumnsInSelect() throws SQLException; + int getMaxColumnsInSelect() throws SQLException; /** * This method returns the maximum number of columns in a table. @@ -1186,7 +1186,7 @@ public interface DatabaseMetaData * @return The maximum number of columns in a table. * @exception SQLException If an error occurs. */ - public int getMaxColumnsInTable() throws SQLException; + int getMaxColumnsInTable() throws SQLException; /** * This method returns the maximum number of connections this client @@ -1195,7 +1195,7 @@ public interface DatabaseMetaData * @return The maximum number of database connections. * @SQLException If an error occurs. */ - public int getMaxConnections() throws SQLException; + int getMaxConnections() throws SQLException; /** * This method returns the maximum length of a cursor name. @@ -1203,7 +1203,7 @@ public interface DatabaseMetaData * @return The maximum length of a cursor name. * @exception SQLException If an error occurs. */ - public int getMaxCursorNameLength() throws SQLException; + int getMaxCursorNameLength() throws SQLException; /** * This method returns the maximum length of an index. @@ -1211,7 +1211,7 @@ public interface DatabaseMetaData * @return The maximum length of an index. * @exception SQLException If an error occurs. */ - public int getMaxIndexLength() throws SQLException; + int getMaxIndexLength() throws SQLException; /** * This method returns the maximum length of a schema name. @@ -1219,7 +1219,7 @@ public interface DatabaseMetaData * @return The maximum length of a schema name. * @exception SQLException If an error occurs. */ - public int getMaxSchemaNameLength() throws SQLException; + int getMaxSchemaNameLength() throws SQLException; /** * This method returns the maximum length of a procedure name. @@ -1227,7 +1227,7 @@ public interface DatabaseMetaData * @return The maximum length of a procedure name. * @exception SQLException If an error occurs. */ - public int getMaxProcedureNameLength() throws SQLException; + int getMaxProcedureNameLength() throws SQLException; /** * This method returns the maximum length of a catalog name. @@ -1235,7 +1235,7 @@ public interface DatabaseMetaData * @return The maximum length of a catalog name. * @exception SQLException If an error occurs. */ - public int getMaxCatalogNameLength() throws SQLException; + int getMaxCatalogNameLength() throws SQLException; /** * This method returns the maximum size of a row in bytes. @@ -1243,7 +1243,7 @@ public interface DatabaseMetaData * @return The maximum size of a row. * @exception SQLException If an error occurs. */ - public int getMaxRowSize() throws SQLException; + int getMaxRowSize() throws SQLException; /** * This method tests whether or not the maximum row size includes BLOB's @@ -1252,7 +1252,7 @@ public interface DatabaseMetaData * <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean doesMaxRowSizeIncludeBlobs() throws SQLException; + boolean doesMaxRowSizeIncludeBlobs() throws SQLException; /** * This method includes the maximum length of a SQL statement. @@ -1260,7 +1260,7 @@ public interface DatabaseMetaData * @return The maximum length of a SQL statement. * @exception SQLException If an error occurs. */ - public int getMaxStatementLength() throws SQLException; + int getMaxStatementLength() throws SQLException; /** * This method returns the maximum number of statements that can be @@ -1269,7 +1269,7 @@ public interface DatabaseMetaData * @return The maximum number of statements that can be active at any time. * @exception SQLException If an error occurs. */ - public int getMaxStatements() throws SQLException; + int getMaxStatements() throws SQLException; /** * This method returns the maximum length of a table name. @@ -1277,7 +1277,7 @@ public interface DatabaseMetaData * @return The maximum length of a table name. * @exception SQLException If an error occurs. */ - public int getMaxTableNameLength() throws SQLException; + int getMaxTableNameLength() throws SQLException; /** * This method returns the maximum number of tables that may be referenced @@ -1286,7 +1286,7 @@ public interface DatabaseMetaData * @return The maximum number of tables allowed in a SELECT statement. * @exception SQLException If an error occurs. */ - public int getMaxTablesInSelect() throws SQLException; + int getMaxTablesInSelect() throws SQLException; /** * This method returns the maximum length of a user name. @@ -1294,7 +1294,7 @@ public interface DatabaseMetaData * @return The maximum length of a user name. * @exception SQLException If an error occurs. */ - public int getMaxUserNameLength() throws SQLException; + int getMaxUserNameLength() throws SQLException; /** * This method returns the default transaction isolation level of the @@ -1304,7 +1304,7 @@ public interface DatabaseMetaData * @exception SQLException If an error occurs. * @see Connection */ - public int getDefaultTransactionIsolation() throws SQLException; + int getDefaultTransactionIsolation() throws SQLException; /** * This method tests whether or not the database supports transactions. @@ -1313,7 +1313,7 @@ public interface DatabaseMetaData * <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean supportsTransactions() throws SQLException; + boolean supportsTransactions() throws SQLException; /** * This method tests whether or not the database supports the specified @@ -1325,7 +1325,7 @@ public interface DatabaseMetaData * is supported, <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean supportsTransactionIsolationLevel(int level) throws + boolean supportsTransactionIsolationLevel(int level) throws SQLException; /** @@ -1336,7 +1336,7 @@ public interface DatabaseMetaData * same transaction, <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean supportsDataDefinitionAndDataManipulationTransactions() + boolean supportsDataDefinitionAndDataManipulationTransactions() throws SQLException; /** @@ -1347,7 +1347,7 @@ public interface DatabaseMetaData * transactions, <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean supportsDataManipulationTransactionsOnly() throws + boolean supportsDataManipulationTransactionsOnly() throws SQLException; /** @@ -1358,7 +1358,7 @@ public interface DatabaseMetaData * <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean dataDefinitionCausesTransactionCommit() throws SQLException; + boolean dataDefinitionCausesTransactionCommit() throws SQLException; /** * This method tests whether or not DDL statements are ignored in @@ -1368,7 +1368,7 @@ public interface DatabaseMetaData * <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean dataDefinitionIgnoredInTransactions() throws SQLException; + boolean dataDefinitionIgnoredInTransactions() throws SQLException; /** * This method returns a list of all the stored procedures matching the @@ -1399,7 +1399,7 @@ public interface DatabaseMetaData * @returns A <code>ResultSet</code> with all the requested procedures. * @exception SQLException If an error occurs. */ - public ResultSet getProcedures(String catalog, String schemaPattern, String + ResultSet getProcedures(String catalog, String schemaPattern, String procedureNamePattern) throws SQLException; /** @@ -1441,7 +1441,7 @@ public interface DatabaseMetaData * @returns A <code>ResultSet</code> with all the requested procedures. * @exception SQLException If an error occurs. */ - public ResultSet getProcedureColumns(String catalog, String schemaPattern, + ResultSet getProcedureColumns(String catalog, String schemaPattern, String procedureNamePattern, String columnNamePattern) throws SQLException; @@ -1467,7 +1467,7 @@ public interface DatabaseMetaData * @returns A <code>ResultSet</code> with all the requested tables. * @exception SQLException If an error occurs. */ - public ResultSet getTables(String catalog, String schemaPattern, String + ResultSet getTables(String catalog, String schemaPattern, String tableNamePattern, String[] types) throws SQLException; /** @@ -1478,7 +1478,7 @@ public interface DatabaseMetaData * @return A <code>ResultSet</code> with all the requested schemas. * @exception SQLException If an error occurs. */ - public ResultSet getSchemas() throws SQLException; + ResultSet getSchemas() throws SQLException; /** * This method returns the list of database catalogs as a @@ -1488,7 +1488,7 @@ public interface DatabaseMetaData * @return A <code>ResultSet</code> with all the requested catalogs. * @exception SQLException If an error occurs. */ - public ResultSet getCatalogs() throws SQLException; + ResultSet getCatalogs() throws SQLException; /** * This method returns the list of database table types as a @@ -1498,7 +1498,7 @@ public interface DatabaseMetaData * @return A <code>ResultSet</code> with all the requested table types. * @exception SQLException If an error occurs. */ - public ResultSet getTableTypes() throws SQLException; + ResultSet getTableTypes() throws SQLException; /** * This method returns a list of the tables columns for @@ -1541,7 +1541,7 @@ public interface DatabaseMetaData * @returns A <code>ResultSet</code> with all the requested tables. * @exception SQLException If an error occurs. */ - public ResultSet getColumns(String catalog, String schemaPattern, String + ResultSet getColumns(String catalog, String schemaPattern, String tableNamePattern, String columnNamePattern) throws SQLException; /** @@ -1573,7 +1573,7 @@ public interface DatabaseMetaData * @return A <code>ResultSet</code> with all the requested privileges. * @exception SQLException If an error occurs. */ - public ResultSet getColumnPrivileges(String catalog, String schema, String + ResultSet getColumnPrivileges(String catalog, String schema, String table, String columnNamePattern) throws SQLException; /** @@ -1604,7 +1604,7 @@ public interface DatabaseMetaData * @return A <code>ResultSet</code> with all the requested privileges. * @exception SQLException If an error occurs. */ - public ResultSet getTablePrivileges(String catalog, String schemaPattern, + ResultSet getTablePrivileges(String catalog, String schemaPattern, String tableNamePattern) throws SQLException; /** @@ -1642,7 +1642,7 @@ public interface DatabaseMetaData * @return A <code>ResultSet</code> with the best row identifier. * @exception SQLException If an error occurs. */ - public ResultSet getBestRowIdentifier(String catalog, String schema, + ResultSet getBestRowIdentifier(String catalog, String schema, String table, int scope, boolean nullable) throws SQLException; /** @@ -1675,7 +1675,7 @@ public interface DatabaseMetaData * @return A <code>ResultSet</code> with the version columns. * @exception SQLException If an error occurs. */ - public ResultSet getVersionColumns(String catalog, String schema, + ResultSet getVersionColumns(String catalog, String schema, String table) throws SQLException; /** @@ -1701,7 +1701,7 @@ public interface DatabaseMetaData * @return A <code>ResultSet</code> with the primary key columns. * @exception SQLException If an error occurs. */ - public ResultSet getPrimaryKeys(String catalog, String schema, String table) + ResultSet getPrimaryKeys(String catalog, String schema, String table) throws SQLException; /** @@ -1746,7 +1746,7 @@ public interface DatabaseMetaData * * @exception SQLException If an error occurs. */ - public ResultSet getImportedKeys(String catalog, String schema, + ResultSet getImportedKeys(String catalog, String schema, String table) throws SQLException; /** @@ -1790,7 +1790,7 @@ public interface DatabaseMetaData * @return A <code>ResultSet</code> with the requested information * @exception SQLException If an error occurs. */ - public ResultSet getExportedKeys(String catalog, String schema, + ResultSet getExportedKeys(String catalog, String schema, String table) throws SQLException; /** @@ -1842,7 +1842,7 @@ public interface DatabaseMetaData * @return A <code>ResultSet</code> with the requested information * @exception SQLException If an error occurs. */ - public ResultSet getCrossReference(String primaryCatalog, String + ResultSet getCrossReference(String primaryCatalog, String primarySchema, String primaryTable, String foreignCatalog, String foreignSchema, String foreignTable) throws SQLException; @@ -1885,7 +1885,7 @@ public interface DatabaseMetaData * @return A <code>ResultSet</code> with the list of available data types. * @exception SQLException If an error occurs. */ - public ResultSet getTypeInfo() throws SQLException; + ResultSet getTypeInfo() throws SQLException; /** * This method returns information about a tables indices and statistics. @@ -1929,7 +1929,7 @@ public interface DatabaseMetaData * @return A <code>ResultSet</code> with the requested index information * @exception SQLException If an error occurs. */ - public ResultSet getIndexInfo(String catalog, String schema, String table, + ResultSet getIndexInfo(String catalog, String schema, String table, boolean unique, boolean approximate) throws SQLException; /** @@ -1946,7 +1946,7 @@ public interface DatabaseMetaData * * @see ResultSet */ - public boolean supportsResultSetType(int type) throws SQLException; + boolean supportsResultSetType(int type) throws SQLException; /** * This method tests whether the specified result set type and result set @@ -1961,7 +1961,7 @@ public interface DatabaseMetaData * @exception SQLException If an error occurs. * @see ResultSet */ - public boolean supportsResultSetConcurrency(int type, int concurrency) + boolean supportsResultSetConcurrency(int type, int concurrency) throws SQLException; /** @@ -1975,7 +1975,7 @@ public interface DatabaseMetaData * @exception SQLException If an error occurs. * @see ResultSet */ - public boolean ownUpdatesAreVisible(int type) throws SQLException; + boolean ownUpdatesAreVisible(int type) throws SQLException; /** * This method tests whether or not the specified result set type sees its @@ -1988,7 +1988,7 @@ public interface DatabaseMetaData * @exception SQLException If an error occurs. * @see ResultSet */ - public boolean ownDeletesAreVisible(int type) throws SQLException; + boolean ownDeletesAreVisible(int type) throws SQLException; /** * This method tests whether or not the specified result set type sees its @@ -2001,7 +2001,7 @@ public interface DatabaseMetaData * @exception SQLException If an error occurs. * @see ResultSet */ - public boolean ownInsertsAreVisible(int type) throws SQLException; + boolean ownInsertsAreVisible(int type) throws SQLException; /** * This method tests whether or not the specified result set type sees @@ -2014,7 +2014,7 @@ public interface DatabaseMetaData * @exception SQLException If an error occurs. * @see ResultSet */ - public boolean othersUpdatesAreVisible(int type) throws SQLException; + boolean othersUpdatesAreVisible(int type) throws SQLException; /** * This method tests whether or not the specified result set type sees @@ -2027,7 +2027,7 @@ public interface DatabaseMetaData * @exception SQLException If an error occurs. * @see ResultSet */ - public boolean othersDeletesAreVisible(int type) throws SQLException; + boolean othersDeletesAreVisible(int type) throws SQLException; /** * This method tests whether or not the specified result set type sees @@ -2040,7 +2040,7 @@ public interface DatabaseMetaData * @exception SQLException If an error occurs. * @see ResultSet */ - public boolean othersInsertsAreVisible(int type) throws SQLException; + boolean othersInsertsAreVisible(int type) throws SQLException; /** * This method tests whether or not the specified result set type can detect @@ -2053,7 +2053,7 @@ public interface DatabaseMetaData * @exception SQLException If an error occurs. * @see ResultSet */ - public boolean updatesAreDetected(int type) throws SQLException; + boolean updatesAreDetected(int type) throws SQLException; /** * This method tests whether or not the specified result set type can detect @@ -2066,7 +2066,7 @@ public interface DatabaseMetaData * @exception SQLException If an error occurs. * @see ResultSet */ - public boolean deletesAreDetected(int type) throws SQLException; + boolean deletesAreDetected(int type) throws SQLException; /** * This method tests whether or not the specified result set type can detect @@ -2079,7 +2079,7 @@ public interface DatabaseMetaData * @exception SQLException If an error occurs. * @see ResultSet */ - public boolean insertsAreDetected(int type) throws SQLException; + boolean insertsAreDetected(int type) throws SQLException; /** * This method tests whether or not the database supports batch updates. @@ -2088,7 +2088,7 @@ public interface DatabaseMetaData * <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean supportsBatchUpdates() throws SQLException; + boolean supportsBatchUpdates() throws SQLException; /** * This method returns the list of user defined data types in use. These @@ -2116,7 +2116,7 @@ public interface DatabaseMetaData * @return A <code>ResultSet</code> with the requested type information * @exception SQLException If an error occurs. */ - public ResultSet getUDTs(String catalog, String schemaPattern, String + ResultSet getUDTs(String catalog, String schemaPattern, String typeNamePattern, int[] types) throws SQLException; /** @@ -2126,89 +2126,89 @@ public interface DatabaseMetaData * @return The connection for this object. * @exception SQLException If an error occurs. */ - public Connection getConnection() throws SQLException; + Connection getConnection() throws SQLException; /** * @since 1.4 */ - public boolean supportsSavepoints() throws SQLException; + boolean supportsSavepoints() throws SQLException; /** * @since 1.4 */ - public boolean supportsNamedParameters() throws SQLException; + boolean supportsNamedParameters() throws SQLException; /** * @since 1.4 */ - public boolean supportsMultipleOpenResults() throws SQLException; + boolean supportsMultipleOpenResults() throws SQLException; /** * @since 1.4 */ - public boolean supportsGetGeneratedKeys() throws SQLException; + boolean supportsGetGeneratedKeys() throws SQLException; /** * @since 1.4 */ - public ResultSet getSuperTypes(String catalog, String schemaPattern, + ResultSet getSuperTypes(String catalog, String schemaPattern, String typeNamePattern) throws SQLException; /** * @since 1.4 */ - public ResultSet getSuperTables(String catalog, String schemaPattern, + ResultSet getSuperTables(String catalog, String schemaPattern, String tableNamePattern) throws SQLException; /** * @since 1.4 */ - public ResultSet getAttributes(String catalog, String schemaPattern, String + ResultSet getAttributes(String catalog, String schemaPattern, String typeNamePattern, String attributeNamePattern) throws SQLException; /** * @since 1.4 */ - public boolean supportsResultSetHoldability(int holdability) + boolean supportsResultSetHoldability(int holdability) throws SQLException; /** * @since 1.4 */ - public int getResultSetHoldability() throws SQLException; + int getResultSetHoldability() throws SQLException; /** * @since 1.4 */ - public int getDatabaseMajorVersion() throws SQLException; + int getDatabaseMajorVersion() throws SQLException; /** * @since 1.4 */ - public int getDatabaseMinorVersion() throws SQLException; + int getDatabaseMinorVersion() throws SQLException; /** * @since 1.4 */ - public int getJDBCMajorVersion() throws SQLException; + int getJDBCMajorVersion() throws SQLException; /** * @since 1.4 */ - public int getJDBCMinorVersion() throws SQLException; + int getJDBCMinorVersion() throws SQLException; /** * @since 1.4 */ - public int getSQLStateType() throws SQLException; + int getSQLStateType() throws SQLException; /** * @since 1.4 */ - public boolean locatorsUpdateCopy() throws SQLException; + boolean locatorsUpdateCopy() throws SQLException; /** * @since 1.4 */ - public boolean supportsStatementPooling() throws SQLException; + boolean supportsStatementPooling() throws SQLException; } diff --git a/java/sql/Driver.java b/java/sql/Driver.java index 5e5731d18..ebd026537 100644 --- a/java/sql/Driver.java +++ b/java/sql/Driver.java @@ -68,7 +68,7 @@ public interface Driver * connection, or <code>null</code> if the URL is not understood. * @exception SQLException If an error occurs. */ - public Connection connect(String url, Properties info) throws SQLException; + Connection connect(String url, Properties info) throws SQLException; /** * This method tests whether or not the driver believes it can connect to @@ -81,9 +81,9 @@ public interface Driver * <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean acceptsURL(String url) throws SQLException; + boolean acceptsURL(String url) throws SQLException; - /** + /** * This method returns an array of possible properties that could be * used to connect to the specified database. * @@ -94,7 +94,7 @@ public interface Driver * database. This list may be empty. * @exception SQLException If an error occurs. */ - public DriverPropertyInfo[] getPropertyInfo(String url, Properties properties) + DriverPropertyInfo[] getPropertyInfo(String url, Properties properties) throws SQLException; /** @@ -102,14 +102,14 @@ public interface Driver * * @return The major version number of the driver. */ - public int getMajorVersion(); + int getMajorVersion(); /** * This method returns the minor version number of the driver. * * @return The minor version number of the driver. */ - public int getMinorVersion(); + int getMinorVersion(); /** * This method tests whether or not the driver is JDBC compliant. This @@ -119,5 +119,5 @@ public interface Driver * @return <code>true</code> if the driver has been certified JDBC compliant, * <code>false</code> otherwise. */ - public boolean jdbcCompliant(); + boolean jdbcCompliant(); } diff --git a/java/sql/ParameterMetaData.java b/java/sql/ParameterMetaData.java index a84bbd4c9..118c76e66 100644 --- a/java/sql/ParameterMetaData.java +++ b/java/sql/ParameterMetaData.java @@ -40,64 +40,64 @@ package java.sql; /** * @since 1.4 */ -public interface ParameterMetaData +interface ParameterMetaData { - public static final int parameterNoNulls = 0; + int parameterNoNulls = 0; - public static final int parameterNullable = 1; + int parameterNullable = 1; - public static final int parameterNullableUnknown = 2; + int parameterNullableUnknown = 2; - public static final int parameterModeUnknown = 0; + int parameterModeUnknown = 0; - public static final int parameterModeIn = 1; + int parameterModeIn = 1; - public static final int parameterModeInOut = 2; + int parameterModeInOut = 2; - public static final int parameterModeOut = 4; + int parameterModeOut = 4; /** * @since 1.4 */ - public int getParameterCount() throws SQLException; + int getParameterCount() throws SQLException; /** * @since 1.4 */ - public int isNullable(int param) throws SQLException; + int isNullable(int param) throws SQLException; /** * @since 1.4 */ - public boolean isSigned(int param) throws SQLException; + boolean isSigned(int param) throws SQLException; /** * @since 1.4 */ - public int getPrecision(int param) throws SQLException; + int getPrecision(int param) throws SQLException; /** * @since 1.4 */ - public int getScale(int param) throws SQLException; + int getScale(int param) throws SQLException; /** * @since 1.4 */ - public int getParameterType(int param) throws SQLException; + int getParameterType(int param) throws SQLException; /** * @since 1.4 */ - public String getParameterTypeName(int param) throws SQLException; + String getParameterTypeName(int param) throws SQLException; /** * @since 1.4 */ - public String getParameterClassName(int param) throws SQLException; + String getParameterClassName(int param) throws SQLException; /** * @since 1.4 */ - public int getParameterMode(int param) throws SQLException; + int getParameterMode(int param) throws SQLException; } diff --git a/java/sql/PreparedStatement.java b/java/sql/PreparedStatement.java index 3507886a6..3d095e0a6 100644 --- a/java/sql/PreparedStatement.java +++ b/java/sql/PreparedStatement.java @@ -51,7 +51,7 @@ import java.util.Calendar; * * @author Aaron M. Renn (arenn@urbanophile.com) */ -public interface PreparedStatement extends Statement +interface PreparedStatement extends Statement { /** * This method executes a prepared SQL query and returns its ResultSet. @@ -59,7 +59,7 @@ public interface PreparedStatement extends Statement * @return The ResultSet of the SQL statement. * @exception SQLException If an error occurs. */ - public ResultSet executeQuery() throws SQLException; + ResultSet executeQuery() throws SQLException; /** * This method executes an SQL INSERT, UPDATE or DELETE statement. SQL @@ -69,7 +69,7 @@ public interface PreparedStatement extends Statement * statements; or 0 for SQL statements that return nothing. * @exception SQLException If an error occurs. */ - public int executeUpdate() throws SQLException; + int executeUpdate() throws SQLException; /** * This method populates the specified parameter with a SQL NULL value @@ -80,7 +80,7 @@ public interface PreparedStatement extends Statement * * @exception SQLException If an error occurs. */ - public void setNull(int parameterIndex, int sqlType) throws SQLException; + void setNull(int parameterIndex, int sqlType) throws SQLException; /** * This method sets the specified parameter from the given Java @@ -90,7 +90,7 @@ public interface PreparedStatement extends Statement * @param value The value of the parameter. * @exception SQLException If an error occurs. */ - public void setBoolean(int parameterIndex, boolean x) throws SQLException; + void setBoolean(int parameterIndex, boolean x) throws SQLException; /** * This method sets the specified parameter from the given Java @@ -100,7 +100,7 @@ public interface PreparedStatement extends Statement * @param value The value of the parameter. * @exception SQLException If an error occurs. */ - public void setByte(int parameterIndex, byte x) throws SQLException; + void setByte(int parameterIndex, byte x) throws SQLException; /** * This method sets the specified parameter from the given Java @@ -110,7 +110,7 @@ public interface PreparedStatement extends Statement * @param value The value of the parameter. * @exception SQLException If an error occurs. */ - public void setShort(int parameterIndex, short x) throws SQLException; + void setShort(int parameterIndex, short x) throws SQLException; /** * This method sets the specified parameter from the given Java @@ -120,7 +120,7 @@ public interface PreparedStatement extends Statement * @param value The value of the parameter. * @exception SQLException If an error occurs. */ - public void setInt(int parameterIndex, int x) throws SQLException; + void setInt(int parameterIndex, int x) throws SQLException; /** * This method sets the specified parameter from the given Java @@ -130,7 +130,7 @@ public interface PreparedStatement extends Statement * @param value The value of the parameter. * @exception SQLException If an error occurs. */ - public void setLong(int parameterIndex, long x) throws SQLException; + void setLong(int parameterIndex, long x) throws SQLException; /** * This method sets the specified parameter from the given Java @@ -140,7 +140,7 @@ public interface PreparedStatement extends Statement * @param value The value of the parameter. * @exception SQLException If an error occurs. */ - public void setFloat(int parameterIndex, float x) throws SQLException; + void setFloat(int parameterIndex, float x) throws SQLException; /** * This method sets the specified parameter from the given Java @@ -150,7 +150,7 @@ public interface PreparedStatement extends Statement * @param value The value of the parameter. * @exception SQLException If an error occurs. */ - public void setDouble(int parameterIndex, double x) throws SQLException; + void setDouble(int parameterIndex, double x) throws SQLException; /** * This method sets the specified parameter from the given Java @@ -160,7 +160,7 @@ public interface PreparedStatement extends Statement * @param value The value of the parameter. * @exception SQLException If an error occurs. */ - public void setBigDecimal(int parameterIndex, BigDecimal x) throws + void setBigDecimal(int parameterIndex, BigDecimal x) throws SQLException; /** @@ -171,7 +171,7 @@ public interface PreparedStatement extends Statement * @param value The value of the parameter. * @exception SQLException If an error occurs. */ - public void setString(int parameterIndex, String x) throws SQLException; + void setString(int parameterIndex, String x) throws SQLException; /** * This method sets the specified parameter from the given Java @@ -181,7 +181,7 @@ public interface PreparedStatement extends Statement * @param value The value of the parameter. * @exception SQLException If an error occurs. */ - public void setBytes(int parameterIndex, byte[] x) throws SQLException; + void setBytes(int parameterIndex, byte[] x) throws SQLException; /** * This method sets the specified parameter from the given Java @@ -191,7 +191,7 @@ public interface PreparedStatement extends Statement * @param value The value of the parameter. * @exception SQLException If an error occurs. */ - public void setDate(int parameterIndex, Date x) throws SQLException; + void setDate(int parameterIndex, Date x) throws SQLException; /** * This method sets the specified parameter from the given Java @@ -201,7 +201,7 @@ public interface PreparedStatement extends Statement * @param value The value of the parameter. * @exception SQLException If an error occurs. */ - public void setTime(int parameterIndex, Time x) throws SQLException; + void setTime(int parameterIndex, Time x) throws SQLException; /** * This method sets the specified parameter from the given Java @@ -211,7 +211,7 @@ public interface PreparedStatement extends Statement * @param value The value of the parameter. * @exception SQLException If an error occurs. */ - public void setTimestamp(int parameterIndex, Timestamp x) + void setTimestamp(int parameterIndex, Timestamp x) throws SQLException; /** @@ -223,7 +223,7 @@ public interface PreparedStatement extends Statement * @param length The number of bytes in the stream. * @exception SQLException If an error occurs. */ - public void setAsciiStream(int parameterIndex, InputStream x, int length) + void setAsciiStream(int parameterIndex, InputStream x, int length) throws SQLException; /** @@ -236,7 +236,7 @@ public interface PreparedStatement extends Statement * @exception SQLException If an error occurs. * @deprecated */ - public void setUnicodeStream(int parameterIndex, InputStream x, int length) + void setUnicodeStream(int parameterIndex, InputStream x, int length) throws SQLException; /** @@ -248,7 +248,7 @@ public interface PreparedStatement extends Statement * @param length The number of bytes in the stream. * @exception SQLException If an error occurs. */ - public void setBinaryStream(int parameterIndex, InputStream x, int length) + void setBinaryStream(int parameterIndex, InputStream x, int length) throws SQLException; /** @@ -257,7 +257,7 @@ public interface PreparedStatement extends Statement * * @exception SQLException If an error occurs. */ - public void clearParameters() throws SQLException; + void clearParameters() throws SQLException; /** * This method sets the specified parameter from the given Java @@ -270,7 +270,7 @@ public interface PreparedStatement extends Statement * @exception SQLException If an error occurs. * @see Types */ - public void setObject(int parameterIndex, Object x, int targetSqlType, + void setObject(int parameterIndex, Object x, int targetSqlType, int scale) throws SQLException; /** @@ -283,7 +283,7 @@ public interface PreparedStatement extends Statement * @exception SQLException If an error occurs. * @see Types */ - public void setObject(int parameterIndex, Object x, int targetSqlType) + void setObject(int parameterIndex, Object x, int targetSqlType) throws SQLException; /** @@ -295,7 +295,7 @@ public interface PreparedStatement extends Statement * @param value The value of the parameter. * @exception SQLException If an error occurs. */ - public void setObject(int parameterIndex, Object x) throws SQLException; + void setObject(int parameterIndex, Object x) throws SQLException; /** * This method executes a prepared SQL query. @@ -306,13 +306,13 @@ public interface PreparedStatement extends Statement * @return The result of the SQL statement. * @exception SQLException If an error occurs. */ - public boolean execute() throws SQLException; + boolean execute() throws SQLException; /** * This method adds a set of parameters to the batch for JDBC 2.0. * @exception SQLException If an error occurs. */ - public void addBatch() throws SQLException; + void addBatch() throws SQLException; /** * This method sets the specified parameter from the given Java @@ -323,7 +323,7 @@ public interface PreparedStatement extends Statement * @param length The number of bytes in the stream. * @exception SQLException If an error occurs. */ - public void setCharacterStream(int parameterIndex, Reader reader, + void setCharacterStream(int parameterIndex, Reader reader, int length) throws SQLException; /** @@ -335,7 +335,7 @@ public interface PreparedStatement extends Statement * @param value The value of the parameter. * @exception SQLException If an error occurs. */ - public void setRef(int i, Ref x) throws SQLException; + void setRef(int i, Ref x) throws SQLException; /** * This method sets the specified parameter from the given Java @@ -346,7 +346,7 @@ public interface PreparedStatement extends Statement * @param value The value of the parameter. * @exception SQLException If an error occurs. */ - public void setBlob(int i, Blob x) throws SQLException; + void setBlob(int i, Blob x) throws SQLException; /** * This method sets the specified parameter from the given Java @@ -357,7 +357,7 @@ public interface PreparedStatement extends Statement * @param value The value of the parameter. * @exception SQLException If an error occurs. */ - public void setClob(int i, Clob x) throws SQLException; + void setClob(int i, Clob x) throws SQLException; /** * This method sets the specified parameter from the given Java @@ -368,7 +368,7 @@ public interface PreparedStatement extends Statement * @param value The value of the parameter. * @exception SQLException If an error occurs. */ - public void setArray(int i, Array x) throws SQLException; + void setArray(int i, Array x) throws SQLException; /** * This method returns meta data for the result set from this statement. @@ -376,7 +376,7 @@ public interface PreparedStatement extends Statement * @return Meta data for the result set from this statement. * @exception SQLException If an error occurs. */ - public ResultSetMetaData getMetaData() throws SQLException; + ResultSetMetaData getMetaData() throws SQLException; /** * This method sets the specified parameter from the given Java @@ -387,7 +387,7 @@ public interface PreparedStatement extends Statement * @param calendar The <code>Calendar</code> to use for timezone and locale. * @exception SQLException If an error occurs. */ - public void setDate(int parameterIndex, Date x, Calendar cal) + void setDate(int parameterIndex, Date x, Calendar cal) throws SQLException; /** @@ -399,7 +399,7 @@ public interface PreparedStatement extends Statement * @param calendar The <code>Calendar</code> to use for timezone and locale. * @exception SQLException If an error occurs. */ - public void setTime(int parameterIndex, Time x, Calendar cal) + void setTime(int parameterIndex, Time x, Calendar cal) throws SQLException; /** @@ -411,7 +411,7 @@ public interface PreparedStatement extends Statement * @param calendar The <code>Calendar</code> to use for timezone and locale. * @exception SQLException If an error occurs. */ - public void setTimestamp(int parameterIndex, Timestamp x, Calendar cal) + void setTimestamp(int parameterIndex, Timestamp x, Calendar cal) throws SQLException; /** @@ -423,16 +423,16 @@ public interface PreparedStatement extends Statement * @param name The name of the data type, for user defined types. * @exception SQLException If an error occurs. */ - public void setNull(int paramIndex, int sqlType, String typeName) + void setNull(int paramIndex, int sqlType, String typeName) throws SQLException; /** * @since 1.4 */ - public void setURL(int parameterIndex, URL x) throws SQLException; + void setURL(int parameterIndex, URL x) throws SQLException; /** * @since 1.4 */ - public ParameterMetaData getParameterMetaData() throws SQLException; + ParameterMetaData getParameterMetaData() throws SQLException; } diff --git a/java/sql/Ref.java b/java/sql/Ref.java index 207d75ed2..6b52c025b 100644 --- a/java/sql/Ref.java +++ b/java/sql/Ref.java @@ -56,20 +56,20 @@ public interface Ref * @exception SQLException If an error occurs. * @since 1.2 */ - public String getBaseTypeName() throws SQLException; + String getBaseTypeName() throws SQLException; /** * @since 1.4 */ - public Object getObject(Map map) throws SQLException; + Object getObject(Map map) throws SQLException; /** * @since 1.4 */ - public Object getObject() throws SQLException; + Object getObject() throws SQLException; /** * @since 1.4 */ - public void setObject(Object value) throws SQLException; + void setObject(Object value) throws SQLException; } diff --git a/java/sql/ResultSet.java b/java/sql/ResultSet.java index de294d8a3..46a6c65c3 100644 --- a/java/sql/ResultSet.java +++ b/java/sql/ResultSet.java @@ -64,48 +64,48 @@ public interface ResultSet /** * The rows will be processed in order from first to last. */ - public static final int FETCH_FORWARD = 1000; + int FETCH_FORWARD = 1000; /** * The rows will be processed in order from last to first. */ - public static final int FETCH_REVERSE = 1001; + int FETCH_REVERSE = 1001; /** * The rows will be processed in an unknown order */ - public static final int FETCH_UNKNOWN = 1002; + int FETCH_UNKNOWN = 1002; /** * This type of result set may only step forward through the rows returned. */ - public static final int TYPE_FORWARD_ONLY = 1003; + int TYPE_FORWARD_ONLY = 1003; /** * This type of result set is scrollable and is not sensitive to changes * made by other statements. */ - public static final int TYPE_SCROLL_INSENSITIVE = 1004; + int TYPE_SCROLL_INSENSITIVE = 1004; /** * This type of result set is scrollable and is also sensitive to changes * made by other statements. */ - public static final int TYPE_SCROLL_SENSITIVE = 1005; + int TYPE_SCROLL_SENSITIVE = 1005; /** * The concurrency mode of for the result set may not be modified. */ - public static final int CONCUR_READ_ONLY = 1007; + int CONCUR_READ_ONLY = 1007; /** * The concurrency mode of for the result set may be modified. */ - public static final int CONCUR_UPDATABLE = 1008; + int CONCUR_UPDATABLE = 1008; - public static final int HOLD_CURSORS_OVER_COMMIT = 1; + int HOLD_CURSORS_OVER_COMMIT = 1; - public static final int CLOSE_CURSORS_AT_COMMIT = 2; + int CLOSE_CURSORS_AT_COMMIT = 2; /** * This method advances to the next row in the result set. Any streams @@ -115,14 +115,14 @@ public interface ResultSet * otherwise. * @exception SQLException If an error occurs. */ - public boolean next() throws SQLException; + boolean next() throws SQLException; /** * This method closes the result set and frees any associated resources. * * @exception SQLException If an error occurs. */ - public void close() throws SQLException; + void close() throws SQLException; /** * This method tests whether the value of the last column that was fetched @@ -132,7 +132,7 @@ public interface ResultSet * <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean wasNull() throws SQLException; + boolean wasNull() throws SQLException; /** * This method returns the value of the specified column as a Java @@ -142,7 +142,7 @@ public interface ResultSet * @return The column value as a <code>String</code>. * @exception SQLException If an error occurs. */ - public String getString(int columnIndex) throws SQLException; + String getString(int columnIndex) throws SQLException; /** * This method returns the value of the specified column as a Java @@ -152,7 +152,7 @@ public interface ResultSet * @return The column value as a <code>boolean</code>. * @exception SQLException If an error occurs. */ - public boolean getBoolean(int columnIndex) throws SQLException; + boolean getBoolean(int columnIndex) throws SQLException; /** * This method returns the value of the specified column as a Java @@ -162,7 +162,7 @@ public interface ResultSet * @return The column value as a <code>byte</code>. * @exception SQLException If an error occurs. */ - public byte getByte(int columnIndex) throws SQLException; + byte getByte(int columnIndex) throws SQLException; /** * This method returns the value of the specified column as a Java @@ -172,7 +172,7 @@ public interface ResultSet * @return The column value as a <code>short</code>. * @exception SQLException If an error occurs. */ - public short getShort(int columnIndex) throws SQLException; + short getShort(int columnIndex) throws SQLException; /** * This method returns the value of the specified column as a Java @@ -182,7 +182,7 @@ public interface ResultSet * @return The column value as a <code>int</code>. * @exception SQLException If an error occurs. */ - public int getInt(int columnIndex) throws SQLException; + int getInt(int columnIndex) throws SQLException; /** * This method returns the value of the specified column as a Java @@ -192,7 +192,7 @@ public interface ResultSet * @return The column value as a <code>long</code>. * @exception SQLException If an error occurs. */ - public long getLong(int columnIndex) throws SQLException; + long getLong(int columnIndex) throws SQLException; /** * This method returns the value of the specified column as a Java @@ -202,7 +202,7 @@ public interface ResultSet * @return The column value as a <code>float</code>. * @exception SQLException If an error occurs. */ - public float getFloat(int columnIndex) throws SQLException; + float getFloat(int columnIndex) throws SQLException; /** * This method returns the value of the specified column as a Java @@ -212,7 +212,7 @@ public interface ResultSet * @return The column value as a <code>double</code>. * @exception SQLException If an error occurs. */ - public double getDouble(int columnIndex) throws SQLException; + double getDouble(int columnIndex) throws SQLException; /** * This method returns the value of the specified column as a Java @@ -224,7 +224,7 @@ public interface ResultSet * @exception SQLException If an error occurs. * @deprecated */ - public BigDecimal getBigDecimal(int columnIndex, int scale) + BigDecimal getBigDecimal(int columnIndex, int scale) throws SQLException; /** @@ -235,7 +235,7 @@ public interface ResultSet * @return The column value as a byte array * @exception SQLException If an error occurs. */ - public byte[] getBytes(int columnIndex) throws SQLException; + byte[] getBytes(int columnIndex) throws SQLException; /** * This method returns the value of the specified column as a Java @@ -245,7 +245,7 @@ public interface ResultSet * @return The column value as a <code>java.sql.Date</code>. * @exception SQLException If an error occurs. */ - public Date getDate(int columnIndex) throws SQLException; + Date getDate(int columnIndex) throws SQLException; /** * This method returns the value of the specified column as a Java @@ -255,7 +255,7 @@ public interface ResultSet * @return The column value as a <code>java.sql.Time</code>. * @exception SQLException If an error occurs. */ - public Time getTime(int columnIndex) throws SQLException; + Time getTime(int columnIndex) throws SQLException; /** * This method returns the value of the specified column as a Java @@ -265,7 +265,7 @@ public interface ResultSet * @return The column value as a <code>java.sql.Timestamp</code>. * @exception SQLException If an error occurs. */ - public Timestamp getTimestamp(int columnIndex) throws SQLException; + Timestamp getTimestamp(int columnIndex) throws SQLException; /** * This method returns the value of the specified column as an ASCII @@ -278,7 +278,7 @@ public interface ResultSet * @return The column value as an ASCII <code>InputStream</code>. * @exception SQLException If an error occurs. */ - public InputStream getAsciiStream(int columnIndex) throws SQLException; + InputStream getAsciiStream(int columnIndex) throws SQLException; /** * This method returns the value of the specified column as a Unicode UTF-8 @@ -292,7 +292,7 @@ public interface ResultSet * @exception SQLException If an error occurs. * @deprecated Use getCharacterStream instead. */ - public InputStream getUnicodeStream(int columnIndex) throws SQLException; + InputStream getUnicodeStream(int columnIndex) throws SQLException; /** * This method returns the value of the specified column as a raw byte @@ -305,7 +305,7 @@ public interface ResultSet * @return The column value as a raw byte <code>InputStream</code>. * @exception SQLException If an error occurs. */ - public InputStream getBinaryStream(int columnIndex) throws SQLException; + InputStream getBinaryStream(int columnIndex) throws SQLException; /** * This method returns the value of the specified column as a Java @@ -315,7 +315,7 @@ public interface ResultSet * @return The column value as a <code>String</code>. * @exception SQLException If an error occurs. */ - public String getString(String columnName) throws SQLException; + String getString(String columnName) throws SQLException; /** * This method returns the value of the specified column as a Java @@ -325,7 +325,7 @@ public interface ResultSet * @return The column value as a <code>boolean</code>. * @exception SQLException If an error occurs. */ - public boolean getBoolean(String columnName) throws SQLException; + boolean getBoolean(String columnName) throws SQLException; /** * This method returns the value of the specified column as a Java @@ -335,7 +335,7 @@ public interface ResultSet * @return The column value as a <code>byte</code>. * @exception SQLException If an error occurs. */ - public byte getByte(String columnName) throws SQLException; + byte getByte(String columnName) throws SQLException; /** * This method returns the value of the specified column as a Java @@ -345,7 +345,7 @@ public interface ResultSet * @return The column value as a <code>short</code>. * @exception SQLException If an error occurs. */ - public short getShort(String columnName) throws SQLException; + short getShort(String columnName) throws SQLException; /** * This method returns the value of the specified column as a Java @@ -355,7 +355,7 @@ public interface ResultSet * @return The column value as a <code>int</code>. * @exception SQLException If an error occurs. */ - public int getInt(String columnName) throws SQLException; + int getInt(String columnName) throws SQLException; /** * This method returns the value of the specified column as a Java @@ -365,7 +365,7 @@ public interface ResultSet * @return The column value as a <code>long</code>. * @exception SQLException If an error occurs. */ - public long getLong(String columnName) throws SQLException; + long getLong(String columnName) throws SQLException; /** * This method returns the value of the specified column as a Java @@ -375,7 +375,7 @@ public interface ResultSet * @return The column value as a <code>float</code>. * @exception SQLException If an error occurs. */ - public float getFloat(String columnName) throws SQLException; + float getFloat(String columnName) throws SQLException; /** * This method returns the value of the specified column as a Java @@ -385,7 +385,7 @@ public interface ResultSet * @return The column value as a <code>double</code>. * @exception SQLException If an error occurs. */ - public double getDouble(String columnName) throws SQLException; + double getDouble(String columnName) throws SQLException; /** * This method returns the value of the specified column as a Java @@ -396,7 +396,7 @@ public interface ResultSet * @exception SQLException If an error occurs. * @deprecated */ - public BigDecimal getBigDecimal(String columnName, int scale) + BigDecimal getBigDecimal(String columnName, int scale) throws SQLException; /** @@ -407,7 +407,7 @@ public interface ResultSet * @return The column value as a byte array * @exception SQLException If an error occurs. */ - public byte[] getBytes(String columnName) throws SQLException; + byte[] getBytes(String columnName) throws SQLException; /** * This method returns the value of the specified column as a Java @@ -417,7 +417,7 @@ public interface ResultSet * @return The column value as a <code>java.sql.Date</code>. * @exception SQLException If an error occurs. */ - public Date getDate(String columnName) throws SQLException; + Date getDate(String columnName) throws SQLException; /** * This method returns the value of the specified column as a Java @@ -427,7 +427,7 @@ public interface ResultSet * @return The column value as a <code>java.sql.Time</code>. * @exception SQLException If an error occurs. */ - public Time getTime(String columnName) throws SQLException; + Time getTime(String columnName) throws SQLException; /** * This method returns the value of the specified column as a Java @@ -437,7 +437,7 @@ public interface ResultSet * @return The column value as a <code>java.sql.Timestamp</code>. * @exception SQLException If an error occurs. */ - public Timestamp getTimestamp(String columnName) throws SQLException; + Timestamp getTimestamp(String columnName) throws SQLException; /** * This method returns the value of the specified column as an ASCII @@ -450,7 +450,7 @@ public interface ResultSet * @return The column value as an ASCII <code>InputStream</code>. * @exception SQLException If an error occurs. */ - public InputStream getAsciiStream(String columnName) throws SQLException; + InputStream getAsciiStream(String columnName) throws SQLException; /** * This method returns the value of the specified column as a Unicode UTF-8 @@ -464,7 +464,7 @@ public interface ResultSet * @exception SQLException If an error occurs. * @deprecated Use getCharacterStream instead. */ - public InputStream getUnicodeStream(String columnName) throws SQLException; + InputStream getUnicodeStream(String columnName) throws SQLException; /** * This method returns the value of the specified column as a raw byte @@ -477,7 +477,7 @@ public interface ResultSet * @return The column value as a raw byte <code>InputStream</code>. * @exception SQLException If an error occurs. */ - public InputStream getBinaryStream(String columnName) throws SQLException; + InputStream getBinaryStream(String columnName) throws SQLException; /** * This method returns the first SQL warning associated with this result @@ -487,14 +487,14 @@ public interface ResultSet * there are no warnings. * @exception SQLException If an error occurs. */ - public SQLWarning getWarnings() throws SQLException; + SQLWarning getWarnings() throws SQLException; /** * This method clears all warnings associated with this result set. * * @exception SQLException If an error occurs. */ - public void clearWarnings() throws SQLException; + void clearWarnings() throws SQLException; /** * This method returns the name of the database cursor used by this @@ -503,7 +503,7 @@ public interface ResultSet * @return The name of the database cursor used by this result set. * @exception SQLException If an error occurs. */ - public String getCursorName() throws SQLException; + String getCursorName() throws SQLException; /** * This method returns data about the columns returned as part of the @@ -512,7 +512,7 @@ public interface ResultSet * @return The <code>ResultSetMetaData</code> instance for this result set. * @exception SQLException If an error occurs. */ - public ResultSetMetaData getMetaData() throws SQLException; + ResultSetMetaData getMetaData() throws SQLException; /** * This method returns the value of the specified column as a Java @@ -522,7 +522,7 @@ public interface ResultSet * @return The column value as an <code>Object</code>. * @exception SQLException If an error occurs. */ - public Object getObject(int columnIndex) throws SQLException; + Object getObject(int columnIndex) throws SQLException; /** * This method returns the value of the specified column as a Java @@ -532,7 +532,7 @@ public interface ResultSet * @return The column value as an <code>Object</code>. * @exception SQLException If an error occurs. */ - public Object getObject(String columnName) throws SQLException; + Object getObject(String columnName) throws SQLException; /** * This method returns the column index of the specified named column. @@ -541,7 +541,7 @@ public interface ResultSet * @return The index of the column. * @exception SQLException If an error occurs. */ - public int findColumn(String columnName) throws SQLException; + int findColumn(String columnName) throws SQLException; /** * This method returns the value of the specified column as a character @@ -554,7 +554,7 @@ public interface ResultSet * @return The column value as an character <code>Reader</code>. * @exception SQLException If an error occurs. */ - public Reader getCharacterStream(int columnIndex) throws SQLException; + Reader getCharacterStream(int columnIndex) throws SQLException; /** * This method returns the value of the specified column as a character @@ -567,7 +567,7 @@ public interface ResultSet * @return The column value as an character <code>Reader</code>. * @exception SQLException If an error occurs. */ - public Reader getCharacterStream(String columnName) throws SQLException; + Reader getCharacterStream(String columnName) throws SQLException; /** * This method returns the value of the specified column as a Java @@ -577,7 +577,7 @@ public interface ResultSet * @return The column value as a <code>BigDecimal</code>. * @exception SQLException If an error occurs. */ - public BigDecimal getBigDecimal(int columnIndex) throws SQLException; + BigDecimal getBigDecimal(int columnIndex) throws SQLException; /** * This method returns the value of the specified column as a Java @@ -587,7 +587,7 @@ public interface ResultSet * @return The column value as a <code>BigDecimal</code>. * @exception SQLException If an error occurs. */ - public BigDecimal getBigDecimal(String columnName) throws SQLException; + BigDecimal getBigDecimal(String columnName) throws SQLException; /** * This method tests whether or not the cursor is before the first row @@ -597,7 +597,7 @@ public interface ResultSet * row, <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean isBeforeFirst() throws SQLException; + boolean isBeforeFirst() throws SQLException; /** * This method tests whether or not the cursor is after the last row @@ -607,7 +607,7 @@ public interface ResultSet * row, <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean isAfterLast() throws SQLException; + boolean isAfterLast() throws SQLException; /** * This method tests whether or not the cursor is positioned on the first @@ -617,7 +617,7 @@ public interface ResultSet * row, <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean isFirst() throws SQLException; + boolean isFirst() throws SQLException; /** * This method tests whether or not the cursor is on the last row @@ -627,7 +627,7 @@ public interface ResultSet * row, <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean isLast() throws SQLException; + boolean isLast() throws SQLException; /** * This method repositions the cursor to before the first row in the @@ -635,7 +635,7 @@ public interface ResultSet * * @exception SQLException If an error occurs. */ - public void beforeFirst() throws SQLException; + void beforeFirst() throws SQLException; /** * This method repositions the cursor to after the last row in the result @@ -643,7 +643,7 @@ public interface ResultSet * * @exception SQLException If an error occurs. */ - public void afterLast() throws SQLException; + void afterLast() throws SQLException; /** * This method repositions the cursor on the first row in the @@ -653,7 +653,7 @@ public interface ResultSet * <code>false</code> if there are no rows in the result set. * @exception SQLException If an error occurs. */ - public boolean first() throws SQLException; + boolean first() throws SQLException; /** * This method repositions the cursor on the last row in the result @@ -663,7 +663,7 @@ public interface ResultSet * <code>false</code> if there are no rows in the result set. * @exception SQLException If an error occurs. */ - public boolean last() throws SQLException; + boolean last() throws SQLException; /** * This method returns the current row number in the cursor. Numbering @@ -672,7 +672,7 @@ public interface ResultSet * @return The current row number, or 0 if there is not current row. * @exception SQLException If an error occurs. */ - public int getRow() throws SQLException; + int getRow() throws SQLException; /** * This method positions the result set to the specified absolute row. @@ -686,7 +686,7 @@ public interface ResultSet * <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean absolute(int row) throws SQLException; + boolean absolute(int row) throws SQLException; /** * This method moves the result set position relative to the current row. @@ -697,7 +697,7 @@ public interface ResultSet * <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean relative(int rows) throws SQLException; + boolean relative(int rows) throws SQLException; /** * This method moves the current position to the previous row in the @@ -707,7 +707,7 @@ public interface ResultSet * otherwise. * @exception SQLException If an error occurs. */ - public boolean previous() throws SQLException; + boolean previous() throws SQLException; /** * This method provides a hint to the driver about which direction the @@ -716,7 +716,7 @@ public interface ResultSet * @param direction The direction in which rows will be processed. (Values?) * @exception SQLException If an error occurs. */ - public void setFetchDirection(int direction) throws SQLException; + void setFetchDirection(int direction) throws SQLException; /** * This method returns the current fetch direction for this result set. @@ -724,7 +724,7 @@ public interface ResultSet * @return The fetch direction for this result set. * @exception SQLException If an error occurs. */ - public int getFetchDirection() throws SQLException; + int getFetchDirection() throws SQLException; /** * This method provides a hint to the driver about how many rows at a @@ -733,7 +733,7 @@ public interface ResultSet * @param rows The number of rows the driver should fetch per call. * @exception SQLException If an error occurs. */ - public void setFetchSize(int rows) throws SQLException; + void setFetchSize(int rows) throws SQLException; /** * This method returns the current number of rows that will be fetched @@ -742,7 +742,7 @@ public interface ResultSet * @return The current fetch size for this result set. * @exception SQLException If an error occurs. */ - public int getFetchSize() throws SQLException; + int getFetchSize() throws SQLException; /** * This method returns the result set type of this result set. This will @@ -751,7 +751,7 @@ public interface ResultSet * @return The result set type. * @exception SQLException If an error occurs. */ - public int getType() throws SQLException; + int getType() throws SQLException; /** * This method returns the concurrency type of this result set. This will @@ -760,7 +760,7 @@ public interface ResultSet * @return The result set concurrency type. * @exception SQLException If an error occurs. */ - public int getConcurrency() throws SQLException; + int getConcurrency() throws SQLException; /** * This method tests whether or not the current row in the result set @@ -771,7 +771,7 @@ public interface ResultSet * otherwise. * @exception SQLException If an error occurs. */ - public boolean rowUpdated() throws SQLException; + boolean rowUpdated() throws SQLException; /** * This method tests whether or not the current row in the result set @@ -782,7 +782,7 @@ public interface ResultSet * otherwise. * @exception SQLException If an error occurs. */ - public boolean rowInserted() throws SQLException; + boolean rowInserted() throws SQLException; /** * This method tests whether or not the current row in the result set @@ -793,7 +793,7 @@ public interface ResultSet * otherwise. * @exception SQLException If an error occurs. */ - public boolean rowDeleted() throws SQLException; + boolean rowDeleted() throws SQLException; /** * This method updates the specified column to have a NULL value. This @@ -803,7 +803,7 @@ public interface ResultSet * @return index The index of the column to update. * @exception SQLException If an error occurs. */ - public void updateNull(int columnIndex) throws SQLException; + void updateNull(int columnIndex) throws SQLException; /** * This method updates the specified column to have a boolean value. This @@ -814,7 +814,7 @@ public interface ResultSet * @param value The new value of the column. * @exception SQLException If an error occurs. */ - public void updateBoolean(int columnIndex, boolean x) throws SQLException; + void updateBoolean(int columnIndex, boolean x) throws SQLException; /** * This method updates the specified column to have a byte value. This @@ -825,7 +825,7 @@ public interface ResultSet * @param value The new value of the column. * @exception SQLException If an error occurs. */ - public void updateByte(int columnIndex, byte x) throws SQLException; + void updateByte(int columnIndex, byte x) throws SQLException; /** * This method updates the specified column to have a short value. This @@ -836,7 +836,7 @@ public interface ResultSet * @param value The new value of the column. * @exception SQLException If an error occurs. */ - public void updateShort(int columnIndex, short x) throws SQLException; + void updateShort(int columnIndex, short x) throws SQLException; /** * This method updates the specified column to have an int value. This @@ -847,7 +847,7 @@ public interface ResultSet * @param value The new value of the column. * @exception SQLException If an error occurs. */ - public void updateInt(int columnIndex, int x) throws SQLException; + void updateInt(int columnIndex, int x) throws SQLException; /** * This method updates the specified column to have a long value. This @@ -858,7 +858,7 @@ public interface ResultSet * @param value The new value of the column. * @exception SQLException If an error occurs. */ - public void updateLong(int columnIndex, long x) throws SQLException; + void updateLong(int columnIndex, long x) throws SQLException; /** * This method updates the specified column to have a float value. This @@ -869,7 +869,7 @@ public interface ResultSet * @param value The new value of the column. * @exception SQLException If an error occurs. */ - public void updateFloat(int columnIndex, float x) throws SQLException; + void updateFloat(int columnIndex, float x) throws SQLException; /** * This method updates the specified column to have a double value. This @@ -880,7 +880,7 @@ public interface ResultSet * @param value The new value of the column. * @exception SQLException If an error occurs. */ - public void updateDouble(int columnIndex, double x) throws SQLException; + void updateDouble(int columnIndex, double x) throws SQLException; /** * This method updates the specified column to have a BigDecimal value. This @@ -891,7 +891,7 @@ public interface ResultSet * @param value The new value of the column. * @exception SQLException If an error occurs. */ - public void updateBigDecimal(int columnIndex, BigDecimal x) + void updateBigDecimal(int columnIndex, BigDecimal x) throws SQLException; /** @@ -903,7 +903,7 @@ public interface ResultSet * @param value The new value of the column. * @exception SQLException If an error occurs. */ - public void updateString(int columnIndex, String x) throws SQLException; + void updateString(int columnIndex, String x) throws SQLException; /** * This method updates the specified column to have a byte array value. This @@ -914,7 +914,7 @@ public interface ResultSet * @param value The new value of the column. * @exception SQLException If an error occurs. */ - public void updateBytes(int columnIndex, byte[] x) throws SQLException; + void updateBytes(int columnIndex, byte[] x) throws SQLException; /** * This method updates the specified column to have a java.sql.Date value. This @@ -925,7 +925,7 @@ public interface ResultSet * @param value The new value of the column. * @exception SQLException If an error occurs. */ - public void updateDate(int columnIndex, Date x) throws SQLException; + void updateDate(int columnIndex, Date x) throws SQLException; /** * This method updates the specified column to have a java.sql.Time value. This @@ -936,7 +936,7 @@ public interface ResultSet * @param value The new value of the column. * @exception SQLException If an error occurs. */ - public void updateTime(int columnIndex, Time x) throws SQLException; + void updateTime(int columnIndex, Time x) throws SQLException; /** * This method updates the specified column to have a java.sql.Timestamp value. @@ -947,7 +947,7 @@ public interface ResultSet * @param value The new value of the column. * @exception SQLException If an error occurs. */ - public void updateTimestamp(int columnIndex, Timestamp x) + void updateTimestamp(int columnIndex, Timestamp x) throws SQLException; /** @@ -960,7 +960,7 @@ public interface ResultSet * @param length The length of the stream. * @exception SQLException If an error occurs. */ - public void updateAsciiStream(int columnIndex, InputStream x, int length) + void updateAsciiStream(int columnIndex, InputStream x, int length) throws SQLException; /** @@ -973,7 +973,7 @@ public interface ResultSet * @param length The length of the stream. * @exception SQLException If an error occurs. */ - public void updateBinaryStream(int columnIndex, InputStream x, int length) + void updateBinaryStream(int columnIndex, InputStream x, int length) throws SQLException; /** @@ -986,7 +986,7 @@ public interface ResultSet * @param length The length of the stream. * @exception SQLException If an error occurs. */ - public void updateCharacterStream(int columnIndex, Reader x, int length) + void updateCharacterStream(int columnIndex, Reader x, int length) throws SQLException; /** @@ -999,7 +999,7 @@ public interface ResultSet * * @exception SQLException If an error occurs. */ - public void updateObject(int columnIndex, Object x, int scale) + void updateObject(int columnIndex, Object x, int scale) throws SQLException; /** @@ -1013,7 +1013,7 @@ public interface ResultSet * for numeric type objects. * @exception SQLException If an error occurs. */ - public void updateObject(int columnIndex, Object x) throws SQLException; + void updateObject(int columnIndex, Object x) throws SQLException; /** * This method updates the specified column to have a NULL value. This @@ -1023,7 +1023,7 @@ public interface ResultSet * @return name The name of the column to update. * @exception SQLException If an error occurs. */ - public void updateNull(String columnName) throws SQLException; + void updateNull(String columnName) throws SQLException; /** * This method updates the specified column to have a boolean value. This @@ -1034,7 +1034,7 @@ public interface ResultSet * @param value The new value of the column. * @exception SQLException If an error occurs. */ - public void updateBoolean(String columnName, boolean x) throws SQLException; + void updateBoolean(String columnName, boolean x) throws SQLException; /** * This method updates the specified column to have a byte value. This @@ -1045,7 +1045,7 @@ public interface ResultSet * @param value The new value of the column. * @exception SQLException If an error occurs. */ - public void updateByte(String columnName, byte x) throws SQLException; + void updateByte(String columnName, byte x) throws SQLException; /** * This method updates the specified column to have a short value. This @@ -1056,7 +1056,7 @@ public interface ResultSet * @param value The new value of the column. * @exception SQLException If an error occurs. */ - public void updateShort(String columnName, short x) throws SQLException; + void updateShort(String columnName, short x) throws SQLException; /** * This method updates the specified column to have an int value. This @@ -1067,7 +1067,7 @@ public interface ResultSet * @param value The new value of the column. * @exception SQLException If an error occurs. */ - public void updateInt(String columnName, int x) throws SQLException; + void updateInt(String columnName, int x) throws SQLException; /** * This method updates the specified column to have a long value. This @@ -1078,7 +1078,7 @@ public interface ResultSet * @param value The new value of the column. * @exception SQLException If an error occurs. */ - public void updateLong(String columnName, long x) throws SQLException; + void updateLong(String columnName, long x) throws SQLException; /** * This method updates the specified column to have a float value. This @@ -1089,7 +1089,7 @@ public interface ResultSet * @param value The new value of the column. * @exception SQLException If an error occurs. */ - public void updateFloat(String columnName, float x) throws SQLException; + void updateFloat(String columnName, float x) throws SQLException; /** * This method updates the specified column to have a double value. This @@ -1100,7 +1100,7 @@ public interface ResultSet * @param value The new value of the column. * @exception SQLException If an error occurs. */ - public void updateDouble(String columnName, double x) throws SQLException; + void updateDouble(String columnName, double x) throws SQLException; /** * This method updates the specified column to have a BigDecimal value. This @@ -1111,7 +1111,7 @@ public interface ResultSet * @param value The new value of the column. * @exception SQLException If an error occurs. */ - public void updateBigDecimal(String columnName, BigDecimal x) + void updateBigDecimal(String columnName, BigDecimal x) throws SQLException; /** @@ -1123,7 +1123,7 @@ public interface ResultSet * @param value The new value of the column. * @exception SQLException If an error occurs. */ - public void updateString(String columnName, String x) throws SQLException; + void updateString(String columnName, String x) throws SQLException; /** * This method updates the specified column to have a byte array value. This @@ -1134,7 +1134,7 @@ public interface ResultSet * @param value The new value of the column. * @exception SQLException If an error occurs. */ - public void updateBytes(String columnName, byte[] x) throws SQLException; + void updateBytes(String columnName, byte[] x) throws SQLException; /** * This method updates the specified column to have a java.sql.Date value. This @@ -1145,7 +1145,7 @@ public interface ResultSet * @param value The new value of the column. * @exception SQLException If an error occurs. */ - public void updateDate(String columnName, Date x) throws SQLException; + void updateDate(String columnName, Date x) throws SQLException; /** * This method updates the specified column to have a java.sql.Time value. This @@ -1156,7 +1156,7 @@ public interface ResultSet * @param value The new value of the column. * @exception SQLException If an error occurs. */ - public void updateTime(String columnName, Time x) throws SQLException; + void updateTime(String columnName, Time x) throws SQLException; /** * This method updates the specified column to have a java.sql.Timestamp value. @@ -1167,7 +1167,7 @@ public interface ResultSet * @param value The new value of the column. * @exception SQLException If an error occurs. */ - public void updateTimestamp(String columnName, Timestamp x) + void updateTimestamp(String columnName, Timestamp x) throws SQLException; /** @@ -1180,7 +1180,7 @@ public interface ResultSet * @param length The length of the stream. * @exception SQLException If an error occurs. */ - public void updateAsciiStream(String columnName, InputStream x, int length) + void updateAsciiStream(String columnName, InputStream x, int length) throws SQLException; /** @@ -1193,7 +1193,7 @@ public interface ResultSet * @param length The length of the stream. * @exception SQLException If an error occurs. */ - public void updateBinaryStream(String columnName, InputStream x, int length) + void updateBinaryStream(String columnName, InputStream x, int length) throws SQLException; /** @@ -1207,7 +1207,7 @@ public interface ResultSet * * @exception SQLException If an error occurs. */ - public void updateCharacterStream(String columnName, Reader reader, + void updateCharacterStream(String columnName, Reader reader, int length) throws SQLException; /** @@ -1219,7 +1219,7 @@ public interface ResultSet * @param value The new value of the column. * @exception SQLException If an error occurs. */ - public void updateObject(String columnName, Object x, int scale) + void updateObject(String columnName, Object x, int scale) throws SQLException; /** @@ -1233,7 +1233,7 @@ public interface ResultSet * for numeric type objects. * @exception SQLException If an error occurs. */ - public void updateObject(String columnName, Object x) throws SQLException; + void updateObject(String columnName, Object x) throws SQLException; /** * This method inserts the current row into the database. The result set @@ -1242,28 +1242,28 @@ public interface ResultSet * * @exception SQLException If an error occurs. */ - public void insertRow() throws SQLException; + void insertRow() throws SQLException; /** * This method updates the current row in the database. * * @exception SQLException If an error occurs. */ - public void updateRow() throws SQLException; + void updateRow() throws SQLException; /** * This method deletes the current row in the database. * * @exception SQLException If an error occurs. */ - public void deleteRow() throws SQLException; + void deleteRow() throws SQLException; /** * This method refreshes the contents of the current row from the database. * * @exception SQLException If an error occurs. */ - public void refreshRow() throws SQLException; + void refreshRow() throws SQLException; /** * This method cancels any changes that have been made to a row. If @@ -1272,7 +1272,7 @@ public interface ResultSet * * @exception SQLException If an error occurs. */ - public void cancelRowUpdates() throws SQLException; + void cancelRowUpdates() throws SQLException; /** * This method positions the result set to the "insert row", which allows @@ -1280,7 +1280,7 @@ public interface ResultSet * * @exception SQLException If an error occurs. */ - public void moveToInsertRow() throws SQLException; + void moveToInsertRow() throws SQLException; /** * This method moves the result set position from the insert row back to @@ -1288,7 +1288,7 @@ public interface ResultSet * * @exception SQLException If an error occurs. */ - public void moveToCurrentRow() throws SQLException; + void moveToCurrentRow() throws SQLException; /** * This method returns a the <code>Statement</code> that was used to @@ -1298,7 +1298,7 @@ public interface ResultSet * * @exception SQLException If an error occurs. */ - public Statement getStatement() throws SQLException; + Statement getStatement() throws SQLException; /** * This method returns the value of the specified column as a Java @@ -1309,7 +1309,7 @@ public interface ResultSet * @return The value of the column as an <code>Object</code>. * @exception SQLException If an error occurs. */ - public Object getObject(int i, Map map) throws SQLException; + Object getObject(int i, Map map) throws SQLException; /** * This method returns a <code>Ref</code> for the specified column which @@ -1319,7 +1319,7 @@ public interface ResultSet * @return A <code>Ref</code> object for the column * @exception SQLException If an error occurs. */ - public Ref getRef(int i) throws SQLException; + Ref getRef(int i) throws SQLException; /** * This method returns the specified column value as a BLOB. @@ -1328,7 +1328,7 @@ public interface ResultSet * @return The value of the column as a BLOB. * @exception SQLException If an error occurs. */ - public Blob getBlob(int i) throws SQLException; + Blob getBlob(int i) throws SQLException; /** * This method returns the specified column value as a CLOB. @@ -1337,7 +1337,7 @@ public interface ResultSet * @return The value of the column as a CLOB. * @exception SQLException If an error occurs. */ - public Clob getClob(int i) throws SQLException; + Clob getClob(int i) throws SQLException; /** * This method returns the specified column value as an <code>Array</code>. @@ -1346,7 +1346,7 @@ public interface ResultSet * @return The value of the column as an <code>Array</code>. * @exception SQLException If an error occurs. */ - public Array getArray(int i) throws SQLException; + Array getArray(int i) throws SQLException; /** * This method returns the value of the specified column as a Java @@ -1357,7 +1357,7 @@ public interface ResultSet * @return The value of the column as an <code>Object</code>. * @exception SQLException If an error occurs. */ - public Object getObject(String colName, Map map) throws SQLException; + Object getObject(String colName, Map map) throws SQLException; /** * This method returns a <code>Ref</code> for the specified column which @@ -1367,7 +1367,7 @@ public interface ResultSet * @return A <code>Ref</code> object for the column * @exception SQLException If an error occurs. */ - public Ref getRef(String colName) throws SQLException; + Ref getRef(String colName) throws SQLException; /** * This method returns the specified column value as a BLOB. @@ -1376,7 +1376,7 @@ public interface ResultSet * @return The value of the column as a BLOB. * @exception SQLException If an error occurs. */ - public Blob getBlob(String colName) throws SQLException; + Blob getBlob(String colName) throws SQLException; /** * This method returns the specified column value as a CLOB. @@ -1385,7 +1385,7 @@ public interface ResultSet * @return The value of the column as a CLOB. * @exception SQLException If an error occurs. */ - public Clob getClob(String colName) throws SQLException; + Clob getClob(String colName) throws SQLException; /** * This method returns the specified column value as an <code>Array</code>. @@ -1394,7 +1394,7 @@ public interface ResultSet * @return The value of the column as an <code>Array</code>. * @exception SQLException If an error occurs. */ - public Array getArray(String colName) throws SQLException; + Array getArray(String colName) throws SQLException; /** * This method returns the specified column value as a @@ -1407,7 +1407,7 @@ public interface ResultSet * @return The value of the column as a <code>java.sql.Date</code>. * @exception SQLException If an error occurs. */ - public Date getDate(int columnIndex, Calendar cal) throws SQLException; + Date getDate(int columnIndex, Calendar cal) throws SQLException; /** * This method returns the specified column value as a @@ -1420,7 +1420,7 @@ public interface ResultSet * @return The value of the column as a <code>java.sql.Date</code>. * @exception SQLException If an error occurs. */ - public Date getDate(String columnName, Calendar cal) throws SQLException; + Date getDate(String columnName, Calendar cal) throws SQLException; /** * This method returns the specified column value as a @@ -1433,7 +1433,7 @@ public interface ResultSet * @return The value of the column as a <code>java.sql.Time</code>. * @exception SQLException If an error occurs. */ - public Time getTime(int columnIndex, Calendar cal) throws SQLException; + Time getTime(int columnIndex, Calendar cal) throws SQLException; /** * This method returns the specified column value as a @@ -1446,7 +1446,7 @@ public interface ResultSet * @return The value of the column as a <code>java.sql.Time</code>. * @exception SQLException If an error occurs. */ - public Time getTime(String columnName, Calendar cal) throws SQLException; + Time getTime(String columnName, Calendar cal) throws SQLException; /** * This method returns the specified column value as a @@ -1459,7 +1459,7 @@ public interface ResultSet * @return The value of the column as a <code>java.sql.Timestamp</code>. * @exception SQLException If an error occurs. */ - public Timestamp getTimestamp(int columnIndex, Calendar cal) + Timestamp getTimestamp(int columnIndex, Calendar cal) throws SQLException; /** @@ -1475,56 +1475,56 @@ public interface ResultSet * * @exception SQLException If an error occurs. */ - public Timestamp getTimestamp(String columnName, Calendar cal) + Timestamp getTimestamp(String columnName, Calendar cal) throws SQLException; /** * @since 1.4 */ - public URL getURL(int columnIndex) throws SQLException; + URL getURL(int columnIndex) throws SQLException; /** * @since 1.4 */ - public URL getURL(String columnName) throws SQLException; + URL getURL(String columnName) throws SQLException; /** * @since 1.4 */ - public void updateRef(int columnIndex, Ref x) throws SQLException; + void updateRef(int columnIndex, Ref x) throws SQLException; /** * @since 1.4 */ - public void updateRef(String columnName, Ref x) throws SQLException; + void updateRef(String columnName, Ref x) throws SQLException; /** * @since 1.4 */ - public void updateBlob(int columnIndex, Blob x) throws SQLException; + void updateBlob(int columnIndex, Blob x) throws SQLException; /** * @since 1.4 */ - public void updateBlob(String columnName, Blob x) throws SQLException; + void updateBlob(String columnName, Blob x) throws SQLException; /** * @since 1.4 */ - public void updateClob(int columnIndex, Clob x) throws SQLException; + void updateClob(int columnIndex, Clob x) throws SQLException; /** * @since 1.4 */ - public void updateClob(String columnName, Clob x) throws SQLException; + void updateClob(String columnName, Clob x) throws SQLException; /** * @since 1.4 */ - public void updateArray(int columnIndex, Array x) throws SQLException; + void updateArray(int columnIndex, Array x) throws SQLException; /** * @since 1.4 */ - public void updateArray(String columnName, Array x) throws SQLException; + void updateArray(String columnName, Array x) throws SQLException; } diff --git a/java/sql/ResultSetMetaData.java b/java/sql/ResultSetMetaData.java index 889128975..5cadb00bd 100644 --- a/java/sql/ResultSetMetaData.java +++ b/java/sql/ResultSetMetaData.java @@ -51,17 +51,17 @@ public interface ResultSetMetaData /** * The column does not allow NULL's. */ - public static final int columnNoNulls = 0; + int columnNoNulls = 0; /** * The column allows NULL's. */ - public static final int columnNullable = 1; + int columnNullable = 1; /** * It is unknown whether or not the column allows NULL's. */ - public static final int columnNullableUnknown = 2; + int columnNullableUnknown = 2; /** * This method returns the number of columns in the result set. @@ -69,7 +69,7 @@ public interface ResultSetMetaData * @return The number of columns in the result set. * @exception SQLException If an error occurs. */ - public int getColumnCount() throws SQLException; + int getColumnCount() throws SQLException; /** * This method test whether or not the column is an auto-increment column. @@ -80,7 +80,7 @@ public interface ResultSetMetaData * otherwise. * @exception SQLException If an error occurs. */ - public boolean isAutoIncrement(int column) throws SQLException; + boolean isAutoIncrement(int column) throws SQLException; /** * This method tests whether or not a column is case sensitive in its values. @@ -90,7 +90,7 @@ public interface ResultSetMetaData * <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean isCaseSensitive(int column) throws SQLException; + boolean isCaseSensitive(int column) throws SQLException; /** * This method tests whether not the specified column can be used in @@ -101,7 +101,7 @@ public interface ResultSetMetaData * <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean isSearchable(int column) throws SQLException; + boolean isSearchable(int column) throws SQLException; /** * This method tests whether or not the column stores a monetary value. @@ -111,7 +111,7 @@ public interface ResultSetMetaData * <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean isCurrency(int column) throws SQLException; + boolean isCurrency(int column) throws SQLException; /** * This method returns a value indicating whether or not the specified @@ -123,7 +123,7 @@ public interface ResultSetMetaData * <code>columnNullable</code>, or <code>columnNullableUnknown</code>. * @exception SQLException If an error occurs. */ - public int isNullable(int column) throws SQLException; + int isNullable(int column) throws SQLException; /** * This method tests whether or not the value of the specified column @@ -134,7 +134,7 @@ public interface ResultSetMetaData * otherwise. * @exception SQLException If an error occurs. */ - public boolean isSigned(int column) throws SQLException; + boolean isSigned(int column) throws SQLException; /** * This method returns the maximum number of characters that can be used @@ -145,7 +145,7 @@ public interface ResultSetMetaData * value for this column. * @exception SQLException If an error occurs. */ - public int getColumnDisplaySize(int column) throws SQLException; + int getColumnDisplaySize(int column) throws SQLException; /** * This method returns a string that should be used as a caption for this @@ -155,7 +155,7 @@ public interface ResultSetMetaData * @return A display string for the column. * @exception SQLException If an error occurs. */ - public String getColumnLabel(int column) throws SQLException; + String getColumnLabel(int column) throws SQLException; /** * This method returns the name of the specified column. @@ -164,7 +164,7 @@ public interface ResultSetMetaData * @return The name of the column. * @exception SQLException If an error occurs. */ - public String getColumnName(int column) throws SQLException; + String getColumnName(int column) throws SQLException; /** * This method returns the name of the schema that contains the specified @@ -174,7 +174,7 @@ public interface ResultSetMetaData * @return The name of the schema that contains the column. * @exception SQLException If an error occurs. */ - public String getSchemaName(int column) throws SQLException; + String getSchemaName(int column) throws SQLException; /** * This method returns the precision of the specified column, which is the @@ -184,7 +184,7 @@ public interface ResultSetMetaData * @return The precision of the specified column. * @exception SQLException If an error occurs. */ - public int getPrecision(int column) throws SQLException; + int getPrecision(int column) throws SQLException; /** * This method returns the scale of the specified column, which is the @@ -194,7 +194,7 @@ public interface ResultSetMetaData * @return The scale of the column. * @exception SQLException If an error occurs. */ - public int getScale(int column) throws SQLException; + int getScale(int column) throws SQLException; /** * This method returns the name of the table containing the specified @@ -204,7 +204,7 @@ public interface ResultSetMetaData * @return The name of the table containing the column. * @exception SQLException If an error occurs. */ - public String getTableName(int column) throws SQLException; + String getTableName(int column) throws SQLException; /** * This method returns the name of the catalog containing the specified @@ -214,7 +214,7 @@ public interface ResultSetMetaData * @return The name of the catalog containing the column. * @exception SQLException If an error occurs. */ - public String getCatalogName(int column) throws SQLException; + String getCatalogName(int column) throws SQLException; /** * This method returns the SQL type of the specified column. This will @@ -225,7 +225,7 @@ public interface ResultSetMetaData * @exception SQLException If an error occurs. * @see Types */ - public int getColumnType(int column) throws SQLException; + int getColumnType(int column) throws SQLException; /** * This method returns the name of the SQL type for this column. @@ -234,7 +234,7 @@ public interface ResultSetMetaData * @return The name of the SQL type for this column. * @exception SQLException If an error occurs. */ - public String getColumnTypeName(int column) throws SQLException; + String getColumnTypeName(int column) throws SQLException; /** * This method tests whether or not the specified column is read only. @@ -244,7 +244,7 @@ public interface ResultSetMetaData * otherwise. * @exception SQLException If an error occurs. */ - public boolean isReadOnly(int column) throws SQLException; + boolean isReadOnly(int column) throws SQLException; /** * This method tests whether or not the column may be writable. This @@ -255,7 +255,7 @@ public interface ResultSetMetaData * <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean isWritable(int column) throws SQLException; + boolean isWritable(int column) throws SQLException; /** * This method tests whether or not the column is writable. This @@ -266,7 +266,7 @@ public interface ResultSetMetaData * <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean isDefinitelyWritable(int column) throws SQLException; + boolean isDefinitelyWritable(int column) throws SQLException; /** * This method returns the name of the Java class which will be used to @@ -277,5 +277,5 @@ public interface ResultSetMetaData * this column. * @exception SQLException If an error occurs. */ - public String getColumnClassName(int column) throws SQLException; + String getColumnClassName(int column) throws SQLException; } diff --git a/java/sql/SQLData.java b/java/sql/SQLData.java index 1d1c205ec..7fa60be12 100644 --- a/java/sql/SQLData.java +++ b/java/sql/SQLData.java @@ -51,7 +51,7 @@ public interface SQLData * @return The user defined data type name for this object. * @exception SQLException If an error occurs. */ - public String getSQLTypeName() throws SQLException; + String getSQLTypeName() throws SQLException; /** * This method populates the data in the object from the specified stream. @@ -60,7 +60,7 @@ public interface SQLData * @param name The data type name of the data on the stream. * @exception SQLException If an error occurs. */ - public void readSQL(SQLInput stream, String typeName) throws SQLException; + void readSQL(SQLInput stream, String typeName) throws SQLException; /** * This method writes the data in this object to the specified stream. @@ -68,5 +68,5 @@ public interface SQLData * @param stream The stream to write the data to. * @exception SQLException If an error occurs. */ - public void writeSQL(SQLOutput stream) throws SQLException; + void writeSQL(SQLOutput stream) throws SQLException; } diff --git a/java/sql/SQLInput.java b/java/sql/SQLInput.java index 6fcec1fe4..e15ae2384 100644 --- a/java/sql/SQLInput.java +++ b/java/sql/SQLInput.java @@ -59,7 +59,7 @@ public interface SQLInput * @return The value read from the stream as a <code>String</code>. * @exception SQLException If an error occurs. */ - public String readString() throws SQLException; + String readString() throws SQLException; /** * This method reads the next item from the stream a Java @@ -68,7 +68,7 @@ public interface SQLInput * @return The value read from the stream as a <code>boolean</code>. * @exception SQLException If an error occurs. */ - public boolean readBoolean() throws SQLException; + boolean readBoolean() throws SQLException; /** * This method reads the next item from the stream a Java @@ -77,7 +77,7 @@ public interface SQLInput * @return The value read from the stream as a <code>byte</code>. * @exception SQLException If an error occurs. */ - public byte readByte() throws SQLException; + byte readByte() throws SQLException; /** * This method reads the next item from the stream a Java @@ -86,7 +86,7 @@ public interface SQLInput * @return The value read from the stream as a <code>short</code>. * @exception SQLException If an error occurs. */ - public short readShort() throws SQLException; + short readShort() throws SQLException; /** * This method reads the next item from the stream a Java @@ -95,7 +95,7 @@ public interface SQLInput * @return The value read from the stream as an <code>int</code>. * @exception SQLException If an error occurs. */ - public int readInt() throws SQLException; + int readInt() throws SQLException; /** * This method reads the next item from the stream a Java @@ -104,7 +104,7 @@ public interface SQLInput * @return The value read from the stream as a <code>long</code>. * @exception SQLException If an error occurs. */ - public long readLong() throws SQLException; + long readLong() throws SQLException; /** * This method reads the next item from the stream a Java @@ -113,7 +113,7 @@ public interface SQLInput * @return The value read from the stream as a <code>float</code>. * @exception SQLException If an error occurs. */ - public float readFloat() throws SQLException; + float readFloat() throws SQLException; /** * This method reads the next item from the stream a Java @@ -122,7 +122,7 @@ public interface SQLInput * @return The value read from the stream as a <code>double</code>. * @exception SQLException If an error occurs. */ - public double readDouble() throws SQLException; + double readDouble() throws SQLException; /** * This method reads the next item from the stream a Java @@ -131,7 +131,7 @@ public interface SQLInput * @return The value read from the stream as a <code>BigDecimal</code>. * @exception SQLException If an error occurs. */ - public BigDecimal readBigDecimal() throws SQLException; + BigDecimal readBigDecimal() throws SQLException; /** * This method reads the next item from the stream a Java @@ -140,7 +140,7 @@ public interface SQLInput * @return The value read from the stream as a byte array. * @exception SQLException If an error occurs. */ - public byte[] readBytes() throws SQLException; + byte[] readBytes() throws SQLException; /** * This method reads the next item from the stream a Java @@ -149,7 +149,7 @@ public interface SQLInput * @return The value read from the stream as a <code>java.sql.Date</code>. * @exception SQLException If an error occurs. */ - public Date readDate() throws SQLException; + Date readDate() throws SQLException; /** * This method reads the next item from the stream a Java @@ -158,7 +158,7 @@ public interface SQLInput * @return The value read from the stream as a <code>java.sql.Time</code>. * @exception SQLException If an error occurs. */ - public Time readTime() throws SQLException; + Time readTime() throws SQLException; /** * This method reads the next item from the stream a Java @@ -167,7 +167,7 @@ public interface SQLInput * @return The value read from the stream as a <code>java.sql.Timestamp</code>. * @exception SQLException If an error occurs. */ - public Timestamp readTimestamp() throws SQLException; + Timestamp readTimestamp() throws SQLException; /** * This method reads the next item from the stream a character @@ -176,7 +176,7 @@ public interface SQLInput * @return The value read from the stream as a <code>Reader</code>. * @exception SQLException If an error occurs. */ - public Reader readCharacterStream() throws SQLException; + Reader readCharacterStream() throws SQLException; /** * This method reads the next item from the stream a ASCII text @@ -185,7 +185,7 @@ public interface SQLInput * @return The value read from the stream as an <code>InputStream</code>. * @exception SQLException If an error occurs. */ - public InputStream readAsciiStream() throws SQLException; + InputStream readAsciiStream() throws SQLException; /** * This method reads the next item from the stream a binary @@ -194,7 +194,7 @@ public interface SQLInput * @return The value read from the stream as an <code>InputStream</code>. * @exception SQLException If an error occurs. */ - public InputStream readBinaryStream() throws SQLException; + InputStream readBinaryStream() throws SQLException; /** * This method reads the next item from the stream a Java @@ -203,7 +203,7 @@ public interface SQLInput * @return The value read from the stream as an <code>Object</code>. * @exception SQLException If an error occurs. */ - public Object readObject() throws SQLException; + Object readObject() throws SQLException; /** * This method reads the next item from the stream a Java SQL @@ -212,7 +212,7 @@ public interface SQLInput * @return The value read from the stream as an <code>Ref</code>. * @exception SQLException If an error occurs. */ - public Ref readRef() throws SQLException; + Ref readRef() throws SQLException; /** * This method reads the next item from the stream a Java SQL @@ -221,7 +221,7 @@ public interface SQLInput * @return The value read from the stream as a <code>Blob</code>. * @exception SQLException If an error occurs. */ - public Blob readBlob() throws SQLException; + Blob readBlob() throws SQLException; /** * This method reads the next item from the stream a Java SQL @@ -230,7 +230,7 @@ public interface SQLInput * @return The value read from the stream as a <code>Clob</code>. * @exception SQLException If an error occurs. */ - public Clob readClob() throws SQLException; + Clob readClob() throws SQLException; /** * This method reads the next item from the stream a Java SQL @@ -239,7 +239,7 @@ public interface SQLInput * @return The value read from the stream as an <code>Array</code>. * @exception SQLException If an error occurs. */ - public Array readArray() throws SQLException; + Array readArray() throws SQLException; /** * This method tests whether or not the last value read was a SQL @@ -249,11 +249,11 @@ public interface SQLInput * <code>false</code> otherwise. * @exception SQLException If an error occurs. */ - public boolean wasNull() throws SQLException; + boolean wasNull() throws SQLException; /** * @since 1.4 */ - public URL readURL() throws SQLException; + URL readURL() throws SQLException; } diff --git a/java/sql/SQLOutput.java b/java/sql/SQLOutput.java index 730e0c058..c07ca158d 100644 --- a/java/sql/SQLOutput.java +++ b/java/sql/SQLOutput.java @@ -59,7 +59,7 @@ public interface SQLOutput * @param value The value to write to the stream. * @exception SQLException If an error occurs. */ - public void writeString(String x) throws SQLException; + void writeString(String x) throws SQLException; /** * This method writes the specified Java <code>boolean</code> @@ -68,7 +68,7 @@ public interface SQLOutput * @param value The value to write to the stream. * @exception SQLException If an error occurs. */ - public void writeBoolean(boolean x) throws SQLException; + void writeBoolean(boolean x) throws SQLException; /** * This method writes the specified Java <code>byte</code> @@ -77,7 +77,7 @@ public interface SQLOutput * @param value The value to write to the stream. * @exception SQLException If an error occurs. */ - public void writeByte(byte x) throws SQLException; + void writeByte(byte x) throws SQLException; /** * This method writes the specified Java <code>short</code> @@ -86,7 +86,7 @@ public interface SQLOutput * @param value The value to write to the stream. * @exception SQLException If an error occurs. */ - public void writeShort(short x) throws SQLException; + void writeShort(short x) throws SQLException; /** * This method writes the specified Java <code>int</code> @@ -95,7 +95,7 @@ public interface SQLOutput * @param value The value to write to the stream. * @exception SQLException If an error occurs. */ - public void writeInt(int x) throws SQLException; + void writeInt(int x) throws SQLException; /** * This method writes the specified Java <code>long</code> @@ -104,7 +104,7 @@ public interface SQLOutput * @param value The value to write to the stream. * @exception SQLException If an error occurs. */ - public void writeLong(long x) throws SQLException; + void writeLong(long x) throws SQLException; /** * This method writes the specified Java <code>float</code> @@ -113,7 +113,7 @@ public interface SQLOutput * @param value The value to write to the stream. * @exception SQLException If an error occurs. */ - public void writeFloat(float x) throws SQLException; + void writeFloat(float x) throws SQLException; /** * This method writes the specified Java <code>double</code> @@ -122,7 +122,7 @@ public interface SQLOutput * @param value The value to write to the stream. * @exception SQLException If an error occurs. */ - public void writeDouble(double x) throws SQLException; + void writeDouble(double x) throws SQLException; /** * This method writes the specified Java <code>BigDecimal</code> @@ -131,7 +131,7 @@ public interface SQLOutput * @param value The value to write to the stream. * @exception SQLException If an error occurs. */ - public void writeBigDecimal(BigDecimal x) throws SQLException; + void writeBigDecimal(BigDecimal x) throws SQLException; /** * This method writes the specified Java <code>byte</code> array @@ -140,7 +140,7 @@ public interface SQLOutput * @param value The value to write to the stream. * @exception SQLException If an error occurs. */ - public void writeBytes(byte[] x) throws SQLException; + void writeBytes(byte[] x) throws SQLException; /** * This method writes the specified Java <code>java.sql.Date</code> @@ -149,7 +149,7 @@ public interface SQLOutput * @param value The value to write to the stream. * @exception SQLException If an error occurs. */ - public void writeDate(Date x) throws SQLException; + void writeDate(Date x) throws SQLException; /** * This method writes the specified Java <code>java.sql.Time</code> @@ -158,7 +158,7 @@ public interface SQLOutput * @param value The value to write to the stream. * @exception SQLException If an error occurs. */ - public void writeTime(Time x) throws SQLException; + void writeTime(Time x) throws SQLException; /** * This method writes the specified Java <code>java.sql.Timestamp</code> @@ -167,7 +167,7 @@ public interface SQLOutput * @param value The value to write to the stream. * @exception SQLException If an error occurs. */ - public void writeTimestamp(Timestamp x) throws SQLException; + void writeTimestamp(Timestamp x) throws SQLException; /** * This method writes the specified Java character stream @@ -176,7 +176,7 @@ public interface SQLOutput * @param value The value to write to the stream. * @exception SQLException If an error occurs. */ - public void writeCharacterStream(Reader x) throws SQLException; + void writeCharacterStream(Reader x) throws SQLException; /** * This method writes the specified ASCII text stream @@ -185,7 +185,7 @@ public interface SQLOutput * @param value The value to write to the stream. * @exception SQLException If an error occurs. */ - public void writeAsciiStream(InputStream x) throws SQLException; + void writeAsciiStream(InputStream x) throws SQLException; /** * This method writes the specified uninterpreted binary byte stream @@ -194,7 +194,7 @@ public interface SQLOutput * @param value The value to write to the stream. * @exception SQLException If an error occurs. */ - public void writeBinaryStream(InputStream x) throws SQLException; + void writeBinaryStream(InputStream x) throws SQLException; /** * This method writes the specified Java <code>SQLData</code> object @@ -203,7 +203,7 @@ public interface SQLOutput * @param value The value to write to the stream. * @exception SQLException If an error occurs. */ - public void writeObject(SQLData x) throws SQLException; + void writeObject(SQLData x) throws SQLException; /** * This method writes the specified Java SQL <code>Ref</code> object @@ -212,7 +212,7 @@ public interface SQLOutput * @param value The value to write to the stream. * @exception SQLException If an error occurs. */ - public void writeRef(Ref x) throws SQLException; + void writeRef(Ref x) throws SQLException; /** * This method writes the specified Java SQL <code>Blob</code> object @@ -221,7 +221,7 @@ public interface SQLOutput * @param value The value to write to the stream. * @exception SQLException If an error occurs. */ - public void writeBlob(Blob x) throws SQLException; + void writeBlob(Blob x) throws SQLException; /** * This method writes the specified Java SQL <code>Clob</code> object @@ -230,7 +230,7 @@ public interface SQLOutput * @param value The value to write to the stream. * @exception SQLException If an error occurs. */ - public void writeClob(Clob x) throws SQLException; + void writeClob(Clob x) throws SQLException; /** * This method writes the specified Java SQL <code>Struct</code> object @@ -239,7 +239,7 @@ public interface SQLOutput * @param value The value to write to the stream. * @exception SQLException If an error occurs. */ - public void writeStruct(Struct x) throws SQLException; + void writeStruct(Struct x) throws SQLException; /** * This method writes the specified Java SQL <code>Array</code> object @@ -248,10 +248,10 @@ public interface SQLOutput * @param value The value to write to the stream. * @exception SQLException If an error occurs. */ - public void writeArray(Array x) throws SQLException; + void writeArray(Array x) throws SQLException; /** * @since 1.4 */ - public void writeURL(URL x) throws SQLException; + void writeURL(URL x) throws SQLException; } diff --git a/java/sql/Savepoint.java b/java/sql/Savepoint.java index f9b839ba8..ac3d56001 100644 --- a/java/sql/Savepoint.java +++ b/java/sql/Savepoint.java @@ -46,10 +46,10 @@ public interface Savepoint /** * @since 1.4 */ - public int getSavepointId() throws SQLException; + int getSavepointId() throws SQLException; /** * @since 1.4 */ - public String getSavepointName() throws SQLException; + String getSavepointName() throws SQLException; } diff --git a/java/sql/Statement.java b/java/sql/Statement.java index fd8a99950..1bff06e08 100644 --- a/java/sql/Statement.java +++ b/java/sql/Statement.java @@ -45,13 +45,13 @@ package java.sql; */ public interface Statement { - public static final int CLOSE_CURRENT_RESULT = 1; - public static final int KEEP_CURRENT_RESULT = 2; - public static final int CLOSE_ALL_RESULTS = 3; - public static final int SUCCESS_NO_INFO = -2; - public static final int EXECUTE_FAILED = -3; - public static final int RETURN_GENERATED_KEYS = 1; - public static final int NO_GENERATED_KEYS = 2; + int CLOSE_CURRENT_RESULT = 1; + int KEEP_CURRENT_RESULT = 2; + int CLOSE_ALL_RESULTS = 3; + int SUCCESS_NO_INFO = -2; + int EXECUTE_FAILED = -3; + int RETURN_GENERATED_KEYS = 1; + int NO_GENERATED_KEYS = 2; /** * This method executes the specified SQL SELECT statement and returns a @@ -61,7 +61,7 @@ public interface Statement * @return The result set of the SQL statement. * @exception SQLException If an error occurs. */ - public ResultSet executeQuery(String sql) throws SQLException; + ResultSet executeQuery(String sql) throws SQLException; /** * This method executes the specified SQL INSERT, UPDATE, or DELETE statement @@ -71,14 +71,14 @@ public interface Statement * @return The number of rows affected by the SQL statement. * @exception SQLException If an error occurs. */ - public int executeUpdate(String sql) throws SQLException; + int executeUpdate(String sql) throws SQLException; /** * This method closes the statement and frees any associated resources. * * @exception SQLException If an error occurs. */ - public void close() throws SQLException; + void close() throws SQLException; /** * This method returns the maximum length of any column value in bytes. @@ -86,7 +86,7 @@ public interface Statement * @return The maximum length of any column value in bytes. * @exception SQLException If an error occurs. */ - public int getMaxFieldSize() throws SQLException; + int getMaxFieldSize() throws SQLException; /** * This method sets the limit for the maximum length of any column in bytes. @@ -94,7 +94,7 @@ public interface Statement * @param maxsize The new maximum length of any column in bytes. * @exception SQLException If an error occurs. */ - public void setMaxFieldSize(int max) throws SQLException; + void setMaxFieldSize(int max) throws SQLException; /** * This method returns the maximum possible number of rows in a result set. @@ -102,7 +102,7 @@ public interface Statement * @return The maximum possible number of rows in a result set. * @exception SQLException If an error occurs. */ - public int getMaxRows() throws SQLException; + int getMaxRows() throws SQLException; /** * This method sets the maximum number of rows that can be present in a @@ -111,7 +111,7 @@ public interface Statement * @param maxrows The maximum possible number of rows in a result set. * @exception SQLException If an error occurs. */ - public void setMaxRows(int max) throws SQLException; + void setMaxRows(int max) throws SQLException; /** * This method sets the local escape processing mode on or off. The @@ -121,7 +121,7 @@ public interface Statement * <code>false</code> to disable it. * @exception SQLException If an error occurs. */ - public void setEscapeProcessing(boolean enable) throws SQLException; + void setEscapeProcessing(boolean enable) throws SQLException; /** * The method returns the number of seconds a statement may be in process @@ -130,7 +130,7 @@ public interface Statement * @return The SQL statement timeout in seconds. * @exception SQLException If an error occurs. */ - public int getQueryTimeout() throws SQLException; + int getQueryTimeout() throws SQLException; /** * This method sets the number of seconds a statement may be in process @@ -139,7 +139,7 @@ public interface Statement * @param timeout The new SQL statement timeout value. * @exception SQLException If an error occurs. */ - public void setQueryTimeout(int seconds) throws SQLException; + void setQueryTimeout(int seconds) throws SQLException; /** * This method cancels an outstanding statement, if the database supports @@ -147,7 +147,7 @@ public interface Statement * * @exception SQLException If an error occurs. */ - public void cancel() throws SQLException; + void cancel() throws SQLException; /** * This method returns the first SQL warning attached to this statement. @@ -156,7 +156,7 @@ public interface Statement * @return The first SQL warning for this statement. * @exception SQLException If an error occurs. */ - public SQLWarning getWarnings() throws SQLException; + SQLWarning getWarnings() throws SQLException; /** * This method clears any SQL warnings that have been attached to this @@ -164,7 +164,7 @@ public interface Statement * * @exception SQLException If an error occurs. */ - public void clearWarnings() throws SQLException; + void clearWarnings() throws SQLException; /** * This method sets the cursor name that will be used by the result set. @@ -172,7 +172,7 @@ public interface Statement * @param name The cursor name to use for this statement. * @exception SQLException If an error occurs. */ - public void setCursorName(String name) throws SQLException; + void setCursorName(String name) throws SQLException; /** * This method executes an arbitrary SQL statement of any time. The @@ -183,7 +183,7 @@ public interface Statement * if an update count was returned. * @exception SQLException If an error occurs. */ - public boolean execute(String sql) throws SQLException; + boolean execute(String sql) throws SQLException; /** * This method returns the result set of the SQL statement that was @@ -194,7 +194,7 @@ public interface Statement * @exception SQLException If an error occurs. * @see execute */ - public ResultSet getResultSet() throws SQLException; + ResultSet getResultSet() throws SQLException; /** * This method returns the update count of the SQL statement that was @@ -205,7 +205,7 @@ public interface Statement * @exception SQLException If an error occurs. * @see execute */ - public int getUpdateCount() throws SQLException; + int getUpdateCount() throws SQLException; /** * This method advances the result set pointer to the next result set, @@ -217,7 +217,7 @@ public interface Statement * @exception SQLException If an error occurs. * @see execute */ - public boolean getMoreResults() throws SQLException; + boolean getMoreResults() throws SQLException; /** * This method informs the driver which direction the result set will @@ -226,7 +226,7 @@ public interface Statement * @param direction The direction the result set will be accessed in (?????) * @exception SQLException If an error occurs. */ - public void setFetchDirection(int direction) throws SQLException; + void setFetchDirection(int direction) throws SQLException; /** * This method returns the current direction that the driver thinks the @@ -235,7 +235,7 @@ public interface Statement * @return The direction the result set will be accessed in (????) * @exception SQLException If an error occurs. */ - public int getFetchDirection() throws SQLException; + int getFetchDirection() throws SQLException; /** * This method informs the driver how many rows it should fetch from the @@ -245,7 +245,7 @@ public interface Statement * to populate the result set. * @exception SQLException If an error occurs. */ - public void setFetchSize(int rows) throws SQLException; + void setFetchSize(int rows) throws SQLException; /** * This method returns the number of rows the driver believes should be @@ -254,7 +254,7 @@ public interface Statement * @return The number of rows that will be fetched from the database at a time. * @exception SQLException If an error occurs. */ - public int getFetchSize() throws SQLException; + int getFetchSize() throws SQLException; /** * This method returns the concurrency type of the result set for this @@ -265,7 +265,7 @@ public interface Statement * @exception SQLException If an error occurs. * @see ResultSet */ - public int getResultSetConcurrency() throws SQLException; + int getResultSetConcurrency() throws SQLException; /** * This method returns the result set type for this statement. This will @@ -275,7 +275,7 @@ public interface Statement * @exception SQLException If an error occurs. * @see ResultSet */ - public int getResultSetType() throws SQLException; + int getResultSetType() throws SQLException; /** * This method adds a SQL statement to a SQL batch. A driver is not @@ -284,7 +284,7 @@ public interface Statement * @param sql The sql statement to add to the batch. * @exception SQLException If an error occurs. */ - public void addBatch(String sql) throws SQLException; + void addBatch(String sql) throws SQLException; /** * This method clears out any SQL statements that have been populated in @@ -292,7 +292,7 @@ public interface Statement * * @exception SQLException If an error occurs. */ - public void clearBatch() throws SQLException; + void clearBatch() throws SQLException; /** * This method executes the SQL batch and returns an array of update @@ -303,7 +303,7 @@ public interface Statement * @return An array of update counts for this batch. * @exception SQLException If an error occurs. */ - public int[] executeBatch() throws SQLException; + int[] executeBatch() throws SQLException; /** * This method returns the <code>Connection</code> instance that was @@ -312,55 +312,55 @@ public interface Statement * @return The connection used to create this object. * @exception SQLException If an error occurs. */ - public Connection getConnection() throws SQLException; + Connection getConnection() throws SQLException; /** * @since 1.4 */ - public boolean getMoreResults(int current) throws SQLException; + boolean getMoreResults(int current) throws SQLException; /** * @since 1.4 */ - public ResultSet getGeneratedKeys() throws SQLException; + ResultSet getGeneratedKeys() throws SQLException; /** * @since 1.4 */ - public int executeUpdate(String sql, int autoGeneratedKeys) + int executeUpdate(String sql, int autoGeneratedKeys) throws SQLException; /** * @since 1.4 */ - public int executeUpdate(String sql, int[] columnIndexes) + int executeUpdate(String sql, int[] columnIndexes) throws SQLException; /** * @since 1.4 */ - public int executeUpdate(String sql, String[] columnNames) + int executeUpdate(String sql, String[] columnNames) throws SQLException; /** * @since 1.4 */ - public boolean execute(String sql, int autoGeneratedKeys) + boolean execute(String sql, int autoGeneratedKeys) throws SQLException; /** * @since 1.4 */ - public boolean execute(String sql, int[] columnIndexes) throws SQLException; + boolean execute(String sql, int[] columnIndexes) throws SQLException; /** * @since 1.4 */ - public boolean execute(String sql, String[] columnNames) + boolean execute(String sql, String[] columnNames) throws SQLException; /** * @since 1.4 */ - public int getResultSetHoldability() throws SQLException; + int getResultSetHoldability() throws SQLException; } diff --git a/java/sql/Struct.java b/java/sql/Struct.java index beec072fa..861d7049e 100644 --- a/java/sql/Struct.java +++ b/java/sql/Struct.java @@ -55,7 +55,7 @@ public interface Struct * @return The SQL structured type name. * @exception SQLException If an error occurs. */ - public String getSQLTypeName() throws SQLException; + String getSQLTypeName() throws SQLException; /** * This method returns the attributes of this SQL structured type. @@ -63,7 +63,7 @@ public interface Struct * @return The attributes of this structure type. * @exception SQLException If an error occurs. */ - public Object[] getAttributes() throws SQLException; + Object[] getAttributes() throws SQLException; /** * This method returns the attributes of this SQL structured type. @@ -73,5 +73,5 @@ public interface Struct * @return The attributes of this structure type. * @exception SQLException If a error occurs. */ - public Object[] getAttributes(Map map) throws SQLException; + Object[] getAttributes(Map map) throws SQLException; } diff --git a/javax/sql/ConnectionEventListener.java b/javax/sql/ConnectionEventListener.java index 9358e694d..b71531853 100644 --- a/javax/sql/ConnectionEventListener.java +++ b/javax/sql/ConnectionEventListener.java @@ -48,10 +48,10 @@ public interface ConnectionEventListener extends EventListener /** * @since 1.4 */ - public void connectionClosed(ConnectionEvent event); + void connectionClosed(ConnectionEvent event); /** * @since 1.4 */ - public void connectionErrorOccurred(ConnectionEvent event); + void connectionErrorOccurred(ConnectionEvent event); } diff --git a/javax/sql/ConnectionPoolDataSource.java b/javax/sql/ConnectionPoolDataSource.java index e281840bd..7e70ce77c 100644 --- a/javax/sql/ConnectionPoolDataSource.java +++ b/javax/sql/ConnectionPoolDataSource.java @@ -49,31 +49,31 @@ public interface ConnectionPoolDataSource /** * @since 1.4 */ - public PooledConnection getPooledConnection() throws SQLException; + PooledConnection getPooledConnection() throws SQLException; /** * @since 1.4 */ - public PooledConnection getPooledConnection(String user, String password) + PooledConnection getPooledConnection(String user, String password) throws SQLException; /** * @since 1.4 */ - public PrintWriter getLogWriter() throws SQLException; + PrintWriter getLogWriter() throws SQLException; /** * @since 1.4 */ - public void setLogWriter(PrintWriter out) throws SQLException; + void setLogWriter(PrintWriter out) throws SQLException; /** * @since 1.4 */ - public void setLoginTimeout(int seconds) throws SQLException; + void setLoginTimeout(int seconds) throws SQLException; /** * @since 1.4 */ - public int getLoginTimeout() throws SQLException; + int getLoginTimeout() throws SQLException; } diff --git a/javax/sql/DataSource.java b/javax/sql/DataSource.java index 05f97fd4b..3b6830f3d 100644 --- a/javax/sql/DataSource.java +++ b/javax/sql/DataSource.java @@ -50,31 +50,31 @@ public interface DataSource /** * @since 1.4 */ - public Connection getConnection() throws SQLException; + Connection getConnection() throws SQLException; /** * @since 1.4 */ - public Connection getConnection(String username, String password) + Connection getConnection(String username, String password) throws SQLException; /** * @since 1.4 */ - public PrintWriter getLogWriter() throws SQLException; + PrintWriter getLogWriter() throws SQLException; /** * @since 1.4 */ - public void setLogWriter(PrintWriter out) throws SQLException; + void setLogWriter(PrintWriter out) throws SQLException; /** * @since 1.4 */ - public void setLoginTimeout(int seconds) throws SQLException; + void setLoginTimeout(int seconds) throws SQLException; /** * @since 1.4 */ - public int getLoginTimeout() throws SQLException; + int getLoginTimeout() throws SQLException; } diff --git a/javax/sql/PooledConnection.java b/javax/sql/PooledConnection.java index f76ab8c90..a1281192f 100644 --- a/javax/sql/PooledConnection.java +++ b/javax/sql/PooledConnection.java @@ -49,20 +49,20 @@ public interface PooledConnection /** * @since 1.4 */ - public Connection getConnection() throws SQLException; + Connection getConnection() throws SQLException; /** * @since 1.4 */ - public void close() throws SQLException; + void close() throws SQLException; /** * @since 1.4 */ - public void addConnectionEventListener(ConnectionEventListener listener); + void addConnectionEventListener(ConnectionEventListener listener); /** * @since 1.4 */ - public void removeConnectionEventListener(ConnectionEventListener listener); + void removeConnectionEventListener(ConnectionEventListener listener); } diff --git a/javax/sql/RowSet.java b/javax/sql/RowSet.java index f5f7d9b25..085288d6e 100644 --- a/javax/sql/RowSet.java +++ b/javax/sql/RowSet.java @@ -58,304 +58,130 @@ import java.util.Map; */ public interface RowSet extends ResultSet { - /** - * @since 1.4 - */ - public String getUrl() throws SQLException; - - /** - * @since 1.4 - */ - public void setUrl(String url) throws SQLException; - - /** - * @since 1.4 - */ - public String getDataSourceName(); - - /** - * @since 1.4 - */ - public void setDataSourceName(String name) throws SQLException; - - /** - * @since 1.4 - */ - public String getUsername(); - - /** - * @since 1.4 - */ - public void setUsername(String name) throws SQLException; - - /** - * @since 1.4 - */ - public String getPassword(); - - /** - * @since 1.4 - */ - public void setPassword(String password) throws SQLException; - - /** - * @since 1.4 - */ - public int getTransactionIsolation(); - - /** - * @since 1.4 - */ - public void setTransactionIsolation(int level) throws SQLException; - - /** - * @since 1.4 - */ - public Map getTypeMap() throws SQLException; - - /** - * @since 1.4 - */ - public void setTypeMap(Map map) throws SQLException; - - /** - * @since 1.4 - */ - public String getCommand(); - - /** - * @since 1.4 - */ - public void setCommand(String cmd) throws SQLException; - - /** - * @since 1.4 - */ - public boolean isReadOnly(); - - /** - * @since 1.4 - */ - public void setReadOnly(boolean value) throws SQLException; - - /** - * @since 1.4 - */ - public int getMaxFieldSize() throws SQLException; - - /** - * @since 1.4 - */ - public void setMaxFieldSize(int max) throws SQLException; - - /** - * @since 1.4 - */ - public int getMaxRows() throws SQLException; - - /** - * @since 1.4 - */ - public void setMaxRows(int max) throws SQLException; - - /** - * @since 1.4 - */ - public boolean getEscapeProcessing() throws SQLException; - - /** - * @since 1.4 - */ - public void setEscapeProcessing(boolean enable) throws SQLException; - - /** - * @since 1.4 - */ - public int getQueryTimeout() throws SQLException; - - /** - * @since 1.4 - */ - public void setQueryTimeout(int seconds) throws SQLException; - - /** - * @since 1.4 - */ - public void setType(int type) throws SQLException; - - /** - * @since 1.4 - */ - public void setConcurrency(int concurrency) throws SQLException; - - /** - * @since 1.4 - */ - public void setNull(int parameterIndex, int sqlType) throws SQLException; - - /** - * @since 1.4 - */ - public void setNull(int paramIndex, int sqlType, String typeName) throws + String getUrl() throws SQLException; + + void setUrl(String url) throws SQLException; + + String getDataSourceName(); + + void setDataSourceName(String name) throws SQLException; + + String getUsername(); + + void setUsername(String name) throws SQLException; + + String getPassword(); + + void setPassword(String password) throws SQLException; + + int getTransactionIsolation(); + + void setTransactionIsolation(int level) throws SQLException; + + Map getTypeMap() throws SQLException; + + void setTypeMap(Map map) throws SQLException; + + String getCommand(); + + void setCommand(String cmd) throws SQLException; + + boolean isReadOnly(); + + void setReadOnly(boolean value) throws SQLException; + + int getMaxFieldSize() throws SQLException; + + void setMaxFieldSize(int max) throws SQLException; + + int getMaxRows() throws SQLException; + + void setMaxRows(int max) throws SQLException; + + boolean getEscapeProcessing() throws SQLException; + + void setEscapeProcessing(boolean enable) throws SQLException; + + int getQueryTimeout() throws SQLException; + + void setQueryTimeout(int seconds) throws SQLException; + + void setType(int type) throws SQLException; + + void setConcurrency(int concurrency) throws SQLException; + + void setNull(int parameterIndex, int sqlType) throws SQLException; + + void setNull(int paramIndex, int sqlType, String typeName) throws SQLException; - /** - * @since 1.4 - */ - public void setBoolean(int parameterIndex, boolean x) throws SQLException; - - /** - * @since 1.4 - */ - public void setByte(int parameterIndex, byte x) throws SQLException; - - /** - * @since 1.4 - */ - public void setShort(int parameterIndex, short x) throws SQLException; - - /** - * @since 1.4 - */ - public void setInt(int parameterIndex, int x) throws SQLException; - - /** - * @since 1.4 - */ - public void setLong(int parameterIndex, long x) throws SQLException; - - /** - * @since 1.4 - */ - public void setFloat(int parameterIndex, float x) throws SQLException; - - /** - * @since 1.4 - */ - public void setDouble(int parameterIndex, double x) throws SQLException; - - /** - * @since 1.4 - */ - public void setBigDecimal(int parameterIndex, BigDecimal x) throws + void setBoolean(int parameterIndex, boolean x) throws SQLException; + + void setByte(int parameterIndex, byte x) throws SQLException; + + void setShort(int parameterIndex, short x) throws SQLException; + + void setInt(int parameterIndex, int x) throws SQLException; + + void setLong(int parameterIndex, long x) throws SQLException; + + void setFloat(int parameterIndex, float x) throws SQLException; + + void setDouble(int parameterIndex, double x) throws SQLException; + + void setBigDecimal(int parameterIndex, BigDecimal x) throws SQLException; - /** - * @since 1.4 - */ - public void setString(int parameterIndex, String x) throws SQLException; - - /** - * @since 1.4 - */ - public void setBytes(int parameterIndex, byte[] x) throws SQLException; - - /** - * @since 1.4 - */ - public void setDate(int parameterIndex, Date x) throws SQLException; - - /** - * @since 1.4 - */ - public void setTime(int parameterIndex, Time x) throws SQLException; - - /** - * @since 1.4 - */ - public void setTimestamp(int parameterIndex, Timestamp x) throws + void setString(int parameterIndex, String x) throws SQLException; + + void setBytes(int parameterIndex, byte[] x) throws SQLException; + + void setDate(int parameterIndex, Date x) throws SQLException; + + void setTime(int parameterIndex, Time x) throws SQLException; + + void setTimestamp(int parameterIndex, Timestamp x) throws SQLException; - /** - * @since 1.4 - */ - public void setAsciiStream(int parameterIndex, InputStream x, int length) + void setAsciiStream(int parameterIndex, InputStream x, int length) throws SQLException; - /** - * @since 1.4 - */ - public void setBinaryStream(int parameterIndex, InputStream x, int length) + void setBinaryStream(int parameterIndex, InputStream x, int length) throws SQLException; - /** - * @since 1.4 - */ - public void setCharacterStream(int parameterIndex, Reader reader, int + void setCharacterStream(int parameterIndex, Reader reader, int length) throws SQLException; - /** - * @since 1.4 - */ - public void setObject(int parameterIndex, Object x, int targetSqlType, int + void setObject(int parameterIndex, Object x, int targetSqlType, int scale) throws SQLException; - /** - * @since 1.4 - */ - public void setObject(int parameterIndex, Object x, int targetSqlType) + void setObject(int parameterIndex, Object x, int targetSqlType) throws SQLException; - /** - * @since 1.4 - */ - public void setObject(int parameterIndex, Object x) throws SQLException; - - /** - * @since 1.4 - */ - public void setRef(int i, Ref x) throws SQLException; - - /** - * @since 1.4 - */ - public void setBlob(int i, Blob x) throws SQLException; - - /** - * @since 1.4 - */ - public void setClob(int i, Clob x) throws SQLException; - - /** - * @since 1.4 - */ - public void setArray(int i, Array x) throws SQLException; - - /** - * @since 1.4 - */ - public void setDate(int parameterIndex, Date x, Calendar cal) throws + void setObject(int parameterIndex, Object x) throws SQLException; + + void setRef(int i, Ref x) throws SQLException; + + void setBlob(int i, Blob x) throws SQLException; + + void setClob(int i, Clob x) throws SQLException; + + void setArray(int i, Array x) throws SQLException; + + void setDate(int parameterIndex, Date x, Calendar cal) throws SQLException; - /** - * @since 1.4 - */ - public void setTime(int parameterIndex, Time x, Calendar cal) throws + void setTime(int parameterIndex, Time x, Calendar cal) throws SQLException; - /** - * @since 1.4 - */ - public void setTimestamp(int parameterIndex, Timestamp x, Calendar cal) + void setTimestamp(int parameterIndex, Timestamp x, Calendar cal) throws SQLException; - /** - * @since 1.4 - */ - public void clearParameters() throws SQLException; - - /** - * @since 1.4 - */ - public void execute() throws SQLException; - - /** - * @since 1.4 - */ - public void addRowSetListener(RowSetListener listener); - - /** - * @since 1.4 - */ - public void removeRowSetListener(RowSetListener listener); + void clearParameters() throws SQLException; + + void execute() throws SQLException; + + void addRowSetListener(RowSetListener listener); + + void removeRowSetListener(RowSetListener listener); } diff --git a/javax/sql/RowSetInternal.java b/javax/sql/RowSetInternal.java index 1fd900bda..8feaa27f9 100644 --- a/javax/sql/RowSetInternal.java +++ b/javax/sql/RowSetInternal.java @@ -50,25 +50,25 @@ public interface RowSetInternal /** * @since 1.4 */ - public Object[] getParams() throws SQLException; + Object[] getParams() throws SQLException; /** * @since 1.4 */ - public Connection getConnection() throws SQLException; + Connection getConnection() throws SQLException; /** * @since 1.4 */ - public void setMetaData(RowSetMetaData md) throws SQLException; + void setMetaData(RowSetMetaData md) throws SQLException; /** * @since 1.4 */ - public ResultSet getOriginal() throws SQLException; + ResultSet getOriginal() throws SQLException; /** * @since 1.4 */ - public ResultSet getOriginalRow() throws SQLException; + ResultSet getOriginalRow() throws SQLException; } diff --git a/javax/sql/RowSetListener.java b/javax/sql/RowSetListener.java index a29623714..6a6e619dd 100644 --- a/javax/sql/RowSetListener.java +++ b/javax/sql/RowSetListener.java @@ -45,18 +45,9 @@ import java.util.EventListener; */ public interface RowSetListener extends EventListener { - /** - * @since 1.4 - */ - public void rowSetChanged(RowSetEvent event); - - /** - * @since 1.4 - */ - public void rowChanged(RowSetEvent event); - - /** - * @since 1.4 - */ - public void cursorMoved(RowSetEvent event); + void rowSetChanged(RowSetEvent event); + + void rowChanged(RowSetEvent event); + + void cursorMoved(RowSetEvent event); } diff --git a/javax/sql/RowSetMetaData.java b/javax/sql/RowSetMetaData.java index 9e667f6b9..7f7749234 100644 --- a/javax/sql/RowSetMetaData.java +++ b/javax/sql/RowSetMetaData.java @@ -46,102 +46,50 @@ import java.sql.SQLException; */ public interface RowSetMetaData extends ResultSetMetaData { + void setColumnCount(int columnCount) throws SQLException; - /** - * @since 1.4 - */ - public void setColumnCount(int columnCount) throws SQLException; - - /** - * @since 1.4 - */ - public void setAutoIncrement(int columnIndex, boolean property) + void setAutoIncrement(int columnIndex, boolean property) throws SQLException; - /** - * @since 1.4 - */ - public void setCaseSensitive(int columnIndex, boolean property) + void setCaseSensitive(int columnIndex, boolean property) throws SQLException; - /** - * @since 1.4 - */ - public void setSearchable(int columnIndex, boolean property) + void setSearchable(int columnIndex, boolean property) throws SQLException; - /** - * @since 1.4 - */ - public void setCurrency(int columnIndex, boolean property) + void setCurrency(int columnIndex, boolean property) throws SQLException; - /** - * @since 1.4 - */ - public void setNullable(int columnIndex, int property) throws SQLException; + void setNullable(int columnIndex, int property) throws SQLException; - /** - * @since 1.4 - */ - public void setSigned(int columnIndex, boolean property) + void setSigned(int columnIndex, boolean property) throws SQLException; - /** - * @since 1.4 - */ - public void setColumnDisplaySize(int columnIndex, int size) + void setColumnDisplaySize(int columnIndex, int size) throws SQLException; - /** - * @since 1.4 - */ - public void setColumnLabel(int columnIndex, String label) + void setColumnLabel(int columnIndex, String label) throws SQLException; - /** - * @since 1.4 - */ - public void setColumnName(int columnIndex, String columnName) + void setColumnName(int columnIndex, String columnName) throws SQLException; - /** - * @since 1.4 - */ - public void setSchemaName(int columnIndex, String schemaName) + void setSchemaName(int columnIndex, String schemaName) throws SQLException; - /** - * @since 1.4 - */ - public void setPrecision(int columnIndex, int precision) + void setPrecision(int columnIndex, int precision) throws SQLException; - /** - * @since 1.4 - */ - public void setScale(int columnIndex, int scale) throws SQLException; + void setScale(int columnIndex, int scale) throws SQLException; - /** - * @since 1.4 - */ - public void setTableName(int columnIndex, String tableName) + void setTableName(int columnIndex, String tableName) throws SQLException; - /** - * @since 1.4 - */ - public void setCatalogName(int columnIndex, String catalogName) + void setCatalogName(int columnIndex, String catalogName) throws SQLException; - /** - * @since 1.4 - */ - public void setColumnType(int columnIndex, int SQLType) throws SQLException; + void setColumnType(int columnIndex, int SQLType) throws SQLException; - /** - * @since 1.4 - */ - public void setColumnTypeName(int columnIndex, String typeName) + void setColumnTypeName(int columnIndex, String typeName) throws SQLException; } diff --git a/javax/sql/RowSetReader.java b/javax/sql/RowSetReader.java index d3000c01c..a5e0f81ff 100644 --- a/javax/sql/RowSetReader.java +++ b/javax/sql/RowSetReader.java @@ -45,8 +45,5 @@ import java.sql.SQLException; */ public interface RowSetReader { - /** - * @since 1.4 - */ - public void readData(RowSetInternal caller) throws SQLException; + void readData(RowSetInternal caller) throws SQLException; } diff --git a/javax/sql/RowSetWriter.java b/javax/sql/RowSetWriter.java index 4f5c0c2a7..fe4c1e6a1 100644 --- a/javax/sql/RowSetWriter.java +++ b/javax/sql/RowSetWriter.java @@ -45,8 +45,5 @@ import java.sql.SQLException; */ public interface RowSetWriter { - /** - * @since 1.4 - */ - public boolean writeData(RowSetInternal caller) throws SQLException; + boolean writeData(RowSetInternal caller) throws SQLException; } diff --git a/javax/sql/XAConnection.java b/javax/sql/XAConnection.java index 3c28c1740..60b83d74c 100644 --- a/javax/sql/XAConnection.java +++ b/javax/sql/XAConnection.java @@ -46,8 +46,5 @@ import javax.transaction.xa.XAResource; */ public interface XAConnection extends PooledConnection { - /** - * @since 1.4 - */ - public XAResource getXAResource() throws SQLException; + XAResource getXAResource() throws SQLException; } diff --git a/javax/sql/XADataSource.java b/javax/sql/XADataSource.java index 1d552ddda..ef55a3280 100644 --- a/javax/sql/XADataSource.java +++ b/javax/sql/XADataSource.java @@ -46,34 +46,16 @@ import java.sql.SQLException; */ public interface XADataSource { - /** - * @since 1.4 - */ - public XAConnection getXAConnection() throws SQLException; + XAConnection getXAConnection() throws SQLException; - /** - * @since 1.4 - */ - public XAConnection getXAConnection(String user, String password) throws + XAConnection getXAConnection(String user, String password) throws SQLException; - /** - * @since 1.4 - */ - public PrintWriter getLogWriter() throws SQLException; + PrintWriter getLogWriter() throws SQLException; - /** - * @since 1.4 - */ - public void setLogWriter(PrintWriter out) throws SQLException; + void setLogWriter(PrintWriter out) throws SQLException; - /** - * @since 1.4 - */ - public void setLoginTimeout(int seconds) throws SQLException; + void setLoginTimeout(int seconds) throws SQLException; - /** - * @since 1.4 - */ - public int getLoginTimeout() throws SQLException; + int getLoginTimeout() throws SQLException; } |