Merged gcj-eclipse branch to trunk.

From-SVN: r120621
This commit is contained in:
Tom Tromey 2007-01-09 19:58:05 +00:00
parent c648dedbde
commit 97b8365caf
17478 changed files with 606493 additions and 100744 deletions

View file

@ -1309,7 +1309,8 @@ public interface ResultSet
* @return The value of the column as an <code>Object</code>.
* @exception SQLException If an error occurs.
*/
Object getObject(int columnIndex, Map map) throws SQLException;
Object getObject(int columnIndex, Map<String, Class<?>> map)
throws SQLException;
/**
* This method returns a <code>Ref</code> for the specified column which
@ -1357,7 +1358,8 @@ public interface ResultSet
* @return The value of the column as an <code>Object</code>.
* @exception SQLException If an error occurs.
*/
Object getObject(String columnName, Map map) throws SQLException;
Object getObject(String columnName, Map<String, Class<?>> map)
throws SQLException;
/**
* This method returns a <code>Ref</code> for the specified column which