clean up warnings produced by Eclipse

11 files changed, 40 insertions, 31 deletions

diff --git a/src/interfaces/jdbc/org/postgresql/test/jdbc2/CallableStmtTest.java b/src/interfaces/jdbc/org/postgresql/test/jdbc2/CallableStmtTest.java
index 7426c8f0c66..3f4538efa27 100644
--- a/src/interfaces/jdbc/org/postgresql/test/jdbc2/CallableStmtTest.java
+++ b/src/interfaces/jdbc/org/postgresql/test/jdbc2/CallableStmtTest.java
@@ -1,9 +1,13 @@
 package org.postgresql.test.jdbc2;
 
 import org.postgresql.test.TestUtil;
+import java.sql.CallableStatement;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.sql.Types;
+
 import junit.framework.TestCase;
-import java.io.*;
-import java.sql.*;
 
 /*
  * CallableStatement tests.
diff --git a/src/interfaces/jdbc/org/postgresql/test/jdbc2/DatabaseMetaDataPropertiesTest.java b/src/interfaces/jdbc/org/postgresql/test/jdbc2/DatabaseMetaDataPropertiesTest.java
index 18dee272340..37a8bb07f96 100644
--- a/src/interfaces/jdbc/org/postgresql/test/jdbc2/DatabaseMetaDataPropertiesTest.java
+++ b/src/interfaces/jdbc/org/postgresql/test/jdbc2/DatabaseMetaDataPropertiesTest.java
@@ -324,7 +324,7 @@ public class DatabaseMetaDataPropertiesTest extends TestCase
 			DatabaseMetaData dbmd = con.getMetaData();
 			assertNotNull(dbmd);
 
-			assertTrue(dbmd.getDriverVersion().equals(pc.getDriver().getVersion()));
+			assertTrue(dbmd.getDriverVersion().equals(org.postgresql.Driver.getVersion()));
 			assertTrue(dbmd.getDriverMajorVersion() == pc.getDriver().getMajorVersion());
 			assertTrue(dbmd.getDriverMinorVersion() == pc.getDriver().getMinorVersion());
 
diff --git a/src/interfaces/jdbc/org/postgresql/test/jdbc2/DatabaseMetaDataTest.java b/src/interfaces/jdbc/org/postgresql/test/jdbc2/DatabaseMetaDataTest.java
index faf23a5c85e..4dc8a656a35 100644
--- a/src/interfaces/jdbc/org/postgresql/test/jdbc2/DatabaseMetaDataTest.java
+++ b/src/interfaces/jdbc/org/postgresql/test/jdbc2/DatabaseMetaDataTest.java
@@ -9,7 +9,7 @@ import java.sql.*;
  *
  * PS: Do you know how difficult it is to type on a train? ;-)
  *
- * $Id: DatabaseMetaDataTest.java,v 1.17 2003/03/24 03:48:32 barry Exp $
+ * $Id: DatabaseMetaDataTest.java,v 1.18 2003/05/29 04:39:48 barry Exp $
  */
 
 public class DatabaseMetaDataTest extends TestCase
