You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ma...@apache.org on 2011/05/05 19:20:05 UTC

svn commit: r1099880 - in /commons/proper/dbcp/trunk/src: java/org/apache/commons/dbcp2/ test/org/apache/commons/dbcp2/

Author: markt
Date: Thu May  5 17:20:05 2011
New Revision: 1099880

URL: http://svn.apache.org/viewvc?rev=1099880&view=rev
Log:
Add missing @Override (thanks Eclipse)

Modified:
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingCallableStatement.java
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingDatabaseMetaData.java
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingResultSet.java
    commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterCallableStatement.java
    commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterDatabaseMetaData.java
    commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterResultSet.java

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingCallableStatement.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingCallableStatement.java?rev=1099880&r1=1099879&r2=1099880&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingCallableStatement.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingCallableStatement.java Thu May  5 17:20:05 2011
@@ -584,6 +584,7 @@ public class DelegatingCallableStatement
         }
     }
 
+    @Override
     public String getNString(String parameterName) throws SQLException {
         checkOpen();
         try {
@@ -595,6 +596,7 @@ public class DelegatingCallableStatement
         }
     }
 
+    @Override
     public Reader getNCharacterStream(int parameterIndex) throws SQLException {
         checkOpen();
         try {
@@ -606,6 +608,7 @@ public class DelegatingCallableStatement
         }
     }
 
+    @Override
     public Reader getNCharacterStream(String parameterName) throws SQLException {
         checkOpen();
         try {
@@ -617,6 +620,7 @@ public class DelegatingCallableStatement
         }
     }
 
+    @Override
     public Reader getCharacterStream(int parameterIndex) throws SQLException {
         checkOpen();
         try {
@@ -628,6 +632,7 @@ public class DelegatingCallableStatement
         }
     }
 
+    @Override
     public Reader getCharacterStream(String parameterName) throws SQLException {
         checkOpen();
         try {
@@ -639,6 +644,7 @@ public class DelegatingCallableStatement
         }
     }
 
+    @Override
     public void setBlob(String parameterName, Blob blob) throws SQLException {
         checkOpen();
         try {
@@ -649,6 +655,7 @@ public class DelegatingCallableStatement
         }
     }
 
+    @Override
     public void setClob(String parameterName, Clob clob) throws SQLException {
         checkOpen();
         try {
@@ -659,6 +666,7 @@ public class DelegatingCallableStatement
         }
     }
 
+    @Override
     public void setAsciiStream(String parameterName, InputStream inputStream, long length) throws SQLException {
         checkOpen();
         try {
@@ -669,6 +677,7 @@ public class DelegatingCallableStatement
         }
     }
 
+    @Override
     public void setBinaryStream(String parameterName, InputStream inputStream, long length) throws SQLException {
         checkOpen();
         try {
@@ -679,6 +688,7 @@ public class DelegatingCallableStatement
         }
     }
 
+    @Override
     public void setCharacterStream(String parameterName, Reader reader, long length) throws SQLException {
         checkOpen();
         try {
@@ -689,6 +699,7 @@ public class DelegatingCallableStatement
         }
     }
 
+    @Override
     public void setAsciiStream(String parameterName, InputStream inputStream) throws SQLException {
         checkOpen();
         try {
@@ -699,6 +710,7 @@ public class DelegatingCallableStatement
         }
     }
 
+    @Override
     public void setBinaryStream(String parameterName, InputStream inputStream) throws SQLException {
         checkOpen();
         try {
@@ -709,6 +721,7 @@ public class DelegatingCallableStatement
         }
     }
 
+    @Override
     public void setCharacterStream(String parameterName, Reader reader) throws SQLException {
         checkOpen();
         try {
@@ -719,6 +732,7 @@ public class DelegatingCallableStatement
         }
     }
 
+    @Override
     public void setNCharacterStream(String parameterName, Reader reader) throws SQLException {
         checkOpen();
         try {
@@ -729,6 +743,7 @@ public class DelegatingCallableStatement
         }
     }
 
+    @Override
     public void setClob(String parameterName, Reader reader) throws SQLException {
         checkOpen();
         try {
@@ -738,6 +753,7 @@ public class DelegatingCallableStatement
             handleException(e);
         }    }
 
+    @Override
     public void setBlob(String parameterName, InputStream inputStream) throws SQLException {
         checkOpen();
         try {
@@ -747,6 +763,7 @@ public class DelegatingCallableStatement
             handleException(e);
         }    }
 
+    @Override
     public void setNClob(String parameterName, Reader reader) throws SQLException {
         checkOpen();
         try {

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingDatabaseMetaData.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingDatabaseMetaData.java?rev=1099880&r1=1099879&r2=1099880&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingDatabaseMetaData.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingDatabaseMetaData.java Thu May  5 17:20:05 2011
@@ -875,342 +875,409 @@ public class DelegatingDatabaseMetaData 
         catch (SQLException e) { handleException(e); return false; } }
     }
 
+    @Override
     public boolean supportsANSI92IntermediateSQL() throws SQLException {
         { try { return _meta.supportsANSI92IntermediateSQL(); }
         catch (SQLException e) { handleException(e); return false; } }
     }
 
+    @Override
     public boolean supportsAlterTableWithAddColumn() throws SQLException {
         { try { return _meta.supportsAlterTableWithAddColumn(); }
         catch (SQLException e) { handleException(e); return false; } }
     }
 
+    @Override
     public boolean supportsAlterTableWithDropColumn() throws SQLException {
         { try { return _meta.supportsAlterTableWithDropColumn(); }
         catch (SQLException e) { handleException(e); return false; } }
     }
 
+    @Override
     public boolean supportsBatchUpdates() throws SQLException {
         { try { return _meta.supportsBatchUpdates(); }
         catch (SQLException e) { handleException(e); return false; } }
     }
 
+    @Override
     public boolean supportsCatalogsInDataManipulation() throws SQLException {
         { try { return _meta.supportsCatalogsInDataManipulation(); }
         catch (SQLException e) { handleException(e); return false; } }
     }
 
+    @Override
     public boolean supportsCatalogsInIndexDefinitions() throws SQLException {
         { try { return _meta.supportsCatalogsInIndexDefinitions(); }
         catch (SQLException e) { handleException(e); return false; } }
     }
 
+    @Override
     public boolean supportsCatalogsInPrivilegeDefinitions() throws SQLException {
         { try { return _meta.supportsCatalogsInPrivilegeDefinitions(); }
         catch (SQLException e) { handleException(e); return false; } }
     }
 
+    @Override
     public boolean supportsCatalogsInProcedureCalls() throws SQLException {
         { try { return _meta.supportsCatalogsInProcedureCalls(); }
         catch (SQLException e) { handleException(e); return false; } }
     }
 
+    @Override
     public boolean supportsCatalogsInTableDefinitions() throws SQLException {
         { try { return _meta.supportsCatalogsInTableDefinitions(); }
         catch (SQLException e) { handleException(e); return false; } }
     }
 
+    @Override
     public boolean supportsColumnAliasing() throws SQLException {
         { try { return _meta.supportsColumnAliasing(); }
         catch (SQLException e) { handleException(e); return false; } }
     }
 
+    @Override
     public boolean supportsConvert() throws SQLException {
         { try { return _meta.supportsConvert(); }
         catch (SQLException e) { handleException(e); return false; } }
     }
 
+    @Override
     public boolean supportsConvert(int fromType, int toType)
             throws SQLException {
         { try { return _meta.supportsConvert(fromType, toType); }
         catch (SQLException e) { handleException(e); return false; } }
     }
 
+    @Override
     public boolean supportsCoreSQLGrammar() throws SQLException {
         { try { return _meta.supportsCoreSQLGrammar(); }
         catch (SQLException e) { handleException(e); return false; } }
     }
 
+    @Override
     public boolean supportsCorrelatedSubqueries() throws SQLException {
         { try { return _meta.supportsCorrelatedSubqueries(); }
         catch (SQLException e) { handleException(e); return false; } }
     }
 
+    @Override
     public boolean supportsDataDefinitionAndDataManipulationTransactions()
             throws SQLException {
         { try { return _meta.supportsDataDefinitionAndDataManipulationTransactions(); }
         catch (SQLException e) { handleException(e); return false; } }
     }
 
