Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitfb630cc

Browse files
author
Barry Lind
committed
clean up warnings produced by Eclipse
1 parent3551108 commitfb630cc

File tree

29 files changed

+118
-115
lines changed

29 files changed

+118
-115
lines changed

‎src/interfaces/jdbc/org/postgresql/Driver.java.in

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Copyright (c) 2003, PostgreSQL Global Development Group
77
*
88
* IDENTIFICATION
9-
* $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/Attic/Driver.java.in,v 1.29 2003/05/2903:22:48 barry Exp $
9+
* $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/Attic/Driver.java.in,v 1.30 2003/05/2904:39:51 barry Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -198,7 +198,8 @@ public class Driver implements java.sql.Driver
198198
public DriverPropertyInfo[] getPropertyInfo(String url, Properties info) throws SQLException
199199
{
200200
//This method isn't really implemented
201-
Properties p = parseURL(url, info);
201+
//we just parse the URL to ensure it is valid
202+
parseURL(url, info);
202203
return new DriverPropertyInfo[0];
203204
}
204205

@@ -261,8 +262,6 @@ public class Driver implements java.sql.Driver
261262
{
262263
int state = -1;
263264
Properties urlProps = new Properties(defaults);
264-
String key = "";
265-
String value = "";
266265

267266
String l_urlServer = url;
268267
String l_urlArgs = "";

‎src/interfaces/jdbc/org/postgresql/fastpath/Fastpath.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Copyright (c) 2003, PostgreSQL Global Development Group
77
*
88
* IDENTIFICATION
9-
* $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/fastpath/Attic/Fastpath.java,v 1.13 2003/05/2903:21:32 barry Exp $
9+
* $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/fastpath/Attic/Fastpath.java,v 1.14 2003/05/2904:39:51 barry Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -225,6 +225,7 @@ private Object fastpathV2(int fnid, boolean resulttype, FastpathArg[] args) thro
225225
switch (c)
226226
{
227227
case'A':// Asynchronous Notify
228+
//TODO: do something with this
228229
intpid =stream.ReceiveInteger(4);
229230
Stringmsg =stream.ReceiveString(conn.getEncoding());
230231
break;

‎src/interfaces/jdbc/org/postgresql/geometric/PGcircle.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,17 @@
77
* Copyright (c) 2003, PostgreSQL Global Development Group
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/geometric/Attic/PGcircle.java,v 1.4 2003/03/07 18:39:42 barry Exp $
10+
* $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/geometric/Attic/PGcircle.java,v 1.5 2003/05/29 04:39:48 barry Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
1414
packageorg.postgresql.geometric;
1515

16-
importjava.io.Serializable;
17-
importjava.sql.SQLException;
18-
importjava.util.Hashtable;
1916
importorg.postgresql.util.PGobject;
2017
importorg.postgresql.util.PGtokenizer;
2118
importorg.postgresql.util.PSQLException;
19+
importjava.io.Serializable;
20+
importjava.sql.SQLException;
2221

2322
publicclassPGcircleextendsPGobjectimplementsSerializable,Cloneable
2423
{

‎src/interfaces/jdbc/org/postgresql/geometric/PGpoint.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,18 @@
66
* Copyright (c) 2003, PostgreSQL Global Development Group
77
*
88
* IDENTIFICATION
9-
* $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/geometric/Attic/PGpoint.java,v 1.4 2003/03/07 18:39:43 barry Exp $
9+
* $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/geometric/Attic/PGpoint.java,v 1.5 2003/05/29 04:39:48 barry Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
1313
packageorg.postgresql.geometric;
1414

15-
importjava.awt.Point;
16-
importjava.io.Serializable;
17-
importjava.sql.SQLException;
1815
importorg.postgresql.util.PGobject;
1916
importorg.postgresql.util.PGtokenizer;
2017
importorg.postgresql.util.PSQLException;
21-
22-
importorg.postgresql.util.*;
18+
importjava.awt.Point;
19+
importjava.io.Serializable;
20+
importjava.sql.SQLException;
2321

2422
/*
2523
* This implements a version of java.awt.Point, except it uses double

‎src/interfaces/jdbc/org/postgresql/geometric/PGpolygon.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,16 @@
66
* Copyright (c) 2003, PostgreSQL Global Development Group
77
*
88
* IDENTIFICATION
9-
* $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/geometric/Attic/PGpolygon.java,v 1.4 2003/03/07 18:39:43 barry Exp $
9+
* $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/geometric/Attic/PGpolygon.java,v 1.5 2003/05/29 04:39:48 barry Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
1313
packageorg.postgresql.geometric;
1414

15-
importjava.io.Serializable;
16-
importjava.sql.SQLException;
1715
importorg.postgresql.util.PGobject;
1816
importorg.postgresql.util.PGtokenizer;
19-
importorg.postgresql.util.PSQLException;
17+
importjava.io.Serializable;
18+
importjava.sql.SQLException;
2019

2120
publicclassPGpolygonextendsPGobjectimplementsSerializable,Cloneable
2221
{

‎src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1DatabaseMetaData.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ public String getDriverName() throws SQLException
250250
*/
251251
publicStringgetDriverVersion()throwsSQLException
252252
{
253-
StringdriverVersion =connection.this_driver.getVersion();
253+
StringdriverVersion =Driver.getVersion();
254254
if (Driver.logDebug)
255255
Driver.debug("getDriverVersion " +driverVersion);
256256
returndriverVersion;
@@ -3412,7 +3412,6 @@ public java.sql.ResultSet getTypeInfo() throws SQLException
34123412
{
34133413

34143414
Fieldf[] =newField[18];
3415-
ResultSetr;// ResultSet for the SQL query that we need to do
34163415
Vectorv =newVector();// The new ResultSet tuple stuff
34173416

34183417
f[0] =newField(connection,"TYPE_NAME",iVarcharOid,getMaxNameLength());

‎src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1ResultSetMetaData.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
packageorg.postgresql.jdbc1;
22

33

4-
importjava.lang.*;
5-
importjava.util.*;
64
importorg.postgresql.core.Field;
7-
importorg.postgresql.util.*;
5+
importorg.postgresql.util.PSQLException;
86
importjava.sql.SQLException;
97
importjava.sql.Types;
8+
importjava.util.Vector;
109

1110
publicabstractclassAbstractJdbc1ResultSetMetaData
1211
{
@@ -180,7 +179,6 @@ public int getColumnDisplaySize(int column) throws SQLException
180179
{
181180
Fieldf =getField(column);
182181
Stringtype_name =f.getPGType();
183-
intsql_type =f.getSQLType();
184182
inttypmod =f.getMod();
185183

186184
// I looked at other JDBC implementations and couldn't find a consistent

‎src/interfaces/jdbc/org/postgresql/jdbc1/AbstractJdbc1Statement.java

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,31 @@
11
packageorg.postgresql.jdbc1;
22

3-
importjava.io.*;
4-
5-
importjava.math.BigDecimal;
6-
importjava.sql.*;
7-
importjava.util.Vector;
83
importorg.postgresql.core.BaseConnection;
94
importorg.postgresql.core.BaseResultSet;
105
importorg.postgresql.core.BaseStatement;
116
importorg.postgresql.core.Field;
127
importorg.postgresql.core.QueryExecutor;
13-
importorg.postgresql.largeobject.*;
14-
importorg.postgresql.util.*;
8+
importorg.postgresql.largeobject.LargeObject;
9+
importorg.postgresql.largeobject.LargeObjectManager;
10+
importorg.postgresql.util.PGbytea;
11+
importorg.postgresql.util.PGobject;
12+
importorg.postgresql.util.PSQLException;
13+
importjava.io.IOException;
14+
importjava.io.InputStream;
15+
importjava.io.InputStreamReader;
16+
importjava.io.OutputStream;
17+
importjava.io.UnsupportedEncodingException;
18+
importjava.math.BigDecimal;
19+
importjava.sql.CallableStatement;
20+
importjava.sql.ResultSet;
21+
importjava.sql.SQLException;
22+
importjava.sql.SQLWarning;
23+
importjava.sql.Time;
24+
importjava.sql.Timestamp;
25+
importjava.sql.Types;
26+
importjava.util.Vector;
1527

16-
/* $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/jdbc1/Attic/AbstractJdbc1Statement.java,v 1.21 2003/05/03 20:40:45 barry Exp $
28+
/* $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/jdbc1/Attic/AbstractJdbc1Statement.java,v 1.22 2003/05/29 04:39:49 barry Exp $
1729
* This class defines methods of the jdbc1 specification. This class is
1830
* extended by org.postgresql.jdbc2.AbstractJdbc2Statement which adds the jdbc2
1931
* methods. The real Statement class (for jdbc1) is org.postgresql.jdbc1.Jdbc1Statement

‎src/interfaces/jdbc/org/postgresql/jdbc2/AbstractJdbc2Blob.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
packageorg.postgresql.jdbc2;
22

3-
importjava.lang.*;
4-
importjava.io.*;
5-
importjava.math.*;
6-
importjava.text.*;
7-
importjava.util.*;
8-
importjava.sql.*;
93
importorg.postgresql.PGConnection;
10-
importorg.postgresql.largeobject.*;
4+
importorg.postgresql.largeobject.LargeObject;
5+
importorg.postgresql.largeobject.LargeObjectManager;
6+
importjava.io.InputStream;
7+
importjava.sql.Blob;
8+
importjava.sql.SQLException;
119

1210
publicabstractclassAbstractJdbc2Blob
1311
{

‎src/interfaces/jdbc/org/postgresql/jdbc2/AbstractJdbc2Clob.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
packageorg.postgresql.jdbc2;
22

33

4-
importjava.lang.*;
5-
importjava.io.*;
6-
importjava.math.*;
7-
importjava.text.*;
8-
importjava.util.*;
9-
importjava.sql.*;
104
importorg.postgresql.PGConnection;
11-
importorg.postgresql.largeobject.*;
5+
importorg.postgresql.largeobject.LargeObject;
6+
importorg.postgresql.largeobject.LargeObjectManager;
7+
importjava.io.InputStream;
8+
importjava.io.InputStreamReader;
9+
importjava.io.Reader;
10+
importjava.sql.Clob;
11+
importjava.sql.SQLException;
1212

1313
publicclassAbstractJdbc2Clob
1414
{

‎src/interfaces/jdbc/org/postgresql/jdbc2/AbstractJdbc2Connection.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
packageorg.postgresql.jdbc2;
22

33

4-
importjava.io.*;
5-
importjava.net.ConnectException;
6-
importjava.sql.*;
7-
importorg.postgresql.util.PSQLException;
4+
importjava.io.PrintWriter;
5+
importjava.sql.DriverManager;
6+
importjava.sql.SQLData;
7+
importjava.sql.SQLException;
8+
importjava.sql.Types;
89

9-
/* $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/jdbc2/Attic/AbstractJdbc2Connection.java,v 1.4 2003/03/07 18:39:44 barry Exp $
10+
/* $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/jdbc2/Attic/AbstractJdbc2Connection.java,v 1.5 2003/05/29 04:39:48 barry Exp $
1011
* This class defines methods of the jdbc2 specification. This class extends
1112
* org.postgresql.jdbc1.AbstractJdbc1Connection which provides the jdbc1
1213
* methods. The real Connection class (for jdbc2) is org.postgresql.jdbc2.Jdbc2Connection

‎src/interfaces/jdbc/org/postgresql/jdbc2/AbstractJdbc2DatabaseMetaData.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
packageorg.postgresql.jdbc2;
22

3-
importorg.postgresql.jdbc1.AbstractJdbc1ResultSet;
4-
importjava.sql.*;
5-
importjava.util.*;
6-
7-
importorg.postgresql.Driver;
8-
importorg.postgresql.core.Field;
9-
importorg.postgresql.util.PSQLException;
3+
importjava.sql.SQLException;
104

115
publicabstractclassAbstractJdbc2DatabaseMetaDataextendsorg.postgresql.jdbc1.AbstractJdbc1DatabaseMetaData
126
{

‎src/interfaces/jdbc/org/postgresql/jdbc2/AbstractJdbc2ResultSetMetaData.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
packageorg.postgresql.jdbc2;
22

33

4-
importjava.lang.*;
5-
importjava.sql.*;
6-
importjava.util.*;
74
importorg.postgresql.core.Field;
8-
importorg.postgresql.util.*;
5+
importorg.postgresql.util.PSQLException;
6+
importjava.sql.SQLException;
7+
importjava.sql.Types;
8+
importjava.util.Vector;
99

1010
publicabstractclassAbstractJdbc2ResultSetMetaDataextendsorg.postgresql.jdbc1.AbstractJdbc1ResultSetMetaData
1111
{
@@ -175,7 +175,6 @@ public int getColumnDisplaySize(int column) throws SQLException
175175
{
176176
Fieldf =getField(column);
177177
Stringtype_name =f.getPGType();
178-
intsql_type =f.getSQLType();
179178
inttypmod =f.getMod();
180179

181180
// I looked at other JDBC implementations and couldn't find a consistent

‎src/interfaces/jdbc/org/postgresql/jdbc2/Array.java

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
11
packageorg.postgresql.jdbc2;
22

3-
importjava.text.*;
4-
importjava.sql.*;
5-
importjava.util.*;
6-
importjava.math.BigDecimal;
73
importorg.postgresql.core.BaseConnection;
84
importorg.postgresql.core.BaseResultSet;
95
importorg.postgresql.core.BaseStatement;
106
importorg.postgresql.core.Field;
11-
importorg.postgresql.util.*;
7+
importorg.postgresql.util.PSQLException;
8+
importjava.math.BigDecimal;
9+
importjava.sql.ResultSet;
10+
importjava.sql.SQLException;
11+
importjava.sql.Timestamp;
12+
importjava.sql.Types;
13+
importjava.util.ArrayList;
14+
importjava.util.Map;
15+
importjava.util.Vector;
1216

1317
/*
1418
* Array is used collect one column of query result data.
@@ -176,7 +180,6 @@ public Object getArray(long index, int count, Map map) throws SQLException
176180
break;
177181
caseTypes.TIMESTAMP:
178182
retVal =newTimestamp[count ];
179-
StringBuffersbuf =null;
180183
for ( ;count >0;count-- )
181184
((java.sql.Timestamp[])retVal)[i++] =AbstractJdbc2ResultSet.toTimestamp(arrayContents[(int)index++],rs,getBaseTypeName() );
182185
break;

‎src/interfaces/jdbc/org/postgresql/jdbc2/PBatchUpdateException.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
packageorg.postgresql.jdbc2;
22

3-
importorg.postgresql.util.*;
4-
importjava.sql.*;
3+
importorg.postgresql.util.MessageTranslator;
54

65
/*
76
* This class extends java.sql.BatchUpdateException, and provides our

‎src/interfaces/jdbc/org/postgresql/jdbc3/Jdbc3Connection.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
packageorg.postgresql.jdbc3;
22

33

4-
importjava.sql.*;
5-
importjava.util.Vector;
6-
importjava.util.Hashtable;
7-
importorg.postgresql.core.Field;
4+
importjava.sql.SQLException;
85

9-
/* $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/jdbc3/Attic/Jdbc3Connection.java,v 1.4 2003/03/07 18:39:45 barry Exp $
6+
/* $Header: /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/jdbc3/Attic/Jdbc3Connection.java,v 1.5 2003/05/29 04:39:50 barry Exp $
107
* This class implements the java.sql.Connection interface for JDBC3.
118
* However most of the implementation is really done in
129
* org.postgresql.jdbc3.AbstractJdbc3Connection or one of it's parents

‎src/interfaces/jdbc/org/postgresql/jdbc3/Jdbc3RefCursorResultSet.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
packageorg.postgresql.jdbc3;
22

3-
importorg.postgresql.core.QueryExecutor;
4-
importorg.postgresql.core.Field;
3+
importorg.postgresql.PGRefCursorResultSet;
54
importorg.postgresql.core.BaseStatement;
5+
importorg.postgresql.core.Field;
6+
importorg.postgresql.core.QueryExecutor;
67
importjava.util.Vector;
7-
importorg.postgresql.PGConnection;
8-
importorg.postgresql.PGRefCursorResultSet;
98

109
/** A real result set based on a ref cursor.
1110
*

‎src/interfaces/jdbc/org/postgresql/test/jdbc2/CallableStmtTest.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
packageorg.postgresql.test.jdbc2;
22

33
importorg.postgresql.test.TestUtil;
4+
importjava.sql.CallableStatement;
5+
importjava.sql.Connection;
6+
importjava.sql.SQLException;
7+
importjava.sql.Statement;
8+
importjava.sql.Types;
9+
410
importjunit.framework.TestCase;
5-
importjava.io.*;
6-
importjava.sql.*;
711

812
/*
913
* CallableStatement tests.

‎src/interfaces/jdbc/org/postgresql/test/jdbc2/DatabaseMetaDataPropertiesTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ public void testDriverVersioning()
324324
DatabaseMetaDatadbmd =con.getMetaData();
325325
assertNotNull(dbmd);
326326

327-
assertTrue(dbmd.getDriverVersion().equals(pc.getDriver().getVersion()));
327+
assertTrue(dbmd.getDriverVersion().equals(org.postgresql.Driver.getVersion()));
328328
assertTrue(dbmd.getDriverMajorVersion() ==pc.getDriver().getMajorVersion());
329329
assertTrue(dbmd.getDriverMinorVersion() ==pc.getDriver().getMinorVersion());
330330

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp