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 rh...@apache.org on 2006/05/09 00:53:28 UTC

svn commit: r405210 - in /db/derby/code/trunk/java: client/org/apache/derby/client/am/ client/org/apache/derby/client/net/ drda/org/apache/derby/impl/drda/

Author: rhillegas
Date: Mon May  8 15:53:26 2006
New Revision: 405210

URL: http://svn.apache.org/viewcvs?rev=405210&view=rev
Log:
DERBY-862: Commit bug 862_misc5.diff, more miscellaneous javadoc warnings.

Modified:
    db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientJDBCObjectFactory.java
    db/derby/code/trunk/java/client/org/apache/derby/client/net/ClientJDBCObjectFactoryImpl.java
    db/derby/code/trunk/java/client/org/apache/derby/client/net/ClientJDBCObjectFactoryImpl40.java
    db/derby/code/trunk/java/client/org/apache/derby/client/net/NetPreparedStatement.java
    db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/EXTDTAInputStream.java

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientJDBCObjectFactory.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientJDBCObjectFactory.java?rev=405210&r1=405209&r2=405210&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 Mon May  8 15:53:26 2006
@@ -78,7 +78,7 @@
             ClientPooledConnection cpc) throws SqlException;
     
     /**
-     * Returns an instance of PreparedStatement
+     * Returns an instance of LogicalConnection.
      * This method returns an instance of LogicalConnection
      * (or LogicalConnection40) which implements java.sql.Connection.
      */
@@ -221,7 +221,6 @@
      *                     NetConnection constructor was called. This is used
      *                     to pass StatementEvents back to the pooledConnection
      *                     object
-     * @return                        
      * @throws             SqlException
      */
     org.apache.derby.client.am.Connection newNetConnection(

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/ClientJDBCObjectFactoryImpl.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/client/org/apache/derby/client/net/ClientJDBCObjectFactoryImpl.java?rev=405210&r1=405209&r2=405210&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 Mon May  8 15:53:26 2006
@@ -118,7 +118,7 @@
      *            It is used to pass the Statement closed and the Statement
      *            error occurred events that occur back to the
      *            ClientPooledConnection.
-     * @returns a PreparedStatement object
+     * @return a PreparedStatement object
      * @throws SqlException
      */
     public PreparedStatement newPreparedStatement(Agent agent,
@@ -154,7 +154,7 @@
      *            it is used to pass the Statement closed and the Statement
      *            error occurred events that occur back to the
      *            ClientPooledConnection.
-     * @returns a PreparedStatement object
+     * @return a PreparedStatement object
      * @throws SqlException
      *
      */
@@ -239,7 +239,7 @@
      *                     NetConnection constructor was called. This is used to
      *                     pass StatementEvents back to the pooledConnection
      *                     object.
-     * @returns a org.apache.derby.client.am.Connection object
+     * @return a org.apache.derby.client.am.Connection object
      * @throws             SqlException
      */
     public org.apache.derby.client.am.Connection newNetConnection(

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/ClientJDBCObjectFactoryImpl40.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/client/org/apache/derby/client/net/ClientJDBCObjectFactoryImpl40.java?rev=405210&r1=405209&r2=405210&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/ClientJDBCObjectFactoryImpl40.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/ClientJDBCObjectFactoryImpl40.java Mon May  8 15:53:26 2006
@@ -100,27 +100,9 @@
                 holdability,cpc);
     }
     /**
-     * This method returns an instance of PreparedStatement
-     * which implements java.sql.PreparedStatement. It has the
-     * ClientPooledConnection as one of its parameters
-     * this is used to raise the Statement Events when the prepared
-     * statement is closed.
-     *
-     * @param agent The instance of NetAgent associated with this
-     *              CallableStatement object.
-     * @param connection The connection object associated with this
-     *                   PreparedStatement Object.
-     * @param sql        A String object that is the SQL statement to be sent
-     *                   to the database.
-     * @param section    Section
-     * @param cpc The ClientPooledConnection wraps the underlying physical
-     *            connection associated with this prepared statement.
-     *            It is used to pass the Statement closed and the Statement
-     *            error occurred events that occur back to the
-     *            ClientPooledConnection.
-     * @returns a PreparedStatement object
-     * @throws SqlException
-     * Returns an instance of org.apache.derby.client.am.LogicalConnection40
+     * Returns an instance of LogicalConnection.
+     * This method returns an instance of LogicalConnection
+     * (or LogicalConnection40) which implements java.sql.Connection.
      */
     public LogicalConnection newLogicalConnection(
                     org.apache.derby.client.am.Connection physicalConnection,
@@ -165,7 +147,7 @@
      *            it is used to pass the Statement closed and the Statement
      *            error occurred events that occur back to the
      *            ClientPooledConnection.
-     * @returns a PreparedStatement object
+     * @return a PreparedStatement object
      * @throws SqlException
      *
      */
@@ -250,7 +232,7 @@
      *                     NetConnection constructor was called. This is used
      *                     to pass StatementEvents back to the pooledConnection
      *                     object
-     * @returns a org.apache.derby.client.am.Connection object
+     * @return a org.apache.derby.client.am.Connection object
      * @throws             SqlException
      */
     public org.apache.derby.client.am.Connection newNetConnection(

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetPreparedStatement.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetPreparedStatement.java?rev=405210&r1=405209&r2=405210&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetPreparedStatement.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetPreparedStatement.java Mon May  8 15:53:26 2006
@@ -65,9 +65,9 @@
      * this is used to raise the Statement Events when the prepared
      * statement is closed.
      *
-     * @param agent The instance of NetAgent associated with this
+     * @param netAgent The instance of NetAgent associated with this
      *              CallableStatement object.
-     * @param netNonnection The connection object associated with this
+     * @param netConnection The connection object associated with this
      *                      PreparedStatement Object.
      * @param sql         A String object that is the SQL statement
      *                    to be sent to the database.
@@ -84,7 +84,6 @@
      *            it is used to pass the Statement closed and the Statement
      *            error occurred events that occur back to the
      *            ClientPooledConnection.
-     * @returns a PreparedStatement object
      * @throws SqlException
      *
      */
@@ -109,13 +108,13 @@
      * its parameters this is used to raise the Statement Events when the 
      * prepared statement is closed.
      *
-     * @param agent The instance of NetAgent associated with this
+     * @param netAgent The instance of NetAgent associated with this
      *              CallableStatement object.
-     * @param netNonnection The connection object associated with this 
+     * @param netConnection The connection object associated with this 
      *                      PreparedStatement Object. 
      * @param sql           A String object that is the SQL statement to be 
      *                      sent to the database.
-     * @param section Section
+     * @param section
      * @param cpc The ClientPooledConnection wraps the underlying physical 
      *            connection associated with this prepared statement 
      *            it is used to pass the Statement closed and the Statement 

Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/EXTDTAInputStream.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/EXTDTAInputStream.java?rev=405210&r1=405209&r2=405210&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/EXTDTAInputStream.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/EXTDTAInputStream.java Mon May  8 15:53:26 2006
@@ -55,9 +55,6 @@
     private Blob blob = null;
     private Clob clob = null;
 	
-	/**
-	 * @param binaryInputStream
-	 */
 	private EXTDTAInputStream(ResultSet rs,
 				  int columnNumber,
 				  int ndrdaType)