Connector/J commit: r5570 - in trunk/connector-j/src: com/mysql/jdbc com/mysql/jdbc/jdbc2/optional com/mysql/jdbc/util testsuite/regression testsuite/...

[eherman]

Modified:
   trunk/connector-j/src/com/mysql/jdbc/CallableStatement.java
   trunk/connector-j/src/com/mysql/jdbc/CharsetMapping.java
   trunk/connector-j/src/com/mysql/jdbc/Connection.java
   trunk/connector-j/src/com/mysql/jdbc/MysqlDefs.java
   trunk/connector-j/src/com/mysql/jdbc/MysqlIO.java
   trunk/connector-j/src/com/mysql/jdbc/PreparedStatement.java
   trunk/connector-j/src/com/mysql/jdbc/ResultSetMetaData.java
   trunk/connector-j/src/com/mysql/jdbc/ServerPreparedStatement.java
   trunk/connector-j/src/com/mysql/jdbc/StandardSocketFactory.java
   trunk/connector-j/src/com/mysql/jdbc/Statement.java
   trunk/connector-j/src/com/mysql/jdbc/TimeUtil.java
   trunk/connector-j/src/com/mysql/jdbc/jdbc2/optional/CallableStatementWrapper.java
   trunk/connector-j/src/com/mysql/jdbc/util/ServerController.java
   trunk/connector-j/src/com/mysql/jdbc/util/VersionFSHierarchyMaker.java
   trunk/connector-j/src/testsuite/regression/BlobRegressionTest.java
   trunk/connector-j/src/testsuite/regression/DataSourceRegressionTest.java
   trunk/connector-j/src/testsuite/regression/MicroPerformanceRegressionTest.java
   trunk/connector-j/src/testsuite/simple/BlobTest.java
   trunk/connector-j/src/testsuite/simple/ConnectionTest.java
   trunk/connector-j/src/testsuite/simple/StatementsTest.java
Log:
organized some imports

Modified: trunk/connector-j/src/com/mysql/jdbc/CallableStatement.java
===================================================================
--- trunk/connector-j/src/com/mysql/jdbc/CallableStatement.java	2006-07-28 19:32:44 UTC
(rev 5569)
+++ trunk/connector-j/src/com/mysql/jdbc/CallableStatement.java	2006-07-28 20:45:43 UTC
(rev 5570)
@@ -46,7 +46,6 @@
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 
 /**

Modified: trunk/connector-j/src/com/mysql/jdbc/CharsetMapping.java
===================================================================
--- trunk/connector-j/src/com/mysql/jdbc/CharsetMapping.java	2006-07-28 19:32:44 UTC (rev
5569)
+++ trunk/connector-j/src/com/mysql/jdbc/CharsetMapping.java	2006-07-28 20:45:43 UTC (rev
5570)
@@ -34,7 +34,6 @@
 import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
-import java.util.SortedSet;
 
 /**
  * Mapping between MySQL charset names and Java charset names. I've investigated

Modified: trunk/connector-j/src/com/mysql/jdbc/Connection.java
===================================================================
--- trunk/connector-j/src/com/mysql/jdbc/Connection.java	2006-07-28 19:32:44 UTC (rev
5569)
+++ trunk/connector-j/src/com/mysql/jdbc/Connection.java	2006-07-28 20:45:43 UTC (rev
5570)
@@ -57,7 +57,6 @@
 import java.util.Calendar;
 import java.util.GregorianCalendar;
 import java.util.HashMap;
-import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;

Modified: trunk/connector-j/src/com/mysql/jdbc/MysqlDefs.java
===================================================================
--- trunk/connector-j/src/com/mysql/jdbc/MysqlDefs.java	2006-07-28 19:32:44 UTC (rev 5569)
+++ trunk/connector-j/src/com/mysql/jdbc/MysqlDefs.java	2006-07-28 20:45:43 UTC (rev 5570)
@@ -25,7 +25,6 @@
 package com.mysql.jdbc;
 
 import java.sql.Types;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;

Modified: trunk/connector-j/src/com/mysql/jdbc/MysqlIO.java
===================================================================
--- trunk/connector-j/src/com/mysql/jdbc/MysqlIO.java	2006-07-28 19:32:44 UTC (rev 5569)
+++ trunk/connector-j/src/com/mysql/jdbc/MysqlIO.java	2006-07-28 20:45:43 UTC (rev 5570)
@@ -42,13 +42,11 @@
 
 import java.math.BigInteger;
 
-import java.net.InetSocketAddress;
 import java.net.MalformedURLException;
 import java.net.Socket;
 import java.net.URL;
 
 import java.nio.ByteBuffer;
-import java.nio.channels.SocketChannel;
 
 import java.security.NoSuchAlgorithmException;
 

Modified: trunk/connector-j/src/com/mysql/jdbc/PreparedStatement.java
===================================================================
--- trunk/connector-j/src/com/mysql/jdbc/PreparedStatement.java	2006-07-28 19:32:44 UTC
(rev 5569)
+++ trunk/connector-j/src/com/mysql/jdbc/PreparedStatement.java	2006-07-28 20:45:43 UTC
(rev 5570)
@@ -50,7 +50,6 @@
 import java.util.Locale;
 import java.util.TimeZone;
 
-import com.mysql.jdbc.Statement.CancelTask;
 import com.mysql.jdbc.exceptions.MySQLTimeoutException;
 import com.mysql.jdbc.profiler.ProfilerEvent;
 

Modified: trunk/connector-j/src/com/mysql/jdbc/ResultSetMetaData.java
===================================================================
--- trunk/connector-j/src/com/mysql/jdbc/ResultSetMetaData.java	2006-07-28 19:32:44 UTC
(rev 5569)
+++ trunk/connector-j/src/com/mysql/jdbc/ResultSetMetaData.java	2006-07-28 20:45:43 UTC
(rev 5570)
@@ -24,9 +24,6 @@
  */
 package com.mysql.jdbc;
 
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
 import java.sql.SQLException;
 import java.sql.Types;
 