+    @Override
     public boolean supportsDataManipulationTransactionsOnly()
             throws SQLException {
         { try { return _meta.supportsDataManipulationTransactionsOnly(); }
         catch (SQLException e) { handleException(e); return false; } }
     }
 
+    @Override
     public boolean supportsDifferentTableCorrelationNames() throws SQLException {
         { try { return _meta.supportsDifferentTableCorrelationNames(); }
         catch (SQLException e) { handleException(e); return false; } }
     }
 
+    @Override
     public boolean supportsExpressionsInOrderBy() throws SQLException {
         { try { return _meta.supportsExpressionsInOrderBy(); }
         catch (SQLException e) { handleException(e); return false; } }
     }
 
+    @Override
     public boolean supportsExtendedSQLGrammar() throws SQLException {
         { try { return _meta.supportsExtendedSQLGrammar(); }
         catch (SQLException e) { handleException(e); return false; } }
     }
 
+    @Override
     public boolean supportsFullOuterJoins() throws SQLException {
         { try { return _meta.supportsFullOuterJoins(); }
         catch (SQLException e) { handleException(e); return false; } }
     }
 
+    @Override
     public boolean supportsGetGeneratedKeys() throws SQLException {
         { try { return _meta.supportsGetGeneratedKeys(); }
         catch (SQLException e) { handleException(e); return false; } }
     }
 
+    @Override
     public boolean supportsGroupBy() throws SQLException {
         { try { return _meta.supportsGroupBy(); }
         catch (SQLException e) { handleException(e); return false; } }
     }
 
+    @Override
     public boolean supportsGroupByBeyondSelect() throws SQLException {
         { try { return _meta.supportsGroupByBeyondSelect(); }
         catch (SQLException e) { handleException(e); return false; } }
     }
 
+    @Override
     public boolean supportsGroupByUnrelated() throws SQLException {
         { try { return _meta.supportsGroupByUnrelated(); }
         catch (SQLException e) { handleException(e); return false; } }
     }
 
+    @Override
     public boolean supportsIntegrityEnhancementFacility() throws SQLException {
         { try { return _meta.supportsIntegrityEnhancementFacility(); }
         catch (SQLException e) { handleException(e); return false; } }
     }
 
+    @Override
     public boolean supportsLikeEscapeClause() throws SQLException {
         { try { return _meta.supportsLikeEscapeClause(); }
         catch (SQLException e) { handleException(e); return false; } }
     }
 
+    @Override
     public boolean supportsLimitedOuterJoins() throws SQLException {
         { try { return _meta.supportsLimitedOuterJoins(); }
         catch (SQLException e) { handleException(e); return false; } }
     }
 
+    @Override
     public boolean supportsMinimumSQLGrammar() throws SQLException {
         { try { return _meta.supportsMinimumSQLGrammar(); }
         catch (SQLException e) { handleException(e); return false; } }
     }
 
+    @Override
     public boolean supportsMixedCaseIdentifiers() throws SQLException {
         { try { return _meta.supportsMixedCaseIdentifiers(); }
         catch (SQLException e) { handleException(e); return false; } }
     }
 
+    @Override
     public boolean supportsMixedCaseQuotedIdentifiers() throws SQLException {
         { try { return _meta.supportsMixedCaseQuotedIdentifiers(); }
         catch (SQLException e) { handleException(e); return false; } }
     }
 
+    @Override
     public boolean supportsMultipleOpenResults() throws SQLException {
         { try { return _meta.supportsMultipleOpenResults(); }
         catch (SQLException e) { handleException(e); return false; } }
     }
 
+    @Override
     public boolean supportsMultipleResultSets() throws SQLException {
         { try { return _meta.supportsMultipleResultSets(); }
         catch (SQLException e) { handleException(e); return false; } }
     }
 
+    @Override
     public boolean supportsMultipleTransactions() throws SQLException {
         { try { return _meta.supportsMultipleTransactions(); }
         catch (SQLException e) { handleException(e); return false; } }
     }
 
+    @Override
     public boolean supportsNamedParameters() throws SQLException {
         { try { return _meta.supportsNamedParameters(); }
         catch (SQLException e) { handleException(e); return false; } }
     }
 
+    @Override
     public boolean supportsNonNullableColumns() throws SQLException {
         { try { return _meta.supportsNonNullableColumns(); }
         catch (SQLException e) { handleException(e); return false; } }
     }
 
+    @Override
     public boolean supportsOpenCursorsAcrossCommit() throws SQLException {
         { try { return _meta.supportsOpenCursorsAcrossCommit(); }
         catch (SQLException e) { handleException(e); return false; } }
     }
 
+    @Override
     public boolean supportsOpenCursorsAcrossRollback() throws SQLException {
         { try { return _meta.supportsOpenCursorsAcrossRollback(); }
         catch (SQLException e) { handleException(e); return false; } }
     }
 
+    @Override
     public boolean supportsOpenStatementsAcrossCommit() throws SQLException {
         { try { return _meta.supportsOpenStatementsAcrossCommit(); }
         catch (SQLException e) { handleException(e); return false; } }
     }
 
+    @Override
     public boolean supportsOpenStatementsAcrossRollback() throws SQLException {
         { try { return _meta.supportsOpenStatementsAcrossRollback(); }
         catch (SQLException e) { handleException(e); return false; } }
     }
 
+    @Override
     public boolean supportsOrderByUnrelated() throws SQLException {
         { try { return _meta.supportsOrderByUnrelated(); }
         catch (SQLException e) { handleException(e); return false; } }
     }
 
+    @Override
     public boolean supportsOuterJoins() throws SQLException {
         { try { return _meta.supportsOuterJoins(); }
         catch (SQLException e) { handleException(e); return false; } }
     }
 
+    @Override
     public boolean supportsPositionedDelete() throws SQLException {
         { try { return _meta.supportsPositionedDelete(); }
         catch (SQLException e) { handleException(e); return false; } }
     }
 
+    @Override
     public boolean supportsPositionedUpdate() throws SQLException {
         { try { return _meta.supportsPositionedUpdate(); }
         catch (SQLException e) { handleException(e); return false; } }
     }
 
+    @Override
     public boolean supportsResultSetConcurrency(int type, int concurrency)
             throws SQLException {
         { try { return _meta.supportsResultSetConcurrency(type, concurrency); }
         catch (SQLException e) { handleException(e); return false; } }
     }
 
+    @Override
     public boolean supportsResultSetHoldability(int holdability)
             throws SQLException {
         { try { return _meta.supportsResultSetHoldability(holdability); }
         catch (SQLException e) { handleException(e); return false; } }
     }
 
+    @Override
     public boolean supportsResultSetType(int type) throws SQLException {
         { try { return _meta.supportsResultSetType(type); }
         catch (SQLException e) { handleException(e); return false; } }
     }
 
+    @Override
     public boolean supportsSavepoints() throws SQLException {
         { try { return _meta.supportsSavepoints(); }
         catch (SQLException e) { handleException(e); return false; } }
     }
 
+    @Override
     public boolean supportsSchemasInDataManipulation() throws SQLException {
         { try { return _meta.supportsSchemasInDataManipulation(); }
         catch (SQLException e) { handleException(e); return false; } }
     }
 
+    @Override
     public boolean supportsSchemasInIndexDefinitions() throws SQLException {
         { try { return _meta.supportsSchemasInIndexDefinitions(); }
         catch (SQLException e) { handleException(e); return false; } }
     }
 
+    @Override
     public boolean supportsSchemasInPrivilegeDefinitions() throws SQLException {
         { try { return _meta.supportsSchemasInPrivilegeDefinitions(); }
         catch (SQLException e) { handleException(e); return false; } }
     }
 
+    @Override
     public boolean supportsSchemasInProcedureCalls() throws SQLException {
         { try { return _meta.supportsSchemasInProcedureCalls(); }
         catch (SQLException e) { handleException(e); return false; } }
     }
 
+    @Override
     public boolean supportsSchemasInTableDefinitions() throws SQLException {
         { try { return _meta.supportsSchemasInTableDefinitions(); }
         catch (SQLException e) { handleException(e); return false; } }
     }
 
