harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r413642 [8/12] - in /incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java: java/sql/ javax/sql/ javax/transaction/ javax/transaction/xa/ org/apache/harmony/sql/internal/common/
Date Mon, 12 Jun 2006 12:13:44 GMT
Modified: incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/ResultSetMetaData.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/ResultSetMetaData.java?rev=413642&r1=413641&r2=413642&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/ResultSetMetaData.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/ResultSetMetaData.java Mon Jun 12 05:13:42 2006
@@ -17,263 +17,259 @@
 
 /**
  * Provides information about the columns in a ResultSet.
- * 
- * TODO - get field values correct
- * 
  */
 public interface ResultSetMetaData {
 
-	/**
-	 * Indicates that a column cannot contain NULL values
-	 */
-	public static int columnNoNulls = 0;
-
-	/**
-	 * Indicates that a column can contain NULL values
-	 */
-	public static int columnNullable = 1;
-
-	/**
-	 * Indicates that it is unknown whether a column can contain NULLs or not
-	 */
-	public static int columnNullableUnknown = 2;
-
-	/**
-	 * Returns the title of indexed columns catalog
-	 * 
-	 * @param column
-	 *            the column index, starting at 1
-	 * @return the catalog title
-	 * @throws SQLException
-	 *             if there is a database error
-	 */
-	public String getCatalogName(int column) throws SQLException;
-
-	/**
-	 * Returns the fully-qualified type of the class that is produced when
-	 * invoking ResultSet.getObject to recover this columns value.
-	 * 
-	 * @param column
-	 *            the column index, starting at 1
-	 * @return the fully-qualified class name
-	 * @throws SQLException
-	 *             if there is a database error
-	 */
-	public String getColumnClassName(int column) throws SQLException;
-
-	/**
-	 * Returns a count of the columns in this set of results.
-	 * 
-	 * @return the column count
-	 * @throws SQLException
-	 *             if there is a database error
-	 */
-	public int getColumnCount() throws SQLException;
-
-	/**
-	 * Returns the indexed column's standard maximum width, expressed in number
-	 * of characters.
-	 * 
-	 * @param column
-	 *            the column index, starting at 1
-	 * @return the column's max width
-	 * @throws SQLException
-	 *             if there is a database error
-	 */
-	public int getColumnDisplaySize(int column) throws SQLException;
-
-	/**
-	 * Returns a recommended title for the indexed column, to be used when the
-	 * title needs to be displayed.
-	 * 
-	 * @param column
-	 *            the column index, starting at 1
-	 * @return the column's title
-	 * @throws SQLException
-	 *             if there is a database error
-	 */
-	public String getColumnLabel(int column) throws SQLException;
-
-	/**
-	 * Returns the title of the indexed column
-	 * 
-	 * @param column
-	 *            the column index, starting at 1
-	 * @return the column title
-	 * @throws SQLException
-	 *             if there is a database error
-	 */
-	public String getColumnName(int column) throws SQLException;
-
-	/**
-	 * Returns the type of the indexed column
-	 * 
-	 * @param column
-	 *            the column index, starting at 1
-	 * @return the column type
-	 * @throws SQLException
-	 *             if there is a database error
-	 */
-	public int getColumnType(int column) throws SQLException;
-
-	/**
-	 * Returns the type name of the indexed column
-	 * 
-	 * @param column
-	 *            the column index, starting at 1
-	 * @return the type name
-	 * @throws SQLException
-	 *             if there is a database error
-	 */
-	public String getColumnTypeName(int column) throws SQLException;
-
-	/**
-	 * Returns the decimal precision of the indexed column
-	 * 
-	 * @param column
-	 *            the column index, starting at 1
-	 * @return the precision
-	 * @throws SQLException
-	 *             if there is a database error
-	 */
-	public int getPrecision(int column) throws SQLException;
-
-	/**
-	 * Returns the number of decimal places in the indexed column.
-	 * 
-	 * @param column
-	 *            the column index, starting at 1
-	 * @return number of decimal places
-	 * @throws SQLException
-	 *             if there is a database error
-	 */
-	public int getScale(int column) throws SQLException;
-
-	/**
-	 * Returns the name of the indexed columns schema
-	 * 
-	 * @param column
-	 *            the column index, starting at 1
-	 * @return the name of the columns schema
-	 * @throws SQLException
-	 *             if there is a database error
-	 */
-	public String getSchemaName(int column) throws SQLException;
-
-	/**
-	 * Returns the title of the indexed columns table.
-	 * 
-	 * @param column
-	 *            the column index, starting at 1
-	 * @return the table title
-	 * @throws SQLException
-	 *             if there is a database error
-	 */
-	public String getTableName(int column) throws SQLException;
-
-	/**
-	 * Returns and indication of whether the indexed column has automatic
-	 * numbering and is therefore read-only
-	 * 
-	 * @param column
-	 *            the column index, starting at 1
-	 * @return true if it is automatically numbered, false otherwise
-	 * @throws SQLException
-	 *             if there is a database error
-	 */
-	public boolean isAutoIncrement(int column) throws SQLException;
-
-	/**
-	 * Returns an indicator of whether the case of the indexed column is important
-	 * 
-	 * @param column
-	 *            the column index, starting at 1
-	 * @return true if case matters, false otherwise
-	 * @throws SQLException
-	 *             if there is a database error
-	 */
-	public boolean isCaseSensitive(int column) throws SQLException;
-
-	/**
-	 * Returns if the indexed column contains a monetary amount.
-	 * 
-	 * @param column
-	 *            the column index, starting at 1
-	 * @return true if it is a monetary value, false otherwise
-	 * @throws SQLException
-	 *             if there is a database error
-	 */
-	public boolean isCurrency(int column) throws SQLException;
-
-	/**
-	 * Returns an indication of whether writing to the indexed column is
-	 * guaranteed to be successful
-	 * 
-	 * @param column
-	 *            the column index, starting at 1
-	 * @return true if the write is guaranteed, false otherwise
-	 * @throws SQLException
-	 *             if there is a database error
-	 */
-	public boolean isDefinitelyWritable(int column) throws SQLException;
-
-	/**
-	 * Returns whether the indexed column is nullable.
-	 * 
-	 * @param column
-	 *            the column index, starting at 1
-	 * @return true if it is nullable, false otherwise
-	 * @throws SQLException
-	 *             if there is a database error
-	 */
-	public int isNullable(int column) throws SQLException;
-
-	/**
-	 * Returns an indication of whether writing to the indexed column is
-	 * guaranteed to be unsuccessful
-	 * 
-	 * @param column
-	 *            the column index, starting at 1
-	 * @return true if the column is read-only, false otherwise
-	 * @throws SQLException
-	 *             if there is a database error
-	 */
-	public boolean isReadOnly(int column) throws SQLException;
-
-	/**
-	 * Returns an indication of whether the indexed column is searchable.
-	 * 
-	 * @param column
-	 *            the column index, starting at 1
-	 * @return true if the indexed column is searchable, false otherwise.
-	 * @throws SQLException
-	 *             if there is a database error
-	 */
-	public boolean isSearchable(int column) throws SQLException;
-
-	/**
-	 * Returns an indicator of whether the values contained in the indexed
-	 * column are signed.
-	 * 
-	 * @param column
-	 *            the column index, starting at 1
-	 * @return true if they are signed, false otherwise
-	 * @throws SQLException
-	 *             if there is a database error
-	 */
-	public boolean isSigned(int column) throws SQLException;
-
-	/**
-	 * Returns an indication of whether writing to the indexed column is
-	 * possible.
-	 * 
-	 * @param column
-	 *            the column index, starting at 1
-	 * @return true if it is possible to write, false otherwise
-	 * @throws SQLException
-	 *             if there is a database error
-	 */
-	public boolean isWritable(int column) throws SQLException;
-
-} // end interface ResultSetMetaData
-
+    /**
+     * Indicates that a column cannot contain NULL values
+     */
+    public static int columnNoNulls = 0;
+
+    /**
+     * Indicates that a column can contain NULL values
+     */
+    public static int columnNullable = 1;
+
+    /**
+     * Indicates that it is unknown whether a column can contain NULLs or not
+     */
+    public static int columnNullableUnknown = 2;
+
+    /**
+     * Returns the title of indexed columns catalog
+     * 
+     * @param column
+     *            the column index, starting at 1
+     * @return the catalog title
+     * @throws SQLException
+     *             if there is a database error
+     */
+    public String getCatalogName(int column) throws SQLException;
+
+    /**
+     * Returns the fully-qualified type of the class that is produced when
+     * invoking ResultSet.getObject to recover this columns value.
+     * 
+     * @param column
+     *            the column index, starting at 1
+     * @return the fully-qualified class name
+     * @throws SQLException
+     *             if there is a database error
+     */
+    public String getColumnClassName(int column) throws SQLException;
+
+    /**
+     * Returns a count of the columns in this set of results.
+     * 
+     * @return the column count
+     * @throws SQLException
+     *             if there is a database error
+     */
+    public int getColumnCount() throws SQLException;
+
+    /**
+     * Returns the indexed column's standard maximum width, expressed in number
+     * of characters.
+     * 
+     * @param column
+     *            the column index, starting at 1
+     * @return the column's max width
+     * @throws SQLException
+     *             if there is a database error
+     */
+    public int getColumnDisplaySize(int column) throws SQLException;
+
+    /**
+     * Returns a recommended title for the indexed column, to be used when the
+     * title needs to be displayed.
+     * 
+     * @param column
+     *            the column index, starting at 1
+     * @return the column's title
+     * @throws SQLException
+     *             if there is a database error
+     */
+    public String getColumnLabel(int column) throws SQLException;
+
+    /**
+     * Returns the title of the indexed column
+     * 
+     * @param column
+     *            the column index, starting at 1
+     * @return the column title
+     * @throws SQLException
+     *             if there is a database error
+     */
+    public String getColumnName(int column) throws SQLException;
+
+    /**
+     * Returns the type of the indexed column
+     * 
+     * @param column
+     *            the column index, starting at 1
+     * @return the column type
+     * @throws SQLException
+     *             if there is a database error
+     */
+    public int getColumnType(int column) throws SQLException;
+
+    /**
+     * Returns the type name of the indexed column
+     * 
+     * @param column
+     *            the column index, starting at 1
+     * @return the type name
+     * @throws SQLException
+     *             if there is a database error
+     */
+    public String getColumnTypeName(int column) throws SQLException;
+
+    /**
+     * Returns the decimal precision of the indexed column
+     * 
+     * @param column
+     *            the column index, starting at 1
+     * @return the precision
+     * @throws SQLException
+     *             if there is a database error
+     */
+    public int getPrecision(int column) throws SQLException;
+
+    /**
+     * Returns the number of decimal places in the indexed column.
+     * 
+     * @param column
+     *            the column index, starting at 1
+     * @return number of decimal places
+     * @throws SQLException
+     *             if there is a database error
+     */
+    public int getScale(int column) throws SQLException;
+
+    /**
+     * Returns the name of the indexed columns schema
+     * 
+     * @param column
+     *            the column index, starting at 1
+     * @return the name of the columns schema
+     * @throws SQLException
+     *             if there is a database error
+     */
+    public String getSchemaName(int column) throws SQLException;
+
+    /**
+     * Returns the title of the indexed columns table.
+     * 
+     * @param column
+     *            the column index, starting at 1
+     * @return the table title
+     * @throws SQLException
+     *             if there is a database error
+     */
+    public String getTableName(int column) throws SQLException;
+
+    /**
+     * Returns and indication of whether the indexed column has automatic
+     * numbering and is therefore read-only
+     * 
+     * @param column
+     *            the column index, starting at 1
+     * @return true if it is automatically numbered, false otherwise
+     * @throws SQLException
+     *             if there is a database error
+     */
+    public boolean isAutoIncrement(int column) throws SQLException;
+
+    /**
+     * Returns an indicator of whether the case of the indexed column is
+     * important
+     * 
+     * @param column
+     *            the column index, starting at 1
+     * @return true if case matters, false otherwise
+     * @throws SQLException
+     *             if there is a database error
+     */
+    public boolean isCaseSensitive(int column) throws SQLException;
+
+    /**
+     * Returns if the indexed column contains a monetary amount.
+     * 
+     * @param column
+     *            the column index, starting at 1
+     * @return true if it is a monetary value, false otherwise
+     * @throws SQLException
+     *             if there is a database error
+     */
+    public boolean isCurrency(int column) throws SQLException;
+
+    /**
+     * Returns an indication of whether writing to the indexed column is
+     * guaranteed to be successful
+     * 
+     * @param column
+     *            the column index, starting at 1
+     * @return true if the write is guaranteed, false otherwise
+     * @throws SQLException
+     *             if there is a database error
+     */
+    public boolean isDefinitelyWritable(int column) throws SQLException;
+
+    /**
+     * Returns whether the indexed column is nullable.
+     * 
+     * @param column
+     *            the column index, starting at 1
+     * @return true if it is nullable, false otherwise
+     * @throws SQLException
+     *             if there is a database error
+     */
+    public int isNullable(int column) throws SQLException;
+
+    /**
+     * Returns an indication of whether writing to the indexed column is
+     * guaranteed to be unsuccessful
+     * 
+     * @param column
+     *            the column index, starting at 1
+     * @return true if the column is read-only, false otherwise
+     * @throws SQLException
+     *             if there is a database error
+     */
+    public boolean isReadOnly(int column) throws SQLException;
+
+    /**
+     * Returns an indication of whether the indexed column is searchable.
+     * 
+     * @param column
+     *            the column index, starting at 1
+     * @return true if the indexed column is searchable, false otherwise.
+     * @throws SQLException
+     *             if there is a database error
+     */
+    public boolean isSearchable(int column) throws SQLException;
+
+    /**
+     * Returns an indicator of whether the values contained in the indexed
+     * column are signed.
+     * 
+     * @param column
+     *            the column index, starting at 1
+     * @return true if they are signed, false otherwise
+     * @throws SQLException
+     *             if there is a database error
+     */
+    public boolean isSigned(int column) throws SQLException;
+
+    /**
+     * Returns an indication of whether writing to the indexed column is
+     * possible.
+     * 
+     * @param column
+     *            the column index, starting at 1
+     * @return true if it is possible to write, false otherwise
+     * @throws SQLException
+     *             if there is a database error
+     */
+    public boolean isWritable(int column) throws SQLException;
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/SQLData.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/SQLData.java?rev=413642&r1=413641&r2=413642&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/SQLData.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/SQLData.java Mon Jun 12 05:13:42 2006
@@ -16,9 +16,9 @@
 package java.sql;
 
 /**
- * TODO Type description An interface for the custom mapping of an SQL User
- * Defined Type (UDT) to a Java Class. The Java Class object will be added to
- * the Connection's type map with the SQL Name of the UDT which it maps.
+ * An interface for the custom mapping of an SQL User Defined Type (UDT) to a
+ * Java Class. The Java Class object will be added to the Connection's type map
+ * with the SQL Name of the UDT which it maps.
  * <p>
  * Usually within an implementation of SQLData, there is a corresponding field
  * for every attribute of an SQL type, or only one field if the type is SQL
@@ -39,69 +39,66 @@
  * <p>
  * Ordinarily a programmer would not call SQLData methods directly. Similarly
  * SQLInput and SQLOutput methods are not usually called directly.
- * 
  */
 public interface SQLData {
 
-	/**
-	 * Gets the SQL name of the User Defined Type (UDT) that this object
-	 * represents. This method, usually invoked by the JDBC driver, retrieves
-	 * the name of the UDT instance associated with this SQLData object.
-	 * 
-	 * @return a string with UDT type name for this object mapping, passed to
-	 *         readSQL when the object was created
-	 * @throws SQLException
-	 *             if a database error occurs
-	 */
-	public String getSQLTypeName() throws SQLException;
+    /**
+     * Gets the SQL name of the User Defined Type (UDT) that this object
+     * represents. This method, usually invoked by the JDBC driver, retrieves
+     * the name of the UDT instance associated with this SQLData object.
+     * 
+     * @return a string with UDT type name for this object mapping, passed to
+     *         readSQL when the object was created
+     * @throws SQLException
+     *             if a database error occurs
+     */
+    public String getSQLTypeName() throws SQLException;
 
-	/**
-	 * Reads data from the database into this object. This method follows these
-	 * steps:
-	 * <ul>
-	 * <li>Utilise the passed input stream to read the attributes or entries of
-	 * the SQL type</li>
-	 * <li>This is carried out by reading each entry from the input stream,
-	 * ordered as the are the SQL definition.</li>
-	 * <li>Assign the data to the appropriate fields or elements. This is done
-	 * by calling the relevant reader method for the type involved (eg.
-	 * SQLInput.readString, SQLInputreadBigDecimal). If the type is distinct,
-	 * then read its only data entry. For structured types, read every entry.</li>
-	 * </ul>
-	 * The supplied input stream is typically initialized by the calling JDBC
-	 * driver with the type map before readSQL is called.
-	 * 
-	 * @param stream
-	 *            the SQLInput stream from which the type map data is read for
-	 *            the custom mapping
-	 * @param typeName
-	 *            the SQL Type name for the type which is being mapped
-	 * @throws SQLException
-	 *             if a database error occurs
-	 */
-	public void readSQL(SQLInput stream, String typeName) throws SQLException;
-
-	/**
-	 * Writes the object to a supplied SQLOuput data stream, writing it out as
-	 * an SQL value to the data source.
-	 * <p>
-	 * This method follows the following steps:
-	 * <ul>
-	 * <li>Write each attribute of the SQL type to the output stream.</li>
-	 * <li>Write each item by calling a method on the output stream, in the
-	 * order they appear in the SQL definition of the type. Use the appropriate
-	 * SQLOutput methods (eg. writeInt, writeString). Write a single data
-	 * element for a Distinct type. For a Structured type, write a value for
-	 * each attribute of the the SQL type.</li>
-	 * </ul>
-	 * 
-	 * @param stream
-	 *            the SQLOutput stream to use to write out the data for the
-	 *            custom mapping
-	 * @throws SQLException
-	 *             if a database error occurs
-	 */
-	public void writeSQL(SQLOutput stream) throws SQLException;
-
-} // end interface SQLData
+    /**
+     * Reads data from the database into this object. This method follows these
+     * steps:
+     * <ul>
+     * <li>Utilise the passed input stream to read the attributes or entries of
+     * the SQL type</li>
+     * <li>This is carried out by reading each entry from the input stream,
+     * ordered as the are the SQL definition.</li>
+     * <li>Assign the data to the appropriate fields or elements. This is done
+     * by calling the relevant reader method for the type involved (eg.
+     * SQLInput.readString, SQLInputreadBigDecimal). If the type is distinct,
+     * then read its only data entry. For structured types, read every entry.</li>
+     * </ul>
+     * The supplied input stream is typically initialized by the calling JDBC
+     * driver with the type map before readSQL is called.
+     * 
+     * @param stream
+     *            the SQLInput stream from which the type map data is read for
+     *            the custom mapping
+     * @param typeName
+     *            the SQL Type name for the type which is being mapped
+     * @throws SQLException
+     *             if a database error occurs
+     */
+    public void readSQL(SQLInput stream, String typeName) throws SQLException;
 
