Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8029417: JDBC 4.2 javadoc updates
authorlancea
Mon, 02 Dec 2013 16:06:03 -0500
changeset 21950 db3c826749f7
parent 21949 d97fd8123cbe
child 21951 eb62ae4c1896
8029417: JDBC 4.2 javadoc updates Reviewed-by: darcy
jdk/src/share/classes/java/sql/CallableStatement.java file | annotate | diff | comparison | revisions
jdk/src/share/classes/java/sql/DriverManager.java file | annotate | diff | comparison | revisions
jdk/src/share/classes/java/sql/JDBCType.java file | annotate | diff | comparison | revisions
jdk/src/share/classes/java/sql/PreparedStatement.java file | annotate | diff | comparison | revisions
jdk/src/share/classes/java/sql/ResultSet.java file | annotate | diff | comparison | revisions
jdk/src/share/classes/java/sql/SQLPermission.java file | annotate | diff | comparison | revisions 
--- a/jdk/src/share/classes/java/sql/CallableStatement.java	Mon Dec 02 11:29:07 2013 -0800
+++ b/jdk/src/share/classes/java/sql/CallableStatement.java	Mon Dec 02 16:06:03 2013 -0500
@@ -1108,7 +1108,7 @@
      * parameter; if a database access error occurs or
      * this method is called on a closed <code>CallableStatement</code>
      * @exception SQLFeatureNotSupportedException if
-     * the JDBC driver does not support this data type
+     * the JDBC driver does not support the specified targetSqlType
      * @see Types
      * @see #getObject
      * @since 1.4
@@ -1131,7 +1131,7 @@
      * parameter; if a database access error occurs or
      * this method is called on a closed <code>CallableStatement</code>
      * @exception SQLFeatureNotSupportedException if
-     * the JDBC driver does not support this data type
+     * the JDBC driver does not support the specified targetSqlType
      * @see #getObject
      * @since 1.4
      */
@@ -2536,7 +2536,7 @@
      *            or Reader object and the value of the scale parameter is less
      *            than zero
      * @exception SQLFeatureNotSupportedException if
-     * the JDBC driver does not support this data type
+     * the JDBC driver does not support the specified targetSqlType
      * @see JDBCType
      * @see SQLType
      *
@@ -2562,7 +2562,7 @@
      * parameter; if a database access error occurs
      * or this method is called on a closed {@code CallableStatement}
      * @exception SQLFeatureNotSupportedException if
-     * the JDBC driver does not support this data type
+     * the JDBC driver does not support the specified targetSqlType
      * @see JDBCType
      * @see SQLType
      * @since 1.8
@@ -2603,7 +2603,7 @@
      * if a database access error occurs or
      * this method is called on a closed {@code CallableStatement}
      * @exception SQLFeatureNotSupportedException if
-     * the JDBC driver does not support this data type
+     * the JDBC driver does not support the specified sqlType
      * @see JDBCType
      * @see SQLType
      * @since 1.8
@@ -2639,7 +2639,7 @@
      * if a database access error occurs or
      * this method is called on a closed {@code CallableStatement}
      * @exception SQLFeatureNotSupportedException if
-     * the JDBC driver does not support this data type
+     * the JDBC driver does not support the specified sqlType
      * @see JDBCType
      * @see SQLType
      * @since 1.8
@@ -2686,7 +2686,7 @@
      * if a database access error occurs or
      * this method is called on a closed {@code CallableStatement}
      * @exception SQLFeatureNotSupportedException if
-     * the JDBC driver does not support this data type
+     * the JDBC driver does not support the specified sqlType
      * @see JDBCType
      * @see SQLType
      * @since 1.8
@@ -2725,7 +2725,7 @@
      * parameter; if a database access error occurs or
      * this method is called on a closed {@code CallableStatement}
      * @exception SQLFeatureNotSupportedException if
-     * the JDBC driver does not support this data type
+     * the JDBC driver does not support the specified sqlType
      * or if the JDBC driver does not support
      * this method
      * @since 1.8