+    @Override
     public boolean supportsSelectForUpdate() throws SQLException {
         { try { return _meta.supportsSelectForUpdate(); }
         catch (SQLException e) { handleException(e); return false; } }
     }
 
+    @Override
     public boolean supportsStatementPooling() throws SQLException {
         { try { return _meta.supportsStatementPooling(); }
         catch (SQLException e) { handleException(e); return false; } }
     }
 
+    @Override
     public boolean supportsStoredProcedures() throws SQLException {
         { try { return _meta.supportsStoredProcedures(); }
         catch (SQLException e) { handleException(e); return false; } }
     }
 
+    @Override
     public boolean supportsSubqueriesInComparisons() throws SQLException {
         { try { return _meta.supportsSubqueriesInComparisons(); }
         catch (SQLException e) { handleException(e); return false; } }
     }
 
+    @Override
     public boolean supportsSubqueriesInExists() throws SQLException {
         { try { return _meta.supportsSubqueriesInExists(); }
         catch (SQLException e) { handleException(e); return false; } }
     }
 
+    @Override
     public boolean supportsSubqueriesInIns() throws SQLException {
         { try { return _meta.supportsSubqueriesInIns(); }
         catch (SQLException e) { handleException(e); return false; } }
     }
 
+    @Override
     public boolean supportsSubqueriesInQuantifieds() throws SQLException {
         { try { return _meta.supportsSubqueriesInQuantifieds(); }
         catch (SQLException e) { handleException(e); return false; } }
     }
 
+    @Override
     public boolean supportsTableCorrelationNames() throws SQLException {
         { try { return _meta.supportsTableCorrelationNames(); }
         catch (SQLException e) { handleException(e); return false; } }
     }
 
+    @Override
     public boolean supportsTransactionIsolationLevel(int level)
             throws SQLException {
         { try { return _meta.supportsTransactionIsolationLevel(level); }
         catch (SQLException e) { handleException(e); return false; } }
     }
 
+    @Override
     public boolean supportsTransactions() throws SQLException {
         { try { return _meta.supportsTransactions(); }
         catch (SQLException e) { handleException(e); return false; } }
     }
 
+    @Override
     public boolean supportsUnion() throws SQLException {
         { try { return _meta.supportsUnion(); }
         catch (SQLException e) { handleException(e); return false; } }
     }
 
+    @Override
     public boolean supportsUnionAll() throws SQLException {
         { try { return _meta.supportsUnionAll(); }
         catch (SQLException e) { handleException(e); return false; } }
     }
 
+    @Override
     public boolean updatesAreDetected(int type) throws SQLException {
         { try { return _meta.updatesAreDetected(type); }
         catch (SQLException e) { handleException(e); return false; } }
     }
 
+    @Override
     public boolean usesLocalFilePerTable() throws SQLException {
         { try { return _meta.usesLocalFilePerTable(); }
         catch (SQLException e) { handleException(e); return false; } }
     }
 
+    @Override
     public boolean usesLocalFiles() throws SQLException {
         { try { return _meta.usesLocalFiles(); }
         catch (SQLException e) { handleException(e); return false; } }
@@ -1218,10 +1285,12 @@ public class DelegatingDatabaseMetaData 
 
     /* JDBC_4_ANT_KEY_BEGIN */
 
+    @Override
     public boolean isWrapperFor(Class<?> iface) throws SQLException {
         return iface.isAssignableFrom(getClass()) || _meta.isWrapperFor(iface);
     }
 
+    @Override
     public <T> T unwrap(Class<T> iface) throws SQLException {
         if (iface.isAssignableFrom(getClass())) {
             return iface.cast(this);
@@ -1232,11 +1301,13 @@ public class DelegatingDatabaseMetaData 
         }
     }
     
+    @Override
     public RowIdLifetime getRowIdLifetime() throws SQLException {
         { try { return _meta.getRowIdLifetime(); }
         catch (SQLException e) { handleException(e); throw new AssertionError(); } }
     }
 
+    @Override
     public ResultSet getSchemas(String catalog, String schemaPattern)
     throws SQLException {
         _conn.checkOpen();
@@ -1250,16 +1321,19 @@ public class DelegatingDatabaseMetaData 
         }
     }
 
+    @Override
     public boolean autoCommitFailureClosesAllResultSets() throws SQLException {
         { try { return _meta.autoCommitFailureClosesAllResultSets(); }
         catch (SQLException e) { handleException(e); return false; } }
     }
 
+    @Override
     public boolean supportsStoredFunctionsUsingCallSyntax() throws SQLException {
         { try { return _meta.supportsStoredFunctionsUsingCallSyntax(); }
         catch (SQLException e) { handleException(e); return false; } }
     }
 
+    @Override
     public ResultSet getClientInfoProperties() throws SQLException {
         _conn.checkOpen();
         try {
@@ -1272,6 +1346,7 @@ public class DelegatingDatabaseMetaData 
         }
     }
 
+    @Override
     public ResultSet getFunctions(String catalog, String schemaPattern,
             String functionNamePattern) throws SQLException {
         _conn.checkOpen();
@@ -1286,6 +1361,7 @@ public class DelegatingDatabaseMetaData 
         }
     }
 
