harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From py...@apache.org
Subject svn commit: r556835 [1/3] - in /harmony/enhanced/classlib/branches/java6/modules/sql/src: main/java/java/sql/ main/java/javax/sql/ test/java/org/apache/harmony/sql/tests/java/sql/ test/java/org/apache/harmony/sql/tests/javax/sql/ test/java/org/apache/h...
Date Tue, 17 Jul 2007 07:43:27 GMT
Author: pyang
Date: Tue Jul 17 00:43:20 2007
New Revision: 556835

URL: http://svn.apache.org/viewvc?view=rev&rev=556835
Log:
Tidy up the format of sql module using Eclipse source formatter, basically the conversion from tabs to spaces, removal of redundant empty lines, spaces, etc.

Modified:
    harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/BatchUpdateException.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/Blob.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/ClientInfoStatus.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/Connection.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/DataTruncation.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/DatabaseMetaData.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/NClob.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/ParameterMetaData.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/RowId.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/RowIdLifetime.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/SQLData.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/SQLException.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/SQLWarning.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/SQLXML.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/Statement.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/Types.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/Wrapper.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/javax/sql/CommonDataSource.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/javax/sql/ConnectionPoolDataSource.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/javax/sql/DataSource.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/javax/sql/StatementEvent.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/BatchUpdateExceptionTest.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/DataTruncationTest.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/DatabaseMetaDataTest.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/SQLExceptionTest.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/SQLSyntaxErrorExceptionTest.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/SQLWarningTest.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TypesTest.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/Impl_RowSet.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/StatementEventTest.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/rowset/serial/SerialArrayTest.java
    harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/rowset/serial/SerialBlobTest.java

Modified: harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/BatchUpdateException.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/BatchUpdateException.java?view=diff&rev=556835&r1=556834&r2=556835
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/BatchUpdateException.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/BatchUpdateException.java Tue Jul 17 00:43:20 2007
@@ -45,88 +45,88 @@
     private int[] updateCounts = null;
 
     /**
-	 * Creates an BatchUpdateException object. The Reason string is set to the
-	 * null if cause == null otherwise to cause.toString(), and the cause
-	 * Throwable object is set to the given cause Throwable object.
-	 * 
-	 * @param cause -
-	 *            the Throwable object for the underlying reason this
-	 *            SQLException
-	 *            
-	 * @since 1.6
-	 */
+     * Creates an BatchUpdateException object. The Reason string is set to the
+     * null if cause == null otherwise to cause.toString(), and the cause
+     * Throwable object is set to the given cause Throwable object.
+     * 
+     * @param cause -
+     *            the Throwable object for the underlying reason this
+     *            SQLException
+     * 
+     * @since 1.6
+     */
     public BatchUpdateException(Throwable cause) {
-		this(null, cause);
-	}
+        this(null, cause);
+    }
 
     /**
-	 * Creates an BatchUpdateException object. The Reason string is set to the
-	 * null if cause == null otherwise to cause.toString(), and the cause
-	 * Throwable object is set to the given cause Throwable object. SQLState is
-	 * initialized to null while vendorCode is zero.
-	 * 
-	 * @param cause -
-	 *            the Throwable object for the underlying reason this
-	 *            SQLException
-	 * 
-	 * @since 1.6
-	 */
+     * Creates an BatchUpdateException object. The Reason string is set to the
+     * null if cause == null otherwise to cause.toString(), and the cause
+     * Throwable object is set to the given cause Throwable object. SQLState is
+     * initialized to null while vendorCode is zero.
+     * 
+     * @param cause -
+     *            the Throwable object for the underlying reason this
+     *            SQLException
+     * 
+     * @since 1.6
+     */
     public BatchUpdateException(int[] updateCounts, Throwable cause) {
-    	super(cause);
-    	this.updateCounts = updateCounts;    	
+        super(cause);
+        this.updateCounts = updateCounts;
     }
 
     /**
-	 * Creates an BatchUpdateException object. The cause Throwable object is set
-	 * to the given cause Throwable object. SQLState is initialized to null
-	 * while vendorCode is zero.
-	 * 
-	 * @param cause -
-	 *            the Throwable object for the underlying reason this
-	 *            SQLException
-	 * 
-	 * @since 1.6
-	 */
+     * Creates an BatchUpdateException object. The cause Throwable object is set
+     * to the given cause Throwable object. SQLState is initialized to null
+     * while vendorCode is zero.
+     * 
+     * @param cause -
+     *            the Throwable object for the underlying reason this
+     *            SQLException
+     * 
+     * @since 1.6
+     */
     public BatchUpdateException(String reason, int[] updateCounts,
             Throwable cause) {
-    	super(reason, cause);
-    	this.updateCounts = updateCounts;
+        super(reason, cause);
+        this.updateCounts = updateCounts;
     }
 
     /**
-	 * Creates an BatchUpdateException object. The cause Throwable object is set
-	 * to the given cause Throwable object and the updateCounts array set to the
-	 * int array parameter. SQLState is initialized to null while vendorCode is
-	 * zero.
-	 * 
-	 * @param cause -
-	 *            the Throwable object for the underlying reason this
-	 *            SQLException
-	 * 
-	 * @since 1.6
-	 */
+     * Creates an BatchUpdateException object. The cause Throwable object is set
+     * to the given cause Throwable object and the updateCounts array set to the
+     * int array parameter. SQLState is initialized to null while vendorCode is
+     * zero.
+     * 
+     * @param cause -
+     *            the Throwable object for the underlying reason this
+     *            SQLException
+     * 
+     * @since 1.6
+     */
     public BatchUpdateException(String reason, String SQLState,
             int[] updateCounts, Throwable cause) {
-    	super(reason, SQLState, cause);
-    	this.updateCounts = updateCounts;
+        super(reason, SQLState, cause);
+        this.updateCounts = updateCounts;
     }
 
     /**
-	 * Creates an BatchUpdateException object. The cause Throwable object is set
-	 * to the given cause Throwable object and the updateCounts array set to the
-	 * int array parameter. VendorCode is set to the given vendorCode. SQLState
-	 * is initialized to null while vendorCode is zero.
-	 * 
-	 * @param cause -
-	 *            the Throwable object for the underlying reason this
-	 *            SQLException
-	 * 
-	 * @since 1.6
-	 */
+     * Creates an BatchUpdateException object. The cause Throwable object is set
+     * to the given cause Throwable object and the updateCounts array set to the
+     * int array parameter. VendorCode is set to the given vendorCode. SQLState
+     * is initialized to null while vendorCode is zero.
+     * 
+     * @param cause -
+     *            the Throwable object for the underlying reason this
+     *            SQLException
+     * 
+     * @since 1.6
+     */
     public BatchUpdateException(String reason, String SQLState, int vendorCode,
             int[] updateCounts, Throwable cause) {
-    	super(reason, SQLState, vendorCode, cause);
-    	this.updateCounts = updateCounts;
+        super(reason, SQLState, vendorCode, cause);
+        this.updateCounts = updateCounts;
     }
 
     /**

Modified: harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/Blob.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/Blob.java?view=diff&rev=556835&r1=556834&r2=556835
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/Blob.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/Blob.java Tue Jul 17 00:43:20 2007
@@ -157,7 +157,7 @@
      *             if an error occurs accessing the Blob
      */
     public void truncate(long len) throws SQLException;