@@ -2762,7 +2762,7 @@
      * parameter; if a database access error occurs or
      * this method is called on a closed {@code CallableStatement}
      * @exception SQLFeatureNotSupportedException if
-     * the JDBC driver does not support this data type
+     * the JDBC driver does not support the specified sqlType
      * or if the JDBC driver does not support
      * this method
      * @since 1.8
@@ -2811,7 +2811,7 @@
      * parameter; if a database access error occurs or
      * this method is called on a closed {@code CallableStatement}
      * @exception SQLFeatureNotSupportedException if
-     * the JDBC driver does not support this data type
+     * the JDBC driver does not support the specified sqlType
      * or if the JDBC driver does not support this method
      * @see JDBCType
      * @see SQLType
--- a/jdk/src/share/classes/java/sql/DriverManager.java	Mon Dec 02 11:29:07 2013 -0800
+++ b/jdk/src/share/classes/java/sql/DriverManager.java	Mon Dec 02 16:06:03 2013 -0500
@@ -213,8 +213,8 @@
      * The <code>DriverManager</code> attempts to select an appropriate driver from
      * the set of registered JDBC drivers.
      *<p>
-     * <B>Note:</B> If a property is specified as part of the {@code url} and
-     * is also specified in the {@code Properties} object, it is
+     * <B>Note:</B> If the {@code user} or {@code password} property are
+     * also specified as part of the {@code url}, it is
      * implementation-defined as to which value will take precedence.
      * For maximum portability, an application should only specify a
      * property once.
@@ -320,7 +320,7 @@
      * Registers the given driver with the {@code DriverManager}.
      * A newly-loaded driver class should call
      * the method {@code registerDriver} to make itself
-     * known to the {@code DriverManager}. If the driver had previously been
+     * known to the {@code DriverManager}. If the driver is currently
      * registered, no action is taken.
      *
      * @param driver the new JDBC Driver that is to be registered with the
@@ -338,7 +338,7 @@
      * Registers the given driver with the {@code DriverManager}.
      * A newly-loaded driver class should call
      * the method {@code registerDriver} to make itself
-     * known to the {@code DriverManager}. If the driver had previously been
+     * known to the {@code DriverManager}. If the driver is currently
      * registered, no action is taken.
      *
      * @param driver the new JDBC Driver that is to be registered with the
