1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8054555: javadoc cleanup for java.sql and javax.sql

Browse Source 
Reviewed-by: darcy, igerasim
This commit is contained in:
Lance Andersen 2014-08-11 14:22:22 -04:00
parent 1db8e112f7
commit 75c0916977
32 changed files with 552 additions and 610 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jdk/src/share/classes/java/sql/Array.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -181,7 +181,7 @@ public interface Array {
Object getArray(long index, int count) throws SQLException; Object getArray(long index, int count) throws SQLException;
/** /**
* Retreives a slice of the SQL <code>ARRAY</code> value * Retrieves a slice of the SQL <code>ARRAY</code> value
* designated by this <code>Array</code> object, beginning with the specified * designated by this <code>Array</code> object, beginning with the specified
* <code>index</code> and containing up to <code>count</code> * <code>index</code> and containing up to <code>count</code>
* successive elements of the SQL array. * successive elements of the SQL array.

6
jdk/src/share/classes/java/sql/BatchUpdateException.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -479,14 +479,14 @@ public class BatchUpdateException extends SQLException {
* to BatchUpdateException: * to BatchUpdateException:
* <ul> * <ul>
* <li>Add field longUpdateCounts</li> * <li>Add field longUpdateCounts</li>
* <li>Add Constructorr which takes long[] for update counts</li> * <li>Add Constructor which takes long[] for update counts</li>
* <li>Add getLargeUpdateCounts method</li> * <li>Add getLargeUpdateCounts method</li>
* </ul> * </ul>
* When any of the constructors are called, the int[] and long[] updateCount * When any of the constructors are called, the int[] and long[] updateCount
* fields are populated by copying the one array to each other. * fields are populated by copying the one array to each other.
* *
* As the JDBC driver passes in the updateCounts, there has always been the * As the JDBC driver passes in the updateCounts, there has always been the
* possiblity for overflow and BatchUpdateException does not need to account * possibility for overflow and BatchUpdateException does not need to account
* for that, it simply copies the arrays. * for that, it simply copies the arrays.
* *
* JDBC drivers should always use the constructor that specifies long[] and * JDBC drivers should always use the constructor that specifies long[] and

19
jdk/src/share/classes/java/sql/CallableStatement.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -1145,7 +1145,7 @@ public interface CallableStatement extends PreparedStatement {
* Java <code>Object</code> types to SQL types. The given argument * Java <code>Object</code> types to SQL types. The given argument
* will be converted to the corresponding SQL type before being * will be converted to the corresponding SQL type before being
* sent to the database. * sent to the database.
* <p>Note that this method may be used to pass datatabase- * <p>Note that this method may be used to pass database-
* specific abstract data types, by using a driver-specific Java * specific abstract data types, by using a driver-specific Java
* type. * type.
* *
@ -1882,7 +1882,8 @@ public interface CallableStatement extends PreparedStatement {
throws SQLException; throws SQLException;
/** /**
* Sets the designated parameter to a <code>InputStream</code> object. The <code>inputstream</code> must contain the number * Sets the designated parameter to a {@code InputStream} object.
* The <code>Inputstream</code> must contain the number
* of characters specified by length, otherwise a <code>SQLException</code> will be * of characters specified by length, otherwise a <code>SQLException</code> will be
* generated when the <code>CallableStatement</code> is executed. * generated when the <code>CallableStatement</code> is executed.
* This method differs from the <code>setBinaryStream (int, InputStream, int)</code> * This method differs from the <code>setBinaryStream (int, InputStream, int)</code>
@ -1899,8 +1900,8 @@ public interface CallableStatement extends PreparedStatement {
* @param length the number of bytes in the parameter data. * @param length the number of bytes in the parameter data.
* @throws SQLException if parameterName does not correspond to a named * @throws SQLException if parameterName does not correspond to a named
* parameter; if the length specified * parameter; if the length specified
* is less than zero; if the number of bytes in the inputstream does not match * is less than zero; if the number of bytes in the {@code InputStream}
* the specified length; if a database access error occurs or * does not match the specified length; if a database access error occurs or
* this method is called on a closed <code>CallableStatement</code> * this method is called on a closed <code>CallableStatement</code>
* @exception SQLFeatureNotSupportedException if the JDBC driver does not support * @exception SQLFeatureNotSupportedException if the JDBC driver does not support
* this method * this method
@ -2378,7 +2379,7 @@ public interface CallableStatement extends PreparedStatement {
throws SQLException; throws SQLException;
/** /**
* Sets the designated parameter to a <code>InputStream</code> object. * Sets the designated parameter to a {@code InputStream} object.
* This method differs from the <code>setBinaryStream (int, InputStream)</code> * This method differs from the <code>setBinaryStream (int, InputStream)</code>
* method because it informs the driver that the parameter value should be * method because it informs the driver that the parameter value should be
* sent to the server as a <code>BLOB</code>. When the <code>setBinaryStream</code> method is used, * sent to the server as a <code>BLOB</code>. When the <code>setBinaryStream</code> method is used,
@ -2430,7 +2431,7 @@ public interface CallableStatement extends PreparedStatement {
/** /**
*<p>Returns an object representing the value of OUT parameter * Returns an object representing the value of OUT parameter
* {@code parameterIndex} and will convert from the * {@code parameterIndex} and will convert from the
* SQL type of the parameter to the requested Java data type, if the * SQL type of the parameter to the requested Java data type, if the
* conversion is supported. If the conversion is not * conversion is supported. If the conversion is not
@ -2459,7 +2460,7 @@ public interface CallableStatement extends PreparedStatement {
/** /**
*<p>Returns an object representing the value of OUT parameter * Returns an object representing the value of OUT parameter
* {@code parameterName} and will convert from the * {@code parameterName} and will convert from the
* SQL type of the parameter to the requested Java data type, if the * SQL type of the parameter to the requested Java data type, if the
* conversion is supported. If the conversion is not * conversion is supported. If the conversion is not
@ -2490,7 +2491,7 @@ public interface CallableStatement extends PreparedStatement {
//------------------------- JDBC 4.2 ----------------------------------- //------------------------- JDBC 4.2 -----------------------------------
/** /**
* <p>Sets the value of the designated parameter with the given object. * Sets the value of the designated parameter with the given object.
* *
* If the second argument is an {@code InputStream} then the stream * If the second argument is an {@code InputStream} then the stream
* must contain the number of bytes specified by scaleOrLength. * must contain the number of bytes specified by scaleOrLength.

10
jdk/src/share/classes/java/sql/Connection.java
View File

@ -274,7 +274,7 @@ public interface Connection extends Wrapper, AutoCloseable {
* <code>close</code> method. If the <code>close</code> method is called * <code>close</code> method. If the <code>close</code> method is called
* and there is an active transaction, the results are implementation-defined. * and there is an active transaction, the results are implementation-defined.
* *
* @exception SQLException SQLException if a database access error occurs * @exception SQLException if a database access error occurs
*/ */
void close() throws SQLException; void close() throws SQLException;
@ -335,7 +335,7 @@ public interface Connection extends Wrapper, AutoCloseable {
* *
* @return <code>true</code> if this <code>Connection</code> object * @return <code>true</code> if this <code>Connection</code> object
* is read-only; <code>false</code> otherwise * is read-only; <code>false</code> otherwise
* @exception SQLException SQLException if a database access error occurs * @exception SQLException if a database access error occurs
* or this method is called on a closed connection * or this method is called on a closed connection
*/ */
boolean isReadOnly() throws SQLException; boolean isReadOnly() throws SQLException;
@ -492,7 +492,7 @@ public interface Connection extends Wrapper, AutoCloseable {
* returns <code>null</code> until a new warning is * returns <code>null</code> until a new warning is
* reported for this <code>Connection</code> object. * reported for this <code>Connection</code> object.
* *
* @exception SQLException SQLException if a database access error occurs * @exception SQLException if a database access error occurs
* or this method is called on a closed connection * or this method is called on a closed connection
*/ */
void clearWarnings() throws SQLException; void clearWarnings() throws SQLException;
@ -632,7 +632,7 @@ public interface Connection extends Wrapper, AutoCloseable {
* this <code>Connection</code> object. The type map will be used for the * this <code>Connection</code> object. The type map will be used for the
* custom mapping of SQL structured types and distinct types. * custom mapping of SQL structured types and distinct types.
* <p> * <p>
* You must set the the values for the <code>TypeMap</code> prior to * You must set the values for the <code>TypeMap</code> prior to
* callng <code>setMap</code> as a JDBC driver may create an internal copy * callng <code>setMap</code> as a JDBC driver may create an internal copy
* of the <code>TypeMap</code>: * of the <code>TypeMap</code>:
* *
@ -662,7 +662,7 @@ public interface Connection extends Wrapper, AutoCloseable {
* Changes the default holdability of <code>ResultSet</code> objects * Changes the default holdability of <code>ResultSet</code> objects
* created using this <code>Connection</code> object to the given * created using this <code>Connection</code> object to the given
* holdability. The default holdability of <code>ResultSet</code> objects * holdability. The default holdability of <code>ResultSet</code> objects
* can be be determined by invoking * can be determined by invoking
* {@link DatabaseMetaData#getResultSetHoldability}. * {@link DatabaseMetaData#getResultSetHoldability}.
* *
* @param holdability a <code>ResultSet</code> holdability constant; one of * @param holdability a <code>ResultSet</code> holdability constant; one of

18
jdk/src/share/classes/java/sql/DatabaseMetaData.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -1216,7 +1216,7 @@ public interface DatabaseMetaData extends Wrapper {
* <code>PROCEDURE_CAT</code>, <code>PROCEDURE_SCHEM</code>, * <code>PROCEDURE_CAT</code>, <code>PROCEDURE_SCHEM</code>,
* <code>PROCEDURE_NAME</code> and <code>SPECIFIC_ NAME</code>. * <code>PROCEDURE_NAME</code> and <code>SPECIFIC_ NAME</code>.
* *
* <P>Each procedure description has the the following columns: * <P>Each procedure description has the following columns:
* <OL> * <OL>
* <LI><B>PROCEDURE_CAT</B> String {@code =>} procedure catalog (may be <code>null</code>) * <LI><B>PROCEDURE_CAT</B> String {@code =>} procedure catalog (may be <code>null</code>)
* <LI><B>PROCEDURE_SCHEM</B> String {@code =>} procedure schema (may be <code>null</code>) * <LI><B>PROCEDURE_SCHEM</B> String {@code =>} procedure schema (may be <code>null</code>)
@ -1487,7 +1487,7 @@ public interface DatabaseMetaData extends Wrapper {
* <LI><B>TABLE_TYPE</B> String {@code =>} table type. Typical types are "TABLE", * <LI><B>TABLE_TYPE</B> String {@code =>} table type. Typical types are "TABLE",
* "VIEW", "SYSTEM TABLE", "GLOBAL TEMPORARY", * "VIEW", "SYSTEM TABLE", "GLOBAL TEMPORARY",
* "LOCAL TEMPORARY", "ALIAS", "SYNONYM". * "LOCAL TEMPORARY", "ALIAS", "SYNONYM".
* <LI><B>REMARKS</B> String {@code =>} explanatory comment on the table * <LI><B>REMARKS</B> String {@code =>} explanatory comment on the table (may be {@code null})
* <LI><B>TYPE_CAT</B> String {@code =>} the types catalog (may be <code>null</code>) * <LI><B>TYPE_CAT</B> String {@code =>} the types catalog (may be <code>null</code>)
* <LI><B>TYPE_SCHEM</B> String {@code =>} the types schema (may be <code>null</code>) * <LI><B>TYPE_SCHEM</B> String {@code =>} the types schema (may be <code>null</code>)
* <LI><B>TYPE_NAME</B> String {@code =>} type name (may be <code>null</code>) * <LI><B>TYPE_NAME</B> String {@code =>} type name (may be <code>null</code>)
@ -1710,7 +1710,7 @@ public interface DatabaseMetaData extends Wrapper {
* <LI><B>GRANTOR</B> String {@code =>} grantor of access (may be <code>null</code>) * <LI><B>GRANTOR</B> String {@code =>} grantor of access (may be <code>null</code>)
* <LI><B>GRANTEE</B> String {@code =>} grantee of access * <LI><B>GRANTEE</B> String {@code =>} grantee of access
* <LI><B>PRIVILEGE</B> String {@code =>} name of access (SELECT, * <LI><B>PRIVILEGE</B> String {@code =>} name of access (SELECT,
* INSERT, UPDATE, REFRENCES, ...) * INSERT, UPDATE, REFERENCES, ...)
* <LI><B>IS_GRANTABLE</B> String {@code =>} "YES" if grantee is permitted * <LI><B>IS_GRANTABLE</B> String {@code =>} "YES" if grantee is permitted
* to grant to others; "NO" if not; <code>null</code> if unknown * to grant to others; "NO" if not; <code>null</code> if unknown
* </OL> * </OL>
@ -1755,7 +1755,7 @@ public interface DatabaseMetaData extends Wrapper {
* <LI><B>GRANTOR</B> String {@code =>} grantor of access (may be <code>null</code>) * <LI><B>GRANTOR</B> String {@code =>} grantor of access (may be <code>null</code>)
* <LI><B>GRANTEE</B> String {@code =>} grantee of access * <LI><B>GRANTEE</B> String {@code =>} grantee of access
* <LI><B>PRIVILEGE</B> String {@code =>} name of access (SELECT, * <LI><B>PRIVILEGE</B> String {@code =>} name of access (SELECT,
* INSERT, UPDATE, REFRENCES, ...) * INSERT, UPDATE, REFERENCES, ...)
* <LI><B>IS_GRANTABLE</B> String {@code =>} "YES" if grantee is permitted * <LI><B>IS_GRANTABLE</B> String {@code =>} "YES" if grantee is permitted
* to grant to others; "NO" if not; <code>null</code> if unknown * to grant to others; "NO" if not; <code>null</code> if unknown
* </OL> * </OL>
@ -2509,7 +2509,7 @@ public interface DatabaseMetaData extends Wrapper {
* <LI><B>TYPE</B> short {@code =>} index type: * <LI><B>TYPE</B> short {@code =>} index type:
* <UL> * <UL>
* <LI> tableIndexStatistic - this identifies table statistics that are * <LI> tableIndexStatistic - this identifies table statistics that are
* returned in conjuction with a table's index descriptions * returned in conjunction with a table's index descriptions
* <LI> tableIndexClustered - this is a clustered index * <LI> tableIndexClustered - this is a clustered index
* <LI> tableIndexHashed - this is a hashed index * <LI> tableIndexHashed - this is a hashed index
* <LI> tableIndexOther - this is some other style of index * <LI> tableIndexOther - this is some other style of index
@ -2524,7 +2524,7 @@ public interface DatabaseMetaData extends Wrapper {
* <LI><B>CARDINALITY</B> long {@code =>} When TYPE is tableIndexStatistic, then * <LI><B>CARDINALITY</B> long {@code =>} When TYPE is tableIndexStatistic, then
* this is the number of rows in the table; otherwise, it is the * this is the number of rows in the table; otherwise, it is the
* number of unique values in the index. * number of unique values in the index.
* <LI><B>PAGES</B> long {@code =>} When TYPE is tableIndexStatisic then * <LI><B>PAGES</B> long {@code =>} When TYPE is tableIndexStatistic then
* this is the number of pages used for the table, otherwise it * this is the number of pages used for the table, otherwise it
* is the number of pages used for the current index. * is the number of pages used for the current index.
* <LI><B>FILTER_CONDITION</B> String {@code =>} Filter condition, if any. * <LI><B>FILTER_CONDITION</B> String {@code =>} Filter condition, if any.
@ -2858,7 +2858,7 @@ public interface DatabaseMetaData extends Wrapper {
* @return <code>true</code> if a <code>CallableStatement</code> object * @return <code>true</code> if a <code>CallableStatement</code> object
* can return multiple <code>ResultSet</code> objects * can return multiple <code>ResultSet</code> objects
* simultaneously; <code>false</code> otherwise * simultaneously; <code>false</code> otherwise
* @exception SQLException if a datanase access error occurs * @exception SQLException if a database access error occurs
* @since 1.4 * @since 1.4
*/ */
boolean supportsMultipleOpenResults() throws SQLException; boolean supportsMultipleOpenResults() throws SQLException;
@ -3302,7 +3302,7 @@ public interface DatabaseMetaData extends Wrapper {
* <code>FUNCTION_NAME</code> and * <code>FUNCTION_NAME</code> and
* <code>SPECIFIC_ NAME</code>. * <code>SPECIFIC_ NAME</code>.
* *
* <P>Each function description has the the following columns: * <P>Each function description has the following columns:
* <OL> * <OL>
* <LI><B>FUNCTION_CAT</B> String {@code =>} function catalog (may be <code>null</code>) * <LI><B>FUNCTION_CAT</B> String {@code =>} function catalog (may be <code>null</code>)
* <LI><B>FUNCTION_SCHEM</B> String {@code =>} function schema (may be <code>null</code>) * <LI><B>FUNCTION_SCHEM</B> String {@code =>} function schema (may be <code>null</code>)

4
jdk/src/share/classes/java/sql/NClob.java
View File

@ -25,8 +25,6 @@
package java.sql; package java.sql;
import java.sql.Clob;
/** /**
* The mapping in the Java&trade; programming language * The mapping in the Java&trade; programming language
* for the SQL <code>NCLOB</code> type. * for the SQL <code>NCLOB</code> type.
@ -34,7 +32,7 @@ import java.sql.Clob;
* that stores a Character Large Object using the National Character Set * that stores a Character Large Object using the National Character Set
* as a column value in a row of a database table. * as a column value in a row of a database table.
* <P>The <code>NClob</code> interface extends the <code>Clob</code> interface * <P>The <code>NClob</code> interface extends the <code>Clob</code> interface
* which provides provides methods for getting the * which provides methods for getting the
* length of an SQL <code>NCLOB</code> value, * length of an SQL <code>NCLOB</code> value,
* for materializing a <code>NCLOB</code> value on the client, and for * for materializing a <code>NCLOB</code> value on the client, and for
* searching for a substring or <code>NCLOB</code> object within a * searching for a substring or <code>NCLOB</code> object within a

11
jdk/src/share/classes/java/sql/PreparedStatement.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -415,7 +415,7 @@ public interface PreparedStatement extends Statement {
* will be converted to the corresponding SQL type before being * will be converted to the corresponding SQL type before being
* sent to the database. * sent to the database.
* *
* <p>Note that this method may be used to pass datatabase- * <p>Note that this method may be used to pass database-
* specific abstract data types, by using a driver-specific Java * specific abstract data types, by using a driver-specific Java
* type. * type.
* *
@ -838,7 +838,8 @@ public interface PreparedStatement extends Statement {
throws SQLException; throws SQLException;
/** /**
* Sets the designated parameter to a <code>InputStream</code> object. The inputstream must contain the number * Sets the designated parameter to a <code>InputStream</code> object.
* The {@code Inputstream} must contain the number
* of characters specified by length otherwise a <code>SQLException</code> will be * of characters specified by length otherwise a <code>SQLException</code> will be
* generated when the <code>PreparedStatement</code> is executed. * generated when the <code>PreparedStatement</code> is executed.
* This method differs from the <code>setBinaryStream (int, InputStream, int)</code> * This method differs from the <code>setBinaryStream (int, InputStream, int)</code>
@ -854,8 +855,8 @@ public interface PreparedStatement extends Statement {
* @throws SQLException if parameterIndex does not correspond to a parameter * @throws SQLException if parameterIndex does not correspond to a parameter
* marker in the SQL statement; if a database access error occurs; * marker in the SQL statement; if a database access error occurs;
* this method is called on a closed <code>PreparedStatement</code>; * this method is called on a closed <code>PreparedStatement</code>;
* if the length specified * if the length specified
* is less than zero or if the number of bytes in the inputstream does not match * is less than zero or if the number of bytes in the {@code InputStream} does not match
* the specified length. * the specified length.
* @throws SQLFeatureNotSupportedException if the JDBC driver does not support this method * @throws SQLFeatureNotSupportedException if the JDBC driver does not support this method
* *

4
jdk/src/share/classes/java/sql/SQLException.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -36,7 +36,7 @@ import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
* <P>Each <code>SQLException</code> provides several kinds of information: * <P>Each <code>SQLException</code> provides several kinds of information:
* <UL> * <UL>
* <LI> a string describing the error. This is used as the Java Exception * <LI> a string describing the error. This is used as the Java Exception
* message, available via the method <code>getMesasge</code>. * message, available via the method <code>getMessage</code>.
* <LI> a "SQLstate" string, which follows either the XOPEN SQLstate conventions * <LI> a "SQLstate" string, which follows either the XOPEN SQLstate conventions
* or the SQL:2003 conventions. * or the SQL:2003 conventions.
* The values of the SQLState string are described in the appropriate spec. * The values of the SQLState string are described in the appropriate spec.

4
jdk/src/share/classes/java/sql/SQLPermission.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -37,7 +37,7 @@ import java.security.*;
* <code>DriverManager.setLogStream</code> (deprecated) method, * <code>DriverManager.setLogStream</code> (deprecated) method,
* {@code SyncFactory.setJNDIContext} method, * {@code SyncFactory.setJNDIContext} method,
* {@code SyncFactory.setLogger} method, * {@code SyncFactory.setLogger} method,
* {@code Connection.setNetworktimeout} method, * {@code Connection.setNetworkTimeout} method,
* or the <code>Connection.abort</code> method. * or the <code>Connection.abort</code> method.
* If there is no <code>SQLPermission</code> object, these methods * If there is no <code>SQLPermission</code> object, these methods
* throw a <code>java.lang.SecurityException</code> as a runtime exception. * throw a <code>java.lang.SecurityException</code> as a runtime exception.

14
jdk/src/share/classes/java/sql/SQLXML.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -174,7 +174,7 @@ import javax.xml.transform.Source;
* reading APIs are called: getBinaryStream(), getCharacterStream(), getSource(), and getString(). * reading APIs are called: getBinaryStream(), getCharacterStream(), getSource(), and getString().
* Implementations may also change the state to not writable when this occurs. * Implementations may also change the state to not writable when this occurs.
* <p> * <p>
* The state moves from writable to not writeable once free() or any of the * The state moves from writable to not writable once free() or any of the
* writing APIs are called: setBinaryStream(), setCharacterStream(), setResult(), and setString(). * writing APIs are called: setBinaryStream(), setCharacterStream(), setResult(), and setString().
* Implementations may also change the state to not readable when this occurs. * Implementations may also change the state to not readable when this occurs.
* *
@ -192,7 +192,7 @@ public interface SQLXML
{ {
/** /**
* This method closes this object and releases the resources that it held. * This method closes this object and releases the resources that it held.
* The SQL XML object becomes invalid and neither readable or writeable * The SQL XML object becomes invalid and neither readable or writable
* when this method is called. * when this method is called.
* *
* After <code>free</code> has been called, any attempt to invoke a * After <code>free</code> has been called, any attempt to invoke a
@ -231,7 +231,7 @@ public interface SQLXML
* The behavior of this method is the same as ResultSet.updateBinaryStream() * The behavior of this method is the same as ResultSet.updateBinaryStream()
* when the designated column of the ResultSet has a type java.sql.Types of SQLXML. * when the designated column of the ResultSet has a type java.sql.Types of SQLXML.
* <p> * <p>
* The SQL XML object becomes not writeable when this method is called and * The SQL XML object becomes not writable when this method is called and
* may also become not readable depending on implementation. * may also become not readable depending on implementation.
* *
* @return a stream to which data can be written. * @return a stream to which data can be written.
@ -277,7 +277,7 @@ public interface SQLXML
* The behavior of this method is the same as ResultSet.updateCharacterStream() * The behavior of this method is the same as ResultSet.updateCharacterStream()
* when the designated column of the ResultSet has a type java.sql.Types of SQLXML. * when the designated column of the ResultSet has a type java.sql.Types of SQLXML.
* <p> * <p>
* The SQL XML object becomes not writeable when this method is called and * The SQL XML object becomes not writable when this method is called and
* may also become not readable depending on implementation. * may also become not readable depending on implementation.
* *
* @return a stream to which data can be written. * @return a stream to which data can be written.
@ -325,7 +325,7 @@ public interface SQLXML
* The behavior of this method is the same as ResultSet.updateString() * The behavior of this method is the same as ResultSet.updateString()
* when the designated column of the ResultSet has a type java.sql.Types of SQLXML. * when the designated column of the ResultSet has a type java.sql.Types of SQLXML.
* <p> * <p>
* The SQL XML object becomes not writeable when this method is called and * The SQL XML object becomes not writable when this method is called and
* may also become not readable depending on implementation. * may also become not readable depending on implementation.
* *
* @param value the XML value * @param value the XML value
@ -387,7 +387,7 @@ public interface SQLXML
* <p> * <p>
* The systemID of the Result is implementation dependent. * The systemID of the Result is implementation dependent.
* <p> * <p>
* The SQL XML object becomes not writeable when this method is called and * The SQL XML object becomes not writable when this method is called and
* may also become not readable depending on implementation. * may also become not readable depending on implementation.
* <p> * <p>
* Note that SAX is a callback architecture and the returned * Note that SAX is a callback architecture and the returned

4
jdk/src/share/classes/java/sql/Timestamp.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -590,7 +590,7 @@ public class Timestamp extends java.util.Date {
* the provided instant * the provided instant
* @exception NullPointerException if {@code instant} is null. * @exception NullPointerException if {@code instant} is null.
* @exception IllegalArgumentException if the instant is too large to * @exception IllegalArgumentException if the instant is too large to
* represent as a {@code Timesamp} * represent as a {@code Timestamp}
* @since 1.8 * @since 1.8
*/ */
public static Timestamp from(Instant instant) { public static Timestamp from(Instant instant) {

6
jdk/src/share/classes/java/sql/Types.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -243,7 +243,7 @@ public class Types {
public final static int REF = 2006; public final static int REF = 2006;
/** /**
* The constant in the Java programming language, somtimes referred to * The constant in the Java programming language, sometimes referred to
* as a type code, that identifies the generic SQL type <code>DATALINK</code>. * as a type code, that identifies the generic SQL type <code>DATALINK</code>.
* *
* @since 1.4 * @since 1.4
@ -251,7 +251,7 @@ public class Types {
public final static int DATALINK = 70; public final static int DATALINK = 70;
/** /**
* The constant in the Java programming language, somtimes referred to * The constant in the Java programming language, sometimes referred to
* as a type code, that identifies the generic SQL type <code>BOOLEAN</code>. * as a type code, that identifies the generic SQL type <code>BOOLEAN</code>.
* *
* @since 1.4 * @since 1.4

83
jdk/src/share/classes/javax/sql/RowSet.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -66,9 +66,9 @@ import java.util.*;
* changes to its data while it is disconnected and then send the changes back * changes to its data while it is disconnected and then send the changes back
* to the original source of the data, but it must reestablish a connection to do so. * to the original source of the data, but it must reestablish a connection to do so.
* <P> * <P>
* A disconnected rowset may have a reader (a <code>RowSetReader</code> object) * A disconnected rowset may have a {@code Reader} (a <code>RowSetReader</code> object)
* and a writer (a <code>RowSetWriter</code> object) associated with it. * and a writer (a <code>RowSetWriter</code> object) associated with it.
* The reader may be implemented in many different ways to populate a rowset * The {@code Reader} may be implemented in many different ways to populate a rowset
* with data, including getting data from a non-relational data source. The * with data, including getting data from a non-relational data source. The
* writer can also be implemented in many different ways to propagate changes * writer can also be implemented in many different ways to propagate changes
* made to the rowset's data back to the underlying data source. * made to the rowset's data back to the underlying data source.
@ -727,7 +727,7 @@ public interface RowSet extends ResultSet {
/** /**
* Sets the designated parameter in this <code>RowSet</code> object's command * Sets the designated parameter in this <code>RowSet</code> object's command
* to the given <code>java.math.BigDeciaml</code> value. * to the given {@code java.math.BigDecimal} value.
* The driver converts this to * The driver converts this to
* an SQL <code>NUMERIC</code> value before sending it to the database. * an SQL <code>NUMERIC</code> value before sending it to the database.
* *
@ -974,7 +974,7 @@ public interface RowSet extends ResultSet {
* standard interface. * standard interface.
* *
* @param parameterIndex the first parameter is 1, the second is 2, ... * @param parameterIndex the first parameter is 1, the second is 2, ...
* @param reader the <code>Reader</code> object that contains the UNICODE data * @param reader the {@code Reader} object that contains the UNICODE data
* to be set * to be set
* @param length the number of characters in the stream * @param length the number of characters in the stream
* @exception SQLException if a database access error occurs * @exception SQLException if a database access error occurs
@ -984,7 +984,7 @@ public interface RowSet extends ResultSet {
int length) throws SQLException; int length) throws SQLException;
/** /**
* Sets the designated parameter to the given <code>Reader</code> * Sets the designated parameter to the given {@code Reader}
* object, which is the given number of characters long. * object, which is the given number of characters long.
* When a very large UNICODE value is input to a <code>LONGVARCHAR</code> * When a very large UNICODE value is input to a <code>LONGVARCHAR</code>
* parameter, it may be more practical to send it via a * parameter, it may be more practical to send it via a
@ -1112,7 +1112,7 @@ public interface RowSet extends ResultSet {
/** /**
* Sets the designated parameter in this <code>RowSet</code> object's command * Sets the designated parameter in this <code>RowSet</code> object's command
* to the given <code>Reader</code> * to the given {@code Reader}
* object. * object.
* When a very large UNICODE value is input to a <code>LONGVARCHAR</code> * When a very large UNICODE value is input to a <code>LONGVARCHAR</code>
* parameter, it may be more practical to send it via a * parameter, it may be more practical to send it via a
@ -1139,7 +1139,7 @@ public interface RowSet extends ResultSet {
java.io.Reader reader) throws SQLException; java.io.Reader reader) throws SQLException;
/** /**
* Sets the designated parameter to the given <code>Reader</code> * Sets the designated parameter to the given {@code Reader}
* object. * object.
* When a very large UNICODE value is input to a <code>LONGVARCHAR</code> * When a very large UNICODE value is input to a <code>LONGVARCHAR</code>
* parameter, it may be more practical to send it via a * parameter, it may be more practical to send it via a
@ -1167,8 +1167,8 @@ public interface RowSet extends ResultSet {
/** /**
* Sets the designated parameter in this <code>RowSet</code> object's command * Sets the designated parameter in this <code>RowSet</code> object's command
* to a <code>Reader</code> object. The * to a {@code Reader} object. The
* <code>Reader</code> reads the data till end-of-file is reached. The * {@code Reader} reads the data till end-of-file is reached. The
* driver does the necessary conversion from Java character format to * driver does the necessary conversion from Java character format to
* the national character set in the database. * the national character set in the database.
@ -1200,7 +1200,8 @@ public interface RowSet extends ResultSet {
* *
* If the second argument is an <code>InputStream</code> then the stream must contain * If the second argument is an <code>InputStream</code> then the stream must contain
* the number of bytes specified by scaleOrLength. If the second argument is a * the number of bytes specified by scaleOrLength. If the second argument is a
* <code>Reader</code> then the reader must contain the number of characters specified * by scaleOrLength. If these conditions are not true the driver will generate a * {@code Reader} then the {@code Reader} must contain the number of characters specified
* by scaleOrLength. If these conditions are not true the driver will generate a
* <code>SQLException</code> when the prepared statement is executed. * <code>SQLException</code> when the prepared statement is executed.
* *
* <p>The given Java object will be converted to the targetSqlType * <p>The given Java object will be converted to the targetSqlType
@ -1216,7 +1217,7 @@ public interface RowSet extends ResultSet {
* value of the corresponding SQL type. * value of the corresponding SQL type.
* *
* *
* <p>Note that this method may be used to pass datatabase-specific * <p>Note that this method may be used to pass database-specific
* abstract data types. * abstract data types.
* *
* @param parameterIndex the first parameter is 1, the second is 2, ... * @param parameterIndex the first parameter is 1, the second is 2, ...
@ -1227,9 +1228,9 @@ public interface RowSet extends ResultSet {
* @param scaleOrLength for <code>java.sql.Types.DECIMAL</code> * @param scaleOrLength for <code>java.sql.Types.DECIMAL</code>
* or <code>java.sql.Types.NUMERIC types</code>, * or <code>java.sql.Types.NUMERIC types</code>,
* this is the number of digits after the decimal point. For * this is the number of digits after the decimal point. For
* Java Object types <code>InputStream</code> and <code>Reader</code>, * Java Object types <code>InputStream</code> and {@code Reader},
* this is the length * this is the length
* of the data in the stream or reader. For all other types, * of the data in the stream or {@code Reader}. For all other types,
* this value will be ignored. * this value will be ignored.
* @exception SQLException if a database access error occurs * @exception SQLException if a database access error occurs
* @see java.sql.Types * @see java.sql.Types
@ -1255,7 +1256,7 @@ public interface RowSet extends ResultSet {
* or <code>Array</code>, the driver should pass it to the database as a * or <code>Array</code>, the driver should pass it to the database as a
* value of the corresponding SQL type. * value of the corresponding SQL type.
* <P> * <P>
* Note that this method may be used to pass datatabase- * Note that this method may be used to pass database-
* specific abstract data types. * specific abstract data types.
* *
* @param parameterName the name of the parameter * @param parameterName the name of the parameter
@ -1335,7 +1336,7 @@ public interface RowSet extends ResultSet {
* will be converted to the corresponding SQL type before being * will be converted to the corresponding SQL type before being
* sent to the database. * sent to the database.
* *
* <p>Note that this method may be used to pass datatabase- * <p>Note that this method may be used to pass database-
* specific abstract data types, by using a driver-specific Java * specific abstract data types, by using a driver-specific Java
* type. * type.
* *
@ -1373,7 +1374,7 @@ public interface RowSet extends ResultSet {
* given Java object to its standard SQL mapping before sending it * given Java object to its standard SQL mapping before sending it
* to the database. * to the database.
* *
* <p>Note that this method may be used to pass datatabase-specific * <p>Note that this method may be used to pass database-specific
* abstract data types by using a driver-specific Java type. * abstract data types by using a driver-specific Java type.
* *
* If the object is of a class implementing <code>SQLData</code>, * If the object is of a class implementing <code>SQLData</code>,
@ -1420,7 +1421,8 @@ public interface RowSet extends ResultSet {
void setBlob (int i, Blob x) throws SQLException; void setBlob (int i, Blob x) throws SQLException;
/** /**
* Sets the designated parameter to a <code>InputStream</code> object. The inputstream must contain the number * Sets the designated parameter to a <code>InputStream</code> object.
* The <code>InputStream</code> must contain the number
* of characters specified by length otherwise a <code>SQLException</code> will be * of characters specified by length otherwise a <code>SQLException</code> will be
* generated when the <code>PreparedStatement</code> is executed. * generated when the <code>PreparedStatement</code> is executed.
* This method differs from the <code>setBinaryStream (int, InputStream, int)</code> * This method differs from the <code>setBinaryStream (int, InputStream, int)</code>
@ -1437,7 +1439,7 @@ public interface RowSet extends ResultSet {
* this method is called on a closed <code>PreparedStatement</code>, * this method is called on a closed <code>PreparedStatement</code>,
* if parameterIndex does not correspond * if parameterIndex does not correspond
* to a parameter marker in the SQL statement, if the length specified * to a parameter marker in the SQL statement, if the length specified
* is less than zero or if the number of bytes in the inputstream does not match * is less than zero or if the number of bytes in the <code>InputStream</code> does not match
* the specified length. * the specified length.
* @throws SQLFeatureNotSupportedException if the JDBC driver does not support this method * @throws SQLFeatureNotSupportedException if the JDBC driver does not support this method
* *
@ -1474,7 +1476,8 @@ public interface RowSet extends ResultSet {
throws SQLException; throws SQLException;
/** /**
* Sets the designated parameter to a <code>InputStream</code> object. The <code>inputstream</code> must contain the number * Sets the designated parameter to a <code>InputStream</code> object.
* The "{@code InputStream} must contain the number
* of characters specified by length, otherwise a <code>SQLException</code> will be * of characters specified by length, otherwise a <code>SQLException</code> will be
* generated when the <code>CallableStatement</code> is executed. * generated when the <code>CallableStatement</code> is executed.
* This method differs from the <code>setBinaryStream (int, InputStream, int)</code> * This method differs from the <code>setBinaryStream (int, InputStream, int)</code>
@ -1491,7 +1494,7 @@ public interface RowSet extends ResultSet {
* @param length the number of bytes in the parameter data. * @param length the number of bytes in the parameter data.
* @throws SQLException if parameterIndex does not correspond * @throws SQLException if parameterIndex does not correspond
* to a parameter marker in the SQL statement, or if the length specified * to a parameter marker in the SQL statement, or if the length specified
* is less than zero; if the number of bytes in the inputstream does not match * is less than zero; if the number of bytes in the <code>InputStream</code> does not match
* the specified length; if a database access error occurs or * the specified length; if a database access error occurs or
* this method is called on a closed <code>CallableStatement</code> * this method is called on a closed <code>CallableStatement</code>
* @exception SQLFeatureNotSupportedException if the JDBC driver does not support * @exception SQLFeatureNotSupportedException if the JDBC driver does not support
@ -1554,7 +1557,8 @@ public interface RowSet extends ResultSet {
void setClob (int i, Clob x) throws SQLException; void setClob (int i, Clob x) throws SQLException;
/** /**
* Sets the designated parameter to a <code>Reader</code> object. The reader must contain the number * Sets the designated parameter to a {@code Reader} object.
* The {@code Reader} must contain the number
* of characters specified by length otherwise a <code>SQLException</code> will be * of characters specified by length otherwise a <code>SQLException</code> will be
* generated when the <code>PreparedStatement</code> is executed. * generated when the <code>PreparedStatement</code> is executed.
*This method differs from the <code>setCharacterStream (int, Reader, int)</code> method *This method differs from the <code>setCharacterStream (int, Reader, int)</code> method
@ -1576,7 +1580,7 @@ public interface RowSet extends ResultSet {
throws SQLException; throws SQLException;
/** /**
* Sets the designated parameter to a <code>Reader</code> object. * Sets the designated parameter to a {@code Reader} object.
* This method differs from the <code>setCharacterStream (int, Reader)</code> method * This method differs from the <code>setCharacterStream (int, Reader)</code> method
* because it informs the driver that the parameter value should be sent to * because it informs the driver that the parameter value should be sent to
* the server as a <code>CLOB</code>. When the <code>setCharacterStream</code> method is used, the * the server as a <code>CLOB</code>. When the <code>setCharacterStream</code> method is used, the
@ -1600,7 +1604,8 @@ public interface RowSet extends ResultSet {
throws SQLException; throws SQLException;
/** /**
* Sets the designated parameter to a <code>Reader</code> object. The <code>reader</code> must contain the number * Sets the designated parameter to a {@code Reader} object. The
* {@code Reader} must contain the number
* of characters specified by length otherwise a <code>SQLException</code> will be * of characters specified by length otherwise a <code>SQLException</code> will be
* generated when the <code>CallableStatement</code> is executed. * generated when the <code>CallableStatement</code> is executed.
* This method differs from the <code>setCharacterStream (int, Reader, int)</code> method * This method differs from the <code>setCharacterStream (int, Reader, int)</code> method
@ -1639,7 +1644,7 @@ public interface RowSet extends ResultSet {
void setClob (String parameterName, Clob x) throws SQLException; void setClob (String parameterName, Clob x) throws SQLException;
/** /**
* Sets the designated parameter to a <code>Reader</code> object. * Sets the designated parameter to a {@code Reader} object.
* This method differs from the <code>setCharacterStream (int, Reader)</code> method * This method differs from the <code>setCharacterStream (int, Reader)</code> method
* because it informs the driver that the parameter value should be sent to * because it informs the driver that the parameter value should be sent to
* the server as a <code>CLOB</code>. When the <code>setCharacterStream</code> method is used, the * the server as a <code>CLOB</code>. When the <code>setCharacterStream</code> method is used, the
@ -1859,10 +1864,10 @@ public interface RowSet extends ResultSet {
* outstanding updates, they are ignored. * outstanding updates, they are ignored.
* <P> * <P>
* If this <code>RowSet</code> object does not maintain a continuous connection * If this <code>RowSet</code> object does not maintain a continuous connection
* with its source of data, it may use a reader (a <code>RowSetReader</code> * with its source of data, it may use a {@code Reader} (a <code>RowSetReader</code>
* object) to fill itself with data. In this case, a reader will have been * object) to fill itself with data. In this case, a {@code Reader} will have been
* registered with this <code>RowSet</code> object, and the method * registered with this <code>RowSet</code> object, and the method
* <code>execute</code> will call on the reader's <code>readData</code> * <code>execute</code> will call on the {@code Reader}'s <code>readData</code>
* method as part of its implementation. * method as part of its implementation.
* *
* @exception SQLException if a database access error occurs or any of the * @exception SQLException if a database access error occurs or any of the
@ -1987,8 +1992,8 @@ public interface RowSet extends ResultSet {
throws SQLException; throws SQLException;
/** /**
* Sets the designated parameter to a <code>Reader</code> object. The * Sets the designated parameter to a {@code Reader} object. The
* <code>Reader</code> reads the data till end-of-file is reached. The * {@code Reader} reads the data till end-of-file is reached. The
* driver does the necessary conversion from Java character format to * driver does the necessary conversion from Java character format to
* the national character set in the database. * the national character set in the database.
* @param parameterIndex of the first parameter is 1, the second is 2, ... * @param parameterIndex of the first parameter is 1, the second is 2, ...
@ -2002,8 +2007,8 @@ public interface RowSet extends ResultSet {
void setNCharacterStream(int parameterIndex, Reader value, long length) throws SQLException; void setNCharacterStream(int parameterIndex, Reader value, long length) throws SQLException;
/** /**
* Sets the designated parameter to a <code>Reader</code> object. The * Sets the designated parameter to a {@code Reader} object. The
* <code>Reader</code> reads the data till end-of-file is reached. The * {@code Reader} reads the data till end-of-file is reached. The
* driver does the necessary conversion from Java character format to * driver does the necessary conversion from Java character format to
* the national character set in the database. * the national character set in the database.
* @param parameterName the name of the column to be set * @param parameterName the name of the column to be set
@ -2018,8 +2023,8 @@ public interface RowSet extends ResultSet {
throws SQLException; throws SQLException;
/** /**
* Sets the designated parameter to a <code>Reader</code> object. The * Sets the designated parameter to a {@code Reader} object. The
* <code>Reader</code> reads the data till end-of-file is reached. The * {@code Reader} reads the data till end-of-file is reached. The
* driver does the necessary conversion from Java character format to * driver does the necessary conversion from Java character format to
* the national character set in the database. * the national character set in the database.
@ -2055,7 +2060,8 @@ public interface RowSet extends ResultSet {
void setNClob(String parameterName, NClob value) throws SQLException; void setNClob(String parameterName, NClob value) throws SQLException;
/** /**
* Sets the designated parameter to a <code>Reader</code> object. The <code>reader</code> must contain the number * Sets the designated parameter to a {@code Reader} object.
* The {@code Reader} must contain the number
* of characters specified by length otherwise a <code>SQLException</code> will be * of characters specified by length otherwise a <code>SQLException</code> will be
* generated when the <code>CallableStatement</code> is executed. * generated when the <code>CallableStatement</code> is executed.
* This method differs from the <code>setCharacterStream (int, Reader, int)</code> method * This method differs from the <code>setCharacterStream (int, Reader, int)</code> method
@ -2081,7 +2087,7 @@ public interface RowSet extends ResultSet {
throws SQLException; throws SQLException;
/** /**
* Sets the designated parameter to a <code>Reader</code> object. * Sets the designated parameter to a {@code Reader} object.
* This method differs from the <code>setCharacterStream (int, Reader)</code> method * This method differs from the <code>setCharacterStream (int, Reader)</code> method
* because it informs the driver that the parameter value should be sent to * because it informs the driver that the parameter value should be sent to
* the server as a <code>NCLOB</code>. When the <code>setCharacterStream</code> method is used, the * the server as a <code>NCLOB</code>. When the <code>setCharacterStream</code> method is used, the
@ -2105,7 +2111,8 @@ public interface RowSet extends ResultSet {
throws SQLException; throws SQLException;
/** /**
* Sets the designated parameter to a <code>Reader</code> object. The reader must contain the number * Sets the designated parameter to a {@code Reader} object.
* The {@code Reader} must contain the number
* of characters specified by length otherwise a <code>SQLException</code> will be * of characters specified by length otherwise a <code>SQLException</code> will be
* generated when the <code>PreparedStatement</code> is executed. * generated when the <code>PreparedStatement</code> is executed.
* This method differs from the <code>setCharacterStream (int, Reader, int)</code> method * This method differs from the <code>setCharacterStream (int, Reader, int)</code> method
@ -2142,7 +2149,7 @@ public interface RowSet extends ResultSet {
void setNClob(int parameterIndex, NClob value) throws SQLException; void setNClob(int parameterIndex, NClob value) throws SQLException;
/** /**
* Sets the designated parameter to a <code>Reader</code> object. * Sets the designated parameter to a {@code Reader} object.
* This method differs from the <code>setCharacterStream (int, Reader)</code> method * This method differs from the <code>setCharacterStream (int, Reader)</code> method
* because it informs the driver that the parameter value should be sent to * because it informs the driver that the parameter value should be sent to
* the server as a <code>NCLOB</code>. When the <code>setCharacterStream</code> method is used, the * the server as a <code>NCLOB</code>. When the <code>setCharacterStream</code> method is used, the

892
jdk/src/share/classes/javax/sql/rowset/BaseRowSet.java
View File

File diff suppressed because it is too large Load Diff

16
jdk/src/share/classes/javax/sql/rowset/CachedRowSet.java
View File

@ -286,7 +286,7 @@ import javax.sql.rowset.spi.*;
* <code>setSyncProvider</code>. * <code>setSyncProvider</code>.
* <P> * <P>
* In order to use the optimistic concurrency control routine, the * In order to use the optimistic concurrency control routine, the
* <code>RIOptismisticProvider</code> maintains both its current * <code>RIOptimisticProvider</code> maintains both its current
* value and its original value (the value it had immediately preceding the * value and its original value (the value it had immediately preceding the
* current value). Note that if no changes have been made to the data in a * current value). Note that if no changes have been made to the data in a
* <code>RowSet</code> object, its current values and its original values are the same, * <code>RowSet</code> object, its current values and its original values are the same,
@ -351,7 +351,7 @@ import javax.sql.rowset.spi.*;
* <code>CachedRowSet</code> object can be used to augment the * <code>CachedRowSet</code> object can be used to augment the
* capabilities of a JDBC technology-enabled driver (hereafter called a * capabilities of a JDBC technology-enabled driver (hereafter called a
* "JDBC driver") when the DBMS does not provide full support for scrolling and * "JDBC driver") when the DBMS does not provide full support for scrolling and
* updating. To achieve the effect of making a non-scrollble and read-only * updating. To achieve the effect of making a non-scrollable and read-only
* <code>ResultSet</code> object scrollable and updatable, a programmer * <code>ResultSet</code> object scrollable and updatable, a programmer
* simply needs to create a <code>CachedRowSet</code> object populated * simply needs to create a <code>CachedRowSet</code> object populated
* with that <code>ResultSet</code> object's data. This is demonstrated * with that <code>ResultSet</code> object's data. This is demonstrated
@ -732,7 +732,7 @@ public interface CachedRowSet extends RowSet, Joinable {
* Note: The <code>acceptChanges()</code> method will determine if the * Note: The <code>acceptChanges()</code> method will determine if the
* <code>COMMIT_ON_ACCEPT_CHANGES</code> is set to true or not. If it is set * <code>COMMIT_ON_ACCEPT_CHANGES</code> is set to true or not. If it is set
* to true, all updates in the synchronization are committed to the data * to true, all updates in the synchronization are committed to the data
* source. Otherwise, the application <b>must</b> explicity call the * source. Otherwise, the application <b>must</b> explicitly call the
* <code>commit()</code> or <code>rollback()</code> methods as appropriate. * <code>commit()</code> or <code>rollback()</code> methods as appropriate.
* *
* @throws SyncProviderException if the underlying * @throws SyncProviderException if the underlying
@ -801,7 +801,7 @@ public interface CachedRowSet extends RowSet, Joinable {
* Note: The <code>acceptChanges()</code> method will determine if the * Note: The <code>acceptChanges()</code> method will determine if the
* <code>COMMIT_ON_ACCEPT_CHANGES</code> is set to true or not. If it is set * <code>COMMIT_ON_ACCEPT_CHANGES</code> is set to true or not. If it is set
* to true, all updates in the synchronization are committed to the data * to true, all updates in the synchronization are committed to the data
* source. Otherwise, the application <b>must</b> explicity call the * source. Otherwise, the application <b>must</b> explicitly call the
* <code>commit</code> or <code>rollback</code> methods as appropriate. * <code>commit</code> or <code>rollback</code> methods as appropriate.
* *
* @param con a standard JDBC <code>Connection</code> object * @param con a standard JDBC <code>Connection</code> object
@ -850,7 +850,7 @@ public interface CachedRowSet extends RowSet, Joinable {
* associated updates are fully cleared, thus preventing 'dirty' reads by * associated updates are fully cleared, thus preventing 'dirty' reads by
* other components that hold a reference to this <code>RowSet</code> object. * other components that hold a reference to this <code>RowSet</code> object.
* In addition, the contents cannot be released * In addition, the contents cannot be released
* until all all components reading this <code>CachedRowSet</code> object * until all components reading this <code>CachedRowSet</code> object
* have completed their reads. This <code>CachedRowSet</code> object * have completed their reads. This <code>CachedRowSet</code> object
* should be returned to normal behavior after firing the * should be returned to normal behavior after firing the
* <code>rowSetChanged</code> event. * <code>rowSetChanged</code> event.
@ -934,7 +934,7 @@ public interface CachedRowSet extends RowSet, Joinable {
* effect until further modification to the rowset data has occurred. * effect until further modification to the rowset data has occurred.
* *
* @throws SQLException if the cursor is before the first row or after the last * @throws SQLException if the cursor is before the first row or after the last
* row in in this <code>CachedRowSet</code> object * row in this <code>CachedRowSet</code> object
* @see #undoDelete * @see #undoDelete
* @see #undoInsert * @see #undoInsert
* @see java.sql.ResultSet#cancelRowUpdates * @see java.sql.ResultSet#cancelRowUpdates
@ -1071,7 +1071,7 @@ public interface CachedRowSet extends RowSet, Joinable {
* <code>CachedRowSet</code> object. Internally, this method is used by a rowset * <code>CachedRowSet</code> object. Internally, this method is used by a rowset
* to trigger read or write actions between the rowset * to trigger read or write actions between the rowset
* and the data source. For example, a rowset may need to get a handle * and the data source. For example, a rowset may need to get a handle
* on the the rowset reader (<code>RowSetReader</code> object) from the * on the rowset reader (<code>RowSetReader</code> object) from the
* <code>SyncProvider</code> to allow the rowset to be populated. * <code>SyncProvider</code> to allow the rowset to be populated.
* <pre> * <pre>
* RowSetReader rowsetReader = null; * RowSetReader rowsetReader = null;
@ -1096,7 +1096,7 @@ public interface CachedRowSet extends RowSet, Joinable {
* it currently has set. * it currently has set.
* *
* @return the <code>SyncProvider</code> object that was set when the rowset * @return the <code>SyncProvider</code> object that was set when the rowset
* was instantiated, or if none was was set, the default provider * was instantiated, or if none was set, the default provider
* @throws SQLException if an error occurs while returning the * @throws SQLException if an error occurs while returning the
* <code>SyncProvider</code> object * <code>SyncProvider</code> object
* @see #setSyncProvider * @see #setSyncProvider

2
jdk/src/share/classes/javax/sql/rowset/FilteredRowSet.java
View File

@ -108,7 +108,7 @@ import java.math.*;
* The <code>FilteredRowSet</code> range criterion can be modified by applying * The <code>FilteredRowSet</code> range criterion can be modified by applying
* a new <code>Predicate</code> object to the <code>FilteredRowSet</code> * a new <code>Predicate</code> object to the <code>FilteredRowSet</code>
* instance at any time. This is possible if no additional references to the * instance at any time. This is possible if no additional references to the
* <code>FilteredRowSet</code> object are detected. A new filter has has an * <code>FilteredRowSet</code> object are detected. A new filter has an
* immediate effect on criterion enforcement within the * immediate effect on criterion enforcement within the
* <code>FilteredRowSet</code> object, and all subsequent views and updates will be * <code>FilteredRowSet</code> object, and all subsequent views and updates will be
* subject to similar enforcement. * subject to similar enforcement.

4
jdk/src/share/classes/javax/sql/rowset/JoinRowSet.java
View File

@ -111,7 +111,7 @@ import javax.sql.rowset.*;
* and they do not have to store the exact same data type as long as the data types * and they do not have to store the exact same data type as long as the data types
* can be compared. * can be compared.
* <P> * <P>
* A match column can be be set in two ways: * A match column can be set in two ways:
* <ul> * <ul>
* <li>By calling the <code>Joinable</code> method <code>setMatchColumn</code><br> * <li>By calling the <code>Joinable</code> method <code>setMatchColumn</code><br>
* This is the only method that can set the match column before a <code>RowSet</code> * This is the only method that can set the match column before a <code>RowSet</code>
@ -527,7 +527,7 @@ public interface JoinRowSet extends WebRowSet {
public static int RIGHT_OUTER_JOIN = 3; public static int RIGHT_OUTER_JOIN = 3;
/** /**
* An ANSI-style <code>JOIN</code> providing a a full JOIN. Specifies that all * An ANSI-style <code>JOIN</code> providing a full JOIN. Specifies that all
* rows from either table be returned regardless of matching * rows from either table be returned regardless of matching
* records on the other table. * records on the other table.
*/ */

4
jdk/src/share/classes/javax/sql/rowset/Predicate.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -102,7 +102,7 @@ import java.sql.*;
*/ */
// <h3>3.0 FilteredRowSet Internals</h3> // <h3>3.0 FilteredRowSet Internals</h3>
// internalNext, Frist, Last. Discuss guidelines on how to approach this // internalNext, First, Last. Discuss guidelines on how to approach this
// and cite examples in reference implementations. // and cite examples in reference implementations.
public interface Predicate { public interface Predicate {
/** /**

8
jdk/src/share/classes/javax/sql/rowset/RowSetMetaDataImpl.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -607,7 +607,7 @@ public class RowSetMetaDataImpl implements RowSetMetaData, Serializable {
} }
/** /**
* Retrieves the the suggested column title for the designated * Retrieves the suggested column title for the designated
* column for use in printouts and displays. * column for use in printouts and displays.
* *
* @param columnIndex the first column is 1, the second is 2, and so on; * @param columnIndex the first column is 1, the second is 2, and so on;
@ -1073,7 +1073,7 @@ public class RowSetMetaDataImpl implements RowSetMetaData, Serializable {
public int colType; public int colType;
/** /**
* The field that holds the the type name used by this particular data source * The field that holds the type name used by this particular data source
* for the value stored in this column. * for the value stored in this column.
* *
* @serial * @serial
@ -1081,7 +1081,7 @@ public class RowSetMetaDataImpl implements RowSetMetaData, Serializable {
public String colTypeName; public String colTypeName;
/** /**
* The field that holds the updatablity boolean per column of a RowSet * The field that holds the updatability boolean per column of a RowSet
* *
* @serial * @serial
*/ */

2
jdk/src/share/classes/javax/sql/rowset/RowSetProvider.java
View File

@ -97,7 +97,7 @@ public class RowSetProvider {
* The {@link ServiceLoader} API. The {@code ServiceLoader} API will look * The {@link ServiceLoader} API. The {@code ServiceLoader} API will look
* for a class name in the file * for a class name in the file
* {@code META-INF/services/javax.sql.rowset.RowSetFactory} * {@code META-INF/services/javax.sql.rowset.RowSetFactory}
* in jars available to the runtime. For example, to have the the RowSetFactory * in jars available to the runtime. For example, to have the RowSetFactory
* implementation {@code com.sun.rowset.RowSetFactoryImpl } loaded, the * implementation {@code com.sun.rowset.RowSetFactoryImpl } loaded, the
* entry in {@code META-INF/services/javax.sql.rowset.RowSetFactory} would be: * entry in {@code META-INF/services/javax.sql.rowset.RowSetFactory} would be:
* <ul> * <ul>

4
jdk/src/share/classes/javax/sql/rowset/RowSetWarning.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -111,7 +111,7 @@ public class RowSetWarning extends SQLException {
* @param reason a <code>String</code> giving a description of the * @param reason a <code>String</code> giving a description of the
* warning; * warning;
* @param SQLState an XOPEN code identifying the warning; if a non standard * @param SQLState an XOPEN code identifying the warning; if a non standard
* XPOEN <i>SQLState</i> is supplied, no exception is thrown. * XOPEN <i>SQLState</i> is supplied, no exception is thrown.
* @param vendorCode a database vendor-specific warning code * @param vendorCode a database vendor-specific warning code
*/ */
public RowSetWarning(java.lang.String reason, java.lang.String SQLState, int vendorCode) { public RowSetWarning(java.lang.String reason, java.lang.String SQLState, int vendorCode) {

6
jdk/src/share/classes/javax/sql/rowset/WebRowSet.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -52,7 +52,7 @@ import org.xml.sax.*;
* of the {@code WebRowSet} interface to ensure interoperability. In addition, * of the {@code WebRowSet} interface to ensure interoperability. In addition,
* the {@code WebRowSet} schema uses specific SQL/XML Schema annotations, * the {@code WebRowSet} schema uses specific SQL/XML Schema annotations,
* thus ensuring greater cross * thus ensuring greater cross
* platform inter-operability. This is an effort currently under way at the ISO * platform interoperability. This is an effort currently under way at the ISO
* organization. The SQL/XML definition is available at the following URI: * organization. The SQL/XML definition is available at the following URI:
* <ul> * <ul>
* <li> * <li>
@ -109,7 +109,7 @@ import org.xml.sax.*;
* <max-rows>0</max-rows> * <max-rows>0</max-rows>
* <query-timeout>0</query-timeout> * <query-timeout>0</query-timeout>
* <read-only>false</read-only> * <read-only>false</read-only>
* <rowset-type>TRANSACTION_READ_UNCOMMITED</rowset-type> * <rowset-type>TRANSACTION_READ_UNCOMMITTED</rowset-type>
* <show-deleted>false</show-deleted> * <show-deleted>false</show-deleted>
* <table-name/> * <table-name/>
* <url>jdbc:thin:oracle</url> * <url>jdbc:thin:oracle</url>

2
jdk/src/share/classes/javax/sql/rowset/package.html
View File

@ -156,7 +156,7 @@ no-argument constructor.
<li><b>3.2 Role of the <code>BaseRowSet</code> Class</b> <li><b>3.2 Role of the <code>BaseRowSet</code> Class</b>
<p> <p>
A compliant JDBC <code>RowSet</code> implementation <b>must</b> implement one or more A compliant JDBC <code>RowSet</code> implementation <b>must</b> implement one or more
standard interfaces specified in this package and and <b>may</b> extend the standard interfaces specified in this package and <b>may</b> extend the
<a href="BaseRowSet.html"><code>BaseRowSet</code></a> abstract class. For example, a <a href="BaseRowSet.html"><code>BaseRowSet</code></a> abstract class. For example, a
<code>CachedRowSet</code> implementation must implement the <code>CachedRowSet</code> <code>CachedRowSet</code> implementation must implement the <code>CachedRowSet</code>
interface and extend the <code>BaseRowSet</code> abstract class. The interface and extend the <code>BaseRowSet</code> abstract class. The

5
jdk/src/share/classes/javax/sql/rowset/serial/SerialArray.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -202,7 +202,7 @@ public class SerialArray implements Array, Serializable, Cloneable {
} }
/** /**
* This method frees the {@code SeriableArray} object and releases the * This method frees the {@code SerialArray} object and releases the
* resources that it holds. The object is invalid once the {@code free} * resources that it holds. The object is invalid once the {@code free}
* method is called. <p> If {@code free} is called multiple times, the * method is called. <p> If {@code free} is called multiple times, the
* subsequent calls to {@code free} are treated as a no-op. </P> * subsequent calls to {@code free} are treated as a no-op. </P>
@ -313,7 +313,6 @@ public class SerialArray implements Array, Serializable, Cloneable {
return dst; return dst;
} }
//[if an error occurstype map used??]
/** /**
* Returns a new array that is a copy of this <code>SerialArray</code> * Returns a new array that is a copy of this <code>SerialArray</code>
* object, using the given type map for the custom * object, using the given type map for the custom

6
jdk/src/share/classes/javax/sql/rowset/serial/SerialBlob.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -475,7 +475,7 @@ public class SerialBlob implements Blob, Serializable, Cloneable {
/** /**
* This method frees the {@code SeriableBlob} object and releases the * This method frees the {@code SerialBlob} object and releases the
* resources that it holds. The object is invalid once the {@code free} * resources that it holds. The object is invalid once the {@code free}
* method is called. <p> If {@code free} is called multiple times, the * method is called. <p> If {@code free} is called multiple times, the
* subsequent calls to {@code free} are treated as a no-op. </P> * subsequent calls to {@code free} are treated as a no-op. </P>
@ -578,7 +578,7 @@ public class SerialBlob implements Blob, Serializable, Cloneable {
fields.put("len", len); fields.put("len", len);
fields.put("origLen", origLen); fields.put("origLen", origLen);
// Note: this check to see if it is an instance of Serializable // Note: this check to see if it is an instance of Serializable
// is for backwards compatibiity // is for backwards compatibility
fields.put("blob", blob instanceof Serializable ? blob : null); fields.put("blob", blob instanceof Serializable ? blob : null);
s.writeFields(); s.writeFields();
} }

6
jdk/src/share/classes/javax/sql/rowset/serial/SerialClob.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -565,7 +565,7 @@ public class SerialClob implements Clob, Serializable, Cloneable {
} }
/** /**
* This method frees the {@code SeriableClob} object and releases the * This method frees the {@code SerialClob} object and releases the
* resources that it holds. * resources that it holds.
* The object is invalid once the {@code free} method is called. * The object is invalid once the {@code free} method is called.
* <p> * <p>
@ -670,7 +670,7 @@ public class SerialClob implements Clob, Serializable, Cloneable {
fields.put("len", len); fields.put("len", len);
fields.put("origLen", origLen); fields.put("origLen", origLen);
// Note: this check to see if it is an instance of Serializable // Note: this check to see if it is an instance of Serializable
// is for backwards compatibiity // is for backwards compatibility
fields.put("clob", clob instanceof Serializable ? clob : null); fields.put("clob", clob instanceof Serializable ? clob : null);
s.writeFields(); s.writeFields();
} }

2
jdk/src/share/classes/javax/sql/rowset/serial/SerialDatalink.java
View File

@ -61,7 +61,7 @@ public class SerialDatalink implements Serializable, Cloneable {
/** /**
* The SQL type of the elements in this <code>SerialDatalink</code> * The SQL type of the elements in this <code>SerialDatalink</code>
* object. The type is expressed as one of the contants from the * object. The type is expressed as one of the constants from the
* class <code>java.sql.Types</code>. * class <code>java.sql.Types</code>.
* @serial * @serial
*/ */

4
jdk/src/share/classes/javax/sql/rowset/serial/SerialRef.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -243,7 +243,7 @@ public class SerialRef implements Ref, Serializable, Cloneable {
fields.put("baseTypeName", baseTypeName); fields.put("baseTypeName", baseTypeName);
fields.put("object", object); fields.put("object", object);
// Note: this check to see if it is an instance of Serializable // Note: this check to see if it is an instance of Serializable
// is for backwards compatibiity // is for backwards compatibility
fields.put("reference", reference instanceof Serializable ? reference : null); fields.put("reference", reference instanceof Serializable ? reference : null);
s.writeFields(); s.writeFields();
} }

4
jdk/src/share/classes/javax/sql/rowset/serial/package.html
View File

@ -87,7 +87,7 @@ materialized on the client as a stream of Unicode characters. <br>
<h3>5.0 SerialDatalink</h3> <h3>5.0 SerialDatalink</h3>
A serializable mapping in the Java programming language of an SQL DATALINK A serializable mapping in the Java programming language of an SQL DATALINK
value. A DATALINK value references a file outside of the underlying data source value. A DATALINK value references a file outside of the underlying data source
that the the originating data source manages. <br> that the originating data source manages. <br>
<br> <br>
<code>RowSet</code> implementations can use the method <tt>RowSet.getURL() </tt>to retrieve <code>RowSet</code> implementations can use the method <tt>RowSet.getURL() </tt>to retrieve
a <code>java.net.URL</code> object, which can be used to manipulate the external data. a <code>java.net.URL</code> object, which can be used to manipulate the external data.
@ -141,7 +141,7 @@ type that has a custom mapping; a programmer never invokes <tt>SQLInputImpl
The <tt>SQLInputImpl</tt> class provides a set of reader methods The <tt>SQLInputImpl</tt> class provides a set of reader methods
analogous to the <tt>ResultSet</tt> getter methods. These methods make it analogous to the <tt>ResultSet</tt> getter methods. These methods make it
possible to read the values in an <tt>SQLInputImpl</tt> object. The method possible to read the values in an <tt>SQLInputImpl</tt> object. The method
<code>wasNull</code> is used to determine whether the the last value read was SQL NULL. <code>wasNull</code> is used to determine whether the last value read was SQL NULL.
<br> <br>
<br> <br>
When a constructor or getter method that takes a <code>Map</code> object is called, When a constructor or getter method that takes a <code>Map</code> object is called,

4
jdk/src/share/classes/javax/sql/rowset/spi/SyncFactory.java
View File

@ -259,7 +259,7 @@ public class SyncFactory {
private static Hashtable<String, SyncProvider> implementations; private static Hashtable<String, SyncProvider> implementations;
/** /**
* Adds the the given synchronization provider to the factory register. Guidelines * Adds the given synchronization provider to the factory register. Guidelines
* are provided in the <code>SyncProvider</code> specification for the * are provided in the <code>SyncProvider</code> specification for the
* required naming conventions for <code>SyncProvider</code> * required naming conventions for <code>SyncProvider</code>
* implementations. * implementations.
@ -462,7 +462,7 @@ public class SyncFactory {
/** /**
* Internal handler for all standard property parsing. Parses standard * Internal handler for all standard property parsing. Parses standard
* ROWSET properties and stores lazy references into the the internal registry. * ROWSET properties and stores lazy references into the internal registry.
*/ */
private static void parseProperties(Properties p) { private static void parseProperties(Properties p) {

2
jdk/src/share/classes/javax/sql/rowset/spi/SyncProvider.java
View File

@ -173,7 +173,7 @@ import javax.sql.*;
* are used as return values or parameters for <code>SyncProvider</code> methods. * are used as return values or parameters for <code>SyncProvider</code> methods.
* <code>SyncProvider</code> objects may be implemented to perform synchronization * <code>SyncProvider</code> objects may be implemented to perform synchronization
* between a <code>RowSet</code> object and its underlying data source with varying * between a <code>RowSet</code> object and its underlying data source with varying
* degrees of of care. The first group of constants indicate how synchronization * degrees of care. The first group of constants indicate how synchronization
* is handled. For example, <code>GRADE_NONE</code> indicates that a * is handled. For example, <code>GRADE_NONE</code> indicates that a
* <code>SyncProvider</code> object will not take any care to see what data is * <code>SyncProvider</code> object will not take any care to see what data is
* valid and will simply write the <code>RowSet</code> data to the data source. * valid and will simply write the <code>RowSet</code> data to the data source.

2
jdk/src/share/classes/javax/sql/rowset/spi/package.html
View File

@ -122,7 +122,7 @@ groups have considered offering XML-based synchronization. For details, see
<a href="http://www.syncml.org">http://www.syncml.org</a> <a href="http://www.syncml.org">http://www.syncml.org</a>
</PRE> </PRE>
<P> <P>
For the the next level up, the For the next level up, the
writer checks to see if there are any conflicts, and if there are, writer checks to see if there are any conflicts, and if there are,
it does not write anything to the data source. The problem with this concurrency it does not write anything to the data source. The problem with this concurrency
level is that if another party has modified the corresponding data in the data source level is that if another party has modified the corresponding data in the data source