+    @Override
     public ResultSet getFunctionColumns(String catalog, String schemaPattern,
             String functionNamePattern, String columnNamePattern)
             throws SQLException {

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingResultSet.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingResultSet.java?rev=1099880&r1=1099879&r2=1099880&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingResultSet.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingResultSet.java Thu May  5 17:20:05 2011
@@ -580,148 +580,195 @@ public class DelegatingResultSet extends
     public void updateFloat(String columnName, float x) throws SQLException
     { try { _res.updateFloat(columnName, x); } catch (SQLException e) { handleException(e); } }
 
+    @Override
     public void updateDouble(String columnName, double x) throws SQLException
     { try { _res.updateDouble(columnName, x); } catch (SQLException e) { handleException(e); } }
 
+    @Override
     public void updateBigDecimal(String columnName, BigDecimal x) throws SQLException
     { try { _res.updateBigDecimal(columnName, x); } catch (SQLException e) { handleException(e); } }
 
+    @Override
     public void updateString(String columnName, String x) throws SQLException
     { try { _res.updateString(columnName, x); } catch (SQLException e) { handleException(e); } }
 
+    @Override
     public void updateBytes(String columnName, byte[] x) throws SQLException
     { try { _res.updateBytes(columnName, x); } catch (SQLException e) { handleException(e); } }
 
+    @Override
     public void updateDate(String columnName, Date x) throws SQLException
     { try { _res.updateDate(columnName, x); } catch (SQLException e) { handleException(e); } }
 
+    @Override
     public void updateTime(String columnName, Time x) throws SQLException
     { try { _res.updateTime(columnName, x); } catch (SQLException e) { handleException(e); } }
 
+    @Override
     public void updateTimestamp(String columnName, Timestamp x) throws SQLException
     { try { _res.updateTimestamp(columnName, x); } catch (SQLException e) { handleException(e); } }
 
+    @Override
     public void updateAsciiStream(String columnName, InputStream x, int length) throws SQLException
     { try { _res.updateAsciiStream(columnName, x, length); } catch (SQLException e) { handleException(e); } }
 
+    @Override
     public void updateBinaryStream(String columnName, InputStream x, int length) throws SQLException
     { try { _res.updateBinaryStream(columnName, x, length); } catch (SQLException e) { handleException(e); } }
 
+    @Override
     public void updateCharacterStream(String columnName, Reader reader, int length) throws SQLException
     { try { _res.updateCharacterStream(columnName, reader, length); } catch (SQLException e) { handleException(e); } }
 
+    @Override
     public void updateObject(String columnName, Object x, int scale) throws SQLException
     { try { _res.updateObject(columnName, x); } catch (SQLException e) { handleException(e); } }
 
+    @Override
     public void updateObject(String columnName, Object x) throws SQLException
     { try { _res.updateObject(columnName, x); } catch (SQLException e) { handleException(e); } }
 
+    @Override
     public void insertRow() throws SQLException
     { try { _res.insertRow(); } catch (SQLException e) { handleException(e); } }
 
+    @Override
     public void updateRow() throws SQLException
     { try { _res.updateRow(); } catch (SQLException e) { handleException(e); } }
 
+    @Override
     public void deleteRow() throws SQLException
     { try { _res.deleteRow(); } catch (SQLException e) { handleException(e); } }
 
+    @Override
     public void refreshRow() throws SQLException
     { try { _res.refreshRow(); } catch (SQLException e) { handleException(e); } }
 
+    @Override
     public void cancelRowUpdates() throws SQLException
     { try { _res.cancelRowUpdates(); } catch (SQLException e) { handleException(e); } }
 
+    @Override
     public void moveToInsertRow() throws SQLException
     { try { _res.moveToInsertRow(); } catch (SQLException e) { handleException(e); } }
 
+    @Override
     public void moveToCurrentRow() throws SQLException
     { try { _res.moveToCurrentRow(); } catch (SQLException e) { handleException(e); } }
 
+    @Override
     public Object getObject(int i, Map map) throws SQLException
     { try { return _res.getObject(i, map); } catch (SQLException e) { handleException(e); return null; } }
 
+    @Override
     public Ref getRef(int i) throws SQLException
     { try { return _res.getRef(i); } catch (SQLException e) { handleException(e); return null; } }
 
+    @Override
     public Blob getBlob(int i) throws SQLException
     { try { return _res.getBlob(i); } catch (SQLException e) { handleException(e); return null; } }
 
+    @Override
     public Clob getClob(int i) throws SQLException
     { try { return _res.getClob(i); } catch (SQLException e) { handleException(e); return null; } }
 
+    @Override
     public Array getArray(int i) throws SQLException
     { try { return _res.getArray(i); } catch (SQLException e) { handleException(e); return null; } }
 
+    @Override
     public Object getObject(String colName, Map map) throws SQLException
     { try { return _res.getObject(colName, map); } catch (SQLException e) { handleException(e); return null; } }
 
+    @Override
     public Ref getRef(String colName) throws SQLException
     { try { return _res.getRef(colName); } catch (SQLException e) { handleException(e); return null; } }
 
+    @Override
     public Blob getBlob(String colName) throws SQLException
     { try { return _res.getBlob(colName); } catch (SQLException e) { handleException(e); return null; } }
 
+    @Override
     public Clob getClob(String colName) throws SQLException
     { try { return _res.getClob(colName); } catch (SQLException e) { handleException(e); return null; } }
 
+    @Override
     public Array getArray(String colName) throws SQLException
     { try { return _res.getArray(colName); } catch (SQLException e) { handleException(e); return null; } }
 
+    @Override
     public Date getDate(int columnIndex, Calendar cal) throws SQLException
     { try { return _res.getDate(columnIndex, cal); } catch (SQLException e) { handleException(e); return null; } }
 
+    @Override
     public Date getDate(String columnName, Calendar cal) throws SQLException
     { try { return _res.getDate(columnName, cal); } catch (SQLException e) { handleException(e); return null; } }
 
+    @Override
     public Time getTime(int columnIndex, Calendar cal) throws SQLException
     { try { return _res.getTime(columnIndex, cal); } catch (SQLException e) { handleException(e); return null; } }
 
+    @Override
     public Time getTime(String columnName, Calendar cal) throws SQLException
     { try { return _res.getTime(columnName, cal); } catch (SQLException e) { handleException(e); return null; } }
 
+    @Override
     public Timestamp getTimestamp(int columnIndex, Calendar cal) throws SQLException
     { try { return _res.getTimestamp(columnIndex, cal); } catch (SQLException e) { handleException(e); return null; } }
 
+    @Override
     public Timestamp getTimestamp(String columnName, Calendar cal) throws SQLException
     { try { return _res.getTimestamp(columnName, cal); } catch (SQLException e) { handleException(e); return null; } }
 
 
+    @Override
     public java.net.URL getURL(int columnIndex) throws SQLException
     { try { return _res.getURL(columnIndex); } catch (SQLException e) { handleException(e); return null; } }
 
+    @Override
     public java.net.URL getURL(String columnName) throws SQLException
     { try { return _res.getURL(columnName); } catch (SQLException e) { handleException(e); return null; } }
 
+    @Override
     public void updateRef(int columnIndex, java.sql.Ref x) throws SQLException
     { try { _res.updateRef(columnIndex, x); } catch (SQLException e) { handleException(e); } }
 
+    @Override
     public void updateRef(String columnName, java.sql.Ref x) throws SQLException
     { try { _res.updateRef(columnName, x); } catch (SQLException e) { handleException(e); } }
 
+    @Override
     public void updateBlob(int columnIndex, java.sql.Blob x) throws SQLException
     { try { _res.updateBlob(columnIndex, x); } catch (SQLException e) { handleException(e); } }
 
+    @Override
     public void updateBlob(String columnName, java.sql.Blob x) throws SQLException
     { try { _res.updateBlob(columnName, x); } catch (SQLException e) { handleException(e); } }
 
+    @Override
     public void updateClob(int columnIndex, java.sql.Clob x) throws SQLException
     { try { _res.updateClob(columnIndex, x); } catch (SQLException e) { handleException(e); } }
 
+    @Override
     public void updateClob(String columnName, java.sql.Clob x) throws SQLException
     { try { _res.updateClob(columnName, x); } catch (SQLException e) { handleException(e); } }
 
+    @Override
     public void updateArray(int columnIndex, java.sql.Array x) throws SQLException
     { try { _res.updateArray(columnIndex, x); } catch (SQLException e) { handleException(e); } }
 
+    @Override
     public void updateArray(String columnName, java.sql.Array x) throws SQLException
     { try { _res.updateArray(columnName, x); } catch (SQLException e) { handleException(e); } }
 
 /* JDBC_4_ANT_KEY_BEGIN */
 
+    @Override
     public boolean isWrapperFor(Class<?> iface) throws SQLException {
         return iface.isAssignableFrom(getClass()) || _res.isWrapperFor(iface);
     }
 
+    @Override
     public <T> T unwrap(Class<T> iface) throws SQLException {
         if (iface.isAssignableFrom(getClass())) {
             return iface.cast(this);
@@ -732,6 +779,7 @@ public class DelegatingResultSet extends
         }
     }
 
+    @Override
     public RowId getRowId(int columnIndex) throws SQLException {
         try {
             return _res.getRowId(columnIndex);
@@ -742,6 +790,7 @@ public class DelegatingResultSet extends
         }
     }
 
+    @Override
     public RowId getRowId(String columnLabel) throws SQLException {
         try {
             return _res.getRowId(columnLabel);
@@ -752,6 +801,7 @@ public class DelegatingResultSet extends
         }
     }
 
+    @Override
     public void updateRowId(int columnIndex, RowId value) throws SQLException {
         try {
             _res.updateRowId(columnIndex, value);
@@ -761,6 +811,7 @@ public class DelegatingResultSet extends
         }
     }
 
+    @Override
     public void updateRowId(String columnLabel, RowId value) throws SQLException {
         try {
             _res.updateRowId(columnLabel, value);
@@ -770,6 +821,7 @@ public class DelegatingResultSet extends
         }
     }
 
+    @Override
     public int getHoldability() throws SQLException {
         try {
             return _res.getHoldability();
@@ -780,6 +832,7 @@ public class DelegatingResultSet extends
         }
     }
 
+    @Override
     public boolean isClosed() throws SQLException {
         try {
             return _res.isClosed();
@@ -790,6 +843,7 @@ public class DelegatingResultSet extends
         }
     }
 
+    @Override
     public void updateNString(int columnIndex, String value) throws SQLException {
         try {
             _res.updateNString(columnIndex, value);
@@ -799,6 +853,7 @@ public class DelegatingResultSet extends
         }
     }
 
+    @Override
     public void updateNString(String columnLabel, String value) throws SQLException {
         try {
             _res.updateNString(columnLabel, value);
@@ -808,6 +863,7 @@ public class DelegatingResultSet extends
         }
     }
 
+    @Override
     public void updateNClob(int columnIndex, NClob value) throws SQLException {
         try {
             _res.updateNClob(columnIndex, value);
@@ -817,6 +873,7 @@ public class DelegatingResultSet extends
         }
     }
 
+    @Override
     public void updateNClob(String columnLabel, NClob value) throws SQLException {
         try {
             _res.updateNClob(columnLabel, value);
@@ -826,6 +883,7 @@ public class DelegatingResultSet extends
         }
     }
 
+    @Override
     public NClob getNClob(int columnIndex) throws SQLException {
         try {
             return _res.getNClob(columnIndex);
@@ -836,6 +894,7 @@ public class DelegatingResultSet extends
         }
     }
 
+    @Override
     public NClob getNClob(String columnLabel) throws SQLException {
         try {
             return _res.getNClob(columnLabel);
@@ -846,6 +905,7 @@ public class DelegatingResultSet extends
         }
     }
 
+    @Override
     public SQLXML getSQLXML(int columnIndex) throws SQLException {
         try {
             return _res.getSQLXML(columnIndex);
@@ -856,6 +916,7 @@ public class DelegatingResultSet extends
         }
     }
 
+    @Override
     public SQLXML getSQLXML(String columnLabel) throws SQLException {
         try {
             return _res.getSQLXML(columnLabel);
@@ -866,6 +927,7 @@ public class DelegatingResultSet extends
         }
     }
 
+    @Override
     public void updateSQLXML(int columnIndex, SQLXML value) throws SQLException {
         try {
             _res.updateSQLXML(columnIndex, value);
@@ -875,6 +937,7 @@ public class DelegatingResultSet extends
         }
     }
 
+    @Override
     public void updateSQLXML(String columnLabel, SQLXML value) throws SQLException {
         try {
             _res.updateSQLXML(columnLabel, value);
@@ -884,6 +947,7 @@ public class DelegatingResultSet extends
         }
     }
 
+    @Override
     public String getNString(int columnIndex) throws SQLException {
         try {
             return _res.getNString(columnIndex);
@@ -894,6 +958,7 @@ public class DelegatingResultSet extends
         }
     }
 
+    @Override
     public String getNString(String columnLabel) throws SQLException {
         try {
             return _res.getNString(columnLabel);
@@ -904,6 +969,7 @@ public class DelegatingResultSet extends
         }
     }
 
+    @Override
     public Reader getNCharacterStream(int columnIndex) throws SQLException {
         try {
             return _res.getNCharacterStream(columnIndex);
@@ -914,6 +980,7 @@ public class DelegatingResultSet extends
         }
     }
 
+    @Override
     public Reader getNCharacterStream(String columnLabel) throws SQLException {
         try {
             return _res.getNCharacterStream(columnLabel);
@@ -924,6 +991,7 @@ public class DelegatingResultSet extends
         }
     }
 
+    @Override
     public void updateNCharacterStream(int columnIndex, Reader reader, long length) throws SQLException {
         try {
             _res.updateNCharacterStream(columnIndex, reader, length);
@@ -933,6 +1001,7 @@ public class DelegatingResultSet extends
         }
     }
 
+    @Override
     public void updateNCharacterStream(String columnLabel, Reader reader, long length) throws SQLException {
         try {
             _res.updateNCharacterStream(columnLabel, reader, length);
@@ -942,6 +1011,7 @@ public class DelegatingResultSet extends
         }
     }
 
+    @Override
     public void updateAsciiStream(int columnIndex, InputStream inputStream, long length) throws SQLException {
         try {
             _res.updateAsciiStream(columnIndex, inputStream, length);
@@ -951,6 +1021,7 @@ public class DelegatingResultSet extends
         }
     }
 
+    @Override
     public void updateBinaryStream(int columnIndex, InputStream inputStream, long length) throws SQLException {
         try {
             _res.updateBinaryStream(columnIndex, inputStream, length);
@@ -960,6 +1031,7 @@ public class DelegatingResultSet extends
         }
     }
 
+    @Override
     public void updateCharacterStream(int columnIndex, Reader reader, long length) throws SQLException {
         try {
             _res.updateCharacterStream(columnIndex, reader, length);
@@ -969,6 +1041,7 @@ public class DelegatingResultSet extends
         }
     }
 
+    @Override
     public void updateAsciiStream(String columnLabel, InputStream inputStream, long length) throws SQLException {
         try {
             _res.updateAsciiStream(columnLabel, inputStream, length);
@@ -978,6 +1051,7 @@ public class DelegatingResultSet extends
         }
     }
 
+    @Override
     public void updateBinaryStream(String columnLabel, InputStream inputStream, long length) throws SQLException {
         try {
             _res.updateBinaryStream(columnLabel, inputStream, length);
@@ -987,6 +1061,7 @@ public class DelegatingResultSet extends
         }
     }
 
+    @Override
     public void updateCharacterStream(String columnLabel, Reader reader, long length) throws SQLException {
         try {
             _res.updateCharacterStream(columnLabel, reader, length);
@@ -996,6 +1071,7 @@ public class DelegatingResultSet extends
         }
     }
 
+    @Override
     public void updateBlob(int columnIndex, InputStream inputStream, long length) throws SQLException {
         try {
             _res.updateBlob(columnIndex, inputStream, length);
@@ -1005,6 +1081,7 @@ public class DelegatingResultSet extends
         }
     }
 
+    @Override
     public void updateBlob(String columnLabel, InputStream inputStream, long length) throws SQLException {
         try {
             _res.updateBlob(columnLabel, inputStream, length);
@@ -1014,6 +1091,7 @@ public class DelegatingResultSet extends
         }
     }
 
+    @Override
     public void updateClob(int columnIndex, Reader reader, long length) throws SQLException {
         try {
             _res.updateClob(columnIndex, reader, length);
@@ -1023,6 +1101,7 @@ public class DelegatingResultSet extends
         }
     }
 
+    @Override
     public void updateClob(String columnLabel, Reader reader, long length) throws SQLException {
         try {
             _res.updateClob(columnLabel, reader, length);
@@ -1032,6 +1111,7 @@ public class DelegatingResultSet extends
         }
     }
 
+    @Override
     public void updateNClob(int columnIndex, Reader reader, long length) throws SQLException {
         try {
             _res.updateNClob(columnIndex, reader, length);
@@ -1041,6 +1121,7 @@ public class DelegatingResultSet extends
         }
     }
 
+    @Override
     public void updateNClob(String columnLabel, Reader reader, long length) throws SQLException {
         try {
             _res.updateNClob(columnLabel, reader, length);
@@ -1050,6 +1131,7 @@ public class DelegatingResultSet extends
         }
     }
 
+    @Override
     public void updateNCharacterStream(int columnIndex, Reader reader) throws SQLException {
         try {
             _res.updateNCharacterStream(columnIndex, reader);
@@ -1059,6 +1141,7 @@ public class DelegatingResultSet extends
         }
     }
 
+    @Override
     public void updateNCharacterStream(String columnLabel, Reader reader) throws SQLException {
         try {
             _res.updateNCharacterStream(columnLabel, reader);
@@ -1068,6 +1151,7 @@ public class DelegatingResultSet extends
         }
     }
 
+    @Override
     public void updateAsciiStream(int columnIndex, InputStream inputStream) throws SQLException {
         try {
             _res.updateAsciiStream(columnIndex, inputStream);
@@ -1077,6 +1161,7 @@ public class DelegatingResultSet extends
         }
     }
 
+    @Override
     public void updateBinaryStream(int columnIndex, InputStream inputStream) throws SQLException {
         try {
             _res.updateBinaryStream(columnIndex, inputStream);
@@ -1086,6 +1171,7 @@ public class DelegatingResultSet extends
         }
     }
 
+    @Override
     public void updateCharacterStream(int columnIndex, Reader reader) throws SQLException {
         try {
             _res.updateCharacterStream(columnIndex, reader);
@@ -1095,6 +1181,7 @@ public class DelegatingResultSet extends
         }
     }
 
+    @Override
     public void updateAsciiStream(String columnLabel, InputStream inputStream) throws SQLException {
         try {
             _res.updateAsciiStream(columnLabel, inputStream);
@@ -1104,6 +1191,7 @@ public class DelegatingResultSet extends
         }
     }
 
+    @Override
     public void updateBinaryStream(String columnLabel, InputStream inputStream) throws SQLException {
         try {
             _res.updateBinaryStream(columnLabel, inputStream);
@@ -1113,6 +1201,7 @@ public class DelegatingResultSet extends
         }
     }
 
+    @Override
     public void updateCharacterStream(String columnLabel, Reader reader) throws SQLException {
         try {
             _res.updateCharacterStream(columnLabel, reader);
@@ -1122,6 +1211,7 @@ public class DelegatingResultSet extends
         }
     }
 
+    @Override
     public void updateBlob(int columnIndex, InputStream inputStream) throws SQLException {
         try {
             _res.updateBlob(columnIndex, inputStream);
@@ -1131,6 +1221,7 @@ public class DelegatingResultSet extends
         }
     }
 
+    @Override
     public void updateBlob(String columnLabel, InputStream inputStream) throws SQLException {
         try {
             _res.updateBlob(columnLabel, inputStream);
@@ -1140,6 +1231,7 @@ public class DelegatingResultSet extends
         }
     }
 
+    @Override
     public void updateClob(int columnIndex, Reader reader) throws SQLException {
         try {
             _res.updateClob(columnIndex, reader);

Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterCallableStatement.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterCallableStatement.java?rev=1099880&r1=1099879&r2=1099880&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterCallableStatement.java (original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterCallableStatement.java Thu May  5 17:20:05 2011
@@ -509,47 +509,61 @@ public class TesterCallableStatement ext
         return null;
     }
 
+    @Override
     public Reader getCharacterStream(int parameterIndex) throws SQLException {
         return null;
     }
 
+    @Override
     public Reader getCharacterStream(String parameterName) throws SQLException {
         return null;
     }
 
+    @Override
     public void setBlob(String parameterName, Blob blob) throws SQLException {
     }
 
+    @Override
     public void setClob(String parameterName, Clob clob) throws SQLException {
     }
 
+    @Override
     public void setAsciiStream(String parameterName, InputStream inputStream, long length) throws SQLException {
     }
 
+    @Override
     public void setBinaryStream(String parameterName, InputStream inputStream, long length) throws SQLException {
     }
 
+    @Override
     public void setCharacterStream(String parameterName, Reader reader, long length) throws SQLException {
     }
 
+    @Override
     public void setAsciiStream(String parameterName, InputStream inputStream) throws SQLException {
     }
 
+    @Override
     public void setBinaryStream(String parameterName, InputStream inputStream) throws SQLException {
     }
 
+    @Override
     public void setCharacterStream(String parameterName, Reader reader) throws SQLException {
     }
 
+    @Override
     public void setNCharacterStream(String parameterName, Reader reader) throws SQLException {
     }
 
+    @Override
     public void setClob(String parameterName, Reader reader) throws SQLException {
     }
 
+    @Override
     public void setBlob(String parameterName, InputStream inputStream) throws SQLException {
     }
 
+    @Override
     public void setNClob(String parameterName, Reader reader) throws SQLException {
     }
 /* JDBC_4_ANT_KEY_END */

Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterDatabaseMetaData.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterDatabaseMetaData.java?rev=1099880&r1=1099879&r2=1099880&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterDatabaseMetaData.java (original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterDatabaseMetaData.java Thu May  5 17:20:05 2011
@@ -552,309 +552,383 @@ public class TesterDatabaseMetaData impl
         return false;
     }
 
+    @Override
     public boolean supportsAlterTableWithDropColumn() throws SQLException {
         return false;
     }
 
+    @Override
     public boolean supportsBatchUpdates() throws SQLException {
         return false;
     }
 
+    @Override
     public boolean supportsCatalogsInDataManipulation() throws SQLException {
         return false;
     }
 
+    @Override
     public boolean supportsCatalogsInIndexDefinitions() throws SQLException {
         return false;
     }
 
+    @Override
     public boolean supportsCatalogsInPrivilegeDefinitions() throws SQLException {
         return false;
     }
 
+    @Override
     public boolean supportsCatalogsInProcedureCalls() throws SQLException {
         return false;
     }
 
+    @Override
     public boolean supportsCatalogsInTableDefinitions() throws SQLException {
         return false;
     }
 
+    @Override
     public boolean supportsColumnAliasing() throws SQLException {
         return false;
     }
 
+    @Override
     public boolean supportsConvert() throws SQLException {
         return false;
     }
 
+    @Override
     public boolean supportsConvert(int fromType, int toType)
             throws SQLException {
         return false;
     }
 
+    @Override
     public boolean supportsCoreSQLGrammar() throws SQLException {
         return false;
     }
 
+    @Override
     public boolean supportsCorrelatedSubqueries() throws SQLException {
         return false;
     }
 
+    @Override
     public boolean supportsDataDefinitionAndDataManipulationTransactions()
             throws SQLException {
         return false;
     }
 
+    @Override
     public boolean supportsDataManipulationTransactionsOnly()
             throws SQLException {
         return false;
     }
 
+    @Override
     public boolean supportsDifferentTableCorrelationNames() throws SQLException {
         return false;
     }
 
+    @Override
     public boolean supportsExpressionsInOrderBy() throws SQLException {
         return false;
     }
 
+    @Override
     public boolean supportsExtendedSQLGrammar() throws SQLException {
         return false;
     }
 
+    @Override
     public boolean supportsFullOuterJoins() throws SQLException {
         return false;
     }
 
+    @Override
     public boolean supportsGetGeneratedKeys() throws SQLException {
         return false;
     }
 
+    @Override
     public boolean supportsGroupBy() throws SQLException {
         return false;
     }
 
+    @Override
     public boolean supportsGroupByBeyondSelect() throws SQLException {
         return false;
     }
 
+    @Override
     public boolean supportsGroupByUnrelated() throws SQLException {
         return false;
     }
 
+    @Override
     public boolean supportsIntegrityEnhancementFacility() throws SQLException {
         return false;
     }
 
+    @Override
     public boolean supportsLikeEscapeClause() throws SQLException {
         return false;
     }
 
+    @Override
     public boolean supportsLimitedOuterJoins() throws SQLException {
         return false;
     }
 
+    @Override
     public boolean supportsMinimumSQLGrammar() throws SQLException {
         return false;
     }
 
+    @Override
     public boolean supportsMixedCaseIdentifiers() throws SQLException {
         return false;
     }
 
+    @Override
     public boolean supportsMixedCaseQuotedIdentifiers() throws SQLException {
         return false;
     }
 
+    @Override
     public boolean supportsMultipleOpenResults() throws SQLException {
         return false;
     }
 
+    @Override
     public boolean supportsMultipleResultSets() throws SQLException {
         return false;
     }
 
+    @Override
     public boolean supportsMultipleTransactions() throws SQLException {
         return false;
     }
 
+    @Override
     public boolean supportsNamedParameters() throws SQLException {
         return false;
     }
 
+    @Override
     public boolean supportsNonNullableColumns() throws SQLException {
         return false;
     }
 
+    @Override
     public boolean supportsOpenCursorsAcrossCommit() throws SQLException {
         return false;
     }
 
+    @Override
     public boolean supportsOpenCursorsAcrossRollback() throws SQLException {
         return false;
     }
 
+    @Override
     public boolean supportsOpenStatementsAcrossCommit() throws SQLException {
         return false;
     }
 
+    @Override
     public boolean supportsOpenStatementsAcrossRollback() throws SQLException {
         return false;
     }
 
+    @Override
     public boolean supportsOrderByUnrelated() throws SQLException {
         return false;
     }
 
+    @Override
     public boolean supportsOuterJoins() throws SQLException {
         return false;
     }
 
+    @Override
     public boolean supportsPositionedDelete() throws SQLException {
         return false;
     }
 
+    @Override
     public boolean supportsPositionedUpdate() throws SQLException {
         return false;
     }
 
+    @Override
     public boolean supportsResultSetConcurrency(int type, int concurrency)
             throws SQLException {
         return false;
     }
 
+    @Override
     public boolean supportsResultSetHoldability(int holdability)
             throws SQLException {
         return false;
     }
 
+    @Override
     public boolean supportsResultSetType(int type) throws SQLException {
         return false;
     }
 
+    @Override
     public boolean supportsSavepoints() throws SQLException {
         return false;
     }
 
+    @Override
     public boolean supportsSchemasInDataManipulation() throws SQLException {
         return false;
     }
 
+    @Override
     public boolean supportsSchemasInIndexDefinitions() throws SQLException {
         return false;
     }
 
+    @Override
     public boolean supportsSchemasInPrivilegeDefinitions() throws SQLException {
         return false;
     }
 
+    @Override
     public boolean supportsSchemasInProcedureCalls() throws SQLException {
         return false;
     }
 
+    @Override
     public boolean supportsSchemasInTableDefinitions() throws SQLException {
         return false;
     }
 
+    @Override
     public boolean supportsSelectForUpdate() throws SQLException {
         return false;
     }
 
+    @Override
     public boolean supportsStatementPooling() throws SQLException {
         return false;
     }
 
+    @Override
     public boolean supportsStoredProcedures() throws SQLException {
         return false;
     }
 
+    @Override
     public boolean supportsSubqueriesInComparisons() throws SQLException {
         return false;
     }
 
+    @Override
     public boolean supportsSubqueriesInExists() throws SQLException {
         return false;
     }
 
+    @Override
     public boolean supportsSubqueriesInIns() throws SQLException {
         return false;
     }
 
+    @Override
     public boolean supportsSubqueriesInQuantifieds() throws SQLException {
         return false;
     }
 
+    @Override
     public boolean supportsTableCorrelationNames() throws SQLException {
         return false;
     }
 
+    @Override
     public boolean supportsTransactionIsolationLevel(int level)
             throws SQLException {
         return false;
     }
 
+    @Override
     public boolean supportsTransactions() throws SQLException {
         return false;
     }
 
+    @Override
     public boolean supportsUnion() throws SQLException {
         return false;
     }
 
+    @Override
     public boolean supportsUnionAll() throws SQLException {
         return false;
     }
 
+    @Override
     public boolean updatesAreDetected(int type) throws SQLException {
         return false;
     }
 
+    @Override
     public boolean usesLocalFilePerTable() throws SQLException {
         return false;
     }
 
+    @Override
     public boolean usesLocalFiles() throws SQLException {
         return false;
     }
 
     /* JDBC_4_ANT_KEY_BEGIN */
 
+    @Override
     public boolean isWrapperFor(Class<?> iface) throws SQLException {
         return false;
     }
 
+    @Override
     public <T> T unwrap(Class<T> iface) throws SQLException {
         return null;
     }
 
+    @Override
     public RowIdLifetime getRowIdLifetime() throws SQLException {
         return null;
     }
 
+    @Override
     public ResultSet getSchemas(String catalog, String schemaPattern)
     throws SQLException {
         return null;
     }
 
+    @Override
     public boolean autoCommitFailureClosesAllResultSets() throws SQLException {
         return false;
     }
 
+    @Override
     public boolean supportsStoredFunctionsUsingCallSyntax() throws SQLException {
         return false;
     }
 
+    @Override
     public ResultSet getClientInfoProperties() throws SQLException {
         return null;
     }
     
+    @Override
     public ResultSet getFunctionColumns(String catalog, String schemaPattern,
             String functionNamePattern, String columnNamePattern)
             throws SQLException {
         return null;
     }
 
+    @Override
     public ResultSet getFunctions(String catalog, String schemaPattern,
             String functionNamePattern) throws SQLException {
         return null;

Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterResultSet.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterResultSet.java?rev=1099880&r1=1099879&r2=1099880&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterResultSet.java (original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterResultSet.java Thu May  5 17:20:05 2011
@@ -650,159 +650,192 @@ public SQLWarning getWarnings() throws S
         checkOpen();
     }
 
+    @Override
     public void updateBytes(String columnName, byte x[]) throws SQLException {
         checkOpen();
     }
 
+    @Override
     public void updateDate(String columnName, java.sql.Date x) throws SQLException {
         checkOpen();
     }
 
+    @Override
     public void updateTime(String columnName, java.sql.Time x) throws SQLException {
         checkOpen();
     }
 
+    @Override
     public void updateTimestamp(String columnName, java.sql.Timestamp x)
       throws SQLException {
         checkOpen();
     }
 
+    @Override
     public void updateAsciiStream(String columnName,
                java.io.InputStream x,
                int length) throws SQLException {
         checkOpen();
     }
 
+    @Override
     public void updateBinaryStream(String columnName,
                 java.io.InputStream x,
                 int length) throws SQLException {
         checkOpen();
     }
 
+    @Override
     public void updateCharacterStream(String columnName,
                  java.io.Reader reader,
                  int length) throws SQLException {
         checkOpen();
     }
 
+    @Override
     public void updateObject(String columnName, Object x, int scale)
       throws SQLException {
         checkOpen();
     }
 
+    @Override
     public void updateObject(String columnName, Object x) throws SQLException {
         checkOpen();
     }
 
+    @Override
     public void insertRow() throws SQLException {
         checkOpen();
     }
 
+    @Override
     public void updateRow() throws SQLException {
         checkOpen();
     }
 
+    @Override
     public void deleteRow() throws SQLException {
         checkOpen();
     }
 
+    @Override
     public void refreshRow() throws SQLException {
         checkOpen();
     }
 
+    @Override
     public void cancelRowUpdates() throws SQLException {
         checkOpen();
     }
 
+    @Override
     public void moveToInsertRow() throws SQLException {
         checkOpen();
     }
 
+    @Override
     public void moveToCurrentRow() throws SQLException {
         checkOpen();
     }
 
+    @Override
     public Statement getStatement() throws SQLException {
         checkOpen();
         return _statement;
     }
 
 
+    @Override
     public Object getObject(int i, java.util.Map map) throws SQLException {
         checkOpen();
         return new Object();
     }
 
+    @Override
     public Ref getRef(int i) throws SQLException {
         checkOpen();
         return null;
     }
 
+    @Override
     public Blob getBlob(int i) throws SQLException {
         checkOpen();
         return null;
     }
 
+    @Override
     public Clob getClob(int i) throws SQLException {
         checkOpen();
         return null;
     }
 
+    @Override
     public Array getArray(int i) throws SQLException {
         checkOpen();
         return null;
     }
 
+    @Override
     public Object getObject(String colName, java.util.Map map) throws SQLException {
         checkOpen();
         return colName;
     }
 
+    @Override
     public Ref getRef(String colName) throws SQLException {
         checkOpen();
         return null;
     }
 
+    @Override
     public Blob getBlob(String colName) throws SQLException {
         checkOpen();
         return null;
     }
 
+    @Override
     public Clob getClob(String colName) throws SQLException {
         checkOpen();
         return null;
     }
 
+    @Override
     public Array getArray(String colName) throws SQLException {
         checkOpen();
         return null;
     }
 
+    @Override
     public java.sql.Date getDate(int columnIndex, Calendar cal) throws SQLException {
         checkOpen();
         return null;
     }
 
+    @Override
     public java.sql.Date getDate(String columnName, Calendar cal) throws SQLException {
         checkOpen();
         return null;
     }
 
+    @Override
     public java.sql.Time getTime(int columnIndex, Calendar cal) throws SQLException {
         checkOpen();
         return null;
     }
 
+    @Override
     public java.sql.Time getTime(String columnName, Calendar cal) throws SQLException {
         checkOpen();
         return null;
     }
 
+    @Override
     public java.sql.Timestamp getTimestamp(int columnIndex, Calendar cal) throws SQLException {
         checkOpen();
         return null;
     }
 
+    @Override
     public java.sql.Timestamp getTimestamp(String columnName, Calendar cal)
       throws SQLException {
         checkOpen();
@@ -815,49 +848,59 @@ public SQLWarning getWarnings() throws S
         }
     }
 
+    @Override
     public java.net.URL getURL(int columnIndex) throws SQLException {
         throw new SQLException("Not implemented.");
     }
 
+    @Override
     public java.net.URL getURL(String columnName) throws SQLException {
         throw new SQLException("Not implemented.");
     }
 
+    @Override
     public void updateRef(int columnIndex, java.sql.Ref x)
         throws SQLException {
         throw new SQLException("Not implemented.");
     }
 
+    @Override
     public void updateRef(String columnName, java.sql.Ref x)
         throws SQLException {
         throw new SQLException("Not implemented.");
     }
 
+    @Override
     public void updateBlob(int columnIndex, java.sql.Blob x)
         throws SQLException {
         throw new SQLException("Not implemented.");
     }
 
+    @Override
     public void updateBlob(String columnName, java.sql.Blob x)
         throws SQLException {
         throw new SQLException("Not implemented.");
     }
 
+    @Override
     public void updateClob(int columnIndex, java.sql.Clob x)
         throws SQLException {
         throw new SQLException("Not implemented.");
     }
 
+    @Override
     public void updateClob(String columnName, java.sql.Clob x)
         throws SQLException {
         throw new SQLException("Not implemented.");
     }
 
+    @Override
     public void updateArray(int columnIndex, java.sql.Array x)
         throws SQLException {
         throw new SQLException("Not implemented.");
     }
 
+    @Override
     public void updateArray(String columnName, java.sql.Array x)
         throws SQLException {
         throw new SQLException("Not implemented.");
@@ -865,202 +908,252 @@ public SQLWarning getWarnings() throws S
 
 /* JDBC_4_ANT_KEY_BEGIN */
 
+    @Override
     public boolean isWrapperFor(Class<?> iface) throws SQLException {
         throw new SQLException("Not implemented.");
     }
 
+    @Override
     public <T> T unwrap(Class<T> iface) throws SQLException {
         throw new SQLException("Not implemented.");
     }
 
+    @Override
     public RowId getRowId(int columnIndex) throws SQLException {
         throw new SQLException("Not implemented.");
     }
 
+    @Override
     public RowId getRowId(String columnLabel) throws SQLException {
         throw new SQLException("Not implemented.");
     }
 
+    @Override
     public void updateRowId(int columnIndex, RowId value) throws SQLException {
         throw new SQLException("Not implemented.");
     }
 
+    @Override
     public void updateRowId(String columnLabel, RowId value) throws SQLException {
         throw new SQLException("Not implemented.");
     }
 
+    @Override
     public int getHoldability() throws SQLException {
         throw new SQLException("Not implemented.");
     }
 
+    @Override
     public boolean isClosed() throws SQLException {
         return !_open;
     }
 
+    @Override
     public void updateNString(int columnIndex, String value) throws SQLException {
         throw new SQLException("Not implemented.");
     }
 
+    @Override
     public void updateNString(String columnLabel, String value) throws SQLException {
         throw new SQLException("Not implemented.");
     }
 
+    @Override
     public void updateNClob(int columnIndex, NClob value) throws SQLException {
         throw new SQLException("Not implemented.");
     }
 
+    @Override
     public void updateNClob(String columnLabel, NClob value) throws SQLException {
         throw new SQLException("Not implemented.");
     }
 
+    @Override
     public NClob getNClob(int columnIndex) throws SQLException {
         throw new SQLException("Not implemented.");
     }
 
+    @Override
     public NClob getNClob(String columnLabel) throws SQLException {
         throw new SQLException("Not implemented.");
     }
 
+    @Override
     public SQLXML getSQLXML(int columnIndex) throws SQLException {
         throw new SQLException("Not implemented.");
     }
 
+    @Override
     public SQLXML getSQLXML(String columnLabel) throws SQLException {
         throw new SQLException("Not implemented.");
     }
 
+    @Override
     public void updateSQLXML(int columnIndex, SQLXML value) throws SQLException {
         throw new SQLException("Not implemented.");
     }
 
+    @Override
     public void updateSQLXML(String columnLabel, SQLXML value) throws SQLException {
         throw new SQLException("Not implemented.");
     }
 
+    @Override
     public String getNString(int columnIndex) throws SQLException {
         throw new SQLException("Not implemented.");
     }
 
+    @Override
     public String getNString(String columnLabel) throws SQLException {
         throw new SQLException("Not implemented.");
     }
 
+    @Override
     public Reader getNCharacterStream(int columnIndex) throws SQLException {
         throw new SQLException("Not implemented.");
     }
 
+    @Override
     public Reader getNCharacterStream(String columnLabel) throws SQLException {
         throw new SQLException("Not implemented.");
     }
 
+    @Override
     public void updateNCharacterStream(int columnIndex, Reader reader, long length) throws SQLException {
         throw new SQLException("Not implemented.");
     }
 
+    @Override
     public void updateNCharacterStream(String columnLabel, Reader reader, long length) throws SQLException {
         throw new SQLException("Not implemented.");
     }
 
+    @Override
     public void updateAsciiStream(int columnIndex, InputStream inputStream, long length) throws SQLException {
         throw new SQLException("Not implemented.");
     }
 
+    @Override
     public void updateBinaryStream(int columnIndex, InputStream inputStream, long length) throws SQLException {
         throw new SQLException("Not implemented.");
     }
 
+    @Override
     public void updateCharacterStream(int columnIndex, Reader reader, long length) throws SQLException {
         throw new SQLException("Not implemented.");
     }
 
+    @Override
     public void updateAsciiStream(String columnLabel, InputStream inputStream, long length) throws SQLException {
         throw new SQLException("Not implemented.");
     }
 
+    @Override
     public void updateBinaryStream(String columnLabel, InputStream inputStream, long length) throws SQLException {
         throw new SQLException("Not implemented.");
     }
 
+    @Override
     public void updateCharacterStream(String columnLabel, Reader reader, long length) throws SQLException {
         throw new SQLException("Not implemented.");
     }
 
+    @Override
     public void updateBlob(int columnIndex, InputStream inputStream, long length) throws SQLException {
         throw new SQLException("Not implemented.");
     }
 
+    @Override
     public void updateBlob(String columnLabel, InputStream inputStream, long length) throws SQLException {
         throw new SQLException("Not implemented.");
     }
 
+    @Override
     public void updateClob(int columnIndex, Reader reader, long length) throws SQLException {
         throw new SQLException("Not implemented.");
     }
 
+    @Override
     public void updateClob(String columnLabel, Reader reader, long length) throws SQLException {
         throw new SQLException("Not implemented.");
     }
 
+    @Override
     public void updateNClob(int columnIndex, Reader reader, long length) throws SQLException {
         throw new SQLException("Not implemented.");
     }
 
+    @Override
     public void updateNClob(String columnLabel, Reader reader, long length) throws SQLException {
         throw new SQLException("Not implemented.");
     }
 
+    @Override
     public void updateNCharacterStream(int columnIndex, Reader reader) throws SQLException {
         throw new SQLException("Not implemented.");
     }
 
+    @Override
     public void updateNCharacterStream(String columnLabel, Reader reader) throws SQLException {
         throw new SQLException("Not implemented.");
     }
 
+    @Override
     public void updateAsciiStream(int columnIndex, InputStream inputStream) throws SQLException {
         throw new SQLException("Not implemented.");
     }
 
+    @Override
     public void updateBinaryStream(int columnIndex, InputStream inputStream) throws SQLException {
         throw new SQLException("Not implemented.");
     }
 
+    @Override
     public void updateCharacterStream(int columnIndex, Reader reader) throws SQLException {
         throw new SQLException("Not implemented.");
     }
 
+    @Override
     public void updateAsciiStream(String columnLabel, InputStream inputStream) throws SQLException {
         throw new SQLException("Not implemented.");
     }
 
+    @Override
     public void updateBinaryStream(String columnLabel, InputStream inputStream) throws SQLException {
         throw new SQLException("Not implemented.");
     }
 
+    @Override
     public void updateCharacterStream(String columnLabel, Reader reader) throws SQLException {
         throw new SQLException("Not implemented.");
     }
 
+    @Override
     public void updateBlob(int columnIndex, InputStream inputStream) throws SQLException {
         throw new SQLException("Not implemented.");
     }
 
+    @Override
     public void updateBlob(String columnLabel, InputStream inputStream) throws SQLException {
         throw new SQLException("Not implemented.");
     }
 
+    @Override
     public void updateClob(int columnIndex, Reader reader) throws SQLException {
         throw new SQLException("Not implemented.");
     }
 
+    @Override
     public void updateClob(String columnLabel, Reader reader) throws SQLException {
         throw new SQLException("Not implemented.");
     }
 
+    @Override
     public void updateNClob(int columnIndex, Reader reader) throws SQLException {
         throw new SQLException("Not implemented.");
     }
 
+    @Override
     public void updateNClob(String columnLabel, Reader reader) throws SQLException {
         throw new SQLException("Not implemented.");
     }