Modified: trunk/connector-j/src/com/mysql/jdbc/ServerPreparedStatement.java
===================================================================
--- trunk/connector-j/src/com/mysql/jdbc/ServerPreparedStatement.java	2006-07-28 19:32:44
UTC (rev 5569)
+++ trunk/connector-j/src/com/mysql/jdbc/ServerPreparedStatement.java	2006-07-28 20:45:43
UTC (rev 5570)
@@ -24,12 +24,10 @@
  */
 package com.mysql.jdbc;
 
-import com.mysql.jdbc.Statement.CancelTask;
 import com.mysql.jdbc.exceptions.MySQLTimeoutException;
 import com.mysql.jdbc.profiler.ProfileEventSink;
 import com.mysql.jdbc.profiler.ProfilerEvent;
 
-import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Reader;
@@ -51,9 +49,7 @@
 import java.sql.Types;
 
 import java.util.ArrayList;
-import java.util.BitSet;
 import java.util.Calendar;
-import java.util.Locale;
 import java.util.TimeZone;
 
 /**

Modified: trunk/connector-j/src/com/mysql/jdbc/StandardSocketFactory.java
===================================================================
--- trunk/connector-j/src/com/mysql/jdbc/StandardSocketFactory.java	2006-07-28 19:32:44
UTC (rev 5569)
+++ trunk/connector-j/src/com/mysql/jdbc/StandardSocketFactory.java	2006-07-28 20:45:43
UTC (rev 5570)
@@ -27,7 +27,6 @@
 import java.io.IOException;
 
 import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
 import java.net.InetAddress;

Modified: trunk/connector-j/src/com/mysql/jdbc/Statement.java
===================================================================
--- trunk/connector-j/src/com/mysql/jdbc/Statement.java	2006-07-28 19:32:44 UTC (rev 5569)
+++ trunk/connector-j/src/com/mysql/jdbc/Statement.java	2006-07-28 20:45:43 UTC (rev 5570)
@@ -29,7 +29,6 @@
 import com.mysql.jdbc.profiler.ProfilerEvent;
 import com.mysql.jdbc.util.LRUCache;
 
-import java.sql.DataTruncation;
 import java.sql.SQLException;
 import java.sql.SQLWarning;
 import java.sql.Types;
@@ -39,7 +38,6 @@
 import java.util.GregorianCalendar;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 import java.util.TimerTask;
 

Modified: trunk/connector-j/src/com/mysql/jdbc/TimeUtil.java
===================================================================
--- trunk/connector-j/src/com/mysql/jdbc/TimeUtil.java	2006-07-28 19:32:44 UTC (rev 5569)
+++ trunk/connector-j/src/com/mysql/jdbc/TimeUtil.java	2006-07-28 20:45:43 UTC (rev 5570)
@@ -32,7 +32,6 @@
 import java.util.Collections;
 import java.util.GregorianCalendar;
 import java.util.HashMap;
-import java.util.Locale;
 import java.util.Map;
 import java.util.TimeZone;
 

Modified:
trunk/connector-j/src/com/mysql/jdbc/jdbc2/optional/CallableStatementWrapper.java
===================================================================
---
trunk/connector-j/src/com/mysql/jdbc/jdbc2/optional/CallableStatementWrapper.java	2006-07-28
19:32:44 UTC (rev 5569)
+++
trunk/connector-j/src/com/mysql/jdbc/jdbc2/optional/CallableStatementWrapper.java	2006-07-28
20:45:43 UTC (rev 5570)
@@ -33,7 +33,6 @@
 import java.sql.CallableStatement;
 import java.sql.Clob;
 import java.sql.Date;
-import java.sql.PreparedStatement;
 import java.sql.Ref;
 import java.sql.SQLException;
 import java.sql.Time;

Modified: trunk/connector-j/src/com/mysql/jdbc/util/ServerController.java
===================================================================
--- trunk/connector-j/src/com/mysql/jdbc/util/ServerController.java	2006-07-28 19:32:44
UTC (rev 5569)
+++ trunk/connector-j/src/com/mysql/jdbc/util/ServerController.java	2006-07-28 20:45:43
UTC (rev 5570)
@@ -28,7 +28,6 @@
 import java.io.IOException;
 
 import java.util.Iterator;
-import java.util.Locale;
 import java.util.Properties;
 
 import com.mysql.jdbc.StringUtils;

Modified: trunk/connector-j/src/com/mysql/jdbc/util/VersionFSHierarchyMaker.java
===================================================================
--- trunk/connector-j/src/com/mysql/jdbc/util/VersionFSHierarchyMaker.java	2006-07-28
19:32:44 UTC (rev 5569)
+++ trunk/connector-j/src/com/mysql/jdbc/util/VersionFSHierarchyMaker.java	2006-07-28
20:45:43 UTC (rev 5570)
@@ -26,7 +26,6 @@
 import java.io.FileOutputStream;
 import java.sql.Connection;
 import java.sql.ResultSet;
-import java.util.Properties;
 
 import com.mysql.jdbc.NonRegisteringDriver;
 

Modified: trunk/connector-j/src/testsuite/regression/BlobRegressionTest.java
===================================================================
--- trunk/connector-j/src/testsuite/regression/BlobRegressionTest.java	2006-07-28 19:32:44
UTC (rev 5569)
+++ trunk/connector-j/src/testsuite/regression/BlobRegressionTest.java	2006-07-28 20:45:43
UTC (rev 5570)
@@ -27,13 +27,9 @@
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.BufferedOutputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
 import java.io.StringReader;
 import java.sql.Blob;
 import java.sql.Connection;
-import java.sql.DriverManager;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.Statement;

Modified: trunk/connector-j/src/testsuite/regression/DataSourceRegressionTest.java
===================================================================
--- trunk/connector-j/src/testsuite/regression/DataSourceRegressionTest.java	2006-07-28
19:32:44 UTC (rev 5569)
+++ trunk/connector-j/src/testsuite/regression/DataSourceRegressionTest.java	2006-07-28
20:45:43 UTC (rev 5570)
@@ -35,7 +35,6 @@
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.Hashtable;
-import java.util.Properties;
 
 import javax.naming.Context;
 import javax.naming.InitialContext;

Modified: trunk/connector-j/src/testsuite/regression/MicroPerformanceRegressionTest.java
===================================================================
---
trunk/connector-j/src/testsuite/regression/MicroPerformanceRegressionTest.java	2006-07-28
19:32:44 UTC (rev 5569)
+++
trunk/connector-j/src/testsuite/regression/MicroPerformanceRegressionTest.java	2006-07-28
20:45:43 UTC (rev 5570)
@@ -29,7 +29,6 @@
 import java.sql.Time;
 import java.sql.Timestamp;
 import java.util.HashMap;
-import java.util.Locale;
 import java.util.Map;
 
 import testsuite.BaseTestCase;

Modified: trunk/connector-j/src/testsuite/simple/BlobTest.java
===================================================================
--- trunk/connector-j/src/testsuite/simple/BlobTest.java	2006-07-28 19:32:44 UTC (rev
5569)
+++ trunk/connector-j/src/testsuite/simple/BlobTest.java	2006-07-28 20:45:43 UTC (rev
5570)
@@ -35,9 +35,7 @@
 import java.io.InputStream;
 
 import java.sql.Connection;
-import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.Properties;
 
 /**
  * Tests BLOB functionality in the driver.

Modified: trunk/connector-j/src/testsuite/simple/ConnectionTest.java
===================================================================
--- trunk/connector-j/src/testsuite/simple/ConnectionTest.java	2006-07-28 19:32:44 UTC
(rev 5569)
+++ trunk/connector-j/src/testsuite/simple/ConnectionTest.java	2006-07-28 20:45:43 UTC
(rev 5570)
@@ -27,7 +27,6 @@
 import testsuite.BaseTestCase;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileWriter;
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
@@ -41,7 +40,6 @@
 import java.util.Properties;
 import java.util.StringTokenizer;
 
-import com.mysql.jdbc.ConnectionPropertiesTransform;
 import com.mysql.jdbc.NonRegisteringDriver;
 import com.mysql.jdbc.SQLError;
 import com.mysql.jdbc.StringUtils;

Modified: trunk/connector-j/src/testsuite/simple/StatementsTest.java
===================================================================
--- trunk/connector-j/src/testsuite/simple/StatementsTest.java	2006-07-28 19:32:44 UTC
(rev 5569)
+++ trunk/connector-j/src/testsuite/simple/StatementsTest.java	2006-07-28 20:45:43 UTC
(rev 5570)
@@ -27,7 +27,6 @@
 import java.io.ByteArrayInputStream;
 import java.io.CharArrayReader;
 import java.io.Reader;
-import java.rmi.server.UID;
 import java.sql.CallableStatement;
 import java.sql.Connection;
 import java.sql.PreparedStatement;