-    
+
     /**
      * TODO Javadoc
      * 
@@ -170,5 +170,6 @@
      * 
      * @throws SQLException
      */
-    public InputStream getBinaryStream(long pos, long length) throws SQLException;
+    public InputStream getBinaryStream(long pos, long length)
+            throws SQLException;
 }

Modified: harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/ClientInfoStatus.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/ClientInfoStatus.java?view=diff&rev=556835&r1=556834&r2=556835
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/ClientInfoStatus.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/ClientInfoStatus.java Tue Jul 17 00:43:20 2007
@@ -24,5 +24,5 @@
  * @since 1.6
  */
 public enum ClientInfoStatus {
-	REASON_UNKNOWN, REASON_UNKNOWN_PROPERTY, REASON_VALUE_INVALID, REASON_VALUE_TRUNCATED,
+    REASON_UNKNOWN, REASON_UNKNOWN_PROPERTY, REASON_VALUE_INVALID, REASON_VALUE_TRUNCATED,
 }

Modified: harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/Connection.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/Connection.java?view=diff&rev=556835&r1=556834&r2=556835
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/Connection.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/Connection.java Tue Jul 17 00:43:20 2007
@@ -24,7 +24,7 @@
  * statements and results are returned within the context of a connection.
  * 
  */
-public interface Connection extends Wrapper{
+public interface Connection extends Wrapper {
 
     /**
      * A constant indicating that transactions are not supported.

Modified: harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/DataTruncation.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/DataTruncation.java?view=diff&rev=556835&r1=556834&r2=556835
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/DataTruncation.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/DataTruncation.java Tue Jul 17 00:43:20 2007
@@ -42,7 +42,7 @@
     private static final String THE_REASON = "Data truncation"; //$NON-NLS-1$
 
     private static final String THE_SQLSTATE_READ = "01004"; //$NON-NLS-1$
-    
+
     private static final String THE_SQLSTATE_WRITE = "22001"; //$NON-NLS-1$
 
     private static final int THE_ERROR_CODE = 0;
@@ -67,50 +67,49 @@
      *            the size of the data after truncation
      */
     public DataTruncation(int index, boolean parameter, boolean read,
-			int dataSize, int transferSize) {
-		super(THE_REASON, read ? THE_SQLSTATE_READ : THE_SQLSTATE_WRITE,
-				THE_ERROR_CODE);
-		this.index = index;
-		this.parameter = parameter;
-		this.read = read;
-		this.dataSize = dataSize;
-		this.transferSize = transferSize;
-	}
+            int dataSize, int transferSize) {
+        super(THE_REASON, read ? THE_SQLSTATE_READ : THE_SQLSTATE_WRITE,
+                THE_ERROR_CODE);
+        this.index = index;
+        this.parameter = parameter;
+        this.read = read;
+        this.dataSize = dataSize;
+        this.transferSize = transferSize;
+    }
 
     /**
-	 * Creates a DataTruncation. The Reason is set to "Data truncation", the
-	 * ErrorCode is set to the SQLException default value and other fields are
-	 * set to the values supplied on this method.
-	 * 
-	 * @param index
-	 *            the Index value of the column value or parameter that was
-	 *            truncated
-	 * @param parameter
-	 *            true if it was a Parameter value that was truncated, false
-	 *            otherwise
-	 * @param read
-	 *            true if the truncation occurred on a read operation, false
-	 *            otherwise
-	 * @param dataSize
-	 *            the original size of the truncated data
-	 * @param transferSize
-	 *            the size of the data after truncation
-	 * @param cause
-	 *            the root reason for this DataTruncation
-	 * 
-	 * @since 1.6
-	 */
-	public DataTruncation(int index, boolean parameter, boolean read,
-			int dataSize, int transferSize, Throwable cause) {
-		super(THE_REASON, read ? THE_SQLSTATE_READ : THE_SQLSTATE_WRITE,
-				THE_ERROR_CODE, cause);
-		this.index = index;
-		this.parameter = parameter;
-		this.read = read;
-		this.dataSize = dataSize;
-		this.transferSize = transferSize;
-	}
-            
+     * Creates a DataTruncation. The Reason is set to "Data truncation", the
+     * ErrorCode is set to the SQLException default value and other fields are
+     * set to the values supplied on this method.
+     * 
+     * @param index
+     *            the Index value of the column value or parameter that was
+     *            truncated
+     * @param parameter
+     *            true if it was a Parameter value that was truncated, false
+     *            otherwise
+     * @param read
+     *            true if the truncation occurred on a read operation, false
+     *            otherwise
+     * @param dataSize
+     *            the original size of the truncated data
+     * @param transferSize
+     *            the size of the data after truncation
+     * @param cause
+     *            the root reason for this DataTruncation
+     * 
+     * @since 1.6
+     */
+    public DataTruncation(int index, boolean parameter, boolean read,
+            int dataSize, int transferSize, Throwable cause) {
+        super(THE_REASON, read ? THE_SQLSTATE_READ : THE_SQLSTATE_WRITE,
+                THE_ERROR_CODE, cause);
+        this.index = index;
+        this.parameter = parameter;
+        this.read = read;
+        this.dataSize = dataSize;
+        this.transferSize = transferSize;
+    }
 
     /**
      * Gets the number of bytes of data that should have been read/written.

Modified: harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/DatabaseMetaData.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/DatabaseMetaData.java?view=diff&rev=556835&r1=556834&r2=556835
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/DatabaseMetaData.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/DatabaseMetaData.java Tue Jul 17 00:43:20 2007
@@ -32,7 +32,7 @@
  * that argument's criteria are dropped from the search.
  * 
  */
-public interface DatabaseMetaData extends Wrapper{
+public interface DatabaseMetaData extends Wrapper {
 
     /**
      * States that it may not be permitted to store <code>NULL</code> values.
@@ -290,9 +290,10 @@
      * States that the version column may be a pseudo column or not.
      */
     public static final int versionColumnUnknown = 0;
-    
+
     /**
-     * States that the method DatabaseMetaData.getSQLStateType may returns  an SQLSTATE value or not.
+     * States that the method DatabaseMetaData.getSQLStateType may returns an
+     * SQLSTATE value or not.
      */
     public static final int sqlStateSQL = 2;
 
@@ -319,8 +320,8 @@
     /**
      * States that the parameter of function is unknown
      */
-    public static final int  functionColumnUnknown = 0;
-    
+    public static final int functionColumnUnknown = 0;
+
     /**
      * States that the parameter or column is a column in a result set
      */
@@ -342,7 +343,8 @@
     public static final int functionNullableUnknown = 2;
 
     /**
-     * States that it is not known whether the function returns a result or a table
+     * States that it is not known whether the function returns a result or a
+     * table
      */
     public static final int functionResultUnknown = 0;
 

Modified: harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/NClob.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/NClob.java?view=diff&rev=556835&r1=556834&r2=556835
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/NClob.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/NClob.java Tue Jul 17 00:43:20 2007
@@ -17,8 +17,5 @@
 
 package java.sql;
 
-/**
- * TODO Javadoc
- */
 public interface NClob extends Clob {
 }

Modified: harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/ParameterMetaData.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/ParameterMetaData.java?view=diff&rev=556835&r1=556834&r2=556835
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/ParameterMetaData.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/ParameterMetaData.java Tue Jul 17 00:43:20 2007
@@ -21,7 +21,7 @@
  * An interface used to get information about the types and properties of
  * parameters in a PreparedStatement object.
  */
-public interface ParameterMetaData extends Wrapper{
+public interface ParameterMetaData extends Wrapper {
 
     /**
      * Indicates that the parameter mode is IN.

Modified: harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/RowId.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/RowId.java?view=diff&rev=556835&r1=556834&r2=556835
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/RowId.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/RowId.java Tue Jul 17 00:43:20 2007
@@ -17,16 +17,13 @@
 
 package java.sql;
 
-/**
- * TODO Javadoc
- */
 public interface RowId {
 
-	boolean equals(Object obj);
+    boolean equals(Object obj);
 
-	byte[] getBytes();
+    byte[] getBytes();
 
-	String toString();
+    String toString();
 
-	int hashCode();
+    int hashCode();
 }

Modified: harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/RowIdLifetime.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/RowIdLifetime.java?view=diff&rev=556835&r1=556834&r2=556835
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/RowIdLifetime.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/RowIdLifetime.java Tue Jul 17 00:43:20 2007
@@ -19,9 +19,9 @@
 
 /**
  * An enumeration to describe the life-time of RowID.
- *  
+ * 
  * @since 1.6
  */
 public enum RowIdLifetime {
-	ROWID_UNSUPPORTED, ROWID_VALID_OTHER, ROWID_VALID_SESSION, ROWID_VALID_TRANSACTION, ROWID_VALID_FOREVER,
+    ROWID_UNSUPPORTED, ROWID_VALID_OTHER, ROWID_VALID_SESSION, ROWID_VALID_TRANSACTION, ROWID_VALID_FOREVER,
 }

Modified: harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/SQLData.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/SQLData.java?view=diff&rev=556835&r1=556834&r2=556835
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/SQLData.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/SQLData.java Tue Jul 17 00:43:20 2007
@@ -66,7 +66,7 @@
      * 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,
+     * SQLInput.readString, SQLInput.readBigDecimal). 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

Modified: harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/SQLException.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/SQLException.java?view=diff&rev=556835&r1=556834&r2=556835
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/SQLException.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/SQLException.java Tue Jul 17 00:43:20 2007
@@ -111,7 +111,7 @@
      * @param theCause
      *            the Throwable object for the underlying reason this
      *            SQLException
-     *            
+     * 
      * @since 1.6
      */
     public SQLException(Throwable theCause) {
@@ -127,7 +127,7 @@
      * @param theCause
      *            the Throwable object for the underlying reason this
      *            SQLException
-     *            
+     * 
      * @since 1.6
      */
     public SQLException(String theReason, Throwable theCause) {
@@ -225,6 +225,7 @@
             next = ex;
         }
     }
+
     /**
      * Answer an iterator over the chained SQLExceptions.
      */

Modified: harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/SQLWarning.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/SQLWarning.java?view=diff&rev=556835&r1=556834&r2=556835
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/SQLWarning.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/SQLWarning.java Tue Jul 17 00:43:20 2007
@@ -90,7 +90,7 @@
         }
         throw new Error(Messages.getString("sql.8")); //$NON-NLS-1$
     }
-    
+
     /**
      * 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, cause is

Modified: harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/SQLXML.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/SQLXML.java?view=diff&rev=556835&r1=556834&r2=556835
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/SQLXML.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/SQLXML.java Tue Jul 17 00:43:20 2007
@@ -30,21 +30,21 @@
  */
 public interface SQLXML {
 
-	void free() throws SQLException;
+    void free() throws SQLException;
 
-	InputStream getBinaryStream() throws SQLException;
+    InputStream getBinaryStream() throws SQLException;
 
-	OutputStream setBinaryStream() throws SQLException;
+    OutputStream setBinaryStream() throws SQLException;
 
-	Reader getCharacterStream() throws SQLException;
+    Reader getCharacterStream() throws SQLException;
 
-	Writer setCharacterStream() throws SQLException;
+    Writer setCharacterStream() throws SQLException;
 
-	String getString() throws SQLException;
+    String getString() throws SQLException;
 
-	void setString(String value) throws SQLException;
-	
-	<T extends Source> T getSource(Class<T> sourceClass) throws SQLException;
-	
-	<T extends Result> T setResult(Class<T> resultClass) throws SQLException;
+    void setString(String value) throws SQLException;
+
+    <T extends Source> T getSource(Class<T> sourceClass) throws SQLException;
+
+    <T extends Result> T setResult(Class<T> resultClass) throws SQLException;
 }

Modified: harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/Statement.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/Statement.java?view=diff&rev=556835&r1=556834&r2=556835
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/Statement.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/Statement.java Tue Jul 17 00:43:20 2007
@@ -30,7 +30,7 @@
  * To have multiple ResultSet objects open concurrently, multiple Statement
  * objects must be used.
  */
-public interface Statement extends Wrapper{
+public interface Statement extends Wrapper {
 
     /**
      * Passing this constant to getMoreResults implies that all ResultSet

Modified: harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/Types.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/Types.java?view=diff&rev=556835&r1=556834&r2=556835
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/Types.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/Types.java Tue Jul 17 00:43:20 2007
@@ -183,32 +183,32 @@
     public static final int VARCHAR = 12;
 
     /**
-     *  The type code that identifies the SQL type ROWID.
+     * The type code that identifies the SQL type ROWID.
      */
     public static final int ROWID = -8;
 
     /**
-     *  The type code that identifies the SQL type NCHAR.
+     * The type code that identifies the SQL type NCHAR.
      */
     public static final int NCHAR = -15;
 
     /**
-     *  The type code that identifies the SQL type NVARCHAR.
+     * The type code that identifies the SQL type NVARCHAR.
      */
     public static final int NVARCHAR = -9;
 
     /**
-     *  The type code that identifies the SQL type LONGNVARCHAR.
+     * The type code that identifies the SQL type LONGNVARCHAR.
      */
     public static final int LONGNVARCHAR = -16;
 
     /**
-     *  The type code that identifies the SQL type NCLOB.
+     * The type code that identifies the SQL type NCLOB.
      */
     public static final int NCLOB = 2011;
 
     /**
-     *  The type code that identifies the SQL type SQLXML.
+     * The type code that identifies the SQL type SQLXML.
      */
     public static final int SQLXML = 2009;
 }

Modified: harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/Wrapper.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/Wrapper.java?view=diff&rev=556835&r1=556834&r2=556835
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/Wrapper.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/java/sql/Wrapper.java Tue Jul 17 00:43:20 2007
@@ -26,27 +26,27 @@
  */
 public interface Wrapper {
 
-	/**
-	 * Answers an object that implements the given interface. If the caller is
-	 * not a wrapper, a SQLException will be thrown.
-	 * 
-	 * @param iface -
-	 *            the class that defines the interface
-	 * @return - an object that implements the interface
-	 * @throws SQLException -
-	 *             if there is no object implementing the specific interface
-	 */
-	<T> T unwrap(Class<T> iface) throws SQLException;
+    /**
+     * Answers an object that implements the given interface. If the caller is
+     * not a wrapper, a SQLException will be thrown.
+     * 
+     * @param iface -
+     *            the class that defines the interface
+     * @return - an object that implements the interface
+     * @throws SQLException -
+     *             if there is no object implementing the specific interface
+     */
+    <T> T unwrap(Class<T> iface) throws SQLException;
 
-	/**
-	 * If the caller is a wrapper of the class or implements the given
-	 * interface, the methods return false and vice versa.
-	 * 
-	 * @param iface -
-	 *            the class that defines the interface
-	 * @return - true if the instance implements the interface
-	 * @throws SQLException -
-	 *             when an error occurs when judges the object
-	 */
-	boolean isWrapperFor(Class<?> iface) throws SQLException;
+    /**
+     * If the caller is a wrapper of the class or implements the given
+     * interface, the methods return false and vice versa.
+     * 
+     * @param iface -
+     *            the class that defines the interface
+     * @return - true if the instance implements the interface
+     * @throws SQLException -
+     *             when an error occurs when judges the object
+     */
+    boolean isWrapperFor(Class<?> iface) throws SQLException;
 }

Modified: harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/javax/sql/CommonDataSource.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/javax/sql/CommonDataSource.java?view=diff&rev=556835&r1=556834&r2=556835
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/javax/sql/CommonDataSource.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/javax/sql/CommonDataSource.java Tue Jul 17 00:43:20 2007
@@ -22,7 +22,7 @@
 
 /**
  * Interface that defines the methods which are common between DataSource,
- * XADataSource and ConnectionPoolDataSource.	
+ * XADataSource and ConnectionPoolDataSource.
  * 
  * @since 1.6
  */

Modified: harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/javax/sql/ConnectionPoolDataSource.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/javax/sql/ConnectionPoolDataSource.java?view=diff&rev=556835&r1=556834&r2=556835
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/javax/sql/ConnectionPoolDataSource.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/javax/sql/ConnectionPoolDataSource.java Tue Jul 17 00:43:20 2007
@@ -29,31 +29,31 @@
  */
 public interface ConnectionPoolDataSource extends CommonDataSource {
 
-	/**
-	 * Create a connection to a database which can then be used as a pooled
-	 * connection.
-	 * 
-	 * @return a PooledConnection which represents the connection to the
-	 *         database
-	 * @throws SQLException
-	 *             if there is a problem accessing the database.
-	 */
-	public PooledConnection getPooledConnection() throws SQLException;
+    /**
+     * Create a connection to a database which can then be used as a pooled
+     * connection.
+     * 
+     * @return a PooledConnection which represents the connection to the
+     *         database
+     * @throws SQLException
+     *             if there is a problem accessing the database.
+     */
+    public PooledConnection getPooledConnection() throws SQLException;
 
-	/**
-	 * Create a connection to a database, using a supplied Username and
-	 * Password, which can then be used as a pooled connection.
-	 * 
-	 * @param theUser
-	 *            a String containing a User Name for the database
-	 * @param thePassword
-	 *            a String containing the Password for the user identified by
-	 *            <code>theUser</code>
-	 * @return a PooledConnection which represents the connection to the
-	 *         database
-	 * @throws SQLException
-	 *             if there is a problem accessing the database.
-	 */
-	public PooledConnection getPooledConnection(String theUser,
-			String thePassword) throws SQLException;
+    /**
+     * Create a connection to a database, using a supplied Username and
+     * Password, which can then be used as a pooled connection.
+     * 
+     * @param theUser
+     *            a String containing a User Name for the database
+     * @param thePassword
+     *            a String containing the Password for the user identified by
+     *            <code>theUser</code>
+     * @return a PooledConnection which represents the connection to the
+     *         database
+     * @throws SQLException
+     *             if there is a problem accessing the database.
+     */
+    public PooledConnection getPooledConnection(String theUser,
+            String thePassword) throws SQLException;
 }

Modified: harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/javax/sql/DataSource.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/javax/sql/DataSource.java?view=diff&rev=556835&r1=556834&r2=556835
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/javax/sql/DataSource.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/javax/sql/DataSource.java Tue Jul 17 00:43:20 2007
@@ -50,7 +50,7 @@
  * loaded via a JNDI lookup process. A driver loaded in this way does not
  * register itself with the <code>DriverManager</code>.
  */
-public interface DataSource extends CommonDataSource, Wrapper{
+public interface DataSource extends CommonDataSource, Wrapper {
 
     /**
      * Creates a connection to the database represented by this DataSource.
@@ -75,5 +75,5 @@
      *             if there is a problem accessing the database.
      */
     public Connection getConnection(String theUsername, String thePassword)
-            throws SQLException;    
+            throws SQLException;
 }

Modified: harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/javax/sql/StatementEvent.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/javax/sql/StatementEvent.java?view=diff&rev=556835&r1=556834&r2=556835
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/javax/sql/StatementEvent.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/javax/sql/StatementEvent.java Tue Jul 17 00:43:20 2007
@@ -21,7 +21,6 @@
 import java.sql.SQLException;
 import java.util.EventObject;
 
-
 /**
  * A statement event that a PreparedStatement is closed
  * 
@@ -29,11 +28,11 @@
  */
 public class StatementEvent extends EventObject {
 
-	private static final long serialVersionUID = -8089573731826608315L;
+    private static final long serialVersionUID = -8089573731826608315L;
 
-	private SQLException exception;
+    private SQLException exception;
 
-	private PreparedStatement statement;
+    private PreparedStatement statement;
 
     /**
      * the constructor

Modified: harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/BatchUpdateExceptionTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/BatchUpdateExceptionTest.java?view=diff&rev=556835&r1=556834&r2=556835
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/BatchUpdateExceptionTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/BatchUpdateExceptionTest.java Tue Jul 17 00:43:20 2007
@@ -287,95 +287,95 @@
         } // end for
 
     } // end method testBatchUpdateExceptionStringStringintintArray
-	
-	/**
-	 * @tests {@link java.sql.BatchUpdateException#BatchUpdateException(Throwable)}
-	 * 
-	 * @since 1.6
-	 */
-	public void testBatchUpdateExceptionLThrowable() {
-		Throwable cause = new Exception("MYTHROWABLE");
-		BatchUpdateException batchUpdateException = new BatchUpdateException(
-				cause);
-		assertNotNull(batchUpdateException);
-		assertEquals("java.lang.Exception: MYTHROWABLE", batchUpdateException
-				.getMessage());
-		assertNull(batchUpdateException.getSQLState());
-		assertEquals(0, batchUpdateException.getErrorCode());
-		assertEquals(cause, batchUpdateException.getCause());
-	}
-	
-	/**
-	 * @tests {@link java.sql.BatchUpdateException#BatchUpdateException(int[], Throwable)}
-	 * 
-	 * @since 1.6
-	 */
-	public void testBatchUpdateException$ILThrowable() {
-		Throwable cause = new Exception("MYTHROWABLE");
-		int[] updateCounts = new int[] {1, 2, 3};
-		BatchUpdateException batchUpdateException = new BatchUpdateException(
-				updateCounts, cause);
-		assertNotNull(batchUpdateException);
-		assertEquals("java.lang.Exception: MYTHROWABLE", batchUpdateException
-				.getMessage());
-		int[] result = batchUpdateException.getUpdateCounts();
-		for (int i = 0; i < updateCounts.length; i++) {
-			assertEquals(updateCounts[i], result[i]);
-		}
-		assertEquals(cause, batchUpdateException.getCause());
-	}
-	
-	/**
-	 * @tests {@link java.sql.BatchUpdateException#BatchUpdateException(String, int[], Throwable)}
-	 * 
-	 * @since 1.6
-	 */
-	public void testBatchUpdateExceptionLString$ILThrowable() {
-		Throwable cause = new Exception("MYTHROWABLE");
-		int[] updateCounts = new int[] {1, 2, 3};
-		BatchUpdateException batchUpdateException = new BatchUpdateException(
-				"MYTESTSTRING1", "MYTESTSTRING2", updateCounts, cause);
-		assertNotNull(batchUpdateException);
-		assertEquals("MYTESTSTRING2", batchUpdateException.getSQLState());
-		assertEquals("MYTESTSTRING1", batchUpdateException.getMessage());
-		assertEquals(0, batchUpdateException.getErrorCode());
-		int[] result = batchUpdateException.getUpdateCounts();
-		for (int i = 0; i < updateCounts.length; i++) {
-			assertEquals(updateCounts[i], result[i]);
-		}
-		assertEquals(cause, batchUpdateException.getCause());
-	}
-	
-	/**
-	 * @tests {@link java.sql.BatchUpdateException#BatchUpdateException(String, String, int[], Throwable)}
-	 * 
-	 * @since 1.6
-	 */
-	public void testBatchUpdateExceptionLStringLStringILThrowable() {
-		int[] updateCounts = new int[] { 1, 2, 3 };
-		BatchUpdateException batchUpdateException = new BatchUpdateException(
-				null, null, updateCounts, null);
-		assertNotNull(batchUpdateException);
-		assertNull(batchUpdateException.getSQLState());
-		assertNull(batchUpdateException.getMessage());
-		assertEquals(0, batchUpdateException.getErrorCode());
-		assertNull(batchUpdateException.getCause());
-	}
-	
-	/**
-	 * @tests {@link java.sql.BatchUpdateException#BatchUpdateException(String, String, int, int[], Throwable)}
-	 * 
-	 * @since 1.6
-	 */
-	public void testBatchUpdateExceptionLStringLStringI$ILThrowable() {
-		BatchUpdateException batchUpdateException = new BatchUpdateException(
-				"MYTESTSTRING1", "MYTESTSTRING2", 1, null);
-		assertNotNull(batchUpdateException);
-		assertEquals("MYTESTSTRING2", batchUpdateException.getSQLState());
-		assertEquals("MYTESTSTRING1", batchUpdateException.getMessage());
-		assertEquals(batchUpdateException.getErrorCode(), 1);
-		assertNull(batchUpdateException.getCause());
-	}
+
+    /**
+     * @tests {@link java.sql.BatchUpdateException#BatchUpdateException(Throwable)}
+     * 
+     * @since 1.6
+     */
+    public void testBatchUpdateExceptionLThrowable() {
+        Throwable cause = new Exception("MYTHROWABLE");
+        BatchUpdateException batchUpdateException = new BatchUpdateException(
+                cause);
+        assertNotNull(batchUpdateException);
+        assertEquals("java.lang.Exception: MYTHROWABLE", batchUpdateException
+                .getMessage());
+        assertNull(batchUpdateException.getSQLState());
+        assertEquals(0, batchUpdateException.getErrorCode());
+        assertEquals(cause, batchUpdateException.getCause());
+    }
+
+    /**
+     * @tests {@link java.sql.BatchUpdateException#BatchUpdateException(int[], Throwable)}
+     * 
+     * @since 1.6
+     */
+    public void testBatchUpdateException$ILThrowable() {
+        Throwable cause = new Exception("MYTHROWABLE");
+        int[] updateCounts = new int[] { 1, 2, 3 };
+        BatchUpdateException batchUpdateException = new BatchUpdateException(
+                updateCounts, cause);
+        assertNotNull(batchUpdateException);
+        assertEquals("java.lang.Exception: MYTHROWABLE", batchUpdateException
+                .getMessage());
+        int[] result = batchUpdateException.getUpdateCounts();
+        for (int i = 0; i < updateCounts.length; i++) {
+            assertEquals(updateCounts[i], result[i]);
+        }
+        assertEquals(cause, batchUpdateException.getCause());
+    }
+
+    /**
+     * @tests {@link java.sql.BatchUpdateException#BatchUpdateException(String, int[], Throwable)}
+     * 
+     * @since 1.6
+     */
+    public void testBatchUpdateExceptionLString$ILThrowable() {
+        Throwable cause = new Exception("MYTHROWABLE");
+        int[] updateCounts = new int[] { 1, 2, 3 };
+        BatchUpdateException batchUpdateException = new BatchUpdateException(
+                "MYTESTSTRING1", "MYTESTSTRING2", updateCounts, cause);
+        assertNotNull(batchUpdateException);
+        assertEquals("MYTESTSTRING2", batchUpdateException.getSQLState());
+        assertEquals("MYTESTSTRING1", batchUpdateException.getMessage());
+        assertEquals(0, batchUpdateException.getErrorCode());
+        int[] result = batchUpdateException.getUpdateCounts();
+        for (int i = 0; i < updateCounts.length; i++) {
+            assertEquals(updateCounts[i], result[i]);
+        }
+        assertEquals(cause, batchUpdateException.getCause());
+    }
+
+    /**
+     * @tests {@link java.sql.BatchUpdateException#BatchUpdateException(String, String, int[], Throwable)}
+     * 
+     * @since 1.6
+     */
+    public void testBatchUpdateExceptionLStringLStringILThrowable() {
+        int[] updateCounts = new int[] { 1, 2, 3 };
+        BatchUpdateException batchUpdateException = new BatchUpdateException(
+                null, null, updateCounts, null);
+        assertNotNull(batchUpdateException);
+        assertNull(batchUpdateException.getSQLState());
+        assertNull(batchUpdateException.getMessage());
+        assertEquals(0, batchUpdateException.getErrorCode());
+        assertNull(batchUpdateException.getCause());
+    }
+
+    /**
+     * @tests {@link java.sql.BatchUpdateException#BatchUpdateException(String, String, int, int[], Throwable)}
+     * 
+     * @since 1.6
+     */
+    public void testBatchUpdateExceptionLStringLStringI$ILThrowable() {
+        BatchUpdateException batchUpdateException = new BatchUpdateException(
+                "MYTESTSTRING1", "MYTESTSTRING2", 1, null);
+        assertNotNull(batchUpdateException);
+        assertEquals("MYTESTSTRING2", batchUpdateException.getSQLState());
+        assertEquals("MYTESTSTRING1", batchUpdateException.getMessage());
+        assertEquals(batchUpdateException.getErrorCode(), 1);
+        assertNull(batchUpdateException.getCause());
+    }
 
     /*
      * Method test for getUpdateCounts

Modified: harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/DataTruncationTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/DataTruncationTest.java?view=diff&rev=556835&r1=556834&r2=556835
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/DataTruncationTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/DataTruncationTest.java Tue Jul 17 00:43:20 2007
@@ -92,20 +92,20 @@
         } // end for
 
     } // end method testDataTruncationintbooleanbooleanintint
-	
-	/**
-	 * @tests {@link java.sql.DataTruncation#DataTruncation(int, boolean, boolean, int, int, Throwable)}
-	 * 
-	 * @since 1.6
-	 */
-	public void testConstructor_IBBIILjava_lang_Throwable() {
-		Exception e = new Exception("error message");
-		DataTruncation dataTruncation = new DataTruncation(2147483647, true,
-				false, 0, 2147483647, e);
-		assertNotNull(dataTruncation);
-		assertEquals(e, dataTruncation.getCause());
-		assertEquals("error message", dataTruncation.getCause().getMessage());
-	}
+
+    /**
+     * @tests {@link java.sql.DataTruncation#DataTruncation(int, boolean, boolean, int, int, Throwable)}
+     * 
+     * @since 1.6
+     */
+    public void testConstructor_IBBIILjava_lang_Throwable() {
+        Exception e = new Exception("error message");
+        DataTruncation dataTruncation = new DataTruncation(2147483647, true,
+                false, 0, 2147483647, e);
+        assertNotNull(dataTruncation);
+        assertEquals(e, dataTruncation.getCause());
+        assertEquals("error message", dataTruncation.getCause().getMessage());
+    }
 
     /*
      * Method test for getIndex

Modified: harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/DatabaseMetaDataTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/DatabaseMetaDataTest.java?view=diff&rev=556835&r1=556834&r2=556835
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/DatabaseMetaDataTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/DatabaseMetaDataTest.java Tue Jul 17 00:43:20 2007
@@ -27,66 +27,66 @@
      * Public statics test
      */
     public void testPublicStatics() {
-        assertEquals(attributeNoNulls,0);
-        assertEquals(attributeNullable,1);
-        assertEquals(attributeNullableUnknown,2);
-        assertEquals(bestRowNotPseudo,1);
-        assertEquals(bestRowPseudo,2);
-        assertEquals(bestRowSession,2);
-        assertEquals(bestRowTemporary,0);
-        assertEquals(bestRowTransaction,1);
-        assertEquals(bestRowUnknown,0);
-        assertEquals(columnNoNulls,0);
-        assertEquals(columnNullable,1);
-        assertEquals(columnNullableUnknown,2);
-        assertEquals(functionColumnIn,1);
-        assertEquals(functionColumnInOut,2);
-        assertEquals(functionColumnOut,3);
-        assertEquals(functionColumnResult,5);
-        assertEquals(functionColumnUnknown,0);
-        assertEquals(functionNoNulls,0);
-        assertEquals(functionNoTable,1);
-        assertEquals(functionNullable,1);
-        assertEquals(functionNullableUnknown,2);
-        assertEquals(functionResultUnknown,0);
-        assertEquals(functionReturn,4);
-        assertEquals(functionReturnsTable,2);
-        assertEquals(importedKeyCascade,0);
-        assertEquals(importedKeyInitiallyDeferred,5);
-        assertEquals(importedKeyInitiallyImmediate,6);
-        assertEquals(importedKeyNoAction,3);
-        assertEquals(importedKeyNotDeferrable,7);
-        assertEquals(importedKeyRestrict,1);
-        assertEquals(importedKeySetDefault,4);
-        assertEquals(importedKeySetNull,2);
-        assertEquals(procedureColumnIn,1);
-        assertEquals(procedureColumnInOut,2);
-        assertEquals(procedureColumnOut,4);
-        assertEquals(procedureColumnResult,3);
-        assertEquals(procedureColumnReturn,5);
-        assertEquals(procedureColumnUnknown,0);
-        assertEquals(procedureNoNulls,0);
-        assertEquals(procedureNoResult,1);
-        assertEquals(procedureNullable,1);
-        assertEquals(procedureNullableUnknown,2);
-        assertEquals(procedureResultUnknown,0);
-        assertEquals(procedureReturnsResult,2);
-        assertEquals(sqlStateSQL,2);
-        assertEquals(sqlStateSQL99,2);
-        assertEquals(sqlStateXOpen,1);
-        assertEquals(tableIndexClustered,1);
-        assertEquals(tableIndexHashed,2);
-        assertEquals(tableIndexOther,3);
-        assertEquals(tableIndexStatistic,0);
-        assertEquals(typeNoNulls,0);
-        assertEquals(typeNullable,1);
-        assertEquals(typeNullableUnknown,2);
-        assertEquals(typePredBasic,2);
-        assertEquals(typePredChar,1);
-        assertEquals(typePredNone,0);
-        assertEquals(typeSearchable,3);
-        assertEquals(versionColumnNotPseudo,1);
-        assertEquals(versionColumnPseudo,2);
-        assertEquals(versionColumnUnknown,0);
-	}
+        assertEquals(attributeNoNulls, 0);
+        assertEquals(attributeNullable, 1);
+        assertEquals(attributeNullableUnknown, 2);
+        assertEquals(bestRowNotPseudo, 1);
+        assertEquals(bestRowPseudo, 2);
+        assertEquals(bestRowSession, 2);
+        assertEquals(bestRowTemporary, 0);
+        assertEquals(bestRowTransaction, 1);
+        assertEquals(bestRowUnknown, 0);
+        assertEquals(columnNoNulls, 0);
+        assertEquals(columnNullable, 1);
+        assertEquals(columnNullableUnknown, 2);
+        assertEquals(functionColumnIn, 1);
+        assertEquals(functionColumnInOut, 2);
+        assertEquals(functionColumnOut, 3);
+        assertEquals(functionColumnResult, 5);
+        assertEquals(functionColumnUnknown, 0);
+        assertEquals(functionNoNulls, 0);
+        assertEquals(functionNoTable, 1);
+        assertEquals(functionNullable, 1);
+        assertEquals(functionNullableUnknown, 2);
+        assertEquals(functionResultUnknown, 0);
+        assertEquals(functionReturn, 4);
+        assertEquals(functionReturnsTable, 2);
+        assertEquals(importedKeyCascade, 0);
+        assertEquals(importedKeyInitiallyDeferred, 5);
+        assertEquals(importedKeyInitiallyImmediate, 6);
+        assertEquals(importedKeyNoAction, 3);
+        assertEquals(importedKeyNotDeferrable, 7);
+        assertEquals(importedKeyRestrict, 1);
+        assertEquals(importedKeySetDefault, 4);
+        assertEquals(importedKeySetNull, 2);
+        assertEquals(procedureColumnIn, 1);
+        assertEquals(procedureColumnInOut, 2);
+        assertEquals(procedureColumnOut, 4);
+        assertEquals(procedureColumnResult, 3);
+        assertEquals(procedureColumnReturn, 5);
+        assertEquals(procedureColumnUnknown, 0);
+        assertEquals(procedureNoNulls, 0);
+        assertEquals(procedureNoResult, 1);
+        assertEquals(procedureNullable, 1);
+        assertEquals(procedureNullableUnknown, 2);
+        assertEquals(procedureResultUnknown, 0);
+        assertEquals(procedureReturnsResult, 2);
+        assertEquals(sqlStateSQL, 2);
+        assertEquals(sqlStateSQL99, 2);
+        assertEquals(sqlStateXOpen, 1);
+        assertEquals(tableIndexClustered, 1);
+        assertEquals(tableIndexHashed, 2);
+        assertEquals(tableIndexOther, 3);
+        assertEquals(tableIndexStatistic, 0);
+        assertEquals(typeNoNulls, 0);
+        assertEquals(typeNullable, 1);
+        assertEquals(typeNullableUnknown, 2);
+        assertEquals(typePredBasic, 2);
+        assertEquals(typePredChar, 1);
+        assertEquals(typePredNone, 0);
+        assertEquals(typeSearchable, 3);
+        assertEquals(versionColumnNotPseudo, 1);
+        assertEquals(versionColumnPseudo, 2);
+        assertEquals(versionColumnUnknown, 0);
+    }
 }

Modified: harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/SQLExceptionTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/SQLExceptionTest.java?view=diff&rev=556835&r1=556834&r2=556835
==============================================================================
Binary files /tmp/tmptD5M4a and /tmp/tmpFX0AYe differ



Mime
View raw message