commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1102285 - in /commons/proper/dbcp/trunk/src: changes/ java/org/apache/commons/dbcp2/ test/org/apache/commons/dbcp2/
Date Thu, 12 May 2011 13:21:27 GMT
Author: markt
Date: Thu May 12 13:21:26 2011
New Revision: 1102285

URL: http://svn.apache.org/viewvc?rev=1102285&view=rev
Log:
Add @Deprecated annotations

Modified:
    commons/proper/dbcp/trunk/src/changes/changes.xml
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DbcpException.java
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingCallableStatement.java
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingPreparedStatement.java
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingResultSet.java
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolingDriver.java
    commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterCallableStatement.java
    commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterPreparedStatement.java
    commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterResultSet.java

Modified: commons/proper/dbcp/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/changes/changes.xml?rev=1102285&r1=1102284&r2=1102285&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/changes/changes.xml (original)
+++ commons/proper/dbcp/trunk/src/changes/changes.xml Thu May 12 13:21:26 2011
@@ -60,7 +60,8 @@ The <action> type attribute can be add,u
       </action>
     </release>
       <action dev="markt" type="update">
-        Updated source code for Java 1.6 (added @Override annotations).
+        Updated source code for Java 1.6 (added @Override & @Deprecated
+        annotations).
       </action>
       <action dev="markt" type="update">
         Removed JOCL support.

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DbcpException.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DbcpException.java?rev=1102285&r1=1102284&r2=1102285&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DbcpException.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DbcpException.java Thu May
12 13:21:26 2011
@@ -29,6 +29,7 @@ package org.apache.commons.dbcp2;
  * 
  * @deprecated This will be removed in a future version of DBCP.
  **/
+@Deprecated
 public class DbcpException extends RuntimeException {
 
     private static final long serialVersionUID = 2477800549022838103L;

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=1102285&r1=1102284&r2=1102285&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 12 13:21:26 2011
@@ -139,6 +139,7 @@ public class DelegatingCallableStatement
 
     /** @deprecated */
     @Override
+    @Deprecated
     public BigDecimal getBigDecimal(int parameterIndex, int scale) throws SQLException
     { checkOpen(); try { return ((CallableStatement)_stmt).getBigDecimal( parameterIndex,
 scale); } catch (SQLException e) { handleException(e); return null; } }
 

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingPreparedStatement.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingPreparedStatement.java?rev=1102285&r1=1102284&r2=1102285&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingPreparedStatement.java
(original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingPreparedStatement.java
Thu May 12 13:21:26 2011
@@ -182,6 +182,7 @@ public class DelegatingPreparedStatement
     { checkOpen(); try { ((PreparedStatement)_stmt).setAsciiStream(parameterIndex,x,length);
} catch (SQLException e) { handleException(e); } }
 
     /** @deprecated */
+    @Deprecated
     @Override
     public void setUnicodeStream(int parameterIndex, java.io.InputStream x, int length) throws
SQLException
     { checkOpen(); try { ((PreparedStatement)_stmt).setUnicodeStream(parameterIndex,x,length);
} catch (SQLException e) { handleException(e); } }

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=1102285&r1=1102284&r2=1102285&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 12 13:21:26 2011
@@ -249,6 +249,7 @@ public class DelegatingResultSet extends
     { try { return _res.getDouble(columnIndex); } catch (SQLException e) { handleException(e);
return 0; } }
 
     /** @deprecated */
+    @Deprecated
     @Override
     public BigDecimal getBigDecimal(int columnIndex, int scale) throws SQLException
     { try { return _res.getBigDecimal(columnIndex); } catch (SQLException e) { handleException(e);
return null; } }
@@ -274,6 +275,7 @@ public class DelegatingResultSet extends
     { try { return _res.getAsciiStream(columnIndex); } catch (SQLException e) { handleException(e);
return null; } }
 
     /** @deprecated */
+    @Deprecated
     @Override
     public InputStream getUnicodeStream(int columnIndex) throws SQLException
     { try { return _res.getUnicodeStream(columnIndex); } catch (SQLException e) { handleException(e);
return null; } }
@@ -315,6 +317,7 @@ public class DelegatingResultSet extends
     { try { return _res.getDouble(columnName); } catch (SQLException e) { handleException(e);
return 0; } }
 
     /** @deprecated */
+    @Deprecated
     @Override
     public BigDecimal getBigDecimal(String columnName, int scale) throws SQLException
     { try { return _res.getBigDecimal(columnName); } catch (SQLException e) { handleException(e);
return null; } }
@@ -340,6 +343,7 @@ public class DelegatingResultSet extends
     { try { return _res.getAsciiStream(columnName); } catch (SQLException e) { handleException(e);
return null; } }
 
     /** @deprecated */
+    @Deprecated
     @Override
     public InputStream getUnicodeStream(String columnName) throws SQLException
     { try { return _res.getUnicodeStream(columnName); } catch (SQLException e) { handleException(e);
return null; } }

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolingDriver.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolingDriver.java?rev=1102285&r1=1102284&r2=1102285&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolingDriver.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolingDriver.java Thu May
12 13:21:26 2011
@@ -89,6 +89,7 @@ public class PoolingDriver implements Dr
      * 
      * @deprecated This will be removed in a future version of DBCP.
      */
+    @Deprecated
     public synchronized ObjectPool getPool(String name) {
         try {
             return getConnectionPool(name);

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=1102285&r1=1102284&r2=1102285&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 12 13:21:26 2011
@@ -115,6 +115,7 @@ public class TesterCallableStatement ext
     /**
      * @deprecated
      */
+    @Deprecated
     @Override
     public BigDecimal getBigDecimal(int parameterIndex, int scale) throws SQLException {
         return null;

Modified: commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterPreparedStatement.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterPreparedStatement.java?rev=1102285&r1=1102284&r2=1102285&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterPreparedStatement.java
(original)
+++ commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp2/TesterPreparedStatement.java
Thu May 12 13:21:26 2011
@@ -184,6 +184,7 @@ public class TesterPreparedStatement ext
     }
 
     /** @deprecated */
+    @Deprecated
     @Override
     public void setUnicodeStream(int parameterIndex, java.io.InputStream x, int length) throws
SQLException {
         checkOpen();

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=1102285&r1=1102284&r2=1102285&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
12 13:21:26 2011
@@ -161,6 +161,7 @@ public class TesterResultSet implements 
     }
 
     /** @deprecated */
+    @Deprecated
     @Override
     public BigDecimal getBigDecimal(int columnIndex, int scale) throws SQLException {
         checkOpen();
@@ -198,6 +199,7 @@ public class TesterResultSet implements 
     }
 
     /** @deprecated */
+    @Deprecated
     @Override
     public java.io.InputStream getUnicodeStream(int columnIndex) throws SQLException {
         checkOpen();
@@ -259,6 +261,7 @@ public class TesterResultSet implements 
     }
 
     /** @deprecated */
+    @Deprecated
     @Override
     public BigDecimal getBigDecimal(String columnName, int scale) throws SQLException {
         checkOpen();
@@ -296,6 +299,7 @@ public class TesterResultSet implements 
     }
 
     /** @deprecated */
+    @Deprecated
     @Override
     public java.io.InputStream getUnicodeStream(String columnName) throws SQLException {
         checkOpen();



Mime
View raw message