db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject svn commit: r1467726 [3/4] - in /db/derby/code/trunk/java/client/org/apache/derby: client/ client/am/ client/am/stmtcache/ client/net/ jdbc/
Date Sun, 14 Apr 2013 04:17:08 GMT
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/stmtcache/StatementKeyFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/stmtcache/StatementKeyFactory.java?rev=1467726&r1=1467725&r2=1467726&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/stmtcache/StatementKeyFactory.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/stmtcache/StatementKeyFactory.java Sun Apr 14 04:17:07 2013
@@ -21,8 +21,6 @@
 
 package org.apache.derby.client.am.stmtcache;
 
-import java.sql.ResultSet;
-import java.sql.Statement;
 
 /**
  * A factory for creating JDBC statement keys for use with the JDBC statement
@@ -55,9 +53,9 @@ public final class StatementKeyFactory {
     public static StatementKey newPrepared(
             String sql, String schema, int holdability) {
         return new StatementKey(PREPARED, sql, schema,
-                ResultSet.TYPE_FORWARD_ONLY,
-                ResultSet.CONCUR_READ_ONLY,
-                holdability, Statement.NO_GENERATED_KEYS);
+                java.sql.ResultSet.TYPE_FORWARD_ONLY,
+                java.sql.ResultSet.CONCUR_READ_ONLY,
+                holdability, java.sql.Statement.NO_GENERATED_KEYS);
     }
 
     /**
@@ -78,8 +76,8 @@ public final class StatementKeyFactory {
     public static StatementKey newPrepared(
             String sql, String schema, int holdability, int autogeneratedKeys) {
         return new StatementKey(PREPARED, sql, schema,
-                                ResultSet.TYPE_FORWARD_ONLY,
-                                ResultSet.CONCUR_READ_ONLY,
+                                java.sql.ResultSet.TYPE_FORWARD_ONLY,
+                                java.sql.ResultSet.CONCUR_READ_ONLY,
                                 holdability, autogeneratedKeys);
     }
 
@@ -98,7 +96,7 @@ public final class StatementKeyFactory {
     public static StatementKey newPrepared(
             String sql, String schema, int rst, int rsc, int rsh) {
         return new StatementKey(PREPARED, sql, schema, rst, rsc, rsh,
-                                Statement.NO_GENERATED_KEYS);
+                                java.sql.Statement.NO_GENERATED_KEYS);
     }
 
     /**
@@ -115,8 +113,8 @@ public final class StatementKeyFactory {
      */
     public static StatementKey newCallable(
             String sql, String schema, int holdability) {
-        return newCallable(sql, schema, ResultSet.TYPE_FORWARD_ONLY,
-                ResultSet.CONCUR_READ_ONLY, holdability);
+        return newCallable(sql, schema, java.sql.ResultSet.TYPE_FORWARD_ONLY,
+                java.sql.ResultSet.CONCUR_READ_ONLY, holdability);
     }
 
     /**
@@ -135,6 +133,6 @@ public final class StatementKeyFactory {
     public static StatementKey newCallable(
             String sql, String schema, int rst, int rsc, int rsh) {
         return new StatementKey(CALLABLE, sql, schema, rst, rsc, rsh,
-                                Statement.NO_GENERATED_KEYS);
+                                java.sql.Statement.NO_GENERATED_KEYS);
     }
 }

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/CcsidManager.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/CcsidManager.java?rev=1467726&r1=1467725&r2=1467726&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/CcsidManager.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/CcsidManager.java Sun Apr 14 04:17:07 2013
@@ -60,7 +60,9 @@ public abstract class CcsidManager {
     //
     // @param sourceString A Java String to convert.
     // @return A new byte array representing the String in a particular ccsid.
-    public abstract byte[] convertFromJavaString(String sourceString, org.apache.derby.client.am.Agent agent) throws org.apache.derby.client.am.SqlException;
+    public abstract byte[] convertFromJavaString(
+        String sourceString,
+        Agent agent) throws SqlException;
 
     // Convert a byte array representing characters in a particular ccsid into a Java String.
     //

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=1467726&r1=1467725&r2=1467726&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 Sun Apr 14 04:17:07 2013
@@ -21,7 +21,9 @@
 
 package org.apache.derby.client.net;
 
+import java.sql.BatchUpdateException;
 import java.sql.SQLException;
+import java.util.Properties;
 import org.apache.derby.client.ClientPooledConnection;
 import org.apache.derby.client.ClientXAConnection;
 import org.apache.derby.client.am.CachingLogicalConnection;
@@ -43,6 +45,10 @@ import org.apache.derby.client.am.stmtca
 import org.apache.derby.client.am.stmtcache.StatementKey;
 import org.apache.derby.jdbc.ClientBaseDataSourceRoot;
 import org.apache.derby.client.am.ColumnMetaData;
+import org.apache.derby.client.am.Connection;
+import org.apache.derby.client.am.DatabaseMetaData;
+import org.apache.derby.client.am.MaterialStatement;
+import org.apache.derby.client.am.ResultSet;
 import org.apache.derby.client.am.StatementCacheInteractor;
 import org.apache.derby.client.am.Utils;
 import org.apache.derby.shared.common.i18n.MessageUtil;
@@ -50,9 +56,9 @@ import org.apache.derby.shared.common.er
 
 /**
  * Implements the the ClientJDBCObjectFactory interface and returns the classes
- * that implement the JDBC3.0/2.0 interfaces
- * For Eg. newCallableStatement would return
- * org.apache.derby.client.am.CallableStatement
+ * that implement the JDBC3.0/2.0 interfaces.
+ * For example newCallableStatement would return
+ * {@link  CallableStatement}.
  */
 
 public class ClientJDBCObjectFactoryImpl implements ClientJDBCObjectFactory{
@@ -66,7 +72,8 @@ public class ClientJDBCObjectFactoryImpl
         SqlException.getMessageUtil();
 
     /**
-     * Returns an instance of org.apache.derby.client.ClientPooledConnection 
+     * @return an instance of {@link
+     * org.apache.derby.client.ClientPooledConnection}
      */
     public ClientPooledConnection newClientPooledConnection(
             ClientBaseDataSourceRoot ds,
@@ -77,7 +84,8 @@ public class ClientJDBCObjectFactoryImpl
         return new ClientPooledConnection(ds,logWriter,user,password);
     }
     /**
-     * Returns an instance of org.apache.derby.client.ClientPooledConnection 
+     * @return an instance of {@link
+     * org.apache.derby.client.ClientPooledConnection}
      */
     public ClientPooledConnection newClientPooledConnection(
             ClientBaseDataSourceRoot ds,
@@ -89,7 +97,7 @@ public class ClientJDBCObjectFactoryImpl
         return new ClientPooledConnection(ds,logWriter,user,password,rmId);
     }
     /**
-     * Returns an instance of org.apache.derby.client.ClientXAConnection 
+     * @return an instance of {@link org.apache.derby.client.ClientXAConnection}
      */
     public ClientXAConnection newClientXAConnection(ClientBaseDataSourceRoot ds,
         LogWriter logWriter,String user, String password) throws SQLException
@@ -98,10 +106,12 @@ public class ClientJDBCObjectFactoryImpl
             (NetLogWriter)logWriter,user,password);
     }
     /**
-     * Returns an instance of org.apache.derby.client.am.CallableStatement.
+     * Returns an instance of {@link
+     * org.apache.derby.client.am.CallableStatement}.
      *
      * @param agent       The instance of NetAgent associated with this
-     *                    CallableStatement object.
+     *                    {@link org.apache.derby.client.am.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 
@@ -112,11 +122,12 @@ 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 CallableStatement object
+     * @return a {@link org.apache.derby.client.am.CallableStatement}
+     *         object
      * @throws SqlException
      */
     public CallableStatement newCallableStatement(Agent agent,
-            org.apache.derby.client.am.Connection connection,
+            Connection connection,
             String sql,int type,int concurrency,
             int holdability,ClientPooledConnection cpc) throws SqlException {
         return new CallableStatement(agent,connection,sql,type,
@@ -124,18 +135,20 @@ public class ClientJDBCObjectFactoryImpl
     }
    
     /**
-     * Returns an instance of org.apache.derby.client.am.LogicalConnection
+     * @return an instance of {@link
+     * org.apache.derby.client.am.LogicalConnection}
      */
     public LogicalConnection newLogicalConnection(
-                    org.apache.derby.client.am.Connection physicalConnection,
+            Connection physicalConnection,
                     ClientPooledConnection pooledConnection)
         throws SqlException {
         return new LogicalConnection(physicalConnection, pooledConnection);
     }
     
    /**
-    * Returns an instance of a {@code CachingLogicalConnection}, which
-    * provides caching of prepared statements.
+    * Returns an instance of a {@link
+    * org.apache.derby.client.am.CachingLogicalConnection}, which provides
+    * caching of prepared statements.
     *
     * @param physicalConnection the underlying physical connection
     * @param pooledConnection the pooled connection
@@ -145,7 +158,7 @@ public class ClientJDBCObjectFactoryImpl
     * @throws SqlException if creation of the logical connection fails
     */
     public LogicalConnection newCachingLogicalConnection(
-            org.apache.derby.client.am.Connection physicalConnection,
+            Connection physicalConnection,
             ClientPooledConnection pooledConnection,
             JDBCStatementCache stmtCache) throws SqlException {
         return new CachingLogicalConnection(physicalConnection,
@@ -154,14 +167,15 @@ public class ClientJDBCObjectFactoryImpl
     }
 
     /**
-     * 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.
+     * This method returns an instance of PreparedStatement which
+     * implements {@code java.sql.PreparedStatement}. It has the {@link
+     * org.apache.derby.client.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.
+     *              {@link org.apache.derby.client.am.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
@@ -176,7 +190,7 @@ public class ClientJDBCObjectFactoryImpl
      * @throws SqlException
      */
     public PreparedStatement newPreparedStatement(Agent agent,
-            org.apache.derby.client.am.Connection connection,
+            Connection connection,
             String sql,Section section,ClientPooledConnection cpc) 
             throws SqlException {
         return new PreparedStatement(agent,connection,sql,section,cpc);
@@ -185,13 +199,14 @@ public class ClientJDBCObjectFactoryImpl
     /**
      *
      * 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.
+     * which implements {@code java.sql.PreparedStatement}.
+     * It has the {@link org.apache.derby.client.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.
+     *              {@link org.apache.derby.client.am.CallableStatement}
+     *              object.
      * @param connection  The connection object associated with this
      *                    PreparedStatement Object.
      * @param sql         A String object that is the SQL statement
@@ -213,7 +228,7 @@ public class ClientJDBCObjectFactoryImpl
      *
      */
     public PreparedStatement newPreparedStatement(Agent agent,
-            org.apache.derby.client.am.Connection connection,
+            Connection connection,
             String sql,int type,int concurrency,int holdability,
             int autoGeneratedKeys,String [] columnNames,
             int[] columnIndexes,
@@ -254,64 +269,90 @@ public class ClientJDBCObjectFactoryImpl
     }
 
     /**
-     * returns an instance of org.apache.derby.client.net.NetConnection
-     */
-    public org.apache.derby.client.am.Connection newNetConnection(
-            org.apache.derby.client.am.LogWriter netLogWriter,
-            String databaseName,java.util.Properties properties)
-            throws SqlException {
-        return (org.apache.derby.client.am.Connection)
-        (new NetConnection((NetLogWriter)netLogWriter,databaseName,properties));
-    }
-    /**
-     * returns an instance of org.apache.derby.client.net.NetConnection
-     */
-    public org.apache.derby.client.am.Connection newNetConnection(
-            org.apache.derby.client.am.LogWriter netLogWriter,
-            ClientBaseDataSourceRoot clientDataSource,
-            String user,String password) throws SqlException {
-        return  (org.apache.derby.client.am.Connection)
-        (new NetConnection((NetLogWriter)netLogWriter,clientDataSource
-                ,user,password));
-    }
-    /**
-     * returns an instance of org.apache.derby.client.net.NetConnection
+     * @return a new connection, see {@link NetConnection}
      */
-    public org.apache.derby.client.am.Connection newNetConnection(
-            org.apache.derby.client.am.LogWriter netLogWriter,
-            int driverManagerLoginTimeout,String serverName,
-            int portNumber,String databaseName,
+    public Connection newNetConnection(
+            LogWriter netLogWriter,
+            String databaseName,
             java.util.Properties properties) throws SqlException {
-        return (org.apache.derby.client.am.Connection)
-        (new NetConnection((NetLogWriter)netLogWriter,driverManagerLoginTimeout,
-                serverName,portNumber,databaseName,properties));
+
+        return new NetConnection(
+                (NetLogWriter)netLogWriter,
+                databaseName,
+                properties);
+    }
+    /**
+     * @return a new connection, see {@link NetConnection}
+     */
+    public Connection newNetConnection(
+           LogWriter netLogWriter,
+           ClientBaseDataSourceRoot clientDataSource,
+           String user,
+           String password) throws SqlException {
+
+        return new NetConnection(
+                (NetLogWriter)netLogWriter,
+                clientDataSource,
+                user,
+                password);
+    }
+    /**
+     * @return an instance of {@link org.apache.derby.client.net.NetConnection}
+     */
+    public Connection newNetConnection(
+            LogWriter netLogWriter,
+            int driverManagerLoginTimeout,
+            String serverName,
+            int portNumber,
+            String databaseName,
+            Properties properties) throws SqlException {
+
+        return new NetConnection(
+                (NetLogWriter)netLogWriter,
+                driverManagerLoginTimeout,
+                serverName,
+                portNumber,
+                databaseName,
+                properties);
     }
     /**
-     * returns an instance of org.apache.derby.client.net.NetConnection
+     * @return an instance of {@link org.apache.derby.client.net.NetConnection}
      */
-    public org.apache.derby.client.am.Connection newNetConnection(
-            org.apache.derby.client.am.LogWriter netLogWriter,String user,
+    public Connection newNetConnection(
+            LogWriter netLogWriter,String user,
             String password,
             ClientBaseDataSourceRoot dataSource,
-            int rmId,boolean isXAConn) throws SqlException {
-        return (org.apache.derby.client.am.Connection)
-        (new NetConnection((NetLogWriter)netLogWriter,user,password,dataSource,rmId,
-                isXAConn));
+            int rmId,
+            boolean isXAConn) throws SqlException {
+
+        return new NetConnection(
+                (NetLogWriter)netLogWriter,
+                user,
+                password,
+                dataSource,
+                rmId,
+                isXAConn);
     }
     /**
-     * returns an instance of org.apache.derby.client.net.NetConnection
+     * @return an instance of {@link org.apache.derby.client.net.NetConnection}
      */
-    public org.apache.derby.client.am.Connection newNetConnection(
-            org.apache.derby.client.am.LogWriter netLogWriter,
-            String ipaddr,int portNumber,
+    public Connection newNetConnection(
+            LogWriter netLogWriter,
+            String ipaddr,
+            int portNumber,
             ClientBaseDataSourceRoot dataSource,
             boolean isXAConn) throws SqlException {
-        return (org.apache.derby.client.am.Connection)
-        new NetConnection((NetLogWriter)netLogWriter,ipaddr,portNumber,dataSource,
+
+        return new NetConnection(
+                (NetLogWriter)netLogWriter,
+                ipaddr,
+                portNumber,
+                dataSource,
                 isXAConn);
     }
+
     /**
-     * Returns an instance of org.apache.derby.client.net.NetConnection.
+     * Returns an instance of NetConnection.
      * @param netLogWriter Placeholder for NetLogWriter object associated
      *                     with this connection.
      * @param user         user id for this connection.
@@ -324,24 +365,30 @@ public class ClientJDBCObjectFactoryImpl
      *                     NetConnection constructor was called. This is used to
      *                     pass StatementEvents back to the pooledConnection
      *                     object.
-     * @return a org.apache.derby.client.am.Connection object
+     * @return a {@link Connection} object
      * @throws             SqlException
      */
-    public org.apache.derby.client.am.Connection newNetConnection(
-            org.apache.derby.client.am.LogWriter netLogWriter,String user,
+    public Connection newNetConnection(
+            LogWriter netLogWriter,String user,
             String password,
             ClientBaseDataSourceRoot dataSource,
             int rmId,boolean isXAConn,
             ClientPooledConnection cpc) throws SqlException {
-        return (org.apache.derby.client.am.Connection)
-        (new NetConnection((NetLogWriter)netLogWriter,user,password,dataSource,rmId,
-                isXAConn,cpc));
+
+        return new NetConnection(
+            (NetLogWriter)netLogWriter,
+            user,
+            password,
+            dataSource,
+            rmId,
+            isXAConn,
+            cpc);
     }
     /**
-     * returns an instance of org.apache.derby.client.net.NetResultSet
+     * @return an instance of {@link NetResultSet}
      */
-    public org.apache.derby.client.am.ResultSet newNetResultSet(Agent netAgent,
-            org.apache.derby.client.am.MaterialStatement netStatement,
+    public ResultSet newNetResultSet(Agent netAgent,
+            MaterialStatement netStatement,
             Cursor cursor,
             int qryprctyp,int sqlcsrhld,int qryattscr,int qryattsns,
             int qryattset,long qryinsid,int actualResultSetType,
@@ -353,10 +400,10 @@ public class ClientJDBCObjectFactoryImpl
                 actualResultSetConcurrency,actualResultSetHoldability);
     }
     /**
-     * returns an instance of org.apache.derby.client.net.NetDatabaseMetaData
+     * @return an instance of {@link NetDatabaseMetaData}
      */
-    public org.apache.derby.client.am.DatabaseMetaData newNetDatabaseMetaData(Agent netAgent,
-            org.apache.derby.client.am.Connection netConnection) {
+    public DatabaseMetaData newNetDatabaseMetaData(Agent netAgent,
+            Connection netConnection) {
         return new NetDatabaseMetaData((NetAgent)netAgent,
                 (NetConnection)netConnection);
     }
@@ -365,11 +412,11 @@ public class ClientJDBCObjectFactoryImpl
      * This method provides an instance of Statement 
      * @param  agent      Agent
      * @param  connection Connection
-     * @return a java.sql.Statement implementation 
+     * @return a {@code java.sql.Statement} implementation
      * @throws SqlException
      *
      */
-     public Statement newStatement(Agent agent, org.apache.derby.client.am.Connection connection) 
+     public Statement newStatement(Agent agent, Connection connection)
                                             throws SqlException {
          return new Statement(agent,connection);
      }
@@ -384,12 +431,12 @@ public class ClientJDBCObjectFactoryImpl
      * @param autoGeneratedKeys int
      * @param columnNames       String[]
      * @param columnIndexes     int[]
-     * @return a java.sql.Statement implementation 
+     * @return a {@code java.sql.Statement} implementation
      * @throws SqlException
      *
      */
      public Statement newStatement(Agent agent, 
-                     org.apache.derby.client.am.Connection connection, int type, 
+                     Connection connection, int type,
                      int concurrency, int holdability,
                      int autoGeneratedKeys, String[] columnNames,
                      int[] columnIndexes) 
@@ -399,7 +446,7 @@ public class ClientJDBCObjectFactoryImpl
      }
      
      /**
-     * Returns an instanceof ColumnMetaData 
+     * Returns an instance of ColumnMetaData
      *
      * @param logWriter LogWriter
      * @return a ColumnMetaData implementation
@@ -410,8 +457,8 @@ public class ClientJDBCObjectFactoryImpl
     }
 
     /**
-     * Returns an instanceof ColumnMetaData or ColumnMetaData40 depending 
-     * on the jdk version under use
+     * Returns an instance of ColumnMetaData or ColumnMetaData40 depending
+     * on the JDK version under use
      *
      * @param logWriter  LogWriter
      * @param upperBound int
@@ -437,10 +484,10 @@ public class ClientJDBCObjectFactoryImpl
     /**
      * Creates a BatchUpdateException depending on the JVM level.
      */
-    public  java.sql.BatchUpdateException    newBatchUpdateException
+    public  BatchUpdateException    newBatchUpdateException
         ( LogWriter logWriter, ClientMessageId msgid, Object[] args, long[] updateCounts, SqlException cause )
     {
-        java.sql.BatchUpdateException   bue = newBatchUpdateException
+        BatchUpdateException bue = newBatchUpdateException
             (
              msgutil_.getCompleteMessage( msgid.msgid, args),
              ExceptionUtil.getSQLStateFromIdentifier(msgid.msgid),
@@ -459,11 +506,11 @@ public class ClientJDBCObjectFactoryImpl
 
         return bue;
     }
-    /** This method is overriden on JVM 8 */
-    protected   java.sql.BatchUpdateException   newBatchUpdateException
+    /** This method is overridden on JVM 8 */
+    protected   BatchUpdateException   newBatchUpdateException
         ( String message, String sqlState, int errorCode, long[] updateCounts, SqlException cause  )
     {
-        java.sql.BatchUpdateException bue = new java.sql.BatchUpdateException
+        BatchUpdateException bue = new BatchUpdateException
             ( message, sqlState, errorCode, Utils.squashLongs( updateCounts ) );
 
         if (cause != null) {

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/ClientJDBCObjectFactoryImpl40.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/ClientJDBCObjectFactoryImpl40.java?rev=1467726&r1=1467725&r2=1467726&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 Sun Apr 14 04:17:07 2013
@@ -22,6 +22,7 @@
 package org.apache.derby.client.net;
 
 import java.sql.SQLException;
+import java.util.Properties;
 import org.apache.derby.client.ClientPooledConnection;
 import org.apache.derby.client.ClientPooledConnection40;
 import org.apache.derby.client.ClientXAConnection;
@@ -30,7 +31,9 @@ import org.apache.derby.client.am.Agent;
 import org.apache.derby.client.am.CachingLogicalConnection40;
 import org.apache.derby.client.am.CallableStatement;
 import org.apache.derby.client.am.CallableStatement40;
+import org.apache.derby.client.am.Connection;
 import org.apache.derby.client.am.Cursor;
+import org.apache.derby.client.am.DatabaseMetaData;
 import org.apache.derby.client.am.LogWriter;
 import org.apache.derby.client.am.LogicalCallableStatement;
 import org.apache.derby.client.am.LogicalCallableStatement40;
@@ -38,8 +41,10 @@ import org.apache.derby.client.am.Logica
 import org.apache.derby.client.am.LogicalConnection40;
 import org.apache.derby.client.am.LogicalPreparedStatement;
 import org.apache.derby.client.am.LogicalPreparedStatement40;
+import org.apache.derby.client.am.MaterialStatement;
 import org.apache.derby.client.am.PreparedStatement;
 import org.apache.derby.client.am.PreparedStatement40;
+import org.apache.derby.client.am.ResultSet;
 import org.apache.derby.client.am.SQLExceptionFactory40;
 import org.apache.derby.client.am.Section;
 import org.apache.derby.client.am.SqlException;
@@ -56,14 +61,15 @@ import org.apache.derby.jdbc.ClientBaseD
 public class ClientJDBCObjectFactoryImpl40 extends ClientJDBCObjectFactoryImpl {
     
     /**
-     * Sets SQLExceptionFactpry40  om SqlException to make sure jdbc40 
-     * exception and sub classes are thrown when running with jdbc4.0 support
+     * Sets SQLExceptionFactory40 to SqlException to make sure JDBC 4.0
+     * exception and sub classes are thrown when running with JDBC 4.0 support.
      */
     public ClientJDBCObjectFactoryImpl40 () {
         SqlException.setExceptionFactory (new SQLExceptionFactory40 ());
     }
     /**
-     * Returns an instance of org.apache.derby.client.ClientPooledConnection40 
+     * @return an instance of
+     * {@link org.apache.derby.client.ClientPooledConnection40}
      */
     public ClientPooledConnection newClientPooledConnection(
             ClientBaseDataSourceRoot ds, LogWriter logWriter,String user,
@@ -71,7 +77,8 @@ public class ClientJDBCObjectFactoryImpl
         return new ClientPooledConnection40(ds,logWriter,user,password);
     }
     /**
-     * Returns an instance of org.apache.derby.client.ClientPooledConnection40 
+     * @return an instance of
+     * {@link org.apache.derby.client.ClientPooledConnection40}
      */
     public ClientPooledConnection newClientPooledConnection(
             ClientBaseDataSourceRoot ds, LogWriter logWriter,String user,
@@ -79,7 +86,8 @@ public class ClientJDBCObjectFactoryImpl
         return new ClientPooledConnection40(ds,logWriter,user,password,rmId);
     }
     /**
-     * Returns an instance of org.apache.derby.client.ClientXAConnection40 
+     * @return an instance of
+     * {@link org.apache.derby.client.ClientXAConnection40}
      */
     public ClientXAConnection newClientXAConnection(
         ClientBaseDataSourceRoot ds, LogWriter logWriter,String user,
@@ -89,7 +97,8 @@ public class ClientJDBCObjectFactoryImpl
             (NetLogWriter)logWriter,user,password);
     }
     /**
-     * Returns an instance of org.apache.derby.client.am.CallableStatement.
+     * Returns an instance of
+     * {@link org.apache.derby.client.am.CallableStatement}.
      *
      * @param agent       The instance of NetAgent associated with this
      *                    CallableStatement object.
@@ -107,7 +116,7 @@ public class ClientJDBCObjectFactoryImpl
      * @throws SqlException
      */
     public CallableStatement newCallableStatement(Agent agent,
-            org.apache.derby.client.am.Connection connection,
+            Connection connection,
             String sql,int type,int concurrency,
             int holdability,ClientPooledConnection cpc) throws SqlException {
         return new CallableStatement40(agent,connection,sql,type,concurrency,
@@ -117,12 +126,12 @@ public class ClientJDBCObjectFactoryImpl
     /**
      * Returns an instance of LogicalConnection.
      * This method returns an instance of LogicalConnection
-     * (or LogicalConnection40) which implements java.sql.Connection.
+     * (or LogicalConnection40) which implements {@link java.sql.Connection}.
      */
     public LogicalConnection newLogicalConnection(
-                    org.apache.derby.client.am.Connection physicalConnection,
-                    ClientPooledConnection pooledConnection)
-        throws SqlException {
+            Connection physicalConnection,
+            ClientPooledConnection pooledConnection) throws SqlException {
+
         return new LogicalConnection40(physicalConnection, pooledConnection);
     }
     
@@ -138,7 +147,7 @@ public class ClientJDBCObjectFactoryImpl
     * @throws SqlException if creation of the logical connection fails
     */
     public LogicalConnection newCachingLogicalConnection(
-            org.apache.derby.client.am.Connection physicalConnection,
+            Connection physicalConnection,
             ClientPooledConnection pooledConnection,
             JDBCStatementCache stmtCache) throws SqlException {
         return new CachingLogicalConnection40(physicalConnection,
@@ -147,10 +156,11 @@ public class ClientJDBCObjectFactoryImpl
     }
 
     /**
-     * Returns an instance of org.apache.derby.client.am.CallableStatement40
+     * @return an instance of {@link
+     * org.apache.derby.client.am.CallableStatement40}
      */
     public PreparedStatement newPreparedStatement(Agent agent,
-            org.apache.derby.client.am.Connection connection,
+            Connection connection,
             String sql,Section section,ClientPooledConnection cpc) 
             throws SqlException {
         return new PreparedStatement40(agent,connection,sql,section,cpc);
@@ -159,7 +169,7 @@ public class ClientJDBCObjectFactoryImpl
     /**
      *
      * This method returns an instance of PreparedStatement
-     * which implements java.sql.PreparedStatement.
+     * which implements {@link 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.
@@ -189,7 +199,7 @@ public class ClientJDBCObjectFactoryImpl
      *
      */
     public PreparedStatement newPreparedStatement(Agent agent,
-            org.apache.derby.client.am.Connection connection,
+            Connection connection,
             String sql,int type,int concurrency,
             int holdability,int autoGeneratedKeys,
             String [] columnNames,
@@ -230,65 +240,76 @@ public class ClientJDBCObjectFactoryImpl
     }
 
     /**
-     * returns an instance of org.apache.derby.client.net.NetConnection40
-     */
-    public org.apache.derby.client.am.Connection newNetConnection
-            (org.apache.derby.client.am.LogWriter netLogWriter,
-            String databaseName,java.util.Properties properties)
-            throws SqlException {
-        return (org.apache.derby.client.am.Connection) 
-        (new NetConnection40((NetLogWriter)netLogWriter,databaseName,properties));
-    }
-    /**
-     * returns an instance of org.apache.derby.client.net.NetConnection40
+     * @return an instance of {@link NetConnection40}
      */
-    public org.apache.derby.client.am.Connection newNetConnection
-            (org.apache.derby.client.am.LogWriter netLogWriter,
-            org.apache.derby.jdbc.ClientBaseDataSourceRoot clientDataSource,
-            String user,String password) throws SqlException {
-        return (org.apache.derby.client.am.Connection)
-        (new NetConnection40((NetLogWriter)netLogWriter,clientDataSource,user,password));
+    public Connection newNetConnection(
+            LogWriter netLogWriter,
+            String databaseName,
+            Properties properties) throws SqlException {
+
+        return new NetConnection40(
+                (NetLogWriter)netLogWriter,
+                databaseName,
+                properties);
     }
     /**
-     * returns an instance of org.apache.derby.client.net.NetConnection40
+     * @return an instance of {@link NetConnection40}
      */
-    public org.apache.derby.client.am.Connection
-            newNetConnection(org.apache.derby.client.am.LogWriter netLogWriter,
-            int driverManagerLoginTimeout,String serverName,
-            int portNumber,String databaseName,
-            java.util.Properties properties) throws SqlException {
-        return (org.apache.derby.client.am.Connection)
-        (new NetConnection40((NetLogWriter)netLogWriter,driverManagerLoginTimeout,
-                serverName,portNumber,databaseName,properties));
+    public Connection newNetConnection
+            (LogWriter netLogWriter,
+            ClientBaseDataSourceRoot clientDataSource,
+            String user,
+            String password) throws SqlException {
+
+        return new NetConnection40(
+                (NetLogWriter)netLogWriter,
+                clientDataSource,
+                user,
+                password);
+    }
+    /**
+     * @return  an instance of
+     * {@link org.apache.derby.client.net.NetConnection40}
+     */
+    public Connection newNetConnection(
+            LogWriter netLogWriter,
+            int driverManagerLoginTimeout,
+            String serverName,
+            int portNumber,
+            String databaseName,
+            Properties properties) throws SqlException {
+
+        return  new NetConnection40(
+                (NetLogWriter)netLogWriter,
+                driverManagerLoginTimeout,
+                serverName,
+                portNumber,
+                databaseName,
+                properties);
     }
     /**
-     * returns an instance of org.apache.derby.client.net.NetConnection40
+     * @return an instance of
+     * {@link org.apache.derby.client.net.NetConnection40}
      */
-    public org.apache.derby.client.am.Connection
-            newNetConnection(org.apache.derby.client.am.LogWriter netLogWriter,
+    public Connection newNetConnection(
+            LogWriter netLogWriter,
             String user,
             String password,
-            org.apache.derby.jdbc.ClientBaseDataSourceRoot dataSource,
-            int rmId,boolean isXAConn) throws SqlException {
-        return (org.apache.derby.client.am.Connection)
-        (new NetConnection40((NetLogWriter)netLogWriter,user,password,dataSource,
-                rmId,isXAConn));
-    }
-
-    /**
-     * returns an instance of org.apache.derby.client.net.NetConnection40
-     */
-    public org.apache.derby.client.am.Connection
-            newNetConnection(org.apache.derby.client.am.LogWriter netLogWriter,
-            String ipaddr,int portNumber,
-            org.apache.derby.jdbc.ClientBaseDataSourceRoot dataSource,
+            ClientBaseDataSourceRoot dataSource,
+            int rmId,
             boolean isXAConn) throws SqlException {
-        return (org.apache.derby.client.am.Connection)
-        (new NetConnection40((NetLogWriter)netLogWriter,ipaddr,portNumber,dataSource,
-                isXAConn));
+
+        return new NetConnection40(
+                (NetLogWriter)netLogWriter,
+                user,
+                password,
+                dataSource,
+                rmId,
+                isXAConn);
     }
+
     /**
-     * Returns an instance of org.apache.derby.client.net.NetConnection.
+     * Returns an instance of {@link NetConnection}.
      * @param netLogWriter placeholder for NetLogWriter object associated with this connection
      * @param user         user id for this connection
      * @param password     password for this connection
@@ -300,29 +321,44 @@ public class ClientJDBCObjectFactoryImpl
      *                     NetConnection constructor was called. This is used
      *                     to pass StatementEvents back to the pooledConnection
      *                     object
-     * @return a org.apache.derby.client.am.Connection object
+     * @return a Connection object
      * @throws             SqlException
      */
-    public org.apache.derby.client.am.Connection newNetConnection(
-            org.apache.derby.client.am.LogWriter netLogWriter,String user,
+    public Connection newNetConnection(
+            LogWriter netLogWriter,
+            String user,
             String password,
-            org.apache.derby.jdbc.ClientBaseDataSourceRoot dataSource,
-            int rmId,boolean isXAConn,ClientPooledConnection cpc) 
-            throws SqlException {
-        return (org.apache.derby.client.am.Connection)
-        (new NetConnection40((NetLogWriter)netLogWriter,user,password,dataSource,rmId,
-                isXAConn,cpc));
+            ClientBaseDataSourceRoot dataSource,
+            int rmId,
+            boolean isXAConn,
+            ClientPooledConnection cpc) throws SqlException {
+
+        return new NetConnection40(
+                (NetLogWriter)netLogWriter,
+                user,
+                password,
+                dataSource,
+                rmId,
+                isXAConn,
+                cpc);
         
     }
     /**
-     * returns an instance of org.apache.derby.client.net.NetResultSet
+     * @return an instance of {@link NetResultSet}
      */
-    public org.apache.derby.client.am.ResultSet newNetResultSet(Agent netAgent,
-            org.apache.derby.client.am.MaterialStatement netStatement,
-            Cursor cursor,int qryprctyp,int sqlcsrhld,
-            int qryattscr,int qryattsns,int qryattset,long qryinsid,
-            int actualResultSetType,int actualResultSetConcurrency,
+    public ResultSet newNetResultSet(Agent netAgent,
+            MaterialStatement netStatement,
+            Cursor cursor,
+            int qryprctyp,
+            int sqlcsrhld,
+            int qryattscr,
+            int qryattsns,
+            int qryattset,
+            long qryinsid,
+            int actualResultSetType,
+            int actualResultSetConcurrency,
             int actualResultSetHoldability) throws SqlException {
+
         return new NetResultSet40((NetAgent)netAgent,(NetStatement)netStatement,
                 cursor,
                 qryprctyp, sqlcsrhld, qryattscr, qryattsns, qryattset, qryinsid,
@@ -330,10 +366,10 @@ public class ClientJDBCObjectFactoryImpl
                 actualResultSetHoldability);
     }
     /**
-     * returns an instance of org.apache.derby.client.net.NetDatabaseMetaData
+     * @return an instance of {@link NetDatabaseMetaData}
      */
-    public org.apache.derby.client.am.DatabaseMetaData newNetDatabaseMetaData(Agent netAgent,
-            org.apache.derby.client.am.Connection netConnection) {
+    public DatabaseMetaData newNetDatabaseMetaData(Agent netAgent,
+           Connection netConnection) {
         return new NetDatabaseMetaData40((NetAgent)netAgent,
                 (NetConnection)netConnection);
     }

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/ClientJDBCObjectFactoryImpl42.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/ClientJDBCObjectFactoryImpl42.java?rev=1467726&r1=1467725&r2=1467726&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/ClientJDBCObjectFactoryImpl42.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/ClientJDBCObjectFactoryImpl42.java Sun Apr 14 04:17:07 2013
@@ -27,16 +27,18 @@ import org.apache.derby.client.ClientPoo
 import org.apache.derby.client.am.Agent;
 import org.apache.derby.client.am.CallableStatement;
 import org.apache.derby.client.am.CallableStatement42;
+import org.apache.derby.client.am.Connection;
 import org.apache.derby.client.am.Cursor;
 import org.apache.derby.client.am.LogicalCallableStatement;
 import org.apache.derby.client.am.LogicalCallableStatement42;
 import org.apache.derby.client.am.LogicalPreparedStatement;
 import org.apache.derby.client.am.LogicalPreparedStatement42;
+import org.apache.derby.client.am.MaterialStatement;
 import org.apache.derby.client.am.PreparedStatement;
 import org.apache.derby.client.am.PreparedStatement42;
+import org.apache.derby.client.am.ResultSet;
 import org.apache.derby.client.am.Section;
 import org.apache.derby.client.am.StatementCacheInteractor;
-import org.apache.derby.client.am.SqlException;
 import org.apache.derby.client.am.stmtcache.StatementKey;
 
 /**
@@ -56,7 +58,7 @@ public class ClientJDBCObjectFactoryImpl
      * Returns a PreparedStatement.
      */
     public PreparedStatement newPreparedStatement(Agent agent,
-            org.apache.derby.client.am.Connection connection,
+            Connection connection,
             String sql,Section section,ClientPooledConnection cpc) 
             throws SqlException {
         return new PreparedStatement42(agent,connection,sql,section,cpc);
@@ -71,7 +73,7 @@ public class ClientJDBCObjectFactoryImpl
      * statement is closed.
      */
     public PreparedStatement newPreparedStatement(Agent agent,
-            org.apache.derby.client.am.Connection connection,
+            Connection connection,
             String sql,int type,int concurrency,
             int holdability,int autoGeneratedKeys,
             String [] columnNames,
@@ -94,8 +96,8 @@ public class ClientJDBCObjectFactoryImpl
     /**
      * returns an instance of org.apache.derby.client.net.NetResultSet
      */
-    public org.apache.derby.client.am.ResultSet newNetResultSet(Agent netAgent,
-            org.apache.derby.client.am.MaterialStatement netStatement,
+    public ResultSet newNetResultSet(Agent netAgent,
+            MaterialStatement netStatement,
             Cursor cursor,int qryprctyp,int sqlcsrhld,
             int qryattscr,int qryattsns,int qryattset,long qryinsid,
             int actualResultSetType,int actualResultSetConcurrency,
@@ -109,7 +111,7 @@ public class ClientJDBCObjectFactoryImpl
 
     /** return a CallableStatement */
     public CallableStatement newCallableStatement(Agent agent,
-            org.apache.derby.client.am.Connection connection,
+            Connection connection,
             String sql,int type,int concurrency,
             int holdability,ClientPooledConnection cpc) throws SqlException {
         return new CallableStatement42(agent,connection,sql,type,concurrency,

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/ConnectionReply.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/ConnectionReply.java?rev=1467726&r1=1467725&r2=1467726&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/ConnectionReply.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/ConnectionReply.java Sun Apr 14 04:17:07 2013
@@ -21,15 +21,19 @@
 
 package org.apache.derby.client.net;
 
+import org.apache.derby.client.am.Agent;
 import org.apache.derby.client.am.ConnectionCallbackInterface;
 import org.apache.derby.client.am.SqlException;
 
 
 public class ConnectionReply {
     private ConnectionReplyInterface materialConnectionReply_;
-    org.apache.derby.client.am.Agent agent_;
+    Agent agent_;
+
+    ConnectionReply(
+            Agent agent,
+            ConnectionReplyInterface materialConnectionReply) {
 
-    ConnectionReply(org.apache.derby.client.am.Agent agent, ConnectionReplyInterface materialConnectionReply) {
         agent_ = agent;
         materialConnectionReply_ = materialConnectionReply;
     }

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/ConnectionRequestInterface.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/ConnectionRequestInterface.java?rev=1467726&r1=1467725&r2=1467726&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/ConnectionRequestInterface.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/ConnectionRequestInterface.java Sun Apr 14 04:17:07 2013
@@ -22,20 +22,29 @@
 package org.apache.derby.client.net;
 
 // In general, required data is passed.
+
+import org.apache.derby.client.am.SqlException;
+
 // In addition, Connection objects are passed for convenient access to any material connection caches.
 // Implementations of this interface should not dereference common layer Connection state, as it is passed in,
 // but may dereference material layer Connection state if necessary for performance.
 
 public interface ConnectionRequestInterface {
-    public void writeCommitSubstitute(NetConnection connection) throws org.apache.derby.client.am.SqlException;
+    public void writeCommitSubstitute(NetConnection connection)
+            throws SqlException;
 
-    public void writeLocalCommit(NetConnection connection) throws org.apache.derby.client.am.SqlException;
+    public void writeLocalCommit(NetConnection connection)
+            throws SqlException;
 
-    public void writeLocalRollback(NetConnection connection) throws org.apache.derby.client.am.SqlException;
+    public void writeLocalRollback(NetConnection connection)
+            throws SqlException;
 
-    public void writeLocalXAStart(NetConnection connection) throws org.apache.derby.client.am.SqlException;
+    public void writeLocalXAStart(NetConnection connection)
+            throws SqlException;
 
-    public void writeLocalXACommit(NetConnection connection) throws org.apache.derby.client.am.SqlException;
+    public void writeLocalXACommit(NetConnection connection)
+            throws SqlException;
 
-    public void writeLocalXARollback(NetConnection connection) throws org.apache.derby.client.am.SqlException;
+    public void writeLocalXARollback(NetConnection connection)
+            throws SqlException;
 }

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/EbcdicCcsidManager.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/EbcdicCcsidManager.java?rev=1467726&r1=1467725&r2=1467726&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/EbcdicCcsidManager.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/EbcdicCcsidManager.java Sun Apr 14 04:17:07 2013
@@ -129,7 +129,10 @@ public class EbcdicCcsidManager extends 
         );
     }
 
-    public byte[] convertFromJavaString(String sourceString, org.apache.derby.client.am.Agent agent) throws SqlException {
+    public byte[] convertFromJavaString(
+            String sourceString,
+            Agent agent) throws SqlException {
+
         CharBuffer src = CharBuffer.wrap(sourceString);
         ByteBuffer dest = ByteBuffer.allocate(sourceString.length());
         startEncoding();

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetAgent.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetAgent.java?rev=1467726&r1=1467725&r2=1467726&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetAgent.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetAgent.java Sun Apr 14 04:17:07 2013
@@ -27,6 +27,8 @@ import org.apache.derby.client.am.Agent;
 import org.apache.derby.client.am.DisconnectException;
 import org.apache.derby.client.am.SqlException;
 import org.apache.derby.client.am.ClientMessageId;
+import org.apache.derby.client.am.LogWriter;
+import org.apache.derby.client.am.Statement;
 import org.apache.derby.client.am.Utils;
 import org.apache.derby.shared.common.sanity.SanityManager;
 
@@ -104,13 +106,13 @@ public class NetAgent extends Agent {
     
     //---------------------constructors/finalizer---------------------------------
     public NetAgent(NetConnection netConnection,
-                    org.apache.derby.client.am.LogWriter logWriter) throws SqlException {
+                    LogWriter logWriter) throws SqlException {
         super(netConnection, logWriter);
         this.netConnection_ = netConnection;
     }
 
     NetAgent(NetConnection netConnection,
-             org.apache.derby.client.am.LogWriter netLogWriter,
+             LogWriter netLogWriter,
              int loginTimeout,
              String server,
              int port,
@@ -228,7 +230,7 @@ public class NetAgent extends Agent {
         }
     }
 
-    protected void resetAgent_(org.apache.derby.client.am.LogWriter netLogWriter,
+    protected void resetAgent_(LogWriter netLogWriter,
                                //CcsidManager sourceCcsidManager,
                                //CcsidManager targetCcsidManager,
                                int loginTimeout,
@@ -417,20 +419,20 @@ public class NetAgent extends Agent {
     }
 
     public void throwCommunicationsFailure(Throwable cause) 
-        throws org.apache.derby.client.am.DisconnectException {
+            throws DisconnectException {
         //org.apache.derby.client.am.DisconnectException
         //accumulateReadExceptionAndDisconnect
         // note when {6} = 0 it indicates the socket was closed.
         // need to still validate any token values against message publications.
         accumulateChainBreakingReadExceptionAndThrow(
-            new org.apache.derby.client.am.DisconnectException(this,
+            new DisconnectException(this,
                 new ClientMessageId(SQLState.COMMUNICATION_ERROR),
                 cause.getMessage(), cause));
     }
         
     // ----------------------- call-down methods ---------------------------------
 
-    public org.apache.derby.client.am.LogWriter newLogWriter_(java.io.PrintWriter printWriter,
+    public LogWriter newLogWriter_(java.io.PrintWriter printWriter,
                                                               int traceLevel) {
         return new NetLogWriter(printWriter, traceLevel);
     }
@@ -468,7 +470,7 @@ public class NetAgent extends Agent {
         super.beginWriteChainOutsideUOW();
     }
 
-    public void beginWriteChain(org.apache.derby.client.am.Statement statement) throws SqlException {
+    public void beginWriteChain(Statement statement) throws SqlException {
         request_.initialize();
         writeDeferredResetConnection();
         super.beginWriteChain(statement);
@@ -493,7 +495,7 @@ public class NetAgent extends Agent {
         }
     }
 
-    protected void beginReadChain(org.apache.derby.client.am.Statement statement) throws SqlException {
+    protected void beginReadChain(Statement statement) throws SqlException {
         readDeferredResetConnection();
         super.beginReadChain(statement);
     }

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnection.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnection.java?rev=1467726&r1=1467725&r2=1467726&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnection.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnection.java Sun Apr 14 04:17:07 2013
@@ -20,11 +20,15 @@
 */
 package org.apache.derby.client.net;
 
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.SocketTimeoutException;
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
-import java.sql.SQLException;
-import java.util.Enumeration;
+import java.util.Arrays;
 import java.util.HashMap;
+import java.util.List;
+import java.util.Properties;
 import javax.transaction.xa.Xid;
 import org.apache.derby.client.am.CallableStatement;
 import org.apache.derby.client.am.DatabaseMetaData;
@@ -40,12 +44,17 @@ import org.apache.derby.iapi.reference.A
 import org.apache.derby.jdbc.ClientBaseDataSourceRoot;
 import org.apache.derby.jdbc.ClientDriver;
 import org.apache.derby.client.ClientPooledConnection;
+import org.apache.derby.client.am.Agent;
+import org.apache.derby.client.am.Connection;
+import org.apache.derby.client.am.LogWriter;
+import org.apache.derby.client.am.Section;
+import org.apache.derby.client.am.SectionManager;
 import org.apache.derby.jdbc.ClientDataSourceInterface;
 
 import org.apache.derby.shared.common.reference.SQLState;
 import org.apache.derby.shared.common.sanity.SanityManager;
 
-public class NetConnection extends org.apache.derby.client.am.Connection {
+public class NetConnection extends Connection {
     
     // Use this to get internationalized strings...
     protected static final MessageUtil msgutil = SqlException.getMessageUtil();
@@ -180,7 +189,7 @@ public class NetConnection extends org.a
 
     public NetConnection(NetLogWriter netLogWriter,
                          String databaseName,
-                         java.util.Properties properties) throws SqlException {
+                         Properties properties) throws SqlException {
         super(netLogWriter, 0, "", -1, databaseName, properties);
         this.pooledConnection_ = null;
         this.closeStatementsOnClose = true;
@@ -188,7 +197,7 @@ public class NetConnection extends org.a
 
     public NetConnection(
             NetLogWriter netLogWriter,
-            org.apache.derby.jdbc.ClientBaseDataSourceRoot dataSource,
+            ClientBaseDataSourceRoot dataSource,
             String user,
             String password) throws SqlException {
 
@@ -204,7 +213,7 @@ public class NetConnection extends org.a
                          String serverName,
                          int portNumber,
                          String databaseName,
-                         java.util.Properties properties) throws SqlException {
+                         Properties properties) throws SqlException {
         super(netLogWriter, driverManagerLoginTimeout, serverName, portNumber, databaseName, properties);
         this.pooledConnection_ = null;
         this.closeStatementsOnClose = true;
@@ -322,7 +331,7 @@ public class NetConnection extends org.a
 
     // preferably without password in the method signature.
     // We can probally get rid of flowReconnect method.
-    public void resetNetConnection(org.apache.derby.client.am.LogWriter logWriter)
+    public void resetNetConnection(LogWriter logWriter)
             throws SqlException {
         super.resetConnection(logWriter);
         //----------------------------------------------------
@@ -350,7 +359,7 @@ public class NetConnection extends org.a
     }
 
 
-    protected void reset_(org.apache.derby.client.am.LogWriter logWriter)
+    protected void reset_(LogWriter logWriter)
             throws SqlException {
         if (inUnitOfWork_) {
             throw new SqlException(logWriter, 
@@ -360,7 +369,7 @@ public class NetConnection extends org.a
         resetNetConnection(logWriter);
     }
 
-    java.util.List getSpecialRegisters() {
+    List getSpecialRegisters() {
         if (xares_ != null) {
             return xares_.getSpecialRegisters();
         } else {
@@ -427,8 +436,10 @@ public class NetConnection extends org.a
                     new ClientMessageId(SQLState.SECMECH_NOT_SUPPORTED),
                     securityMechanism);
             }
-        } catch (java.lang.Throwable e) { // if *anything* goes wrong, make sure the connection is destroyed
-            // always mark the connection closed in case of an error.
+        } catch (Throwable e) {
+            // If *anything* goes wrong, make sure the connection is
+            // destroyed always mark the connection closed in case of
+            // an error.
             // This prevents attempts to use this closed connection
             // to retrieve error message text if an error SQLCA
             // is returned in one of the connect flows.
@@ -474,8 +485,10 @@ public class NetConnection extends org.a
 
         try {
             flowServerAttributes();
-        } catch (java.lang.Throwable e) { // if *anything* goes wrong, make sure the connection is destroyed
-            // always mark the connection closed in case of an error.
+        } catch (Throwable e) {
+            // If *anything* goes wrong, make sure the connection is
+            // destroyed always mark the connection closed in case of
+            // an error.
             // This prevents attempts to use this closed connection
             // to retrieve error message text if an error SQLCA
             // is returned in one of the connect flows.
@@ -514,7 +527,7 @@ public class NetConnection extends org.a
     {
         for ( Throwable cause = original; cause != null; cause = cause.getCause() )
         {
-            if ( cause instanceof java.net.SocketTimeoutException )
+            if ( cause instanceof SocketTimeoutException )
             {
                 throw new SqlException
                     ( agent_.logWriter_, new ClientMessageId( SQLState.LOGIN_TIMEOUT ), original );
@@ -1009,8 +1022,12 @@ public class NetConnection extends org.a
 
     //-------------------Abstract object factories--------------------------------
 
-    protected org.apache.derby.client.am.Agent newAgent_(org.apache.derby.client.am.LogWriter logWriter, int loginTimeout, String serverName, int portNumber, int clientSSLMode)
-            throws SqlException {
+    protected Agent newAgent_(LogWriter logWriter,
+            int loginTimeout,
+            String serverName,
+            int portNumber,
+            int clientSSLMode) throws SqlException {
+
         return new NetAgent(this,
                 (NetLogWriter) logWriter,
                 loginTimeout,
@@ -1028,8 +1045,9 @@ public class NetConnection extends org.a
         ((NetStatement) statement.getMaterialStatement()).resetNetStatement(netAgent_, this, type, concurrency, holdability);
     }
 
-    protected PreparedStatement newPositionedUpdatePreparedStatement_(String sql,
-                                                                      org.apache.derby.client.am.Section section) throws SqlException {
+    protected PreparedStatement newPositionedUpdatePreparedStatement_(
+            String sql,
+            Section section) throws SqlException {
         //passing the pooledConnection_ object which will be used to raise 
         //StatementEvents to the PooledConnection
         return new NetPreparedStatement(netAgent_, this, sql, section,pooledConnection_).preparedStatement_;
@@ -1226,7 +1244,7 @@ public class NetConnection extends org.a
         if (crrtkn_ == null) {
             crrtkn_ = new byte[19];
         } else {
-            java.util.Arrays.fill(crrtkn_, (byte) 0);
+            Arrays.fill(crrtkn_, (byte) 0);
         }
 
         byte [] localAddressBytes = netAgent_.socket_.getLocalAddress().getAddress();
@@ -1287,7 +1305,7 @@ public class NetConnection extends org.a
 
     private void constructExtnam() throws SqlException {
         /* Construct the EXTNAM based on the thread name */
-        char[] chars = java.lang.Thread.currentThread().getName().toCharArray();
+        char[] chars = Thread.currentThread().getName().toCharArray();
 
         /* DERBY-4584: Replace non-EBCDIC characters (> 0xff) with '?' */
         for (int i = 0; i < chars.length; i++) {
@@ -1301,7 +1319,7 @@ public class NetConnection extends org.a
             prddta_ = ByteBuffer.allocate(NetConfiguration.PRDDTA_MAXSIZE);
         } else {
             prddta_.clear();
-            java.util.Arrays.fill(prddta_.array(), (byte) 0);
+            Arrays.fill(prddta_.array(), (byte) 0);
         }
 
         CcsidManager ccsidMgr = netAgent_.getCurrentCcsidManager();
@@ -1558,19 +1576,19 @@ public class NetConnection extends org.a
         return false;
     }
 
-    public void setInputStream(java.io.InputStream inputStream) {
+    public void setInputStream(InputStream inputStream) {
         netAgent_.setInputStream(inputStream);
     }
 
-    public void setOutputStream(java.io.OutputStream outputStream) {
+    public void setOutputStream(OutputStream outputStream) {
         netAgent_.setOutputStream(outputStream);
     }
 
-    public java.io.InputStream getInputStream() {
+    public InputStream getInputStream() {
         return netAgent_.getInputStream();
     }
 
-    public java.io.OutputStream getOutputStream() {
+    public OutputStream getOutputStream() {
         return netAgent_.getOutputStream();
     }
 
@@ -1606,11 +1624,11 @@ public class NetConnection extends org.a
         readOnlyTransaction_ = flag;
     }
 
-    public org.apache.derby.client.am.SectionManager newSectionManager
+    public SectionManager newSectionManager
             (String collection,
-             org.apache.derby.client.am.Agent agent,
+             Agent agent,
              String databaseName) {
-        return new org.apache.derby.client.am.SectionManager(collection, agent, databaseName);
+        return new SectionManager(collection, agent, databaseName);
     }
 
     public boolean willAutoCommitGenerateFlow() {

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnection40.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnection40.java?rev=1467726&r1=1467725&r2=1467726&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnection40.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnection40.java Sun Apr 14 04:17:07 2013
@@ -23,8 +23,6 @@ package org.apache.derby.client.net;
 
 import java.sql.Array;
 import java.sql.NClob;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
 import java.sql.SQLClientInfoException;
 import java.sql.SQLException;
 import java.sql.SQLPermission;
@@ -40,13 +38,13 @@ import org.apache.derby.client.am.SqlExc
 import org.apache.derby.jdbc.ClientBaseDataSourceRoot;
 import org.apache.derby.shared.common.reference.SQLState;
 
-public class  NetConnection40 extends org.apache.derby.client.net.NetConnection {
+public class  NetConnection40 extends NetConnection {
     /**
      * Prepared statement that is used each time isValid() is called on this
      * connection. The statement is created the first time isValid is called
      * and closed when the connection is closed (by the close call).
      */
-    private PreparedStatement isValidStmt = null;
+    private java.sql.PreparedStatement isValidStmt = null;
 
     /*
      *-------------------------------------------------------
@@ -198,7 +196,7 @@ public class  NetConnection40 extends or
                 isValidStmt.setQueryTimeout(timeout);
 
                 // Run the query against the database
-                ResultSet rs = isValidStmt.executeQuery();
+                java.sql.ResultSet rs = isValidStmt.executeQuery();
                 rs.close();
 
                 // Restore the previous timeout value

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetCursor.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetCursor.java?rev=1467726&r1=1467725&r2=1467726&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetCursor.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetCursor.java Sun Apr 14 04:17:07 2013
@@ -27,6 +27,7 @@ import org.apache.derby.client.am.Agent;
 import org.apache.derby.client.am.Blob;
 import org.apache.derby.client.am.ClientMessageId;
 import org.apache.derby.client.am.Clob;
+import org.apache.derby.client.am.Cursor;
 import org.apache.derby.client.am.DisconnectException;
 import org.apache.derby.client.am.Lob;
 import org.apache.derby.client.am.SignedBinary;
@@ -34,10 +35,11 @@ import org.apache.derby.client.am.SqlCod
 import org.apache.derby.client.am.SqlException;
 import org.apache.derby.client.am.SqlWarning;
 import org.apache.derby.client.am.Types;
+import org.apache.derby.client.am.Utils;
 import org.apache.derby.shared.common.reference.SQLState;
 import org.apache.derby.shared.common.sanity.SanityManager;
 
-public class NetCursor extends org.apache.derby.client.am.Cursor {
+public class NetCursor extends Cursor {
 
     NetResultSet netResultSet_;
     NetAgent netAgent_;
@@ -392,7 +394,7 @@ public class NetCursor extends org.apach
         }
     }
 
-    private int readFdocaInt() throws org.apache.derby.client.am.DisconnectException, SqlException {
+    private int readFdocaInt() throws DisconnectException, SqlException {
         checkForSplitRowAndComplete(4);
         int i = SignedBinary.getInt(dataBuffer_, position_);
         position_ += 4;
@@ -401,14 +403,16 @@ public class NetCursor extends org.apach
 
     // Reads 1-byte from the dataBuffer from the current position.
     // If position is already at the end of the buffer, send CNTQRY to get more data.
-    private int readFdocaOneByte() throws org.apache.derby.client.am.DisconnectException, SqlException {
+    private int readFdocaOneByte() throws DisconnectException, SqlException {
         checkForSplitRowAndComplete(1);
         return dataBuffer_[position_++] & 0xff;
     }
 
     // Reads 1-byte from the dataBuffer from the current position.
     // If position is already at the end of the buffer, send CNTQRY to get more data.
-    private int readFdocaOneByte(int index) throws org.apache.derby.client.am.DisconnectException, SqlException {
+    private int readFdocaOneByte(int index)
+            throws DisconnectException, SqlException {
+
         checkForSplitRowAndComplete(1, index);
         return dataBuffer_[position_++] & 0xff;
     }
@@ -417,7 +421,9 @@ public class NetCursor extends org.apach
     // current position.  Returns a new byte array which contains the bytes read.
     // If current position plus length goes past the lastValidBytePosition, send
     // CNTQRY to get more data.
-    private byte[] readFdocaBytes(int length) throws org.apache.derby.client.am.DisconnectException, SqlException {
+    private byte[] readFdocaBytes(int length)
+            throws DisconnectException, SqlException {
+
         checkForSplitRowAndComplete(length);
 
         byte[] b = new byte[length];
@@ -430,14 +436,18 @@ public class NetCursor extends org.apach
     // Reads 2-bytes from the dataBuffer starting from the current position, and
     // returns an integer constructed from the 2-bytes.  If current position plus
     // 2 bytes goes past the lastValidBytePosition, send CNTQRY to get more data.
-    private int readFdocaTwoByteLength() throws org.apache.derby.client.am.DisconnectException, SqlException {
+    private int readFdocaTwoByteLength()
+            throws DisconnectException, SqlException {
+
         checkForSplitRowAndComplete(2);
         return
                 ((dataBuffer_[position_++] & 0xff) << 8) +
                 ((dataBuffer_[position_++] & 0xff) << 0);
     }
 
-    private int readFdocaTwoByteLength(int index) throws org.apache.derby.client.am.DisconnectException, SqlException {
+    private int readFdocaTwoByteLength(int index)
+            throws DisconnectException, SqlException {
+
         checkForSplitRowAndComplete(2, index);
         return
                 ((dataBuffer_[position_++] & 0xff) << 8) +
@@ -448,13 +458,17 @@ public class NetCursor extends org.apach
     // If so, send CNTQRY to get more data.
     // length - number of bytes to skip
     // returns the number of bytes skipped
-    private int skipFdocaBytes(int length) throws org.apache.derby.client.am.DisconnectException, SqlException {
+    private int skipFdocaBytes(int length)
+            throws DisconnectException, SqlException {
+
         checkForSplitRowAndComplete(length);
         position_ += length;
         return length;
     }
 
-    private int skipFdocaBytes(int length, int index) throws org.apache.derby.client.am.DisconnectException, SqlException {
+    private int skipFdocaBytes(int length, int index)
+            throws DisconnectException, SqlException {
+
         checkForSplitRowAndComplete(length, index);
         position_ += length;
         return length;
@@ -563,7 +577,9 @@ public class NetCursor extends org.apach
     //
     // FORMAT FOR ALL SQLAM LEVELS
     //   SQLCAGRP; GROUP LID 0x54; ELEMENT TAKEN 0(all); REP FACTOR 1
-    NetSqlca[] parseSQLCARD(Typdef typdef) throws org.apache.derby.client.am.DisconnectException, SqlException {
+    NetSqlca[] parseSQLCARD(Typdef typdef)
+            throws DisconnectException, SqlException {
+
         return parseSQLCAGRP(typdef);
     }
 
@@ -582,7 +598,9 @@ public class NetCursor extends org.apach
     //   SQLERRPROC; PROTOCOL TYPE FCS; ENVLID 0x30; Length Override 8
     //   SQLCAXGRP; PROTOCOL TYPE N-GDA; ENVLID 0x52; Length Override 0
     //   SQLDIAGGRP; PROTOCOL TYPE N-GDA; ENVLID 0x56; Length Override 0
-    private NetSqlca[] parseSQLCAGRP(Typdef typdef) throws org.apache.derby.client.am.DisconnectException, SqlException {
+    private NetSqlca[] parseSQLCAGRP(Typdef typdef)
+            throws DisconnectException, SqlException {
+
         if (readFdocaOneByte() == CodePoint.NULLDATA) {
             return null;
         }
@@ -862,7 +880,7 @@ public class NetCursor extends org.apach
             s = new String(dataBuffer_, position_, length, encoding);
         } catch (java.io.UnsupportedEncodingException e) {
             netAgent_.accumulateChainBreakingReadExceptionAndThrow(
-                new org.apache.derby.client.am.DisconnectException(
+                new DisconnectException(
                     netAgent_, 
                     new ClientMessageId(SQLState.NET_ENCODING_NOT_SUPPORTED), 
                     e));
@@ -1088,7 +1106,9 @@ public class NetCursor extends org.apach
         // has been received.
         if (!netResultSet_.openOnServer_) {
             SqlException sqlException = null;
-            int sqlcode = org.apache.derby.client.am.Utils.getSqlcodeFromSqlca(netResultSet_.queryTerminatingSqlca_);
+            int sqlcode = Utils.getSqlcodeFromSqlca(
+                netResultSet_.queryTerminatingSqlca_);
+
             if (sqlcode < 0) {
                 sqlException = new SqlException(agent_.logWriter_, netResultSet_.queryTerminatingSqlca_);
             } else {

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetDatabaseMetaData.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetDatabaseMetaData.java?rev=1467726&r1=1467725&r2=1467726&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetDatabaseMetaData.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetDatabaseMetaData.java Sun Apr 14 04:17:07 2013
@@ -21,10 +21,11 @@
 package org.apache.derby.client.net;
 
 import org.apache.derby.client.am.Configuration;
+import org.apache.derby.client.am.DatabaseMetaData;
 import org.apache.derby.client.am.ProductLevel;
 import org.apache.derby.client.am.SqlException;
 
-public class NetDatabaseMetaData extends org.apache.derby.client.am.DatabaseMetaData {
+public class NetDatabaseMetaData extends DatabaseMetaData {
 
     public NetDatabaseMetaData(NetAgent netAgent, NetConnection netConnection) {
         // Consider setting product level during parse

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetDatabaseMetaData40.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetDatabaseMetaData40.java?rev=1467726&r1=1467725&r2=1467726&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetDatabaseMetaData40.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetDatabaseMetaData40.java Sun Apr 14 04:17:07 2013
@@ -27,7 +27,7 @@ import org.apache.derby.client.am.Client
 import org.apache.derby.client.am.SqlException;
 import org.apache.derby.shared.common.reference.SQLState;
 
-public class NetDatabaseMetaData40 extends org.apache.derby.client.net.NetDatabaseMetaData {
+public class NetDatabaseMetaData40 extends NetDatabaseMetaData {
     
     
     public NetDatabaseMetaData40(NetAgent netAgent, NetConnection netConnection) {

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetLogWriter.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetLogWriter.java?rev=1467726&r1=1467725&r2=1467726&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetLogWriter.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetLogWriter.java Sun Apr 14 04:17:07 2013
@@ -22,10 +22,15 @@
 package org.apache.derby.client.net;
 
 // network traffic tracer.
+
+import org.apache.derby.client.am.Connection;
+import org.apache.derby.client.am.LogWriter;
+import org.apache.derby.jdbc.ClientDataSource;
+
 // This class traces communication buffers for both sends and receives.
 // The value of the hex bytes are traced along with the ascii and ebcdic translations.
 
-public class NetLogWriter extends org.apache.derby.client.am.LogWriter {
+public class NetLogWriter extends LogWriter {
 
     // The recevie constant is used to indicate that the bytes were read to a Stream.
     // It indicates to this class that a receive header should be used.
@@ -141,7 +146,7 @@ public class NetLogWriter extends org.ap
     //------------------------------entry points----------------------------------
 
     // Specialization of LogWriter.traceConnectsExit()
-    public void traceConnectsExit(org.apache.derby.client.am.Connection connection) {
+    public void traceConnectsExit(Connection connection) {
         NetConnection c = (NetConnection) connection;
         synchronized (printWriter_) {
             super.traceConnectsExit(c);
@@ -159,7 +164,7 @@ public class NetLogWriter extends org.ap
         }
     }
 
-    public void traceConnectsResetExit(org.apache.derby.client.am.Connection connection) {
+    public void traceConnectsResetExit(Connection connection) {
         NetConnection c = (NetConnection) connection;
         synchronized (printWriter_) {
             super.traceConnectsResetExit(c);
@@ -191,7 +196,7 @@ public class NetLogWriter extends org.ap
                                                String className,
                                                String methodName,
                                                int tracepoint) {
-        if (!loggingEnabled(org.apache.derby.jdbc.ClientDataSource.TRACE_PROTOCOL_FLOWS)) {
+        if (!loggingEnabled(ClientDataSource.TRACE_PROTOCOL_FLOWS)) {
             return;
         }
         synchronized (printWriter_) {

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetPreparedStatement.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetPreparedStatement.java?rev=1467726&r1=1467725&r2=1467726&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 Sun Apr 14 04:17:07 2013
@@ -27,32 +27,33 @@ import org.apache.derby.client.am.SqlExc
 import org.apache.derby.jdbc.ClientDriver;
 import org.apache.derby.client.am.ClientJDBCObjectFactory;
 import org.apache.derby.client.ClientPooledConnection;
+import org.apache.derby.client.am.MaterialPreparedStatement;
 
 
 public class NetPreparedStatement extends NetStatement
-        implements org.apache.derby.client.am.MaterialPreparedStatement {
+        implements MaterialPreparedStatement {
 
     // Alias for (NetPreparedStatement) super.statement.
     /*final*/
-    org.apache.derby.client.am.PreparedStatement preparedStatement_;
+    PreparedStatement preparedStatement_;
 
 
     // Relay constructor for NetCallableStatement.
-    NetPreparedStatement(org.apache.derby.client.am.PreparedStatement statement,
+    NetPreparedStatement(PreparedStatement statement,
                          NetAgent netAgent,
                          NetConnection netConnection) {
         super(statement, netAgent, netConnection);
         initNetPreparedStatement(statement);
     }
 
-    void resetNetPreparedStatement(org.apache.derby.client.am.PreparedStatement statement,
+    void resetNetPreparedStatement(PreparedStatement statement,
                                    NetAgent netAgent,
                                    NetConnection netConnection) {
         super.resetNetStatement(statement, netAgent, netConnection);
         initNetPreparedStatement(statement);
     }
 
-    private void initNetPreparedStatement(org.apache.derby.client.am.PreparedStatement statement) {
+    private void initNetPreparedStatement(PreparedStatement statement) {
         preparedStatement_ = statement;
         preparedStatement_.materialPreparedStatement_ = this;
     }

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetResultSet.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetResultSet.java?rev=1467726&r1=1467725&r2=1467726&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetResultSet.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetResultSet.java Sun Apr 14 04:17:07 2013
@@ -22,11 +22,12 @@ package org.apache.derby.client.net;
 
 import org.apache.derby.client.am.Cursor;
 import org.apache.derby.client.am.DisconnectException;
+import org.apache.derby.client.am.ResultSet;
 import org.apache.derby.client.am.Section;
 import org.apache.derby.client.am.SqlException;
 
 
-public class NetResultSet extends org.apache.derby.client.am.ResultSet {
+public class NetResultSet extends ResultSet {
     // Alias for (NetConnection) super.statement.connection
     private final NetConnection netConnection_;
 

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetResultSet40.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetResultSet40.java?rev=1467726&r1=1467725&r2=1467726&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetResultSet40.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetResultSet40.java Sun Apr 14 04:17:07 2013
@@ -24,8 +24,6 @@ package org.apache.derby.client.net;
 import java.io.InputStream;
 import java.io.Reader;
 import java.math.BigDecimal;
-import java.sql.Blob;
-import java.sql.Clob;
 import java.sql.Date;
 import java.sql.NClob;
 import java.sql.RowId;
@@ -297,10 +295,19 @@ public class NetResultSet40 extends NetR
         else if ( Date.class.equals( type ) ) { retval = getDate( columnIndex ); }
         else if ( Time.class.equals( type ) ) { retval = getTime( columnIndex ); }
         else if ( Timestamp.class.equals( type ) ) { retval = getTimestamp( columnIndex ); }
-        else if ( Blob.class.equals( type ) ) { retval = getBlob( columnIndex ); }
-        else if ( Clob.class.equals( type ) ) { retval = getClob( columnIndex ); }
-        else if ( type.isArray() && type.getComponentType().equals( byte.class ) ) { retval = getBytes( columnIndex ); }
-        else { retval = getObject( columnIndex ); }
+
+        else if ( java.sql.Blob.class.equals( type ) ) {
+            retval = getBlob( columnIndex );
+
+        } else if ( java.sql.Clob.class.equals( type ) ) {
+            retval = getClob( columnIndex );
+
+        } else if ( type.isArray() &&
+                    type.getComponentType().equals( byte.class ) ) {
+            retval = getBytes( columnIndex );
+
+        } else { retval = getObject( columnIndex );
+        }
 
         if ( wasNull() ) { retval = null; }
 

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetSqlca.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetSqlca.java?rev=1467726&r1=1467725&r2=1467726&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetSqlca.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetSqlca.java Sun Apr 14 04:17:07 2013
@@ -26,13 +26,14 @@ import org.apache.derby.shared.common.re
 import org.apache.derby.client.am.ClientMessageId;
 import org.apache.derby.client.am.SqlException;
 import java.io.UnsupportedEncodingException;
+import org.apache.derby.client.am.Connection;
 import org.apache.derby.client.am.DisconnectException;
 
 public class NetSqlca extends Sqlca {
     // these are the same variables that are in the Sqlca except ccsids
     // are a little different
 
-    NetSqlca(org.apache.derby.client.am.Connection connection,
+    NetSqlca(Connection connection,
              int sqlCode,
              String sqlState,
              byte[] sqlErrpBytes) {
@@ -42,7 +43,7 @@ public class NetSqlca extends Sqlca {
         sqlErrpBytes_ = sqlErrpBytes;
     }
 
-    NetSqlca(org.apache.derby.client.am.Connection connection,
+    NetSqlca(Connection connection,
             int sqlCode,
             byte[] sqlState,
             byte[] sqlErrpBytes) throws SqlException {

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetSqldta.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetSqldta.java?rev=1467726&r1=1467725&r2=1467726&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetSqldta.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetSqldta.java Sun Apr 14 04:17:07 2013
@@ -21,6 +21,8 @@
 
 package org.apache.derby.client.net;
 
+import org.apache.derby.client.am.SqlException;
+
 
 public class NetSqldta extends NetCursor {
     private NetConnection netConnection_;
@@ -31,7 +33,7 @@ public class NetSqldta extends NetCursor
         netConnection_ = netAgent.netConnection_;
     }
 
-    public boolean next() throws org.apache.derby.client.am.SqlException {
+    public boolean next() throws SqlException {
         if (allRowsReceivedFromServer()) {
             return false;
         } else {

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetStatement.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetStatement.java?rev=1467726&r1=1467725&r2=1467726&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetStatement.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetStatement.java Sun Apr 14 04:17:07 2013
@@ -22,12 +22,13 @@
 package org.apache.derby.client.net;
 
 import org.apache.derby.client.am.ColumnMetaData;
+import org.apache.derby.client.am.MaterialStatement;
 import org.apache.derby.client.am.Section;
 import org.apache.derby.client.am.SqlException;
 import org.apache.derby.client.am.Statement;
 import org.apache.derby.jdbc.ClientDriver;
 
-public class NetStatement implements org.apache.derby.client.am.MaterialStatement {
+public class NetStatement implements MaterialStatement {
 
     Statement statement_;
 
@@ -57,17 +58,23 @@ public class NetStatement implements org
     }
 
     // Relay constructor for NetPreparedStatement.
-    NetStatement(org.apache.derby.client.am.Statement statement, NetAgent netAgent, NetConnection netConnection) {
+    NetStatement(Statement statement,
+                 NetAgent netAgent,
+                 NetConnection netConnection) {
         this();
         initNetStatement(statement, netAgent, netConnection);
     }
 
-    void resetNetStatement(org.apache.derby.client.am.Statement statement, NetAgent netAgent, NetConnection netConnection) {
+    void resetNetStatement(Statement statement,
+                           NetAgent netAgent,
+                           NetConnection netConnection) {
         resetNetStatement();
         initNetStatement(statement, netAgent, netConnection);
     }
 
-    private void initNetStatement(org.apache.derby.client.am.Statement statement, NetAgent netAgent, NetConnection netConnection) {
+    private void initNetStatement(Statement statement,
+                                  NetAgent netAgent,
+                                  NetConnection netConnection) {
         netAgent_ = netAgent;
         netConnection_ = netConnection;
         statement_ = statement;

Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetStatementReply.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetStatementReply.java?rev=1467726&r1=1467725&r2=1467726&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetStatementReply.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetStatementReply.java Sun Apr 14 04:17:07 2013
@@ -21,7 +21,6 @@
 
 package org.apache.derby.client.net;
 
-import java.sql.ResultSet;
 import java.util.ArrayList;
 import java.util.List;
 import org.apache.derby.client.am.ClientMessageId;
@@ -2317,9 +2316,9 @@ public class NetStatementReply extends N
 
     private int calculateResultSetHoldability(int sqlcsrhld) {
         if (sqlcsrhld == 0xF0) {
-            return ResultSet.CLOSE_CURSORS_AT_COMMIT;
+            return java.sql.ResultSet.CLOSE_CURSORS_AT_COMMIT;
         } else {
-            return ResultSet.HOLD_CURSORS_OVER_COMMIT;
+            return java.sql.ResultSet.HOLD_CURSORS_OVER_COMMIT;
         }
     }
 



Mime
View raw message