diff options
Diffstat (limited to 'libjava/classpath/java/sql')
| -rw-r--r-- | libjava/classpath/java/sql/Array.java | 13 | ||||
| -rw-r--r-- | libjava/classpath/java/sql/CallableStatement.java | 4 | ||||
| -rw-r--r-- | libjava/classpath/java/sql/Connection.java | 4 | ||||
| -rw-r--r-- | libjava/classpath/java/sql/DriverManager.java | 2 | ||||
| -rw-r--r-- | libjava/classpath/java/sql/Ref.java | 2 | ||||
| -rw-r--r-- | libjava/classpath/java/sql/ResultSet.java | 6 | ||||
| -rw-r--r-- | libjava/classpath/java/sql/Struct.java | 2 | ||||
| -rw-r--r-- | libjava/classpath/java/sql/Timestamp.java | 4 |
8 files changed, 20 insertions, 17 deletions
diff --git a/libjava/classpath/java/sql/Array.java b/libjava/classpath/java/sql/Array.java index c3c42d9cb57..cdd60a42f12 100644 --- a/libjava/classpath/java/sql/Array.java +++ b/libjava/classpath/java/sql/Array.java @@ -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>start</code> @@ -94,7 +94,7 @@ public interface Array * The object returned will be an array of Java objects of * the appropriate types. * - * @param start The index into this array to start returning elements from. + * @param start 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 start The index into this array to start returning elements from. + * @param start 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 start, int count, Map map) throws SQLException; + Object getArray(long start, 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>. @@ -180,6 +181,6 @@ public interface Array * @exception SQLException If an error occurs. * @see ResultSet */ - ResultSet getResultSet(long start, int count, Map map) + ResultSet getResultSet(long start, int count, Map<String, Class<?>> map) throws SQLException; } diff --git a/libjava/classpath/java/sql/CallableStatement.java b/libjava/classpath/java/sql/CallableStatement.java index 75eade77480..e605b381d5b 100644 --- a/libjava/classpath/java/sql/CallableStatement.java +++ b/libjava/classpath/java/sql/CallableStatement.java @@ -250,7 +250,7 @@ public interface CallableStatement extends PreparedStatement * @exception SQLException If an error occurs. * @since 1.2 */ - Object getObject(int index, Map map) throws SQLException; + Object getObject(int index, Map<String, Class<?>> map) throws SQLException; /** * This method returns the value of the specified parameter as a Java @@ -865,7 +865,7 @@ public interface CallableStatement extends PreparedStatement * @exception SQLException If an error occurs. * @since 1.4 */ - Object getObject(String name, Map map) throws SQLException; + Object getObject(String name, Map<String, Class<?>> map) throws SQLException; /** * This method returns the value of the specified parameter as a Java diff --git a/libjava/classpath/java/sql/Connection.java b/libjava/classpath/java/sql/Connection.java index d827e75b089..8dc7544c760 100644 --- a/libjava/classpath/java/sql/Connection.java +++ b/libjava/classpath/java/sql/Connection.java @@ -339,7 +339,7 @@ public interface Connection * @return The SQL type to Java class mapping. * @exception SQLException If an error occurs. */ - Map getTypeMap() throws SQLException; + Map<String, Class<?>> getTypeMap() throws SQLException; /** * This method sets the mapping table for SQL types to Java classes. @@ -348,7 +348,7 @@ public interface Connection * @param map The new SQL mapping table. * @exception SQLException If an error occurs. */ - void setTypeMap(Map map) throws SQLException; + void setTypeMap(Map<String, Class<?>> map) throws SQLException; /** * Sets the default holdability of <code>ResultSet</code>S that are created diff --git a/libjava/classpath/java/sql/DriverManager.java b/libjava/classpath/java/sql/DriverManager.java index 94f743b92da..7d1ef07c1a0 100644 --- a/libjava/classpath/java/sql/DriverManager.java +++ b/libjava/classpath/java/sql/DriverManager.java @@ -264,7 +264,7 @@ public class DriverManager * * @return An <code>Enumeration</code> of all currently loaded JDBC drivers. */ - public static Enumeration getDrivers() + public static Enumeration<Driver> getDrivers() { Vector v = new Vector(); Enumeration e = drivers.elements(); diff --git a/libjava/classpath/java/sql/Ref.java b/libjava/classpath/java/sql/Ref.java index 4ebd5e64898..c5c54eefef1 100644 --- a/libjava/classpath/java/sql/Ref.java +++ b/libjava/classpath/java/sql/Ref.java @@ -61,7 +61,7 @@ public interface Ref /** * @since 1.4 */ - Object getObject(Map map) throws SQLException; + Object getObject(Map<String, Class<?>> map) throws SQLException; /** * @since 1.4 diff --git a/libjava/classpath/java/sql/ResultSet.java b/libjava/classpath/java/sql/ResultSet.java index 79cba63d419..573deb3e105 100644 --- 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 diff --git a/libjava/classpath/java/sql/Struct.java b/libjava/classpath/java/sql/Struct.java index 5cbc88e133a..ce8db22bb55 100644 --- a/libjava/classpath/java/sql/Struct.java +++ b/libjava/classpath/java/sql/Struct.java @@ -73,5 +73,5 @@ public interface Struct * @return The attributes of this structure type. * @exception SQLException If a error occurs. */ - Object[] getAttributes(Map map) throws SQLException; + Object[] getAttributes(Map<String, Class<?>> map) throws SQLException; } diff --git a/libjava/classpath/java/sql/Timestamp.java b/libjava/classpath/java/sql/Timestamp.java index 66a57641a02..18ccda5577d 100644 --- a/libjava/classpath/java/sql/Timestamp.java +++ b/libjava/classpath/java/sql/Timestamp.java @@ -1,5 +1,5 @@ /* Time.java -- Wrapper around java.util.Date - Copyright (C) 1999, 2000, 2003, 2004, 2006 Free Software Foundation, Inc. + Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -312,7 +312,7 @@ public class Timestamp extends java.util.Date * @see #compareTo(Timestamp) * @since 1.2 */ - public int compareTo(Object obj) + public int compareTo(java.util.Date obj) { return compareTo((Timestamp) obj); } |