procyberian/gcc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merged gcj-eclipse branch to trunk.

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

13
libjava/classpath/java/sql/Array.java
View file

@ -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;
}

4
libjava/classpath/java/sql/CallableStatement.java
View file

@ -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

4
libjava/classpath/java/sql/Connection.java
View file

@ -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

2
libjava/classpath/java/sql/DriverManager.java
View file

@ -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();

2
libjava/classpath/java/sql/Ref.java
View file

@ -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

6
libjava/classpath/java/sql/ResultSet.java
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

2
libjava/classpath/java/sql/Struct.java
View file

@ -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;
}

4
libjava/classpath/java/sql/Timestamp.java
View file

@ -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);
}