clean up warnings produced by Eclipse

7 files changed, 33 insertions, 39 deletions

diff --git a/src/interfaces/jdbc/org/postgresql/jdbc2/AbstractJdbc2Blob.java b/src/interfaces/jdbc/org/postgresql/jdbc2/AbstractJdbc2Blob.java
index e98543f995c..27e10af2b95 100644
--- a/src/interfaces/jdbc/org/postgresql/jdbc2/AbstractJdbc2Blob.java
+++ b/src/interfaces/jdbc/org/postgresql/jdbc2/AbstractJdbc2Blob.java
@@ -1,13 +1,11 @@
 package org.postgresql.jdbc2;
 
-import java.lang.*;
-import java.io.*;
-import java.math.*;
-import java.text.*;
-import java.util.*;
-import java.sql.*;
 import org.postgresql.PGConnection;
-import org.postgresql.largeobject.*;
+import org.postgresql.largeobject.LargeObject;
+import org.postgresql.largeobject.LargeObjectManager;
+import java.io.InputStream;
+import java.sql.Blob;
+import java.sql.SQLException;
 
 public abstract class AbstractJdbc2Blob
 {
diff --git a/src/interfaces/jdbc/org/postgresql/jdbc2/AbstractJdbc2Clob.java b/src/interfaces/jdbc/org/postgresql/jdbc2/AbstractJdbc2Clob.java
index 70c52eb5085..d1948f6331b 100644
--- a/src/interfaces/jdbc/org/postgresql/jdbc2/AbstractJdbc2Clob.java
+++ b/src/interfaces/jdbc/org/postgresql/jdbc2/AbstractJdbc2Clob.java
@@ -1,14 +1,14 @@
 package org.postgresql.jdbc2;
 
 
-import java.lang.*;
-import java.io.*;
-import java.math.*;
-import java.text.*;
-import java.util.*;
-import java.sql.*;
 import org.postgresql.PGConnection;
-import org.postgresql.largeobject.*;
+import org.postgresql.largeobject.LargeObject;
+import org.postgresql.largeobject.LargeObjectManager;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.sql.Clob;
+import java.sql.SQLException;
 
 public class AbstractJdbc2Clob
 {
diff --git a/src/interfaces/jdbc/org/postgresql/jdbc2/AbstractJdbc2Connection.java b/src/interfaces/jdbc/org/postgresql/jdbc2/AbstractJdbc2Connection.java
index 71f8a098bdb..2e896c6f1a2 100644
--- a/src/interfaces/jdbc/org/postgresql/jdbc2/AbstractJdbc2Connection.java
+++ b/src/interfaces/jdbc/org/postgresql/jdbc2/AbstractJdbc2Connection.java
@@ -1,12 +1,13 @@
 package org.postgresql.jdbc2;
 
 
-import java.io.*;
-import java.net.ConnectException;
-import java.sql.*;
-import org.postgresql.util.PSQLException;
+import java.io.PrintWriter;
+import java.sql.DriverManager;
+import java.sql.SQLData;
+import java.sql.SQLException;
+import java.sql.Types;
 
-/* $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/jdbc2/Attic/AbstractJdbc2Connection.java,v 1.4 2003/03/07 18:39:44 barry Exp $
+/* $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/jdbc2/Attic/AbstractJdbc2Connection.java,v 1.5 2003/05/29 04:39:48 barry Exp $
  * This class defines methods of the jdbc2 specification.  This class extends
  * org.postgresql.jdbc1.AbstractJdbc1Connection which provides the jdbc1
  * methods.  The real Connection class (for jdbc2) is org.postgresql.jdbc2.Jdbc2Connection
diff --git a/src/interfaces/jdbc/org/postgresql/jdbc2/AbstractJdbc2DatabaseMetaData.java b/src/interfaces/jdbc/org/postgresql/jdbc2/AbstractJdbc2DatabaseMetaData.java
index 3cbd96f3ba7..d3f7e1253dd 100644
--- a/src/interfaces/jdbc/org/postgresql/jdbc2/AbstractJdbc2DatabaseMetaData.java
+++ b/src/interfaces/jdbc/org/postgresql/jdbc2/AbstractJdbc2DatabaseMetaData.java
@@ -1,12 +1,6 @@
 package org.postgresql.jdbc2;
 
-import org.postgresql.jdbc1.AbstractJdbc1ResultSet;
-import java.sql.*;
-import java.util.*;
-
-import org.postgresql.Driver;
-import org.postgresql.core.Field;
-import org.postgresql.util.PSQLException;
+import java.sql.SQLException;
 
 public abstract class AbstractJdbc2DatabaseMetaData extends org.postgresql.jdbc1.AbstractJdbc1DatabaseMetaData
 {
diff --git a/src/interfaces/jdbc/org/postgresql/jdbc2/AbstractJdbc2ResultSetMetaData.java b/src/interfaces/jdbc/org/postgresql/jdbc2/AbstractJdbc2ResultSetMetaData.java
index 4c54c52f807..8f83c74273e 100644
--- a/src/interfaces/jdbc/org/postgresql/jdbc2/AbstractJdbc2ResultSetMetaData.java
+++ b/src/interfaces/jdbc/org/postgresql/jdbc2/AbstractJdbc2ResultSetMetaData.java
@@ -1,11 +1,11 @@
 package org.postgresql.jdbc2;
 
 
-import java.lang.*;
-import java.sql.*;
-import java.util.*;
 import org.postgresql.core.Field;
-import org.postgresql.util.*;
+import org.postgresql.util.PSQLException;
+import java.sql.SQLException;
+import java.sql.Types;
+import java.util.Vector;
 
 public abstract class AbstractJdbc2ResultSetMetaData extends org.postgresql.jdbc1.AbstractJdbc1ResultSetMetaData
 {
@@ -175,7 +175,6 @@ public abstract class AbstractJdbc2ResultSetMetaData extends org.postgresql.jdbc
 	{
 		Field f = getField(column);
 		String type_name = f.getPGType();
-		int sql_type = f.getSQLType();
 		int typmod = f.getMod();
 
 		// I looked at other JDBC implementations and couldn't find a consistent
diff --git a/src/interfaces/jdbc/org/postgresql/jdbc2/Array.java b/src/interfaces/jdbc/org/postgresql/jdbc2/Array.java
index 2980785aec7..973da1d2b06 100644
--- a/src/interfaces/jdbc/org/postgresql/jdbc2/Array.java
+++ b/src/interfaces/jdbc/org/postgresql/jdbc2/Array.java
@@ -1,14 +1,18 @@
 package org.postgresql.jdbc2;
 
-import java.text.*;
-import java.sql.*;
-import java.util.*;
-import java.math.BigDecimal;
 import org.postgresql.core.BaseConnection;
 import org.postgresql.core.BaseResultSet;
 import org.postgresql.core.BaseStatement;
 import org.postgresql.core.Field;
-import org.postgresql.util.*;
+import org.postgresql.util.PSQLException;
+import java.math.BigDecimal;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Timestamp;
+import java.sql.Types;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.Vector;
 
 /*
  * Array is used collect one column of query result data.
@@ -176,7 +180,6 @@ public class Array implements java.sql.Array
 				break;
 			case Types.TIMESTAMP:
 				retVal = new Timestamp[ count ];
-				StringBuffer sbuf = null;
 				for ( ; count > 0; count-- )
 					((java.sql.Timestamp[])retVal)[i++] = AbstractJdbc2ResultSet.toTimestamp( arrayContents[(int)index++], rs, getBaseTypeName() );
 				break;
diff --git a/src/interfaces/jdbc/org/postgresql/jdbc2/PBatchUpdateException.java b/src/interfaces/jdbc/org/postgresql/jdbc2/PBatchUpdateException.java
index ba58702f8ce..1b30e53de3f 100644
--- a/src/interfaces/jdbc/org/postgresql/jdbc2/PBatchUpdateException.java
+++ b/src/interfaces/jdbc/org/postgresql/jdbc2/PBatchUpdateException.java
@@ -1,7 +1,6 @@
 package org.postgresql.jdbc2;
 
-import org.postgresql.util.*;
-import java.sql.*;
+import org.postgresql.util.MessageTranslator;
 
 /*
  * This class extends java.sql.BatchUpdateException, and provides our