Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2013-05-14 13:09:19 -0400
committerEike Stepper2013-05-14 13:09:19 -0400
commitd6bbeede74a8c4aa761372a35c10de0350cd5b1f (patch)
tree4719ac31796832edb4a0bfbf42333f89723b7899
parent436e5a332040b9b0772bddf3f8846bd680f5b6a9 (diff)
downloadcdo-d6bbeede74a8c4aa761372a35c10de0350cd5b1f.tar.gz
cdo-d6bbeede74a8c4aa761372a35c10de0350cd5b1f.tar.xz
cdo-d6bbeede74a8c4aa761372a35c10de0350cd5b1f.zip
[407671] Java 1.6 API usage in org.eclipse.net4j.db drops/I20130514-1309
https://bugs.eclipse.org/bugs/show_bug.cgi?id=407671
-rw-r--r--plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBConnection.java11
-rw-r--r--plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBPreparedStatement.java33
2 files changed, 19 insertions, 25 deletions
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBConnection.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBConnection.java
index 0f01852553..bea0778966 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBConnection.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBConnection.java
@@ -24,13 +24,10 @@ import java.sql.CallableStatement;
import java.sql.Clob;
import java.sql.Connection;
import java.sql.DatabaseMetaData;
-import java.sql.NClob;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
-import java.sql.SQLClientInfoException;
import java.sql.SQLException;
import java.sql.SQLWarning;
-import java.sql.SQLXML;
import java.sql.Savepoint;
import java.sql.Statement;
import java.sql.Struct;
@@ -342,12 +339,12 @@ public final class DBConnection implements IDBConnection
return delegate.createBlob();
}
- public NClob createNClob() throws SQLException
+ public java.sql.NClob createNClob() throws SQLException
{
return delegate.createNClob();
}
- public SQLXML createSQLXML() throws SQLException
+ public java.sql.SQLXML createSQLXML() throws SQLException
{
return delegate.createSQLXML();
}
@@ -357,12 +354,12 @@ public final class DBConnection implements IDBConnection
return delegate.isValid(timeout);
}
- public void setClientInfo(String name, String value) throws SQLClientInfoException
+ public void setClientInfo(String name, String value) throws java.sql.SQLClientInfoException
{
delegate.setClientInfo(name, value);
}
- public void setClientInfo(Properties properties) throws SQLClientInfoException
+ public void setClientInfo(Properties properties) throws java.sql.SQLClientInfoException
{
delegate.setClientInfo(properties);
}
diff --git a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBPreparedStatement.java b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBPreparedStatement.java
index 0ed8b0cbad..e7800f2ab9 100644
--- a/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBPreparedStatement.java
+++ b/plugins/org.eclipse.net4j.db/src/org/eclipse/net4j/internal/db/DBPreparedStatement.java
@@ -22,16 +22,13 @@ import java.sql.Blob;
import java.sql.Clob;
import java.sql.Connection;
import java.sql.Date;
-import java.sql.NClob;
import java.sql.ParameterMetaData;
import java.sql.PreparedStatement;
import java.sql.Ref;
import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
-import java.sql.RowId;
import java.sql.SQLException;
import java.sql.SQLWarning;
-import java.sql.SQLXML;
import java.sql.Time;
import java.sql.Timestamp;
import java.util.Calendar;
@@ -465,7 +462,7 @@ public final class DBPreparedStatement implements IDBPreparedStatement
return delegate.getParameterMetaData();
}
- public void setRowId(int parameterIndex, RowId x) throws SQLException
+ public void setRowId(int parameterIndex, java.sql.RowId x) throws SQLException
{
delegate.setRowId(parameterIndex, x);
}
@@ -490,7 +487,7 @@ public final class DBPreparedStatement implements IDBPreparedStatement
return delegate.execute(sql, columnNames);
}
- public void setNClob(int parameterIndex, NClob value) throws SQLException
+ public void setNClob(int parameterIndex, java.sql.NClob value) throws SQLException
{
delegate.setNClob(parameterIndex, value);
}
@@ -530,7 +527,7 @@ public final class DBPreparedStatement implements IDBPreparedStatement
return delegate.isPoolable();
}
- public void setSQLXML(int parameterIndex, SQLXML xmlObject) throws SQLException
+ public void setSQLXML(int parameterIndex, java.sql.SQLXML xmlObject) throws SQLException
{
delegate.setSQLXML(parameterIndex, xmlObject);
}
@@ -1311,22 +1308,22 @@ public final class DBPreparedStatement implements IDBPreparedStatement
delegate.updateArray(columnLabel, x);
}
- public RowId getRowId(int columnIndex) throws SQLException
+ public java.sql.RowId getRowId(int columnIndex) throws SQLException
{
return delegate.getRowId(columnIndex);
}
- public RowId getRowId(String columnLabel) throws SQLException
+ public java.sql.RowId getRowId(String columnLabel) throws SQLException
{
return delegate.getRowId(columnLabel);
}
- public void updateRowId(int columnIndex, RowId x) throws SQLException
+ public void updateRowId(int columnIndex, java.sql.RowId x) throws SQLException
{
delegate.updateRowId(columnIndex, x);
}
- public void updateRowId(String columnLabel, RowId x) throws SQLException
+ public void updateRowId(String columnLabel, java.sql.RowId x) throws SQLException
{
delegate.updateRowId(columnLabel, x);
}
@@ -1351,42 +1348,42 @@ public final class DBPreparedStatement implements IDBPreparedStatement
delegate.updateNString(columnLabel, nString);
}
- public void updateNClob(int columnIndex, NClob nClob) throws SQLException
+ public void updateNClob(int columnIndex, java.sql.NClob nClob) throws SQLException
{
delegate.updateNClob(columnIndex, nClob);
}
- public void updateNClob(String columnLabel, NClob nClob) throws SQLException
+ public void updateNClob(String columnLabel, java.sql.NClob nClob) throws SQLException
{
delegate.updateNClob(columnLabel, nClob);
}
- public NClob getNClob(int columnIndex) throws SQLException
+ public java.sql.NClob getNClob(int columnIndex) throws SQLException
{
return delegate.getNClob(columnIndex);
}
- public NClob getNClob(String columnLabel) throws SQLException
+ public java.sql.NClob getNClob(String columnLabel) throws SQLException
{
return delegate.getNClob(columnLabel);
}
- public SQLXML getSQLXML(int columnIndex) throws SQLException
+ public java.sql.SQLXML getSQLXML(int columnIndex) throws SQLException
{
return delegate.getSQLXML(columnIndex);
}
- public SQLXML getSQLXML(String columnLabel) throws SQLException
+ public java.sql.SQLXML getSQLXML(String columnLabel) throws SQLException
{
return delegate.getSQLXML(columnLabel);
}
- public void updateSQLXML(int columnIndex, SQLXML xmlObject) throws SQLException
+ public void updateSQLXML(int columnIndex, java.sql.SQLXML xmlObject) throws SQLException
{
delegate.updateSQLXML(columnIndex, xmlObject);
}
- public void updateSQLXML(String columnLabel, SQLXML xmlObject) throws SQLException
+ public void updateSQLXML(String columnLabel, java.sql.SQLXML xmlObject) throws SQLException
{
delegate.updateSQLXML(columnLabel, xmlObject);
}

Back to the top