You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by ay...@apache.org on 2006/12/07 14:15:53 UTC
svn commit: r483442 - in /harmony/enhanced/classlib/trunk/modules/sql/src:
main/java/java/sql/ main/java/javax/sql/ main/java/javax/transaction/xa/
test/java/org/apache/harmony/sql/tests/java/sql/
Author: ayza
Date: Thu Dec 7 05:15:50 2006
New Revision: 483442
URL: http://svn.apache.org/viewvc?view=rev&rev=483442
Log:
applying patch from HARMONY-2472 ([classlib][sql] corrections for misprints)
Modified:
harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/Blob.java
harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/Clob.java
harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/DatabaseMetaData.java
harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/Date.java
harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/Driver.java
harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/ResultSet.java
harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/SQLData.java
harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/SQLException.java
harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/SQLInput.java
harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/Savepoint.java
harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/Statement.java
harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/Struct.java
harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/PooledConnection.java
harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/RowSet.java
harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/RowSetMetaData.java
harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/RowSetReader.java
harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/transaction/xa/XAResource.java
harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/SQLPermissionTest.java
Modified: harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/Blob.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/Blob.java?view=diff&rev=483442&r1=483441&r2=483442
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/Blob.java (original)
+++ harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/Blob.java Thu Dec 7 05:15:50 2006
@@ -46,7 +46,7 @@
*
* @param pos
* the position of the first byte in the Blob to get, where the
- * first byte in the Blob hss position = 1
+ * first byte in the Blob has position = 1
* @param length
* the number of bytes to get
* @return a byte array containing the data from the Blob, starting at pos
Modified: harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/Clob.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/Clob.java?view=diff&rev=483442&r1=483441&r2=483442
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/Clob.java (original)
+++ harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/Clob.java Thu Dec 7 05:15:50 2006
@@ -94,10 +94,10 @@
* in this Clob object.
*
* @param searchstr
- * th String to seach for
+ * th String to search for
* @param start
* the position at which to start the search within this Clob.
- * @return a long value with the position at which the specificed String
+ * @return a long value with the position at which the specified String
* occurs within this Clob.
* @throws SQLException
* if an error occurs accessing the Clob
Modified: harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/DatabaseMetaData.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/DatabaseMetaData.java?view=diff&rev=483442&r1=483441&r2=483442
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/DatabaseMetaData.java (original)
+++ harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/DatabaseMetaData.java Thu Dec 7 05:15:50 2006
@@ -1090,7 +1090,7 @@
* <li>DatabaseMetaData.tableIndexStatistic - table statistics returned
* with Index descriptions</li>
* <li>DatabaseMetaData.tableIndexClustered - a clustered Index</li>
- * <li>DatabaseMetaData.tableIndexHased - a hashed Index</li>
+ * <li>DatabaseMetaData.tableIndexHashed - a hashed Index</li>
* <li>DatabaseMetaData.tableIndexOther - other style of Index</li>
* </ul>
* </li>
@@ -1683,7 +1683,7 @@
* have a direct supertype, it is not listed.
* <p>
* The listing is returned as a ResultSet where there is one row for a
- * specific UDT which describes its supertype, with the data organised in
+ * specific UDT which describes its supertype, with the data organized in
* columns as follows:
* <ol>
* <li><code>TYPE_CAT</code> - String - the UDT Catalog name (possibly
Modified: harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/Date.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/Date.java?view=diff&rev=483442&r1=483441&r2=483442
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/Date.java (original)
+++ harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/Date.java Thu Dec 7 05:15:50 2006
@@ -31,7 +31,7 @@
* <p>
* Time points are handled as millisecond values - milliseconds since the epoch,
* January 1st 1970, 00:00:00.000 GMT. Time values passed to the java.sql.Date
- * class are "normalised" to the time 00:00:00.000 GMT on the date implied by
+ * class are "normalized" to the time 00:00:00.000 GMT on the date implied by
* the time value.
*/
public class Date extends java.util.Date {
@@ -203,7 +203,7 @@
}
int firstIndex = dateString.indexOf('-');
int secondIndex = dateString.indexOf('-', firstIndex + 1);
- // secondIndex == -1 means none or only one separater '-' has been
+ // secondIndex == -1 means none or only one separator '-' has been
// found.
// The string is separated into three parts by two separator characters,
// if the first or the third part is null string, we should throw
Modified: harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/Driver.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/Driver.java?view=diff&rev=483442&r1=483441&r2=483442
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/Driver.java (original)
+++ harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/Driver.java Thu Dec 7 05:15:50 2006
@@ -38,7 +38,7 @@
* @param url
* the URL to connect to.
* @return true if the driver thinks that is can open a connection to the
- * supplied URL, flase otherwise. Typically, the driver will respond
+ * supplied URL, false otherwise. Typically, the driver will respond
* true if it thinks that it can handle the subprotocol specified by
* the driver.
* @throws SQLException
Modified: harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/ResultSet.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/ResultSet.java?view=diff&rev=483442&r1=483441&r2=483442
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/ResultSet.java (original)
+++ harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/ResultSet.java Thu Dec 7 05:15:50 2006
@@ -56,7 +56,7 @@
* column names are used, it is not possible to guarantee that the name will
* retrieve data from the intended column - for certainty it is better to use
* column indexes. Ideally the columns should be read left-to-right and read
- * once only, since not all * databases are optimised to handle other techniques
+ * once only, since not all * databases are optimized to handle other techniques
* of reading the data.
* <p>
* When reading data, the JDBC driver maps the SQL data retrieved from the
Modified: harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/SQLData.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/SQLData.java?view=diff&rev=483442&r1=483441&r2=483442
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/SQLData.java (original)
+++ harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/SQLData.java Thu Dec 7 05:15:50 2006
@@ -60,7 +60,7 @@
* 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
+ * <li>Utilize 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>
@@ -83,7 +83,7 @@
public void readSQL(SQLInput stream, String typeName) throws SQLException;
/**
- * Writes the object to a supplied SQLOuput data stream, writing it out as
+ * Writes the object to a supplied SQLOutput data stream, writing it out as
* an SQL value to the data source.
* <p>
* This method follows the following steps:
Modified: harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/SQLException.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/SQLException.java?view=diff&rev=483442&r1=483441&r2=483442
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/SQLException.java (original)
+++ harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/SQLException.java Thu Dec 7 05:15:50 2006
@@ -113,7 +113,7 @@
}
/**
- * Retrieves the SQLException chanied to this SQLException, if any.
+ * Retrieves the SQLException chained to this SQLException, if any.
*
* @return The SQLException chained to this SQLException. null if there is
* no SQLException chained to this SQLException.
Modified: harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/SQLInput.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/SQLInput.java?view=diff&rev=483442&r1=483441&r2=483442
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/SQLInput.java (original)
+++ harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/SQLInput.java Thu Dec 7 05:15:50 2006
@@ -35,7 +35,7 @@
* <p>
* When the getObject method is called with an object which implements the
* SQLData interface, the JDBC driver determines the SQL type of the UDT being
- * mapped by caling the SQLData.getSQLType method. The driver creates an
+ * mapped by calling the SQLData.getSQLType method. The driver creates an
* 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.
Modified: harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/Savepoint.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/Savepoint.java?view=diff&rev=483442&r1=483441&r2=483442
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/Savepoint.java (original)
+++ harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/Savepoint.java Thu Dec 7 05:15:50 2006
@@ -18,7 +18,7 @@
package java.sql;
/**
- * A Savepoint is an instant during the current transaction that can be utilised
+ * A Savepoint is an instant during the current transaction that can be utilized
* 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.
Modified: harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/Statement.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/Statement.java?view=diff&rev=483442&r1=483441&r2=483442
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/Statement.java (original)
+++ harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/Statement.java Thu Dec 7 05:15:50 2006
@@ -522,7 +522,7 @@
* <p>
* Cursor names must be unique within one Connection.
* <p>
- * With the Cursor name set, it can then be utilised in SQL positioned
+ * With the Cursor name set, it can then be utilized in SQL positioned
* update or delete statements to determine the current row in a ResultSet
* generated from this Statement. The positioned update or delete must be
* done with a different Statement than this one.
@@ -560,7 +560,7 @@
* ResultSet.FETCH_REVERSE
* @throws SQLException
* if there is an error while accessing the database or if the
- * fetch direction is unrecognised
+ * fetch direction is unrecognized
*/
public void setFetchDirection(int direction) throws SQLException;
Modified: harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/Struct.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/Struct.java?view=diff&rev=483442&r1=483441&r2=483442
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/Struct.java (original)
+++ harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/Struct.java Thu Dec 7 05:15:50 2006
@@ -53,7 +53,7 @@
* method uses the supplied type map for customized type mappings. Where
* there is no entry in the Type Map which matches the this structured type,
* the JDBC driver uses the default mapping. The Connection type map is
- * never utilised by this method.
+ * never utilized by this method.
*
* @param theMap
* a Map describing how SQL Type names are mapped to classes.
Modified: harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/PooledConnection.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/PooledConnection.java?view=diff&rev=483442&r1=483441&r2=483442
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/PooledConnection.java (original)
+++ harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/PooledConnection.java Thu Dec 7 05:15:50 2006
@@ -84,7 +84,7 @@
/**
* Creates a connection to the database. This method is typically called by
- * the Connectio Pool manager when an application invokes the method
+ * the Connection Pool manager when an application invokes the method
* <code>DataSource.getConnection</code> and there are no PooledConnection
* objects available in the connection pool.
*
@@ -98,7 +98,7 @@
/**
* Deregister the supplied ConnectionEventListener from this
* PooledConnection. Once deregistered, the ConnectionEventListener will not
- * longer receive events ocurring in the PooledConnection.
+ * longer receive events occurring in the PooledConnection.
*
* @param theListener
* an object which implements the ConnectionEventListener
Modified: harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/RowSet.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/RowSet.java?view=diff&rev=483442&r1=483441&r2=483442
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/RowSet.java (original)
+++ harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/RowSet.java Thu Dec 7 05:15:50 2006
@@ -38,7 +38,7 @@
* can be used as a JavaBeans component, perhaps being used in a visual
* programming environment.
* <p>
- * Facilities are provided for get/set of propoerties relating to the Database
+ * Facilities are provided for get/set of properties relating to the Database
* and the SQL Command and for getting/setting data within the Rows represented
* by the RowSet. The RowSet supports JavaBeans events so that other components
* in an application can be informed when various changes happen to the RowSet,
@@ -154,7 +154,7 @@
public int getMaxRows() throws SQLException;
/**
- * Gets the value of the password propoerty for this RowSet. This property
+ * Gets the value of the password property for this RowSet. This property
* is used when making a connection to the database and should be set before
* invoking the <code>execute</code> method.
*
@@ -187,7 +187,7 @@
/**
* Gets the custom mapping of SQL types for this RowSet, if any.
*
- * @return a Map olding the custom mappings of SQL types to Java classes for
+ * @return a Map holding the custom mappings of SQL types to Java classes for
* this RowSet. By default, the Map is empty.
* @throws SQLException
* if an error occurs accessing the database.
@@ -452,7 +452,7 @@
* @param theDate
* the Date to use
* @param theCalendar
- * the Calendar to use in coverting the Date to an SQL DATE value
+ * the Calendar to use in converting the Date to an SQL DATE value
* @throws SQLException
* if an error occurs accessing the database.
*/
@@ -807,7 +807,7 @@
public void setTransactionIsolation(int level) throws SQLException;
/**
- * Sets the type of this RowSet. By default, the type is non-scollable.
+ * Sets the type of this RowSet. By default, the type is non-scrollable.
*
* @param type
* the new type for the RowSet. One of:
Modified: harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/RowSetMetaData.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/RowSetMetaData.java?view=diff&rev=483442&r1=483441&r2=483442
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/RowSetMetaData.java (original)
+++ harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/RowSetMetaData.java Thu Dec 7 05:15:50 2006
@@ -27,7 +27,7 @@
* RowSetMetaData extends ResultSetMetaData, adding new operations for carrying
* out value sets.
* <p>
- * Application code would not mormally call this interface directly. It would be
+ * Application code would not normally call this interface directly. It would be
* called internally when <code>RowSet.execute</code> is called.
*/
public interface RowSetMetaData extends ResultSetMetaData {
@@ -35,7 +35,7 @@
/**
* Sets automatic numbering for a specified column in the RowSet. If
* automatic numbering is on, the column is read only. The default value is
- * for automatice numbering to be off.
+ * for automatic numbering to be off.
*
* @param columnIndex
* the index number for the column, where the first column has
@@ -153,7 +153,7 @@
* the index number for the column, where the first column has
* index 1.
* @param theTypeName
- * a string containing the Type Name for the colunm
+ * a string containing the Type Name for the column
* @throws SQLException
* if a problem occurs accessing the database
*/
@@ -201,7 +201,7 @@
* the index number for the column, where the first column has
* index 1.
* @param thePrecision
- * an integer containoing the number of decimal digits
+ * an integer containing the number of decimal digits
* @throws SQLException
* if a problem occurs accessing the database
*/
Modified: harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/RowSetReader.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/RowSetReader.java?view=diff&rev=483442&r1=483441&r2=483442
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/RowSetReader.java (original)
+++ harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/RowSetReader.java Thu Dec 7 05:15:50 2006
@@ -23,7 +23,7 @@
* An interface which provides functionality for a disconnected RowSet to get
* data from a data source into its rows. The RowSet calls the RowSetReader
* interface when the RowSet's execute method is invoked - a RowSetReader must
- * firat be registered with the RowSet for this to work.
+ * first be registered with the RowSet for this to work.
*/
public interface RowSetReader {
Modified: harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/transaction/xa/XAResource.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/transaction/xa/XAResource.java?view=diff&rev=483442&r1=483441&r2=483442
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/transaction/xa/XAResource.java (original)
+++ harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/transaction/xa/XAResource.java Thu Dec 7 05:15:50 2006
@@ -41,7 +41,7 @@
public static final int TMFAIL = 0x20000000;
/**
- * Flag to indicate that the caller is joiing sn existing transaction
+ * Flag to indicate that the caller is joining sn existing transaction
* branch.
*/
public static final int TMJOIN = 0x200000;
@@ -250,7 +250,7 @@
* an integer. Must be one of XAResource.TMNOFLAGS,
* XAResource.TMJOIN, or XAResource.TMRESUME.
* <p>
- * TMJOIN implies that the start applies to joiing a transaction
+ * TMJOIN implies that the start applies to joining a transaction
* previously passed to the Resource Manager.
* <p>
* TMRESUME implies that the start applies to a suspended
Modified: harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/SQLPermissionTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/SQLPermissionTest.java?view=diff&rev=483442&r1=483441&r2=483442
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/SQLPermissionTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/SQLPermissionTest.java Thu Dec 7 05:15:50 2006
@@ -25,7 +25,7 @@
* JUnit Testcase for the java.sql.SQLPermission class
*
* Note that the SQLPermission class only defines 2 constructors and all other
- * methods are inherited. This testcase explicity tets the constructors but also
+ * methods are inherited. This testcase explicitly tets the constructors but also
* implicitly tests some of the inherited query methods.
*
*/
@@ -70,4 +70,5 @@
} // end method testSQLPermissionString
} // end class SQLPermissionTest
+