* java/sql/Struct.java (getAttributes): Genericized.

	* java/sql/ResultSet.java (getObject): Genericized.
	* java/sql/Ref.java (getObject): Genericized.
	* java/sql/DriverManager.java (getDrivers): Genericized.
	* java/sql/Connection.java (getTypeMap): Genericized.
	(setTypeMap): Likewise.
	* java/sql/CallableStatement.java (getObject): Genericized.
	(getObject): Likewise.
	* java/sql/Array.java (getBaseTypeName): Fixed javadoc.
	(getArray): Likewise.
	(getResultSet): Likewise.
	(getResultSet): Likewise.
	(getArray): Genericized.
	(getResultSet): Likewise.

1 files changed, 11 insertions, 10 deletions

diff --git a/java/sql/Array.java b/java/sql/Array.java
index 516287578..b37a89cc4 100644
--- a/java/sql/Array.java
+++ b/java/sql/Array.java
@@ -50,7 +50,7 @@ public interface Array
    * Returns the name of the SQL type of the elements in this
    * array.  This name is database specific.
    *
-   * @param The name of the SQL type of the elements in this array.
+   * @return The name of the SQL type of the elements in this array.
    * @exception SQLException If an error occurs.
    */
   String getBaseTypeName() throws SQLException;
@@ -84,7 +84,7 @@ public interface Array
    * @return The contents of the array as an array of Java objects.
    * @exception SQLException If an error occurs.
    */
-  Object getArray(Map map) throws SQLException;
+  Object getArray(Map<String, Class<?>> map) throws SQLException;
 
   /**
    * Returns a portion of this array starting at <code>index</code>
@@ -94,7 +94,7 @@ public interface Array
    * The object returned will be an array of Java objects of
    * the appropriate types.
    *
-   * @param offset The offset into this array to start returning elements from.
+   * @param index The offset into this array to start returning elements from.
    * @param count The requested number of elements to return.
    * @return The requested portion of the array.
    * @exception SQLException If an error occurs.
@@ -110,13 +110,14 @@ public interface Array
    * <code>Map</code> will be used for overriding selected SQL type to
    * Java class mappings.
    *
-   * @param offset The offset into this array to start returning elements from.
+   * @param index The offset into this array to start returning elements from.
    * @param count The requested number of elements to return.
    * @param map A mapping of SQL types to Java classes.
    * @return The requested portion of the array.
    * @exception SQLException If an error occurs.
    */
-  Object getArray(long index, int count, Map map) throws SQLException;
+  Object getArray(long index, int count, Map<String, Class<?>> map)
+    throws SQLException;
 
   /**
    * Returns the elements in the array as a <code>ResultSet</code>.
@@ -143,7 +144,7 @@ public interface Array
    * @exception SQLException If an error occurs.
    * @see ResultSet
    */
-  ResultSet getResultSet(Map map) throws SQLException;
+  ResultSet getResultSet(Map<String, Class<?>> map) throws SQLException;
 
   /**
    * This method returns a portion of the array as a <code>ResultSet</code>.
@@ -154,8 +155,8 @@ public interface Array
    * the index into the array of that row's contents.  The second will be
    * the actual value of that array element.
    *
-   * @param offset The index into the array to start returning elements from.
-   * @param length The requested number of elements to return.
+   * @param index The index into the array to start returning elements from.
+   * @param count The requested number of elements to return.
    * @return The requested elements of this array as a <code>ResultSet</code>.
    * @exception SQLException If an error occurs.
    * @see ResultSet
@@ -173,8 +174,8 @@ public interface Array
    * will be used to override selected default mappings of SQL types to
    * Java classes.</p>
    *
-   * @param offset The index into the array to start returning elements from.
-   * @param length The requested number of elements to return.
+   * @param index The index into the array to start returning elements from.
+   * @param count The requested number of elements to return.
    * @param map A mapping of SQL types to Java classes.
    * @return The requested elements of this array as a <code>ResultSet</code>.
    * @exception SQLException If an error occurs.