@@ -347,6 +347,7 @@
      *               {@code DriverManager#deregisterDriver} is called
      * @exception SQLException if a database access error occurs
      * @exception NullPointerException if {@code driver} is null
+     * @since 1.8
      */
     public static synchronized void registerDriver(java.sql.Driver driver,
             DriverAction da)
--- a/jdk/src/share/classes/java/sql/JDBCType.java	Mon Dec 02 11:29:07 2013 -0800
+++ b/jdk/src/share/classes/java/sql/JDBCType.java	Mon Dec 02 16:06:03 2013 -0500
@@ -218,8 +218,8 @@
     }
 
     /**
-     * Returns the name of the data type.
-     * @return The name of the data type.
+     *{@inheritDoc }
+     * @return The name of this {@code SQLType}.
      */
     public String getName() {
         return name();
--- a/jdk/src/share/classes/java/sql/PreparedStatement.java	Mon Dec 02 11:29:07 2013 -0800
+++ b/jdk/src/share/classes/java/sql/PreparedStatement.java	Mon Dec 02 16:06:03 2013 -0500
@@ -401,7 +401,7 @@
     * marker in the SQL statement; if a database access error occurs or this
     * method is called on a closed PreparedStatement
     * @exception SQLFeatureNotSupportedException if
-    * the JDBC driver does not support this data type
+    * the JDBC driver does not support the specified targetSqlType
     * @see Types
     */
     void setObject(int parameterIndex, Object x, int targetSqlType)
@@ -951,7 +951,7 @@
      *            or Reader object and the value of the scale parameter is less
      *            than zero
      * @exception SQLFeatureNotSupportedException if
-     * the JDBC driver does not support this data type
+     * the JDBC driver does not support the specified targetSqlType
      * @see Types
      *
      */
@@ -1255,7 +1255,7 @@
      *            or Reader object and the value of the scale parameter is less
      *            than zero
      * @exception SQLFeatureNotSupportedException if
-     * the JDBC driver does not support this data type
+     * the JDBC driver does not support the specified targetSqlType
      * @see JDBCType
      * @see SQLType
      * @since 1.8
@@ -1281,7 +1281,7 @@
      * parameter marker in the SQL statement; if a database access error occurs
      * or this method is called on a closed {@code PreparedStatement}
      * @exception SQLFeatureNotSupportedException if
-     * the JDBC driver does not support this data type
+     * the JDBC driver does not support the specified targetSqlType
      * @see JDBCType
      * @see SQLType
      * @since 1.8
--- a/jdk/src/share/classes/java/sql/ResultSet.java	Mon Dec 02 11:29:07 2013 -0800
+++ b/jdk/src/share/classes/java/sql/ResultSet.java	Mon Dec 02 16:06:03 2013 -0500
@@ -4178,7 +4178,7 @@
      * the result set concurrency is {@code CONCUR_READ_ONLY}
      * or this method is called on a closed result set
      * @exception SQLFeatureNotSupportedException if the JDBC driver does not
-     * support this method; if the JDBC driver does not support this data type
+     * support this method; if the JDBC driver does not support the specified targetSqlType
      * @see JDBCType
      * @see SQLType
      * @since 1.8
@@ -4221,7 +4221,7 @@
      * the result set concurrency is {@code CONCUR_READ_ONLY}
      * or this method is called on a closed result set
      * @exception SQLFeatureNotSupportedException if the JDBC driver does not
-     * support this method; if the JDBC driver does not support this data type
+     * support this method; if the JDBC driver does not support the specified targetSqlType
      * @see JDBCType
      * @see SQLType
      * @since 1.8
@@ -4249,7 +4249,7 @@
      * the result set concurrency is {@code CONCUR_READ_ONLY}
      * or this method is called on a closed result set
      * @exception SQLFeatureNotSupportedException if the JDBC driver does not
-     * support this method; if the JDBC driver does not support this data type
+     * support this method; if the JDBC driver does not support the specified targetSqlType
      * @see JDBCType
      * @see SQLType
      * @since 1.8
@@ -4279,7 +4279,7 @@
      * the result set concurrency is {@code CONCUR_READ_ONLY}
      * or this method is called on a closed result set
      * @exception SQLFeatureNotSupportedException if the JDBC driver does not
-     * support this method; if the JDBC driver does not support this data type
+     * support this method; if the JDBC driver does not support the specified targetSqlType
      * @see JDBCType
      * @see SQLType
      * @since 1.8
--- a/jdk/src/share/classes/java/sql/SQLPermission.java	Mon Dec 02 11:29:07 2013 -0800
+++ b/jdk/src/share/classes/java/sql/SQLPermission.java	Mon Dec 02 16:06:03 2013 -0500
@@ -122,7 +122,7 @@
      *
      * @param name the name of this <code>SQLPermission</code> object, which must
      * be either {@code  setLog}, {@code callAbort}, {@code setSyncFactory},
-     *  or {@code setNetworkTimeout}
+     *  {@code deregisterDriver}, or {@code setNetworkTimeout}
      * @throws NullPointerException if <code>name</code> is <code>null</code>.
      * @throws IllegalArgumentException if <code>name</code> is empty.
 
@@ -140,7 +140,7 @@
      *
      * @param name the name of this <code>SQLPermission</code> object, which must
      * be either {@code  setLog}, {@code callAbort}, {@code setSyncFactory},
-     *  or {@code setNetworkTimeout}
+     *  {@code deregisterDriver}, or {@code setNetworkTimeout}
      * @param actions should be <code>null</code>
      * @throws NullPointerException if <code>name</code> is <code>null</code>.
      * @throws IllegalArgumentException if <code>name</code> is empty.
jdk-sandbox