svn commit: r1362464 - in /db/derby/code/trunk: build.xml java/stubs/jdbc3/java/sql/CallableStatement.java java/stubs/jdbc3/java/sql/Connection.java java/stubs/jdbc3/java/sql/DriverManager.java

[ka...@apache.org]

Author: kahatlen
Date: Tue Jul 17 12:13:47 2012
New Revision: 1362464

URL: http://svn.apache.org/viewvc?rev=1362464&view=rev
Log:
DERBY-5840: Update JDBC 3.0 stubs for Java 5

Some JDBC signatures were changed to generics between 1.4.2 and 1.5.0.
Update the stubs so that we get the same results when we compile against
the stubs as when we compile against Java 5 class libraries.

Modified:
    db/derby/code/trunk/build.xml
    db/derby/code/trunk/java/stubs/jdbc3/java/sql/CallableStatement.java
    db/derby/code/trunk/java/stubs/jdbc3/java/sql/Connection.java
    db/derby/code/trunk/java/stubs/jdbc3/java/sql/DriverManager.java

Modified: db/derby/code/trunk/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/build.xml?rev=1362464&r1=1362463&r2=1362464&view=diff
==============================================================================
--- db/derby/code/trunk/build.xml (original)
+++ db/derby/code/trunk/build.xml Tue Jul 17 12:13:47 2012
@@ -812,8 +812,8 @@
     <mkdir dir="${out.jdbc3.dir}"/>
 
     <javac
-      source="1.4"
-      target="1.4"
+      source="1.5"
+      target="1.5"
       bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"

Modified: db/derby/code/trunk/java/stubs/jdbc3/java/sql/CallableStatement.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/stubs/jdbc3/java/sql/CallableStatement.java?rev=1362464&r1=1362463&r2=1362464&view=diff
==============================================================================
--- db/derby/code/trunk/java/stubs/jdbc3/java/sql/CallableStatement.java (original)
+++ db/derby/code/trunk/java/stubs/jdbc3/java/sql/CallableStatement.java Tue Jul 17 12:13:47 2012
@@ -446,7 +446,7 @@ public interface CallableStatement exten
      * @throws SQLException
      *             if a database error happens
      */
-    public Object getObject(int parameterIndex, Map map)
+    public Object getObject(int parameterIndex, Map<String, Class<?>> map)
             throws SQLException;
 
     /**
@@ -478,7 +478,7 @@ public interface CallableStatement exten
      * @throws SQLException
      *             if there is a problem accessing the database
      */
-    public Object getObject(String parameterName, Map map)
+    public Object getObject(String parameterName, Map<String, Class<?>> map)
             throws SQLException;
 
     /**

Modified: db/derby/code/trunk/java/stubs/jdbc3/java/sql/Connection.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/stubs/jdbc3/java/sql/Connection.java?rev=1362464&r1=1362463&r2=1362464&view=diff
==============================================================================
--- db/derby/code/trunk/java/stubs/jdbc3/java/sql/Connection.java (original)
+++ db/derby/code/trunk/java/stubs/jdbc3/java/sql/Connection.java Tue Jul 17 12:13:47 2012
@@ -252,7 +252,7 @@ public interface Connection {
      * @throws SQLException
      *             if there is a problem accessing the database
      */
-    public Map getTypeMap() throws SQLException;
+    public Map<String, Class<?>> getTypeMap() throws SQLException;
 
     /**
      * Gets the first instance of any <code>SQLWarning</code> objects that may
@@ -755,5 +755,5 @@ public interface Connection {
      *             if there is a problem accessing the database or if
      *             <code>map</code> is not an instance of {@link Map}.
      */
-    public void setTypeMap(Map map) throws SQLException;
+    public void setTypeMap(Map<String, Class<?>> map) throws SQLException;
 }

Modified: db/derby/code/trunk/java/stubs/jdbc3/java/sql/DriverManager.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/stubs/jdbc3/java/sql/DriverManager.java?rev=1362464&r1=1362463&r2=1362464&view=diff
==============================================================================
--- db/derby/code/trunk/java/stubs/jdbc3/java/sql/DriverManager.java (original)
+++ db/derby/code/trunk/java/stubs/jdbc3/java/sql/DriverManager.java Tue Jul 17 12:13:47 2012
@@ -50,7 +50,7 @@ public class DriverManager {
      * Set to hold Registered Drivers - initial capacity 10 drivers (will expand
      * automatically if necessary.
      */
-    private static final List theDrivers = new ArrayList(10);
+    private static final List<Driver> theDrivers = new ArrayList<Driver>(10);
 
     // Permission for setting log
     private static final SQLPermission logPermission = null;