Author: smishura
Date: Mon May 1 20:32:01 2006
New Revision: 398789
URL: http://svn.apache.org/viewcvs?rev=398789&view=rev
Log:
Apply updated patch for HARMONY-422 (sql modules needs some updates for 1.5)
Modified:
incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/Array.java
incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/CallableStatement.java
incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/Connection.java
incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/DriverManager.java
incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/Ref.java
incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/ResultSet.java
incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/Struct.java
incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/RowSet.java
Modified: incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/Array.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/Array.java?rev=398789&r1=398788&r2=398789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/Array.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/Array.java
Mon May 1 20:32:01 2006
@@ -54,7 +54,8 @@
* @return A Java array containing the subportion of elements of this Array
* @throws SQLException
*/
- public Object getArray(long index, int count, Map map) throws SQLException;
+ public Object getArray(long index, int count, Map<String, Class<?>> map)
+ throws SQLException;
/**
* Returns the SQL ARRAY associated with this Array.
@@ -63,7 +64,7 @@
* @return A Java array containing the elements of this Array
* @throws SQLException
*/
- public Object getArray(Map map) throws SQLException;
+ public Object getArray(Map<String, Class<?>> map) throws SQLException;
/**
* Returns the JDBC type of the entries in this Array's associated array.
@@ -114,7 +115,7 @@
* @return the ResultSet
* @throws SQLException
*/
- public ResultSet getResultSet(long index, int count, Map map)
+ public ResultSet getResultSet(long index, int count, Map<String, Class<?>> map)
throws SQLException;
/**
@@ -125,7 +126,8 @@
* @return the ResultSet
* @throws SQLException
*/
- public ResultSet getResultSet(Map map) throws SQLException;
+ public ResultSet getResultSet(Map<String, Class<?>> map)
+ throws SQLException;
} // end interface Array
Modified: incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/CallableStatement.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/CallableStatement.java?rev=398789&r1=398788&r2=398789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/CallableStatement.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/CallableStatement.java
Mon May 1 20:32:01 2006
@@ -384,7 +384,8 @@
* @return an Object holding the value of the parameter.
* @throws SQLException if a database error happens
*/
- public Object getObject(int parameterIndex, Map map) throws SQLException;
+ public Object getObject(int parameterIndex, Map<String, Class<?>> map)
+ throws SQLException;
/**
* Gets the value of a specified parameter as an Object.
@@ -415,7 +416,8 @@
* @throws SQLException
* if there is a problem accessing the database
*/
- public Object getObject(String parameterName, Map map) throws SQLException;
+ public Object getObject(String parameterName, Map<String, Class<?>> map)
+ throws SQLException;
/**
* Gets the value of a specified JDBC REF(<structured type>) parameter as a java.sql.Ref
Modified: incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/Connection.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/Connection.java?rev=398789&r1=398788&r2=398789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/Connection.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/Connection.java
Mon May 1 20:32:01 2006
@@ -249,7 +249,7 @@
* @throws SQLException
* if there is a problem accessing the database
*/
- public Map getTypeMap() throws SQLException;
+ public Map<String, Class<?>> getTypeMap() throws SQLException;
/**
* Gets the first instance of any <code>SQLWarning</code> objects that may
@@ -747,7 +747,7 @@
* if there is a problem accessing the database or if
* <code>map</code> is not an instance of {@link Map}.
*/
- public void setTypeMap(Map map) throws SQLException;
+ public void setTypeMap(Map<String, Class<?>> map) throws SQLException;
} // end interface Connection
Modified: incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/DriverManager.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/DriverManager.java?rev=398789&r1=398788&r2=398789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/DriverManager.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/DriverManager.java
Mon May 1 20:32:01 2006
@@ -251,7 +251,7 @@
*
* @return An Enumeration containing all the currently loaded JDBC Drivers
*/
- public static Enumeration getDrivers() {
+ public static Enumeration<Driver> getDrivers() {
Enumeration theEnumeration;
ClassLoader callerClassLoader = VM.callerClassLoader();
Modified: incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/Ref.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/Ref.java?rev=398789&r1=398788&r2=398789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/Ref.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/Ref.java
Mon May 1 20:32:01 2006
@@ -62,7 +62,7 @@
* @throws SQLException
* if there is a database error
*/
- public Object getObject(Map map) throws SQLException;
+ public Object getObject(Map<String, Class<?>> map) throws SQLException;
/**
* Sets the value of the structured typethat this Ref references to a
Modified: incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/ResultSet.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/ResultSet.java?rev=398789&r1=398788&r2=398789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/ResultSet.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/ResultSet.java
Mon May 1 20:32:01 2006
@@ -736,7 +736,8 @@
* @throws SQLException
* if a database error happens
*/
- public Object getObject(int columnIndex, Map map) throws SQLException;
+ public Object getObject(int columnIndex, Map<String, Class<?>> map)
+ throws SQLException;
/**
* Gets the value of a specified column as a Java Object. The type of the
@@ -772,7 +773,8 @@
* @throws SQLException
* if a database error happens
*/
- public Object getObject(String columnName, Map map) throws SQLException;
+ public Object getObject(String columnName, Map<String, Class<?>> map)
+ throws SQLException;
/**
* Gets the value of a column specified as a column index as a Java
Modified: incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/Struct.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/Struct.java?rev=398789&r1=398788&r2=398789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/Struct.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/Struct.java
Mon May 1 20:32:01 2006
@@ -60,7 +60,8 @@
* @throws SQLException
* if a database error occurs
*/
- public Object[] getAttributes(Map theMap) throws SQLException;
+ public Object[] getAttributes(Map<String, Class<?>> theMap)
+ throws SQLException;
} // end interface Struct
Modified: incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/RowSet.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/RowSet.java?rev=398789&r1=398788&r2=398789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/RowSet.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/RowSet.java
Mon May 1 20:32:01 2006
@@ -163,7 +163,7 @@
* By default, the Map is empty.
* @throws SQLException if an error occurs accessing the database.
*/
- public Map getTypeMap() throws SQLException;
+ public Map<String, Class<?>> getTypeMap() throws SQLException;
/**
* Gets the URL property value for this RowSet. If there is no DataSource object specified,
the
@@ -569,7 +569,8 @@
* which they are mapped.
* @throws SQLException if an error occurs accessing the database.
*/
- public void setTypeMap( Map theTypeMap ) throws SQLException;
+ public void setTypeMap(Map<String, Class<?>> theTypeMap )
+ throws SQLException;
/**
* Sets the URL used by this RowSet to access the database via a <code>DriverManager</code>.
|