Index: modules/sql/src/main/java/java/sql/Connection.java =================================================================== --- modules/sql/src/main/java/java/sql/Connection.java (revision 397805) +++ modules/sql/src/main/java/java/sql/Connection.java (working copy) @@ -249,7 +249,7 @@ * @throws SQLException * if there is a problem accessing the database */ - public Map getTypeMap() throws SQLException; + public Map> getTypeMap() throws SQLException; /** * Gets the first instance of any SQLWarning objects that may @@ -747,7 +747,7 @@ * if there is a problem accessing the database or if * map is not an instance of {@link Map}. */ - public void setTypeMap(Map map) throws SQLException; + public void setTypeMap(Map> map) throws SQLException; } // end interface Connection Index: modules/sql/src/main/java/java/sql/Ref.java =================================================================== --- modules/sql/src/main/java/java/sql/Ref.java (revision 397805) +++ modules/sql/src/main/java/java/sql/Ref.java (working copy) @@ -62,7 +62,7 @@ * @throws SQLException * if there is a database error */ - public Object getObject(Map map) throws SQLException; + public Object getObject(Map> map) throws SQLException; /** * Sets the value of the structured typethat this Ref references to a Index: modules/sql/src/main/java/java/sql/Array.java =================================================================== --- modules/sql/src/main/java/java/sql/Array.java (revision 397805) +++ modules/sql/src/main/java/java/sql/Array.java (working copy) @@ -54,7 +54,7 @@ * @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> map) throws SQLException; /** * Returns the SQL ARRAY associated with this Array. @@ -63,7 +63,7 @@ * @return A Java array containing the elements of this Array * @throws SQLException */ - public Object getArray(Map map) throws SQLException; + public Object getArray(Map> map) throws SQLException; /** * Returns the JDBC type of the entries in this Array's associated array. @@ -114,7 +114,7 @@ * @return the ResultSet * @throws SQLException */ - public ResultSet getResultSet(long index, int count, Map map) + public ResultSet getResultSet(long index, int count, Map> map) throws SQLException; /** @@ -125,7 +125,7 @@ * @return the ResultSet * @throws SQLException */ - public ResultSet getResultSet(Map map) throws SQLException; + public ResultSet getResultSet(Map> map) throws SQLException; } // end interface Array Index: modules/sql/src/main/java/java/sql/CallableStatement.java =================================================================== --- modules/sql/src/main/java/java/sql/CallableStatement.java (revision 397805) +++ modules/sql/src/main/java/java/sql/CallableStatement.java (working copy) @@ -384,7 +384,7 @@ * @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> map) throws SQLException; /** * Gets the value of a specified parameter as an Object. @@ -415,7 +415,7 @@ * @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> map) throws SQLException; /** * Gets the value of a specified JDBC REF() parameter as a java.sql.Ref Index: modules/sql/src/main/java/java/sql/Struct.java =================================================================== --- modules/sql/src/main/java/java/sql/Struct.java (revision 397805) +++ modules/sql/src/main/java/java/sql/Struct.java (working copy) @@ -60,7 +60,7 @@ * @throws SQLException * if a database error occurs */ - public Object[] getAttributes(Map theMap) throws SQLException; + public Object[] getAttributes(Map> theMap) throws SQLException; } // end interface Struct Index: modules/sql/src/main/java/java/sql/DriverManager.java =================================================================== --- modules/sql/src/main/java/java/sql/DriverManager.java (revision 397805) +++ modules/sql/src/main/java/java/sql/DriverManager.java (working copy) @@ -251,7 +251,7 @@ * * @return An Enumeration containing all the currently loaded JDBC Drivers */ - public static Enumeration getDrivers() { + public static Enumeration getDrivers() { Enumeration theEnumeration; ClassLoader callerClassLoader = VM.callerClassLoader(); Index: modules/sql/src/main/java/java/sql/ResultSet.java =================================================================== --- modules/sql/src/main/java/java/sql/ResultSet.java (revision 397805) +++ modules/sql/src/main/java/java/sql/ResultSet.java (working copy) @@ -736,7 +736,7 @@ * @throws SQLException * if a database error happens */ - public Object getObject(int columnIndex, Map map) throws SQLException; + public Object getObject(int columnIndex, Map> map) throws SQLException; /** * Gets the value of a specified column as a Java Object. The type of the @@ -772,7 +772,7 @@ * @throws SQLException * if a database error happens */ - public Object getObject(String columnName, Map map) throws SQLException; + public Object getObject(String columnName, Map> map) throws SQLException; /** * Gets the value of a column specified as a column index as a Java Index: modules/sql/src/main/java/javax/sql/RowSet.java =================================================================== --- modules/sql/src/main/java/javax/sql/RowSet.java (revision 397805) +++ modules/sql/src/main/java/javax/sql/RowSet.java (working copy) @@ -163,7 +163,8 @@ * By default, the Map is empty. * @throws SQLException if an error occurs accessing the database. */ - public Map getTypeMap() throws SQLException; + public Map> getTypeMap() + throws SQLException; /** * Gets the URL property value for this RowSet. If there is no DataSource object specified, the @@ -569,7 +570,7 @@ * which they are mapped. * @throws SQLException if an error occurs accessing the database. */ - public void setTypeMap( Map theTypeMap ) throws SQLException; + public void setTypeMap(Map> theTypeMap ) throws SQLException; /** * Sets the URL used by this RowSet to access the database via a DriverManager.