Author: sebb
Date: Wed Aug 17 12:55:44 2011
New Revision: 1158678
URL: http://svn.apache.org/viewvc?rev=1158678&view=rev
Log:
Javadoc fixes
Modified:
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolingConnection.java
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/PStmtKeyCPDS.java
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/KeyedCPDSConnectionFactory.java
Modified:
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolingConnection.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolingConnection.java?rev=1158678&r1=1158677&r2=1158678&view=diff
==============================================================================
---
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolingConnection.java
(original)
+++
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolingConnection.java
Wed Aug 17 12:55:44 2011
@@ -275,7 +275,7 @@ public class PoolingConnection extends D
* The <code>stmtType</code> field in the key determines whether
* a PoolablePreparedStatement or PoolableCallableStatement is created.
*
- * @param obj the key for the {@link PreparedStatement} to be created
+ * @param key the key for the {@link PreparedStatement} to be created
* @see #createKey(String, int, int, byte)
*/
@Override
@@ -308,7 +308,7 @@ public class PoolingConnection extends D
* Closes the underlying statement.
*
* @param key ignored
- * @param obj the pooled statement to be destroyed.
+ * @param dps the pooled statement to be destroyed.
*/
@Override
public void destroyObject(PStmtKey key, DelegatingPreparedStatement dps)
@@ -335,7 +335,7 @@ public class PoolingConnection extends D
* pooled statements.
*
* @param key ignored
- * @param obj pooled statement to be activated
+ * @param dps pooled statement to be activated
*/
@Override
public void activateObject(PStmtKey key,
@@ -349,7 +349,7 @@ public class PoolingConnection extends D
* Invokes {@link PreparedStatement#clearParameters}.
*
* @param key ignored
- * @param obj a {@link PreparedStatement}
+ * @param dps a {@link PreparedStatement}
*/
@Override
public void passivateObject(PStmtKey key,
Modified:
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/PStmtKeyCPDS.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/PStmtKeyCPDS.java?rev=1158678&r1=1158677&r2=1158678&view=diff
==============================================================================
---
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/PStmtKeyCPDS.java
(original)
+++
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/PStmtKeyCPDS.java
Wed Aug 17 12:55:44 2011
@@ -21,7 +21,7 @@ import java.util.Arrays;
import org.apache.commons.dbcp2.PStmtKey;
/**
- * A key uniquely identifying {@link PreparedStatement}s.
+ * A key uniquely identifying a {@link java.sql.PreparedStatement
PreparedStatement}.
*/
public class PStmtKeyCPDS extends PStmtKey {
private Integer _autoGeneratedKeys = null;
Modified:
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java?rev=1158678&r1=1158677&r2=1158678&view=diff
==============================================================================
---
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java
(original)
+++
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/cpdsadapter/PooledConnectionImpl.java
Wed Aug 17 12:55:44 2011
@@ -424,7 +424,7 @@ class PooledConnectionImpl implements Po
/**
* My {*link KeyedPoolableObjectFactory} method for creating
* {*link PreparedStatement}s.
- * @param obj the key for the {*link PreparedStatement} to be created
+ * @param key the key for the {*link PreparedStatement} to be created
*/
@Override
public
PoolablePreparedStatement<PStmtKeyCPDS,PoolablePreparedStatementStub>
makeObject(PStmtKeyCPDS key) throws Exception {
@@ -458,7 +458,7 @@ class PooledConnectionImpl implements Po
* My {*link KeyedPoolableObjectFactory} method for destroying
* {*link PreparedStatement}s.
* @param key ignored
- * @param obj the {*link PreparedStatement} to be destroyed.
+ * @param ppss the {*link PreparedStatement} to be destroyed.
*/
@Override
public void destroyObject(PStmtKeyCPDS key,
PoolablePreparedStatement<PStmtKeyCPDS,PoolablePreparedStatementStub> ppss)
@@ -470,7 +470,7 @@ class PooledConnectionImpl implements Po
* My {*link KeyedPoolableObjectFactory} method for validating
* {*link PreparedStatement}s.
* @param key ignored
- * @param obj ignored
+ * @param ppss ignored
* @return <tt>true</tt>
*/
@Override
@@ -482,7 +482,7 @@ class PooledConnectionImpl implements Po
* My {*link KeyedPoolableObjectFactory} method for activating
* {*link PreparedStatement}s.
* @param key ignored
- * @param obj ignored
+ * @param ppss ignored
*/
@Override
public void activateObject(PStmtKeyCPDS key,
PoolablePreparedStatement<PStmtKeyCPDS,PoolablePreparedStatementStub> ppss)
@@ -494,7 +494,7 @@ class PooledConnectionImpl implements Po
* My {*link KeyedPoolableObjectFactory} method for passivating
* {*link PreparedStatement}s. Currently invokes {*link
PreparedStatement#clearParameters}.
* @param key ignored
- * @param obj a {*link PreparedStatement}
+ * @param ppss a {*link PreparedStatement}
*/
@Override
public void passivateObject(PStmtKeyCPDS key,
PoolablePreparedStatement<PStmtKeyCPDS,PoolablePreparedStatementStub> ppss)
Modified:
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/KeyedCPDSConnectionFactory.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/KeyedCPDSConnectionFactory.java?rev=1158678&r1=1158677&r2=1158678&view=diff
==============================================================================
---
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/KeyedCPDSConnectionFactory.java
(original)
+++
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/KeyedCPDSConnectionFactory.java
Wed Aug 17 12:55:44 2011
@@ -110,7 +110,7 @@ class KeyedCPDSConnectionFactory
/**
* Creates a new {@link PooledConnectionAndInfo} from the given {@link
UserPassKey}.
*
- * @param key {@link UserPassKey} containing user credentials
+ * @param upkey {@link UserPassKey} containing user credentials
* @throws SQLException if the connection could not be created.
* @see
org.apache.commons.pool2.KeyedPoolableObjectFactory#makeObject(java.lang.Object)
*/
