Merged gcj-eclipse branch to trunk.

[pf3gnuchains/gcc-fork.git] / libjava / classpath / java / sql / ResultSet.java

diff --git a/libjava/classpath/java/sql/ResultSet.java b/libjava/classpath/java/sql/ResultSet.java
index 79cba63..573deb3 100644 (file)
--- a/libjava/classpath/java/sql/ResultSet.java
+++ b/libjava/classpath/java/sql/ResultSet.java
@@ -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