+    /**
+     * Writes the object to a supplied SQLOuput data stream, writing it out as
+     * an SQL value to the data source.
+     * <p>
+     * This method follows the following steps:
+     * <ul>
+     * <li>Write each attribute of the SQL type to the output stream.</li>
+     * <li>Write each item by calling a method on the output stream, in the
+     * order they appear in the SQL definition of the type. Use the appropriate
+     * SQLOutput methods (eg. writeInt, writeString). Write a single data
+     * element for a Distinct type. For a Structured type, write a value for
+     * each attribute of the the SQL type.</li>
+     * </ul>
+     * 
+     * @param stream
+     *            the SQLOutput stream to use to write out the data for the
+     *            custom mapping
+     * @throws SQLException
+     *             if a database error occurs
+     */
+    public void writeSQL(SQLOutput stream) throws SQLException;
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/SQLException.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/SQLException.java?rev=413642&r1=413641&r2=413642&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/SQLException.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/SQLException.java Mon Jun 12 05:13:42 2006
@@ -11,121 +11,138 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */
-
-
-package java.sql;
-
-import java.io.Serializable;
-
-/**
- * An Exception class that is used in conjunction with JDBC operations.
- * It provides information about problems encountered with Database access and other
- * problems related to JDBC
- * <p>
- * The SQLException class provides the following information:
- * <ul>
- * <li>A standard Java exception message, as a String
- * <li>An SQLState string.  This is an error description string which follows either the SQL 99 conventions
- * or the XOPEN SQLstate conventions. The potential values of the SQLState string are described in each of
- * the specifications.  Which of the conventions is being used by the SQLState string can be discovered by
- * using the getSQLStateType method of the DatabaseMetaData interface.
- * <li>An Error Code, an an integer.  The error code is specific to each database vendor and is typically
- * the error code returned by the database itself.
- * <li>A chain to a next Exception, if relevant, which can give access to additional error information.
- * </ul> 
- * 
- */
-public class SQLException extends Exception implements Serializable {
-
-	private static final long serialVersionUID = 2135244094396331484L;
-	
-	private String 	SQLState = null;
-	private int		errorCode = 0;
-	private SQLException	chainedException = null;
-	
-	/**
-	 * Creates an SQLException object.
-	 * The Reason string is set to null, the SQLState string is set to null and the Error Code is set
-	 * to 0.
-	 */
-	public SQLException() {
-		super();
-	} // end method SQLException()
-	
-	/**
-	 * Creates an SQLException object.
-	 * The Reason string is set to the given reason string, the SQLState string is set to null and the
-	 * Error Code is set to 0.
-	 * @param theReason the string to use as the Reason string
-	 */
-	public SQLException(String theReason) {
-		this( theReason, null, 0 );
-	} // end method SQLException( String )
-	
-	/**
-	 * Creates an SQLException object.
-	 * The Reason string is set to the given reason string, the SQLState string is set to the given
-	 * SQLState string and the Error Code is set to 0.
-	 * @param theReason the string to use as the Reason string
-	 * @param theSQLState the string to use as the SQLState string
-	 */
-	public SQLException(String theReason, String theSQLState) {
-		this( theReason, theSQLState, 0 );
-	} // end method SQLException( String, String )
-	
-	/**
-	 * Creates an SQLException object.
-	 * The Reason string is set to the given reason string, the SQLState string is set to the given
-	 * SQLState string and the Error Code is set to the given error code value. 
-	 * @param theReason the string to use as the Reason string
-	 * @param theSQLState the string to use as the SQLState string
-	 * @param theErrorCode the integer value for the error code
-	 */
-	public SQLException(String theReason, String theSQLState, int theErrorCode) {
-		super( theReason );
-		SQLState = theSQLState;
-		errorCode = theErrorCode;
-	} // end method SQLException( String, String, int )
-	
-	/**
-	 * Returns the integer error code for this SQLException
-	 * @return The integer error code for this SQLException.  The meaning of the code is specific to the
-	 * vendor of the database. 
-	 */
-	public int getErrorCode() {
-		return errorCode;
-	} // end method getErrorCode()
-	
-     /**
-      * Retrieves the SQLException chanied to this SQLException, if any.
-      * @return The SQLException chained to this SQLException.  null if there is no SQLException chained
-      * to this SQLException. 
-      */
-	 public SQLException getNextException() {
-     	return chainedException;
-     } // end method getNextException()
-	 
-	 /**
-	  * Retrieves the SQLState description string for this SQLException object
-	  * @return The SQLState string for this SQLException object.  This is an error description string 
-	  * which follows either the SQL 99 conventions or the XOPEN SQLstate conventions. The potential 
-	  * values of the SQLState string are described in each of the specifications.  Which of the 
-	  * conventions is being used by the SQLState string can be discovered by using the getSQLStateType 
-	  * method of the DatabaseMetaData interface.
-	  */
-	 public String getSQLState() {
-     	return SQLState;
-     } // end getSQLState()
-     
-     /**
-      * Sets the SQLException chained to this SQLException.  If there is an existing SQLException
-      * chained to this SQLException, it is replaced.
-      * @param ex the SQLException to chain to this SQLException 
-      */
-	 public void setNextException(SQLException ex) {
-     	chainedException = ex;
-     } // end setNextException( SQLException )
-	
-} // end class SQLException
-
+ */
+
+package java.sql;
+
+import java.io.Serializable;
+
+/**
+ * An Exception class that is used in conjunction with JDBC operations. It
+ * provides information about problems encountered with Database access and
+ * other problems related to JDBC
+ * <p>
+ * The SQLException class provides the following information:
+ * <ul>
+ * <li>A standard Java exception message, as a String
+ * <li>An SQLState string. This is an error description string which follows
+ * either the SQL 99 conventions or the XOPEN SQLstate conventions. The
+ * potential values of the SQLState string are described in each of the
+ * specifications. Which of the conventions is being used by the SQLState string
+ * can be discovered by using the getSQLStateType method of the DatabaseMetaData
+ * interface.
+ * <li>An Error Code, an an integer. The error code is specific to each
+ * database vendor and is typically the error code returned by the database
+ * itself.
+ * <li>A chain to a next Exception, if relevant, which can give access to
+ * additional error information.
+ * </ul>
+ */
+public class SQLException extends Exception implements Serializable {
+
+    private static final long serialVersionUID = 2135244094396331484L;
+
+    private String SQLState = null;
+
+    private int errorCode = 0;
+
+    private SQLException chainedException = null;
+
+    /**
+     * Creates an SQLException object. The Reason string is set to null, the
+     * SQLState string is set to null and the Error Code is set to 0.
+     */
+    public SQLException() {
+        super();
+    }
+
+    /**
+     * Creates an SQLException object. The Reason string is set to the given
+     * reason string, the SQLState string is set to null and the Error Code is
+     * set to 0.
+     * 
+     * @param theReason
+     *            the string to use as the Reason string
+     */
+    public SQLException(String theReason) {
+        this(theReason, null, 0);
+    }
+
+    /**
+     * Creates an SQLException object. The Reason string is set to the given
+     * reason string, the SQLState string is set to the given SQLState string
+     * and the Error Code is set to 0.
+     * 
+     * @param theReason
+     *            the string to use as the Reason string
+     * @param theSQLState
+     *            the string to use as the SQLState string
+     */
+    public SQLException(String theReason, String theSQLState) {
+        this(theReason, theSQLState, 0);
+    }
+
+    /**
+     * Creates an SQLException object. The Reason string is set to the given
+     * reason string, the SQLState string is set to the given SQLState string
+     * and the Error Code is set to the given error code value.
+     * 
+     * @param theReason
+     *            the string to use as the Reason string
+     * @param theSQLState
+     *            the string to use as the SQLState string
+     * @param theErrorCode
+     *            the integer value for the error code
+     */
+    public SQLException(String theReason, String theSQLState, int theErrorCode) {
+        super(theReason);
+        SQLState = theSQLState;
+        errorCode = theErrorCode;
+    }
+
+    /**
+     * Returns the integer error code for this SQLException
+     * 
+     * @return The integer error code for this SQLException. The meaning of the
+     *         code is specific to the vendor of the database.
+     */
+    public int getErrorCode() {
+        return errorCode;
+    }
+
+    /**
+     * Retrieves the SQLException chanied to this SQLException, if any.
+     * 
+     * @return The SQLException chained to this SQLException. null if there is
+     *         no SQLException chained to this SQLException.
+     */
+    public SQLException getNextException() {
+        return chainedException;
+    }
+
+    /**
+     * Retrieves the SQLState description string for this SQLException object
+     * 
+     * @return The SQLState string for this SQLException object. This is an
+     *         error description string which follows either the SQL 99
+     *         conventions or the XOPEN SQLstate conventions. The potential
+     *         values of the SQLState string are described in each of the
+     *         specifications. Which of the conventions is being used by the
+     *         SQLState string can be discovered by using the getSQLStateType
+     *         method of the DatabaseMetaData interface.
+     */
+    public String getSQLState() {
+        return SQLState;
+    }
+
+    /**
+     * Sets the SQLException chained to this SQLException. If there is an
+     * existing SQLException chained to this SQLException, it is replaced.
+     * 
+     * @param ex
+     *            the SQLException to chain to this SQLException
+     */
+    public void setNextException(SQLException ex) {
+        chainedException = ex;
+    }
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/SQLInput.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/SQLInput.java?rev=413642&r1=413641&r2=413642&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/SQLInput.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/SQLInput.java Mon Jun 12 05:13:42 2006
@@ -37,245 +37,242 @@
  * instance of an SQLInput stream, filling the stream with the attributes of the
  * UDT. The SQLInput stream is passed to the SQLData.readSQL method which then
  * calls the SQLInput reader methods to read the attributes.
- * 
  */
 public interface SQLInput {
 
-	/**
-	 * Returns the next attribute in the stream in the form of a String.
-	 * 
-	 * @return the next attribute as a String. null if the value is SQL NULL.
-	 * @throws SQLException
-	 *             if there is a database error
-	 */
-	public String readString() throws SQLException;
-
-	/**
-	 * Returns the next attribute in the stream in the form of a boolean.
-	 * 
-	 * @return the next attribute as a boolean. false if the value is SQL NULL.
-	 * @throws SQLException
-	 *             if there is a database error
-	 */
-	public boolean readBoolean() throws SQLException;
-
-	/**
-	 * Returns the next attribute in the stream in the form of a byte.
-	 * 
-	 * @return the next attribute as a byte. 0 if the value is SQL NULL.
-	 * @throws SQLException
-	 *             if there is a database error
-	 */
-	public byte readByte() throws SQLException;
-
-	/**
-	 * Returns the next attribute in the stream in the form of a short.
-	 * 
-	 * @return the next attribute as a short. 0 if the value is SQL NULL.
-	 * @throws SQLException
-	 *             if there is a database error
-	 */
-	public short readShort() throws SQLException;
-
-	/**
-	 * Returns the next attribute in the stream in the form of an int.
-	 * 
-	 * @return the next attribute as an int. 0 if the value is SQL NULL.
-	 * @throws SQLException
-	 *             if there is a database error
-	 */
-	public int readInt() throws SQLException;
-
-	/**
-	 * Returns the next attribute in the stream in the form of a long.
-	 * 
-	 * @return the next attribute as a long. 0 if the value is SQL NULL.
-	 * @throws SQLException
-	 *             if there is a database error
-	 */
-	public long readLong() throws SQLException;
-
-	/**
-	 * Returns the next attribute in the stream in the form of a float.
-	 * 
-	 * @return the next attribute as a float. 0 if the value is SQL NULL.
-	 * @throws SQLException
-	 *             if there is a database error
-	 */
-	public float readFloat() throws SQLException;
-
-	/**
-	 * Returns the next attribute in the stream in the form of a double.
-	 * 
-	 * @return the next attribute as a double. 0 if the value is SQL NULL.
-	 * @throws SQLException
-	 *             if there is a database error
-	 */
-	public double readDouble() throws SQLException;
-
-	/**
-	 * Returns the next attribute in the stream in the form of a
-	 * java.math.BigDecimal.
-	 * 
-	 * @return the attribute as a java.math.BigDecimal. null if the read returns
-	 *         SQL NULL.
-	 * @throws SQLException
-	 *             if there is a database error
-	 */
-	public BigDecimal readBigDecimal() throws SQLException;
-
-	/**
-	 * Returns the next attribute in the stream in the form of a byte array.
-	 * 
-	 * @return the attribute as a byte array. null if the read returns SQL NULL.
-	 * @throws SQLException
-	 *             if there is a database error
-	 */
-	public byte[] readBytes() throws SQLException;
-
-	/**
-	 * Returns the next attribute in the stream in the form of a java.sql.Date.
-	 * 
-	 * @return the next attribute as a java.sql.Date. null if the value is SQL
-	 *         NULL.
-	 * @throws SQLException
-	 *             if there is a database error
-	 */
-	public Date readDate() throws SQLException;
-
-	/**
-	 * Returns the next attribute in the stream in the form of a java.sql.Time.
-	 * 
-	 * @return the attribute as a java.sql.Time. null if the read returns SQL
-	 *         NULL.
-	 * @throws SQLException
-	 *             if there is a database error
-	 */
-	public Time readTime() throws SQLException;
-
-	/**
-	 * Returns the next attribute in the stream in the form of a
-	 * java.sql.Timestamp.
-	 * 
-	 * @return the attribute as a java.sql.Timestamp. null if the read returns
-	 *         SQL NULL.
-	 * @throws SQLException
-	 *             if there is a database error
-	 */
-	public Timestamp readTimestamp() throws SQLException;
-
-	/**
-	 * Returns the next attribute in the stream in the form of a Unicode
-	 * character stream embodied as a java.io.Reader.
-	 * 
-	 * @return the next attribute as a java.io.Reader. null if the value is SQL
-	 *         NULL.
-	 * @throws SQLException
-	 *             if there is a database error
-	 */
-	public Reader readCharacterStream() throws SQLException;
-
-	/**
-	 * Returns the next attribute in the stream in the form of an ASCII
-	 * character stream embodied as a java.io.InputStream.
-	 * 
-	 * @return the next attribute as a java.io.InputStream. null if the value is
-	 *         SQL NULL.
-	 * @throws SQLException
-	 *             if there is a database error
-	 */
-	public InputStream readAsciiStream() throws SQLException;
-
-	/**
-	 * Returns the next attribute in the stream in the form of a stream of bytes
-	 * embodied as a java.io.InputStream.
-	 * 
-	 * @return the next attribute as a java.io.InputStream. null if the value is
-	 *         SQL NULL.
-	 * @throws SQLException
-	 *             if there is a database error
-	 */
-	public InputStream readBinaryStream() throws SQLException;
-
-	/**
-	 * Returns the next attribute in the stream in the form of a
-	 * java.lang.Object.
-	 * <p>
-	 * The type of the Object returned is determined by the type mapping for
-	 * this JDBC driver, including any customized mappings in force. A type map
-	 * is given to the SQLInput by the JDBC driver before the SQLInput is given
-	 * to the application.
-	 * <p>
-	 * If the attribute is an SQL structured or distinct type, its SQL type is
-	 * determined. If the streams type map contains an element for that SQL
-	 * type, the driver creates an object of relevant type and invokes the
-	 * method SQLData.readSQL on it, which reads supplementary data from the
-	 * stream using whichever protocol is defined for that method.
-	 * 
-	 * @return the next attribute as an Object. null if the value is SQL NULL.
-	 * @throws SQLException
-	 *             if there is a database error
-	 */
-	public Object readObject() throws SQLException;
-
-	/**
-	 * Returns the next attribute in the stream in the form of a java.sql.Ref.
-	 * 
-	 * @return the next attribute as a java.sql.Ref. null if the value is SQL
-	 *         NULL.
-	 * @throws SQLException
-	 *             if there is a database error
-	 */
-	public Ref readRef() throws SQLException;
-
-	/**
-	 * Returns the next attribute in the stream in the form of a java.sql.Blob.
-	 * 
-	 * @return the next attribute as a java.sql.Blob. null if the value is SQL
-	 *         NULL.
-	 * @throws SQLException
-	 *             if there is a database error
-	 */
-	public Blob readBlob() throws SQLException;
-
-	/**
-	 * Returns the next attribute in the stream in the form of a java.sql.Clob.
-	 * 
-	 * @return the next attribute as a java.sql.Clob. null if the value is SQL
-	 *         NULL.
-	 * @throws SQLException
-	 *             if there is a database error
-	 */
-	public Clob readClob() throws SQLException;
-
-	/**
-	 * Returns the next attribute in the stream in the form of a java.sql.Array.
-	 * 
-	 * @return the next attribute as an Array. null if the value is SQL NULL.
-	 * @throws SQLException
-	 *             if there is a database error
-	 */
-	public Array readArray() throws SQLException;
-
-	/**
-	 * Reports whether the last value read was SQL NULL.
-	 * 
-	 * @return true if the last value read was SQL NULL, false otherwise.
-	 * @throws SQLException
-	 *             if there is a database error
-	 */
-	public boolean wasNull() throws SQLException;
-
-	/**
-	 * Reads the next attribute in the stream (SQL DATALINK value) and returns
-	 * it as a java.net.URL object.
-	 * 
-	 * @return the next attribute as a java.net.URL. null if the value is SQL
-	 *         NULL.
-	 * @throws SQLException
-	 *             if there is a database error
-	 */
-	public URL readURL() throws SQLException;
-
-} // end interface SQLInput
-
+    /**
+     * Returns the next attribute in the stream in the form of a String.
+     * 
+     * @return the next attribute as a String. null if the value is SQL NULL.
+     * @throws SQLException
+     *             if there is a database error
+     */
+    public String readString() throws SQLException;
+
+    /**
+     * Returns the next attribute in the stream in the form of a boolean.
+     * 
+     * @return the next attribute as a boolean. false if the value is SQL NULL.
+     * @throws SQLException
+     *             if there is a database error
+     */
+    public boolean readBoolean() throws SQLException;
+
+    /**
+     * Returns the next attribute in the stream in the form of a byte.
+     * 
+     * @return the next attribute as a byte. 0 if the value is SQL NULL.
+     * @throws SQLException
+     *             if there is a database error
+     */
+    public byte readByte() throws SQLException;
+
+    /**
+     * Returns the next attribute in the stream in the form of a short.
+     * 
+     * @return the next attribute as a short. 0 if the value is SQL NULL.
+     * @throws SQLException
+     *             if there is a database error
+     */
+    public short readShort() throws SQLException;
+
+    /**
+     * Returns the next attribute in the stream in the form of an int.
+     * 
+     * @return the next attribute as an int. 0 if the value is SQL NULL.
+     * @throws SQLException
+     *             if there is a database error
+     */
+    public int readInt() throws SQLException;
+
+    /**
+     * Returns the next attribute in the stream in the form of a long.
+     * 
+     * @return the next attribute as a long. 0 if the value is SQL NULL.
+     * @throws SQLException
+     *             if there is a database error
+     */
+    public long readLong() throws SQLException;
+
+    /**
+     * Returns the next attribute in the stream in the form of a float.
+     * 
+     * @return the next attribute as a float. 0 if the value is SQL NULL.
+     * @throws SQLException
+     *             if there is a database error
+     */
+    public float readFloat() throws SQLException;
+
+    /**
+     * Returns the next attribute in the stream in the form of a double.
+     * 
+     * @return the next attribute as a double. 0 if the value is SQL NULL.
+     * @throws SQLException
+     *             if there is a database error
+     */
+    public double readDouble() throws SQLException;
+
+    /**
+     * Returns the next attribute in the stream in the form of a
+     * java.math.BigDecimal.
+     * 
+     * @return the attribute as a java.math.BigDecimal. null if the read returns
+     *         SQL NULL.
+     * @throws SQLException
+     *             if there is a database error
+     */
+    public BigDecimal readBigDecimal() throws SQLException;
+
+    /**
+     * Returns the next attribute in the stream in the form of a byte array.
+     * 
+     * @return the attribute as a byte array. null if the read returns SQL NULL.
+     * @throws SQLException
+     *             if there is a database error
+     */
+    public byte[] readBytes() throws SQLException;
+
+    /**
+     * Returns the next attribute in the stream in the form of a java.sql.Date.
+     * 
+     * @return the next attribute as a java.sql.Date. null if the value is SQL
+     *         NULL.
+     * @throws SQLException
+     *             if there is a database error
+     */
+    public Date readDate() throws SQLException;
+
+    /**
+     * Returns the next attribute in the stream in the form of a java.sql.Time.
+     * 
+     * @return the attribute as a java.sql.Time. null if the read returns SQL
+     *         NULL.
+     * @throws SQLException
+     *             if there is a database error
+     */
+    public Time readTime() throws SQLException;
+
+    /**
+     * Returns the next attribute in the stream in the form of a
+     * java.sql.Timestamp.
+     * 
+     * @return the attribute as a java.sql.Timestamp. null if the read returns
+     *         SQL NULL.
+     * @throws SQLException
+     *             if there is a database error
+     */
+    public Timestamp readTimestamp() throws SQLException;
+
+    /**
+     * Returns the next attribute in the stream in the form of a Unicode
+     * character stream embodied as a java.io.Reader.
+     * 
+     * @return the next attribute as a java.io.Reader. null if the value is SQL
+     *         NULL.
+     * @throws SQLException
+     *             if there is a database error
+     */
+    public Reader readCharacterStream() throws SQLException;
+
+    /**
+     * Returns the next attribute in the stream in the form of an ASCII
+     * character stream embodied as a java.io.InputStream.
+     * 
+     * @return the next attribute as a java.io.InputStream. null if the value is
+     *         SQL NULL.
+     * @throws SQLException
+     *             if there is a database error
+     */
+    public InputStream readAsciiStream() throws SQLException;
+
+    /**
+     * Returns the next attribute in the stream in the form of a stream of bytes
+     * embodied as a java.io.InputStream.
+     * 
+     * @return the next attribute as a java.io.InputStream. null if the value is
+     *         SQL NULL.
+     * @throws SQLException
+     *             if there is a database error
+     */
+    public InputStream readBinaryStream() throws SQLException;
+
+    /**
+     * Returns the next attribute in the stream in the form of a
+     * java.lang.Object.
+     * <p>
+     * The type of the Object returned is determined by the type mapping for
+     * this JDBC driver, including any customized mappings in force. A type map
+     * is given to the SQLInput by the JDBC driver before the SQLInput is given
+     * to the application.
+     * <p>
+     * If the attribute is an SQL structured or distinct type, its SQL type is
+     * determined. If the streams type map contains an element for that SQL
+     * type, the driver creates an object of relevant type and invokes the
+     * method SQLData.readSQL on it, which reads supplementary data from the
+     * stream using whichever protocol is defined for that method.
+     * 
+     * @return the next attribute as an Object. null if the value is SQL NULL.
+     * @throws SQLException
+     *             if there is a database error
+     */
+    public Object readObject() throws SQLException;
+
+    /**
+     * Returns the next attribute in the stream in the form of a java.sql.Ref.
+     * 
+     * @return the next attribute as a java.sql.Ref. null if the value is SQL
+     *         NULL.
+     * @throws SQLException
+     *             if there is a database error
+     */
+    public Ref readRef() throws SQLException;
+
+    /**
+     * Returns the next attribute in the stream in the form of a java.sql.Blob.
+     * 
+     * @return the next attribute as a java.sql.Blob. null if the value is SQL
+     *         NULL.
+     * @throws SQLException
+     *             if there is a database error
+     */
+    public Blob readBlob() throws SQLException;
+
+    /**
+     * Returns the next attribute in the stream in the form of a java.sql.Clob.
+     * 
+     * @return the next attribute as a java.sql.Clob. null if the value is SQL
+     *         NULL.
+     * @throws SQLException
+     *             if there is a database error
+     */
+    public Clob readClob() throws SQLException;
+
+    /**
+     * Returns the next attribute in the stream in the form of a java.sql.Array.
+     * 
+     * @return the next attribute as an Array. null if the value is SQL NULL.
+     * @throws SQLException
+     *             if there is a database error
+     */
+    public Array readArray() throws SQLException;
+
+    /**
+     * Reports whether the last value read was SQL NULL.
+     * 
+     * @return true if the last value read was SQL NULL, false otherwise.
+     * @throws SQLException
+     *             if there is a database error
+     */
+    public boolean wasNull() throws SQLException;
+
+    /**
+     * Reads the next attribute in the stream (SQL DATALINK value) and returns
+     * it as a java.net.URL object.
+     * 
+     * @return the next attribute as a java.net.URL. null if the value is SQL
+     *         NULL.
+     * @throws SQLException
+     *             if there is a database error
+     */
+    public URL readURL() throws SQLException;
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/SQLOutput.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/SQLOutput.java?rev=413642&r1=413641&r2=413642&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/SQLOutput.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/SQLOutput.java Mon Jun 12 05:13:42 2006
@@ -11,198 +11,268 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */
-
-
-package java.sql;
-
-import java.math.BigDecimal;
-import java.io.Reader;
-import java.io.InputStream;
-import java.net.URL;
-
-/**
- * The interface for an output stream used to write attributes of an SQL User Defined Type to
- * the database.  This interface is used for custom mapping of types and is called by the JDBC
- * driver.  It is not expected that this interface is used by applications.
- * <p>
- * When an object which implements the SQLData interface is used as an argument to an SQL statement,
- * the JDBC driver calls the method <code>SQLData.getSQLType</code> to establish the type of the
- * SQL UDT that is being passed.  The driver then creates an SQLOutput stream and passes it to the
- * <code>SQLData.writeSQL</code> method, which in turn uses the appropriate SQLOutput writer methods
- * to write the data from the SQLData object into the stream according to the defined mapping. 
- * 
- */
-public interface SQLOutput {
-	
-	/**
-	 * Write a String value into the output stream.
-	 * @param theString the String to write
-	 * @throws SQLException if a database error occurs
-	 */
-	public void writeString(String theString) throws SQLException;
-	
-	/**
-	 * Write a boolean value into the output stream.
-	 * @param theFlag the boolean value to write
-	 * @throws SQLException if a database error occurs
-	 */
-	public void writeBoolean(boolean theFlag) throws SQLException;
-	
-	/**
-	 * Write a byte value into the output stream.
-	 * @param theByte the byte value to write
-	 * @throws SQLException if a database error occurs
-	 */
-	public void writeByte(byte theByte) throws SQLException;
-	
-	/**
-	 * Write a short value into the output stream.
-	 * @param theShort the short value to write
-	 * @throws SQLException if a database error occurs
-	 */
-	public void writeShort(short theShort) throws SQLException;
-	
-	/**
-	 * Write an int value into the output stream.
-	 * @param theInt the int value to write
-	 * @throws SQLException if a database error occurs
-	 */
-	public void writeInt(int theInt) throws SQLException;
-	
-	/**
-	 * Write a long value into the output stream.
-	 * @param theLong the long value to write
-	 * @throws SQLException if a database error occurs
-	 */
-	public void writeLong(long theLong) throws SQLException;
-	
-	/**
-	 * Write a float value into the output stream.
-	 * @param theFloat the float value to write
-	 * @throws SQLException if a database error occurs
-	 */
-	public void writeFloat(float theFloat) throws SQLException;
-	
-	/**
-	 * Write a double value into the output stream.
-	 * @param theDouble the double value to write
-	 * @throws SQLException if a database error occurs
-	 */
-	public void writeDouble(double theDouble) throws SQLException;
-	
-	/**
-	 * Write a java.math.BigDecimal value into the output stream.
-	 * @param theBigDecimal the BigDecimal value to write
-	 * @throws SQLException if a database error occurs
-	 */
-	public void writeBigDecimal(BigDecimal theBigDecimal) throws SQLException;
-	
-	/**
-	 * Write an array of bytes into the output stream.
-	 * @param theBytes the array of bytes to write
-	 * @throws SQLException if a database error occurs
-	 */
-	public void writeBytes(byte[] theBytes) throws SQLException;
-	
-	/**
-	 * Write a java.sql.Date value into the output stream.
-	 * @param theDate the Date value to write
-	 * @throws SQLException if a database error occurs
-	 */
-	public void writeDate(Date theDate) throws SQLException;
-	
-	/**
-	 * Write a java.sql.Time value into the output stream.
-	 * @param theTime the Time value to write
-	 * @throws SQLException if a database error occurs
-	 */
-	public void writeTime(Time theTime) throws SQLException;
-	
-	/**
-	 * Write a java.sql.Timestamp value into the output stream.
-	 * @param theTimestamp the Timestamp value to write
-	 * @throws SQLException if a database error occurs
-	 */
-	public void writeTimestamp(Timestamp theTimestamp) throws SQLException;
-	
-	/**
-	 * Write a stream of Unicode characters into the output stream.
-	 * @param theStream the stream of Unicode characters to write, as a java.io.Reader object
-	 * @throws SQLException if a database error occurs
-	 */
-	public void writeCharacterStream(Reader theStream) throws SQLException;
-	
-	/**
-	 * Write a stream of ASCII characters into the output stream.
-	 * @param theStream the stream of ASCII characters to write, as a java.io.InputStream object
-	 * @throws SQLException if a database error occurs
-	 */
-	public void writeAsciiStream(InputStream theStream) throws SQLException;
-	
-	/**
-	 * Write a stream of uninterpreted bytes into the output stream.
-	 * @param theStream the stream of bytes to write, as a java.io.InputStream object
-	 * @throws SQLException if a database error occurs
-	 */
-	public void writeBinaryStream(InputStream theStream) throws SQLException;
-	
-	/**
-	 * Write an SQLData object into the output stream.
-	 * <p>
-	 * If the SQLData object is null, writes SQL NULL to the stream.
-	 * <p>
-	 * Otherwise, calls the <code>SQLData.writeSQL</code> method of the object, which
-	 * writes the object's attributes to the stream by calling the appropriate SQLOutput writer
-	 * methods for each attribute, in order.  The order of the attributes is the order they are
-	 * listed in the SQL definition of the User Defined Type.
-	 * @param theObject the SQLData object to write
-	 * @throws SQLException if a database error occurs
-	 */
-	public void writeObject(SQLData theObject) throws SQLException;
-	
-	/**
-	 * Write an SQL Ref value into the output stream.
-	 * @param theRef the java.sql.Ref object to write
-	 * @throws SQLException if a database error occurs
-	 */
-	public void writeRef(Ref theRef) throws SQLException;
-	
-	/**
-	 * Write an SQL Blob value into the output stream.
-	 * @param theBlob the java.sql.Blob object to write
-	 * @throws SQLException if a database error occurs
-	 */
-	public void writeBlob(Blob theBlob) throws SQLException;
-	
-	/**
-	 * Write an SQL Clob value into the output stream.
-	 * @param theClob the java.sql.Clob object to write
-	 * @throws SQLException if a database error occurs
-	 */
-	public void writeClob(Clob theClob) throws SQLException;
-	
-	/**
-	 * Write an SQL Struct value into the output stream.
-	 * @param theStruct the java.sql.Struct object to write
-	 * @throws SQLException if a database error occurs
-	 */
-	public void writeStruct(Struct theStruct) throws SQLException;
-	
-	/**
-	 * Write an SQL Array value into the output stream.
-	 * @param theArray the java.sql.Array object to write
-	 * @throws SQLException if a database error occurs
-	 */
-	public void writeArray(Array theArray) throws SQLException;
-	
-	/**
-	 * Write an SQL DATALINK value into the output stream.
-	 * @param theURL the Datalink value as a java.net.URL to write
-	 * @throws SQLException if a database error occurs
-	 */
-	public void writeURL(URL theURL) throws SQLException;
-	
-} // end interface SQLOutput
-
-
+ */
+
+package java.sql;
+
+import java.io.InputStream;
+import java.io.Reader;
+import java.math.BigDecimal;
+import java.net.URL;
+
+/**
+ * The interface for an output stream used to write attributes of an SQL User
+ * Defined Type to the database. This interface is used for custom mapping of
+ * types and is called by the JDBC driver. It is not expected that this
+ * interface is used by applications.
+ * <p>
+ * When an object which implements the SQLData interface is used as an argument
+ * to an SQL statement, the JDBC driver calls the method
+ * <code>SQLData.getSQLType</code> to establish the type of the SQL UDT that
+ * is being passed. The driver then creates an SQLOutput stream and passes it to
+ * the <code>SQLData.writeSQL</code> method, which in turn uses the
+ * appropriate SQLOutput writer methods to write the data from the SQLData
+ * object into the stream according to the defined mapping.
+ */
+public interface SQLOutput {
+
+    /**
+     * Write a String value into the output stream.
+     * 
+     * @param theString
+     *            the String to write
+     * @throws SQLException
+     *             if a database error occurs
+     */
+    public void writeString(String theString) throws SQLException;
+
+    /**
+     * Write a boolean value into the output stream.
+     * 
+     * @param theFlag
+     *            the boolean value to write
+     * @throws SQLException
+     *             if a database error occurs
+     */
+    public void writeBoolean(boolean theFlag) throws SQLException;
+
+    /**
+     * Write a byte value into the output stream.
+     * 
+     * @param theByte
+     *            the byte value to write
+     * @throws SQLException
+     *             if a database error occurs
+     */
+    public void writeByte(byte theByte) throws SQLException;
+
+    /**
+     * Write a short value into the output stream.
+     * 
+     * @param theShort
+     *            the short value to write
+     * @throws SQLException
+     *             if a database error occurs
+     */
+    public void writeShort(short theShort) throws SQLException;
+
+    /**
+     * Write an int value into the output stream.
+     * 
+     * @param theInt
+     *            the int value to write
+     * @throws SQLException
+     *             if a database error occurs
+     */
+    public void writeInt(int theInt) throws SQLException;
+
+    /**
+     * Write a long value into the output stream.
+     * 
+     * @param theLong
+     *            the long value to write
+     * @throws SQLException
+     *             if a database error occurs
+     */
+    public void writeLong(long theLong) throws SQLException;
+
+    /**
+     * Write a float value into the output stream.
+     * 
+     * @param theFloat
+     *            the float value to write
+     * @throws SQLException
+     *             if a database error occurs
+     */
+    public void writeFloat(float theFloat) throws SQLException;
+
+    /**
+     * Write a double value into the output stream.
+     * 
+     * @param theDouble
+     *            the double value to write
+     * @throws SQLException
+     *             if a database error occurs
+     */
+    public void writeDouble(double theDouble) throws SQLException;
+
+    /**
+     * Write a java.math.BigDecimal value into the output stream.
+     * 
+     * @param theBigDecimal
+     *            the BigDecimal value to write
+     * @throws SQLException
+     *             if a database error occurs
+     */
+    public void writeBigDecimal(BigDecimal theBigDecimal) throws SQLException;
+
+    /**
+     * Write an array of bytes into the output stream.
+     * 
+     * @param theBytes
+     *            the array of bytes to write
+     * @throws SQLException
+     *             if a database error occurs
+     */
+    public void writeBytes(byte[] theBytes) throws SQLException;
+
+    /**
+     * Write a java.sql.Date value into the output stream.
+     * 
+     * @param theDate
+     *            the Date value to write
+     * @throws SQLException
+     *             if a database error occurs
+     */
+    public void writeDate(Date theDate) throws SQLException;
+
+    /**
+     * Write a java.sql.Time value into the output stream.
+     * 
+     * @param theTime
+     *            the Time value to write
+     * @throws SQLException
+     *             if a database error occurs
+     */
+    public void writeTime(Time theTime) throws SQLException;
+
+    /**
+     * Write a java.sql.Timestamp value into the output stream.
+     * 
+     * @param theTimestamp
+     *            the Timestamp value to write
+     * @throws SQLException
+     *             if a database error occurs
+     */
+    public void writeTimestamp(Timestamp theTimestamp) throws SQLException;
+
+    /**
+     * Write a stream of Unicode characters into the output stream.
+     * 
+     * @param theStream
+     *            the stream of Unicode characters to write, as a java.io.Reader
+     *            object
+     * @throws SQLException
+     *             if a database error occurs
+     */
+    public void writeCharacterStream(Reader theStream) throws SQLException;
+
+    /**
+     * Write a stream of ASCII characters into the output stream.
+     * 
+     * @param theStream
+     *            the stream of ASCII characters to write, as a
+     *            java.io.InputStream object
+     * @throws SQLException
+     *             if a database error occurs
+     */
+    public void writeAsciiStream(InputStream theStream) throws SQLException;
+
+    /**
+     * Write a stream of uninterpreted bytes into the output stream.
+     * 
+     * @param theStream
+     *            the stream of bytes to write, as a java.io.InputStream object
+     * @throws SQLException
+     *             if a database error occurs
+     */
+    public void writeBinaryStream(InputStream theStream) throws SQLException;
+
+    /**
+     * Write an SQLData object into the output stream.
+     * <p>
+     * If the SQLData object is null, writes SQL NULL to the stream.
+     * <p>
+     * Otherwise, calls the <code>SQLData.writeSQL</code> method of the
+     * object, which writes the object's attributes to the stream by calling the
+     * appropriate SQLOutput writer methods for each attribute, in order. The
+     * order of the attributes is the order they are listed in the SQL
+     * definition of the User Defined Type.
+     * 
+     * @param theObject
+     *            the SQLData object to write
+     * @throws SQLException
+     *             if a database error occurs
+     */
+    public void writeObject(SQLData theObject) throws SQLException;
+
+    /**
+     * Write an SQL Ref value into the output stream.
+     * 
+     * @param theRef
+     *            the java.sql.Ref object to write
+     * @throws SQLException
+     *             if a database error occurs
+     */
+    public void writeRef(Ref theRef) throws SQLException;
+
+    /**
+     * Write an SQL Blob value into the output stream.
+     * 
+     * @param theBlob
+     *            the java.sql.Blob object to write
+     * @throws SQLException
+     *             if a database error occurs
+     */
+    public void writeBlob(Blob theBlob) throws SQLException;
+
+    /**
+     * Write an SQL Clob value into the output stream.
+     * 
+     * @param theClob
+     *            the java.sql.Clob object to write
+     * @throws SQLException
+     *             if a database error occurs
+     */
+    public void writeClob(Clob theClob) throws SQLException;
+
+    /**
+     * Write an SQL Struct value into the output stream.
+     * 
+     * @param theStruct
+     *            the java.sql.Struct object to write
+     * @throws SQLException
+     *             if a database error occurs
+     */
+    public void writeStruct(Struct theStruct) throws SQLException;
+
+    /**
+     * Write an SQL Array value into the output stream.
+     * 
+     * @param theArray
+     *            the java.sql.Array object to write
+     * @throws SQLException
+     *             if a database error occurs
+     */
+    public void writeArray(Array theArray) throws SQLException;
+
+    /**
+     * Write an SQL DATALINK value into the output stream.
+     * 
+     * @param theURL
+     *            the Datalink value as a java.net.URL to write
+     * @throws SQLException
+     *             if a database error occurs
+     */
+    public void writeURL(URL theURL) throws SQLException;
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/SQLPermission.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/SQLPermission.java?rev=413642&r1=413641&r2=413642&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/SQLPermission.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/SQLPermission.java Mon Jun 12 05:13:42 2006
@@ -11,46 +11,48 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */
-
-
-package java.sql;
-
-import java.security.BasicPermission;
-import java.security.Guard;
-import java.io.Serializable;
-
-/**
- * Permission relating to security access control in the java.sql package.
- * <p>
- * Currently, the only permission supported has the name "setLog".  The setLog permission
- * controls whether a Java application or applet can open a logging stream using the 
- * DriverManager.setLogWriter method or the DriverManager.setLogStream method.  This is a
- * potentially dangerous operation since the logging stream can contain usernames, passwords 
- */
-public final class SQLPermission extends BasicPermission implements Guard, Serializable {
-	
-	private static final long serialVersionUID = -1439323187199563495L;
-
-	/**
-	 * Creates a new SQLPermission object with the specified name.
-	 * @param name the name to use for this SQLPermission
-	 */
-	public SQLPermission(String name) {
-		super( name );
-		//if (name != "setLog") throw new IllegalArgumentException();	
-	} // end method SQLPermissions( String )
-    
-	/**
-	 * Creates a new SQLPermission object with the specified name.
-	 * @param name is the name of the SQLPermission.  Currently only "setLog" is allowed.
-	 * @param actions is currently unused and should be set to null
-	 */
-	public SQLPermission(String name, String actions) {
-    	super( name, null );
-    	//if (name != "setLog") throw new IllegalArgumentException(); 
-    } // end method SQLPermissions( String, String )
-    
-} // end class SQLPermission
-
-
+ */
+
+package java.sql;
+
+import java.io.Serializable;
+import java.security.BasicPermission;
+import java.security.Guard;
+
+/**
+ * Permission relating to security access control in the java.sql package.
+ * <p>
+ * Currently, the only permission supported has the name "setLog". The setLog
+ * permission controls whether a Java application or applet can open a logging
+ * stream using the DriverManager.setLogWriter method or the
+ * DriverManager.setLogStream method. This is a potentially dangerous operation
+ * since the logging stream can contain usernames, passwords
+ */
+public final class SQLPermission extends BasicPermission implements Guard,
+        Serializable {
+
+    private static final long serialVersionUID = -1439323187199563495L;
+
+    /**
+     * Creates a new SQLPermission object with the specified name.
+     * 
+     * @param name
+     *            the name to use for this SQLPermission
+     */
+    public SQLPermission(String name) {
+        super(name);
+    }
+
+    /**
+     * Creates a new SQLPermission object with the specified name.
+     * 
+     * @param name
+     *            is the name of the SQLPermission. Currently only "setLog" is
+     *            allowed.
+     * @param actions
+     *            is currently unused and should be set to null
+     */
+    public SQLPermission(String name, String actions) {
+        super(name, null);
+    }
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/SQLWarning.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/SQLWarning.java?rev=413642&r1=413641&r2=413642&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/SQLWarning.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/SQLWarning.java Mon Jun 12 05:13:42 2006
@@ -11,83 +11,85 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */
-
-
-package java.sql;
-
-import java.io.Serializable;
-
-/**
- * An exception class that holds information about Database access warnings.
- * 
- */
-public class SQLWarning extends SQLException implements Serializable {
-	
-	private static final long serialVersionUID = 3917336774604784856L;
-	
-	private SQLWarning chainedWarning = null;
-
-	/** 
-	 * Creates an SQLWarning object.
-	 * The Reason string is set to null, the SQLState string is set to null and the Error Code is set
-	 * to 0.
-	 */
-	public SQLWarning() {
-		super();
-	} // end method SQLWarning()
-
-	/**
-	 * Creates an SQLWarning object.
-	 * The Reason string is set to the given reason string, the SQLState string is set to null and the
-	 * Error Code is set to 0.
-	 * @param theReason
-	 */
-	public SQLWarning(String theReason) {
-		super(theReason);
-	} // end method SQLWarning( String )
-
-	/**
-	 * Creates an SQLWarning object.
-	 * The Reason string is set to the given reason string, the SQLState string is set to the given
-	 * SQLState string and the Error Code is set to 0.
-	 * @param theReason the string to use as the Reason string
-	 * @param theSQLState the string to use as the SQLState string
-	 */
-	public SQLWarning(String theReason, String theSQLState) {
-		super(theReason, theSQLState);
-	} // end method SQLWarning( String, String )
-
-	/**
-	 * Creates an SQLWarning object.
-	 * The Reason string is set to the given reason string, the SQLState string is set to the given
-	 * SQLState string and the Error Code is set to the given ErrorCode value.
-	 * @param theReason
-	 * @param theSQLState
-	 * @param theErrorCode
-	 */
-	public SQLWarning(String theReason, String theSQLState, int theErrorCode) {
-		super(theReason, theSQLState, theErrorCode);
-	} // end method SQLWarning( String, String, int )
-	
-	/**
-	 * Gets the SQLWarning chained to this SQLWarning object.
-	 * @return the SQLWarning chained to this SQLWarning.  null if no SQLWarning is
-	 * chained to this SQLWarning.
-	 */
-	public SQLWarning 	getNextWarning() {
-		return chainedWarning;
-	} // end method getNextWarning()
-	
-    /**
-     * Chains a supplied SQLWarning to this SQLWarning.
-     * @param w the SQLWarning to chain to this SQLWarning.
-     */ 
-	public void setNextWarning(SQLWarning w) {
-		chainedWarning = w;
-		return;
-	} // end method setNextWarning( SQLWarning )
-  
-} // end class SQLWarning
-
-
+ */
+
+package java.sql;
+
+import java.io.Serializable;
+
+/**
+ * An exception class that holds information about Database access warnings.
+ */
+public class SQLWarning extends SQLException implements Serializable {
+
+    private static final long serialVersionUID = 3917336774604784856L;
+
+    private SQLWarning chainedWarning = null;
+
+    /**
+     * Creates an SQLWarning object. The Reason string is set to null, the
+     * SQLState string is set to null and the Error Code is set to 0.
+     */
+    public SQLWarning() {
+        super();
+    }
+
+    /**
+     * Creates an SQLWarning object. The Reason string is set to the given
+     * reason string, the SQLState string is set to null and the Error Code is
+     * set to 0.
+     * 
+     * @param theReason
+     */
+    public SQLWarning(String theReason) {
+        super(theReason);
+    }
+
+    /**
+     * Creates an SQLWarning object. The Reason string is set to the given
+     * reason string, the SQLState string is set to the given SQLState string
+     * and the Error Code is set to 0.
+     * 
+     * @param theReason
+     *            the string to use as the Reason string
+     * @param theSQLState
+     *            the string to use as the SQLState string
+     */
+    public SQLWarning(String theReason, String theSQLState) {
+        super(theReason, theSQLState);
+    }
+
+    /**
+     * Creates an SQLWarning object. The Reason string is set to the given
+     * reason string, the SQLState string is set to the given SQLState string
+     * and the Error Code is set to the given ErrorCode value.
+     * 
+     * @param theReason
+     * @param theSQLState
+     * @param theErrorCode
+     */
+    public SQLWarning(String theReason, String theSQLState, int theErrorCode) {
+        super(theReason, theSQLState, theErrorCode);
+    }
+
+    /**
+     * Gets the SQLWarning chained to this SQLWarning object.
+     * 
+     * @return the SQLWarning chained to this SQLWarning. null if no SQLWarning
+     *         is chained to this SQLWarning.
+     */
+    public SQLWarning getNextWarning() {
+        return chainedWarning;
+    }
+
+    /**
+     * Chains a supplied SQLWarning to this SQLWarning.
+     * 
+     * @param w
+     *            the SQLWarning to chain to this SQLWarning.
+     */
+    public void setNextWarning(SQLWarning w) {
+        chainedWarning = w;
+        return;
+    }
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/Savepoint.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/Savepoint.java?rev=413642&r1=413641&r2=413642&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/Savepoint.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/Savepoint.java Mon Jun 12 05:13:42 2006
@@ -11,34 +11,31 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */
-
-
-package java.sql;
-
+ */
+
+package java.sql;
+
 /**
- * A Savepoint is an instant during the current transaction that can be utilised by a 
- * Rollback from the Connection.rollback method. Rolling back to a particular Savepoint means
- * that all changes that occurred after that Savepoint are removed.
- * 
- */
-public interface Savepoint {
-
-	/**
-	 * Returns the constructed ID for this Savepoint.
-	 * @return the ID for this Savepoint.
-	 * @throws SQLException
-	 */
-	public int getSavepointId() throws SQLException;
+ * A Savepoint is an instant during the current transaction that can be utilised
+ * by a Rollback from the Connection.rollback method. Rolling back to a
+ * particular Savepoint means that all changes that occurred after that
+ * Savepoint are removed.
+ */
+public interface Savepoint {
+
+    /**
+     * Returns the constructed ID for this Savepoint.
+     * 
+     * @return the ID for this Savepoint.
+     * @throws SQLException
+     */
+    public int getSavepointId() throws SQLException;
 
-	/**
-	 * Returns the name for this Savepoint.
-	 * 
-	 * @return the name of this Savepoint.
-	 * @throws SQLException
-	 */
-	public String 	getSavepointName() throws SQLException;
-    	
-} // end interface Savepoint
-
-
+    /**
+     * Returns the name for this Savepoint.
+     * 
+     * @return the name of this Savepoint.
+     * @throws SQLException
+     */
+    public String getSavepointName() throws SQLException;
+}



Mime
View raw message