You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by da...@apache.org on 2013/04/26 07:15:50 UTC
svn commit: r1476040 - in
/db/derby/code/trunk/java/client/org/apache/derby/client:
am/CallableLocatorProcedures.java am/ClientJDBCObjectFactory.java
am/ClientPreparedStatement.java am/ClientStatement.java
net/ClientJDBCObjectFactoryImpl.java
Author: dag
Date: Fri Apr 26 05:15:49 2013
New Revision: 1476040
URL: http://svn.apache.org/r1476040
Log:
DERBY-6125 Code clean up in client driver.
Javadoc fixup after changes in derby-6125-rename-01-c (svn 1471245).
Modified:
db/derby/code/trunk/java/client/org/apache/derby/client/am/CallableLocatorProcedures.java
db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientJDBCObjectFactory.java
db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientPreparedStatement.java
db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientStatement.java
db/derby/code/trunk/java/client/org/apache/derby/client/net/ClientJDBCObjectFactoryImpl.java
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/CallableLocatorProcedures.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/CallableLocatorProcedures.java?rev=1476040&r1=1476039&r2=1476040&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/CallableLocatorProcedures.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/CallableLocatorProcedures.java Fri Apr 26 05:15:49 2013
@@ -43,7 +43,7 @@ import org.apache.derby.shared.common.re
* that does not fit in a VARCHAR (FOR BIT DATA), are split into
* several calls each operating on a fragment of the LOB.
*
- * @see Connection#locatorProcedureCall for an example of how to use
+ * @see ClientConnection#locatorProcedureCall for an example of how to use
* this class.
*/
class CallableLocatorProcedures
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientJDBCObjectFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientJDBCObjectFactory.java?rev=1476040&r1=1476039&r2=1476040&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientJDBCObjectFactory.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientJDBCObjectFactory.java Fri Apr 26 05:15:49 2013
@@ -221,7 +221,7 @@ public interface ClientJDBCObjectFactory
/**
* This method returns an instance of NetConnection (or
- * NetConnection40) class which extends from Connection. This
+ * NetConnection40) class which extends from ClientConnection. This
* implements the {@code java.sql.Connection} interface.
*/
ClientConnection newNetConnection(
@@ -231,7 +231,7 @@ public interface ClientJDBCObjectFactory
/**
* This method returns an instance of NetConnection (or NetConnection40) class
- * which extends from Connection
+ * which extends from ClientConnection
* this implements the {@code java.sql.Connection} interface
*/
ClientConnection newNetConnection(
@@ -242,7 +242,7 @@ public interface ClientJDBCObjectFactory
/**
* This method returns an instance of NetConnection (or NetConnection40)
- * class which extends from org.apache.derby.client.am.Connection
+ * class which extends from ClientConnection
* this implements the java.sql.Connection interface
*/
ClientConnection newNetConnection(
@@ -253,7 +253,7 @@ public interface ClientJDBCObjectFactory
/**
* This method returns an instance of NetConnection (or
- * NetConnection40) class which extends from Connection. This
+ * NetConnection40) class which extends from ClientConnection. This
* implements the {@code java.sql.Connection} interface.
*/
ClientConnection newNetConnection(
@@ -267,7 +267,7 @@ public interface ClientJDBCObjectFactory
/**
* This method returns an instance of NetConnection
* (or NetConnection40) class which extends from
- * Connection this implements the
+ * ClientConnection this implements the
* {@code java.sql.Connection interface}.
*/
ClientConnection newNetConnection(
@@ -306,7 +306,7 @@ public interface ClientJDBCObjectFactory
/**
* This method returns an instance of NetResultSet(or
- * NetResultSet40) which extends from ResultSet which implements
+ * NetResultSet40) which extends from ClientResultSet which implements
* {@code java.sql.ResultSet}.
*/
ClientResultSet newNetResultSet(
@@ -325,7 +325,7 @@ public interface ClientJDBCObjectFactory
/**
* This method provides an instance of NetDatabaseMetaData (or
- * NetDatabaseMetaData40) which extends from DatabaseMetaData
+ * NetDatabaseMetaData40) which extends from ClientDatabaseMetaData
* which implements {@code java.sql.DatabaseMetaData}.
*/
ClientDatabaseMetaData newNetDatabaseMetaData(Agent netAgent,
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientPreparedStatement.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientPreparedStatement.java?rev=1476040&r1=1476039&r2=1476040&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientPreparedStatement.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientPreparedStatement.java Fri Apr 26 05:15:49 2013
@@ -131,7 +131,7 @@ public class ClientPreparedStatement ext
* Resets the prepared statement for reuse in a statement pool.
*
* @throws SqlException if the reset fails
- * @see Statement#resetForReuse
+ * @see ClientStatement#resetForReuse
*/
void resetForReuse()
throws SqlException {
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientStatement.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientStatement.java?rev=1476040&r1=1476039&r2=1476040&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientStatement.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientStatement.java Fri Apr 26 05:15:49 2013
@@ -3209,9 +3209,9 @@ public class ClientStatement implements
}
/**
- * Convenience method for resultSetCommitting(ResultSet, boolean)
+ * Convenience method for resultSetCommitting(ClientResultSet, boolean)
*
- * @see Statement#resultSetCommitting(ResultSet, boolean)
+ * @see ClientStatement#resultSetCommitting(ClientResultSet, boolean)
* @param closingRS The ResultSet to be closed
* @throws SqlException
*/
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/ClientJDBCObjectFactoryImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/ClientJDBCObjectFactoryImpl.java?rev=1476040&r1=1476039&r2=1476040&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/ClientJDBCObjectFactoryImpl.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/ClientJDBCObjectFactoryImpl.java Fri Apr 26 05:15:49 2013
@@ -110,7 +110,7 @@ public class ClientJDBCObjectFactoryImpl
* Returns an instance of ClientCallableStatement.
*
* @param agent The instance of NetAgent associated with this
- * {@link org.apache.derby.client.am.CallableStatement}
+ * {@link org.apache.derby.client.am.ClientCallableStatement}
* object.
* @param connection The connection object associated with this
* PreparedStatement Object.
@@ -122,7 +122,7 @@ public class ClientJDBCObjectFactoryImpl
* @param cpc The PooledConnection object that will be used to
* notify the PooledConnection reference of the Error
* Occurred and the Close events.
- * @return a {@link org.apache.derby.client.am.CallableStatement}
+ * @return a {@link org.apache.derby.client.am.ClientCallableStatement}
* object
* @throws SqlException
*/
@@ -174,7 +174,7 @@ public class ClientJDBCObjectFactoryImpl
* statement is closed.
*
* @param agent The instance of NetAgent associated with this
- * {@link org.apache.derby.client.am.CallableStatement}
+ * {@link org.apache.derby.client.am.ClientCallableStatement}
* object.
* @param connection The connection object associated with this
* PreparedStatement Object.
@@ -205,7 +205,7 @@ public class ClientJDBCObjectFactoryImpl
* prepared statement is closed.
*
* @param agent The instance of NetAgent associated with this
- * {@link org.apache.derby.client.am.CallableStatement}
+ * {@link org.apache.derby.client.am.ClientCallableStatement}
* object.
* @param connection The connection object associated with this
* PreparedStatement Object.
@@ -375,7 +375,7 @@ public class ClientJDBCObjectFactoryImpl
* NetConnection constructor was called. This is used to
* pass StatementEvents back to the pooledConnection
* object.
- * @return a {@link Connection} object
+ * @return a {@link ClientConnection} object
* @throws SqlException
*/
public ClientConnection newNetConnection(