@@ -337,7 +337,7 @@ public class DatabaseMetaDataTest extends TestCase
 		{
 			DatabaseMetaData dbmd = con.getMetaData();
 			assertNotNull(dbmd);
-			ResultSet rs = dbmd.getBestRowIdentifier(null,null,"pg_type",dbmd.bestRowSession,false);
+			ResultSet rs = dbmd.getBestRowIdentifier(null,null,"pg_type",DatabaseMetaData.bestRowSession,false);
 			rs.close();
 		} catch (SQLException sqle) {
 			fail(sqle.getMessage());
diff --git a/src/interfaces/jdbc/org/postgresql/test/jdbc2/JBuilderTest.java b/src/interfaces/jdbc/org/postgresql/test/jdbc2/JBuilderTest.java
index 13ce93b24d8..7a4cd9a5373 100644
--- a/src/interfaces/jdbc/org/postgresql/test/jdbc2/JBuilderTest.java
+++ b/src/interfaces/jdbc/org/postgresql/test/jdbc2/JBuilderTest.java
@@ -1,12 +1,14 @@
 package org.postgresql.test.jdbc2;
 
 import org.postgresql.test.TestUtil;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.Statement;
+
 import junit.framework.TestCase;
-import java.sql.*;
-import java.math.BigDecimal;
 
 /*
- * $Id: JBuilderTest.java,v 1.7 2002/09/06 21:23:06 momjian Exp $
+ * $Id: JBuilderTest.java,v 1.8 2003/05/29 04:39:48 barry Exp $
  *
  * Some simple tests to check that the required components needed for JBuilder
  * stay working
@@ -54,7 +56,7 @@ public class JBuilderTest extends TestCase
 
 			while (rs.next())
 			{
-				double bd = rs.getDouble(1);
+				rs.getDouble(1);
 			}
 
 			rs.close();
diff --git a/src/interfaces/jdbc/org/postgresql/test/jdbc2/Jdbc2TestSuite.java b/src/interfaces/jdbc/org/postgresql/test/jdbc2/Jdbc2TestSuite.java
index 8976aefe702..4a8548a3cf4 100644
--- a/src/interfaces/jdbc/org/postgresql/test/jdbc2/Jdbc2TestSuite.java
+++ b/src/interfaces/jdbc/org/postgresql/test/jdbc2/Jdbc2TestSuite.java
@@ -1,11 +1,6 @@
 package org.postgresql.test.jdbc2;
 
 import junit.framework.TestSuite;
-import junit.framework.TestCase;
-import junit.framework.Test;
-
-import java.sql.*;
-import java.lang.reflect.Method;
 
 /*
  * Executes all known tests for JDBC2 and includes some utility methods.
diff --git a/src/interfaces/jdbc/org/postgresql/test/jdbc2/MiscTest.java b/src/interfaces/jdbc/org/postgresql/test/jdbc2/MiscTest.java
index 8c95b0e39f5..97ad814a674 100644
--- a/src/interfaces/jdbc/org/postgresql/test/jdbc2/MiscTest.java
+++ b/src/interfaces/jdbc/org/postgresql/test/jdbc2/MiscTest.java
@@ -5,7 +5,7 @@ import junit.framework.TestCase;
 import java.sql.*;
 
 /*
- * $Id: MiscTest.java,v 1.9 2003/05/29 03:21:32 barry Exp $
+ * $Id: MiscTest.java,v 1.10 2003/05/29 04:39:48 barry Exp $
  *
  * Some simple tests based on problems reported by users. Hopefully these will
  * help prevent previous problems from re-occuring ;-)
@@ -38,7 +38,7 @@ public class MiscTest extends TestCase
 
 			while (rs.next())
 			{
-				String s = rs.getString(1);
+				rs.getString(1);
 			}
 
 			rs.close();
diff --git a/src/interfaces/jdbc/org/postgresql/test/jdbc2/RefCursorTest.java b/src/interfaces/jdbc/org/postgresql/test/jdbc2/RefCursorTest.java
index a3ce71cb155..556bb403be1 100644
--- a/src/interfaces/jdbc/org/postgresql/test/jdbc2/RefCursorTest.java
+++ b/src/interfaces/jdbc/org/postgresql/test/jdbc2/RefCursorTest.java
@@ -1,9 +1,13 @@
 package org.postgresql.test.jdbc2;
 
 import org.postgresql.test.TestUtil;
+import java.sql.CallableStatement;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.Statement;
+import java.sql.Types;
+
 import junit.framework.TestCase;
-import java.io.*;
-import java.sql.*;
 
 /*
  * RefCursor ResultSet tests.
diff --git a/src/interfaces/jdbc/org/postgresql/test/jdbc2/ResultSetTest.java b/src/interfaces/jdbc/org/postgresql/test/jdbc2/ResultSetTest.java
index b983d20b0ac..617034f76bf 100644
--- a/src/interfaces/jdbc/org/postgresql/test/jdbc2/ResultSetTest.java
+++ b/src/interfaces/jdbc/org/postgresql/test/jdbc2/ResultSetTest.java
@@ -1,9 +1,11 @@
 package org.postgresql.test.jdbc2;
 
 import org.postgresql.test.TestUtil;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.Statement;
+
 import junit.framework.TestCase;
-import java.io.*;
-import java.sql.*;
 
 /*
  * ResultSet tests.
diff --git a/src/interfaces/jdbc/org/postgresql/test/jdbc2/ServerPreparedStmtTest.java b/src/interfaces/jdbc/org/postgresql/test/jdbc2/ServerPreparedStmtTest.java
index d374d226648..dcd85572b7b 100644
--- a/src/interfaces/jdbc/org/postgresql/test/jdbc2/ServerPreparedStmtTest.java
+++ b/src/interfaces/jdbc/org/postgresql/test/jdbc2/ServerPreparedStmtTest.java
@@ -1,10 +1,13 @@
 package org.postgresql.test.jdbc2;
 
-import org.postgresql.test.TestUtil;
 import org.postgresql.PGStatement;
+import org.postgresql.test.TestUtil;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.Statement;
+
 import junit.framework.TestCase;
-import java.io.*;
-import java.sql.*;
 
 /*
  *  Tests for using server side prepared statements
diff --git a/src/interfaces/jdbc/org/postgresql/test/jdbc2/TimestampTest.java b/src/interfaces/jdbc/org/postgresql/test/jdbc2/TimestampTest.java
index a5307e3b42e..c0a43cdefb0 100644
--- a/src/interfaces/jdbc/org/postgresql/test/jdbc2/TimestampTest.java
+++ b/src/interfaces/jdbc/org/postgresql/test/jdbc2/TimestampTest.java
@@ -5,7 +5,7 @@ import junit.framework.TestCase;
 import java.sql.*;
 
 /*
- * $Id: TimestampTest.java,v 1.10 2003/01/14 09:13:51 barry Exp $
+ * $Id: TimestampTest.java,v 1.11 2003/05/29 04:39:48 barry Exp $
  *
  * Test get/setTimestamp for both timestamp with time zone and
  * timestamp without time zone datatypes
@@ -24,8 +24,6 @@ public class TimestampTest extends TestCase
 	protected void setUp() throws Exception
 	{
 		con = TestUtil.openDB();
-		Statement stmt = con.createStatement();
-
 		TestUtil.createTable(con, TSWTZ_TABLE, "ts timestamp with time zone");
 		TestUtil.createTable(con, TSWOTZ_TABLE, "ts timestamp without time zone");
 	}
diff --git a/src/interfaces/jdbc/org/postgresql/test/jdbc3/Jdbc3ConnectionPoolTest.java b/src/interfaces/jdbc/org/postgresql/test/jdbc3/Jdbc3ConnectionPoolTest.java
index a171e8ff025..f679c48f77c 100644
--- a/src/interfaces/jdbc/org/postgresql/test/jdbc3/Jdbc3ConnectionPoolTest.java
+++ b/src/interfaces/jdbc/org/postgresql/test/jdbc3/Jdbc3ConnectionPoolTest.java
@@ -1,17 +1,18 @@
 package org.postgresql.test.jdbc3;
 
-import java.sql.Connection;
+import org.postgresql.jdbc3.Jdbc3ConnectionPool;
+import org.postgresql.jdbc3.Jdbc3PooledConnection;
+import org.postgresql.test.TestUtil;
+import org.postgresql.test.jdbc2.optional.ConnectionPoolTest;
 import java.sql.SQLException;
+
 import javax.sql.PooledConnection;
-import org.postgresql.test.jdbc2.optional.ConnectionPoolTest;
-import org.postgresql.test.TestUtil;
-import org.postgresql.jdbc3.*;
 
 /**
  * Tests JDBC3 implementation of ConnectionPoolDataSource.
  *
  * @author Aaron Mulder (ammulder@chariotsolutions.com)
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
  */
 public class Jdbc3ConnectionPoolTest extends ConnectionPoolTest
 {