You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by py...@apache.org on 2007/07/16 11:03:03 UTC
svn commit: r556562 [1/6] - in
/harmony/enhanced/classlib/trunk/modules/sql/src: main/java/java/sql/
main/java/javax/sql/ main/java/javax/sql/rowset/
main/java/javax/sql/rowset/serial/ main/java/javax/sql/rowset/spi/
main/java/javax/transaction/xa/ mai...
Author: pyang
Date: Mon Jul 16 02:02:56 2007
New Revision: 556562
URL: http://svn.apache.org/viewvc?view=rev&rev=556562
Log:
Tidy up format of sql module using Eclipse formatter, convert tab to spaces, remove redundant empty lines and spaces, etc
Modified:
harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/DriverManager.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/Time.java
harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/Timestamp.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/rowset/BaseRowSet.java
harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/RowSetMetaDataImpl.java
harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/SqlUtil.java
harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/WebRowSet.java
harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/serial/DefaultUDTMap.java
harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/serial/SQLInputImpl.java
harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/serial/SQLOutputImpl.java
harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/serial/SerialArray.java
harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/serial/SerialClob.java
harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/serial/SerialDatalink.java
harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/serial/SerialException.java
harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/serial/SerialJavaObject.java
harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/serial/SerialRef.java
harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/spi/ProviderImpl.java
harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/spi/SyncFactory.java
harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/spi/SyncProvider.java
harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/transaction/xa/XAException.java
harmony/enhanced/classlib/trunk/modules/sql/src/main/java/org/apache/harmony/sql/internal/nls/Messages.java
harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/BatchUpdateExceptionTest.java
harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/ConnectionTest.java
harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/DataTruncationTest.java
harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/DatabaseMetaDataTest.java
harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/DateTest.java
harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/DriverManagerTest.java
harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/DriverPropertyInfoTest.java
harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/ParameterMetaDataTest.java
harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/ResultSetMetaDataTest.java
harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/ResultSetTest.java
harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/SQLExceptionTest.java
harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/SQLPermissionTest.java
harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/SQLWarningTest.java
harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/StatementTest.java
harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_ClassLoader.java
harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Connection1.java
harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Driver1.java
harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Driver2.java
harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Driver3.java
harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Driver4.java
harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Driver5.java
harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_DriverManager.java
harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestMainForDriver.java
harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TimeTest.java
harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TimestampTest.java
harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TypesTest.java
harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/ConnectionEventTest.java
harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/Impl_PooledConnection.java
harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/Impl_RowSet.java
harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/RowSetEventTest.java
harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/rowset/BaseRowSetTest.java
harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/rowset/MockArray.java
harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/rowset/MockBlob.java
harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/rowset/MockClob.java
harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/rowset/RowSetMetaDataImplTest.java
harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/rowset/serial/SQLInputImplTest.java
harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/rowset/serial/SQLOutputImplTest.java
harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/rowset/serial/SerialArrayTest.java
harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/rowset/serial/SerialClobTest.java
harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/rowset/serial/SerialExceptionTest.java
harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/rowset/serial/SerialJavaObjectTest.java
harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/rowset/serial/SerialRefTest.java
harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/javax/transaction/InvalidTransactionExceptionTest.java
harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/javax/transaction/TransactionRequiredExceptionTest.java
harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/javax/transaction/TransactionRolledbackExceptionTest.java
harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/javax/transaction/xa/XAExceptionTest.java
harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/javax/transaction/xa/XAResourceTest.java
harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/javax/transaction/xa/XidTest.java
Modified: harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/DriverManager.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/DriverManager.java?view=diff&rev=556562&r1=556561&r2=556562
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/DriverManager.java (original)
+++ harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/DriverManager.java Mon Jul 16 02:02:56 2007
@@ -56,7 +56,8 @@
private static final List<Driver> theDrivers = new ArrayList<Driver>(10);
// Permission for setting log
- private static final SQLPermission logPermission = new SQLPermission("setLog"); //$NON-NLS-1$
+ private static final SQLPermission logPermission = new SQLPermission(
+ "setLog"); //$NON-NLS-1$
/*
* Load drivers on initialization
@@ -122,7 +123,8 @@
ClassLoader callerClassLoader = VM.callerClassLoader();
if (!DriverManager.isClassFromClassLoader(driver, callerClassLoader)) {
- // sql.1=DriverManager: calling class not authorized to deregister JDBC driver
+ // sql.1=DriverManager: calling class not authorized to deregister
+ // JDBC driver
throw new SecurityException(Messages.getString("sql.1")); //$NON-NLS-1$
} // end if
synchronized (theDrivers) {
@@ -208,10 +210,10 @@
public static Connection getConnection(String url, String user,
String password) throws SQLException {
Properties theProperties = new Properties();
- if(null != user){
+ if (null != user) {
theProperties.setProperty("user", user); //$NON-NLS-1$
}
- if(null != password){
+ if (null != password) {
theProperties.setProperty("password", password); //$NON-NLS-1$
}
return getConnection(url, theProperties);
@@ -248,8 +250,8 @@
}
// If no drivers understand the URL, throw an SQLException
// sql.6=No suitable driver
- //SQLState: 08 - connection exception
- //001 - SQL-client unable to establish SQL-connection
+ // SQLState: 08 - connection exception
+ // 001 - SQL-client unable to establish SQL-connection
throw new SQLException(Messages.getString("sql.6"), "08001"); //$NON-NLS-1$ //$NON-NLS-2$
}
@@ -415,13 +417,13 @@
*/
private static boolean isClassFromClassLoader(Object theObject,
ClassLoader theClassLoader) {
-
+
if ((theObject == null) || (theClassLoader == null)) {
return false;
}
-
+
Class<?> objectClass = theObject.getClass();
-
+
try {
Class<?> checkClass = Class.forName(objectClass.getName(), true,
theClassLoader);
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=556562&r1=556561&r2=556562
==============================================================================
--- 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 Mon Jul 16 02:02:56 2007
@@ -143,7 +143,7 @@
* @param ex
* the new SQLException to be added to the end of the chain
*/
- public void setNextException(SQLException ex) {
+ public void setNextException(SQLException ex) {
if (next != null) {
next.setNextException(ex);
} else {
Modified: harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/Time.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/Time.java?view=diff&rev=556562&r1=556561&r2=556562
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/Time.java (original)
+++ harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/Time.java Mon Jul 16 02:02:56 2007
@@ -204,18 +204,21 @@
}
int firstIndex = timeString.indexOf(':');
int secondIndex = timeString.indexOf(':', firstIndex + 1);
- // secondIndex == -1 means none or only one separator '-' has been found.
+ // 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
// IllegalArgumentException to follow RI
- if (secondIndex == -1|| firstIndex == 0 || secondIndex + 1 == timeString.length()) {
+ if (secondIndex == -1 || firstIndex == 0
+ || secondIndex + 1 == timeString.length()) {
throw new IllegalArgumentException();
}
// parse each part of the string
int hour = Integer.parseInt(timeString.substring(0, firstIndex));
- int minute = Integer.parseInt(timeString.substring(firstIndex + 1, secondIndex));
- int second = Integer.parseInt(timeString.substring(secondIndex + 1, timeString
- .length()));
+ int minute = Integer.parseInt(timeString.substring(firstIndex + 1,
+ secondIndex));
+ int second = Integer.parseInt(timeString.substring(secondIndex + 1,
+ timeString.length()));
return new Time(hour, minute, second);
}
}
Modified: harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/Timestamp.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/Timestamp.java?view=diff&rev=556562&r1=556561&r2=556562
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/Timestamp.java (original)
+++ harmony/enhanced/classlib/trunk/modules/sql/src/main/java/java/sql/Timestamp.java Mon Jul 16 02:02:56 2007
@@ -318,7 +318,7 @@
decimalFormat.setMaximumIntegerDigits(9);
String theNanos = decimalFormat.format(nanos);
theNanos = stripTrailingZeros(theNanos);
-
+
String year = format((getYear() + 1900), 4);
String month = format((getMonth() + 1), 2);
String date = format(getDate(), 2);
@@ -336,11 +336,11 @@
private String format(int date, int digits) {
StringBuilder dateStringBuffer = new StringBuilder(String.valueOf(date));
while (dateStringBuffer.length() < digits) {
- dateStringBuffer = dateStringBuffer.insert(0,'0');
+ dateStringBuffer = dateStringBuffer.insert(0, '0');
}
return dateStringBuffer.toString();
}
-
+
/*
* Private method to strip trailing '0' characters from a string. @param
* inputString the starting string @return a string with the trailing zeros
@@ -439,7 +439,8 @@
// Require the next character to be a "."
if (s.charAt(position) != '.') {
// sql.4=Bad input string format: expected '.' not {0}
- throw new NumberFormatException(Messages.getString("sql.4", s.charAt(position))); //$NON-NLS-1$
+ throw new NumberFormatException(Messages.getString(
+ "sql.4", s.charAt(position))); //$NON-NLS-1$
}
// Get the length of the number string - need to account for the '.'
int nanoLength = s.length() - position - 1;
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=556562&r1=556561&r2=556562
==============================================================================
--- 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 Mon Jul 16 02:02:56 2007
@@ -154,8 +154,8 @@
public int getMaxRows() throws SQLException;
/**
- * 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
+ * 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.
*
* @return a String containing the value of the password property.
@@ -187,8 +187,8 @@
/**
* Gets the custom mapping of SQL types for this RowSet, if any.
*
- * @return a Map holding the custom mappings of SQL types to Java classes for
- * this RowSet. By default, the Map is empty.
+ * @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,8 @@
* @param theDate
* the Date to use
* @param theCalendar
- * the Calendar to use in converting 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.
*/
Modified: harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/BaseRowSet.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/BaseRowSet.java?view=diff&rev=556562&r1=556561&r2=556562
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/BaseRowSet.java (original)
+++ harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/BaseRowSet.java Mon Jul 16 02:02:56 2007
@@ -45,8 +45,8 @@
import javax.sql.rowset.serial.SerialRef;
public abstract class BaseRowSet implements Cloneable, Serializable {
- private static final long serialVersionUID = 4886719666485113312L ;
-
+ private static final long serialVersionUID = 4886719666485113312L;
+
public static final int UNICODE_STREAM_PARAM = 0;
public static final int BINARY_STREAM_PARAM = 1;
@@ -215,15 +215,15 @@
public void setType(int type) throws SQLException {
switch (type) {
- case ResultSet.TYPE_FORWARD_ONLY:
- case ResultSet.TYPE_SCROLL_INSENSITIVE:
- case ResultSet.TYPE_SCROLL_SENSITIVE: {
- this.rowSetType = type;
- return;
- }
- default: {
- throw new SQLException();
- }
+ case ResultSet.TYPE_FORWARD_ONLY:
+ case ResultSet.TYPE_SCROLL_INSENSITIVE:
+ case ResultSet.TYPE_SCROLL_SENSITIVE: {
+ this.rowSetType = type;
+ return;
+ }
+ default: {
+ throw new SQLException();
+ }
}
}
@@ -233,14 +233,14 @@
public void setConcurrency(int concurrency) throws SQLException {
switch (concurrency) {
- case ResultSet.CONCUR_READ_ONLY:
- case ResultSet.CONCUR_UPDATABLE: {
- this.concurrency = concurrency;
- return;
- }
- default: {
- throw new SQLException();
- }
+ case ResultSet.CONCUR_READ_ONLY:
+ case ResultSet.CONCUR_UPDATABLE: {
+ this.concurrency = concurrency;
+ return;
+ }
+ default: {
+ throw new SQLException();
+ }
}
}
@@ -262,17 +262,17 @@
public void setTransactionIsolation(int level) throws SQLException {
switch (level) {
- case Connection.TRANSACTION_NONE:
- case Connection.TRANSACTION_READ_UNCOMMITTED:
- case Connection.TRANSACTION_READ_COMMITTED:
- case Connection.TRANSACTION_REPEATABLE_READ:
- case Connection.TRANSACTION_SERIALIZABLE: {
- this.isolation = level;
- return;
- }
- default: {
- throw new SQLException();
- }
+ case Connection.TRANSACTION_NONE:
+ case Connection.TRANSACTION_READ_UNCOMMITTED:
+ case Connection.TRANSACTION_READ_COMMITTED:
+ case Connection.TRANSACTION_REPEATABLE_READ:
+ case Connection.TRANSACTION_SERIALIZABLE: {
+ this.isolation = level;
+ return;
+ }
+ default: {
+ throw new SQLException();
+ }
}
}
@@ -330,20 +330,20 @@
public void setFetchDirection(int direction) throws SQLException {
switch (direction) {
- case ResultSet.FETCH_REVERSE:
- case ResultSet.FETCH_UNKNOWN: {
- if (rowSetType == ResultSet.TYPE_FORWARD_ONLY) {
- throw new SQLException();
- }
- }
- case ResultSet.FETCH_FORWARD: {
- this.fetchDir = direction;
- return;
- }
- default: {
+ case ResultSet.FETCH_REVERSE:
+ case ResultSet.FETCH_UNKNOWN: {
+ if (rowSetType == ResultSet.TYPE_FORWARD_ONLY) {
throw new SQLException();
}
}
+ case ResultSet.FETCH_FORWARD: {
+ this.fetchDir = direction;
+ return;
+ }
+ default: {
+ throw new SQLException();
+ }
+ }
}
public int getFetchDirection() throws SQLException {
@@ -376,7 +376,8 @@
params.put(Integer.valueOf(parameterIndex - 1), value);
}
- public void setNull(int parameterIndex, int sqlType, String typeName) throws SQLException {
+ public void setNull(int parameterIndex, int sqlType, String typeName)
+ throws SQLException {
if (parameterIndex < 1) {
throw new SQLException();
}
@@ -459,7 +460,8 @@
params.put(Integer.valueOf(parameterIndex - 1), Double.valueOf(x));
}
- public void setBigDecimal(int parameterIndex, BigDecimal x) throws SQLException {
+ public void setBigDecimal(int parameterIndex, BigDecimal x)
+ throws SQLException {
if (parameterIndex < 1) {
throw new SQLException();
}
@@ -509,7 +511,8 @@
params.put(Integer.valueOf(parameterIndex - 1), x);
}
- public void setTimestamp(int parameterIndex, Timestamp x) throws SQLException {
+ public void setTimestamp(int parameterIndex, Timestamp x)
+ throws SQLException {
if (parameterIndex < 1) {
throw new SQLException();
}
@@ -579,8 +582,8 @@
params.put(Integer.valueOf(parameterIndex - 1), value);
}
- public void setObject(int parameterIndex, Object x, int targetSqlType, int scale)
- throws SQLException {
+ public void setObject(int parameterIndex, Object x, int targetSqlType,
+ int scale) throws SQLException {
if (parameterIndex < 1) {
throw new SQLException();
}
@@ -594,7 +597,8 @@
params.put(Integer.valueOf(parameterIndex - 1), value);
}
- public void setObject(int parameterIndex, Object x, int targetSqlType) throws SQLException {
+ public void setObject(int parameterIndex, Object x, int targetSqlType)
+ throws SQLException {
if (parameterIndex < 1) {
throw new SQLException();
}
@@ -657,7 +661,8 @@
params.put(Integer.valueOf(parameterIndex - 1), new SerialArray(array));
}
- public void setDate(int parameterIndex, Date x, Calendar cal) throws SQLException {
+ public void setDate(int parameterIndex, Date x, Calendar cal)
+ throws SQLException {
if (parameterIndex < 1) {
throw new SQLException();
}
@@ -670,7 +675,8 @@
params.put(Integer.valueOf(parameterIndex - 1), value);
}
- public void setTime(int parameterIndex, Time x, Calendar cal) throws SQLException {
+ public void setTime(int parameterIndex, Time x, Calendar cal)
+ throws SQLException {
if (parameterIndex < 1) {
throw new SQLException();
}
@@ -683,7 +689,8 @@
params.put(Integer.valueOf(parameterIndex - 1), value);
}
- public void setTimestamp(int parameterIndex, Timestamp x, Calendar cal) throws SQLException {
+ public void setTimestamp(int parameterIndex, Timestamp x, Calendar cal)
+ throws SQLException {
if (parameterIndex < 1) {
throw new SQLException();
}
Modified: harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/RowSetMetaDataImpl.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/RowSetMetaDataImpl.java?view=diff&rev=556562&r1=556561&r2=556562
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/RowSetMetaDataImpl.java (original)
+++ harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/RowSetMetaDataImpl.java Mon Jul 16 02:02:56 2007
@@ -40,54 +40,54 @@
private static final int DEFAULT_COLUMN_COUNT = 5;
private static final long serialVersionUID = 6893806403181801867L;
-
+
private int colCount;
private ColInfo[] colInfo;
/**
- * The default constructor.
+ * The default constructor.
*/
public RowSetMetaDataImpl() {
// do nothing
}
-
+
private void checkNegativeValue(int value, String msg) throws SQLException {
if (value < 0) {
throw new SQLException(Messages.getString(msg));
}
}
-
+
private void checkColumnIndex(int columnIndex) throws SQLException {
if (null == colInfo || columnIndex < 1 || columnIndex >= colInfo.length) {
throw new SQLException(Messages
.getString("sql.27", columnIndex + 1)); //$NON-NLS-1$
}
- // lazy initialization
+ // lazy initialization
if (null == colInfo[columnIndex]) {
colInfo[columnIndex] = new ColInfo();
}
}
-
+
/**
* {@inheritDoc}
*
* @see javax.sql.RowSetMetaData#setColumnCount(int)
*/
- public void setColumnCount(int columnCount) throws SQLException {
+ public void setColumnCount(int columnCount) throws SQLException {
if (columnCount <= 0) {
throw new SQLException(Messages.getString("sql.26")); //$NON-NLS-1$
}
try {
if (columnCount + 1 > 0) {
- colInfo = new ColInfo[columnCount + 1];
+ colInfo = new ColInfo[columnCount + 1];
} else {
colInfo = new ColInfo[DEFAULT_COLUMN_COUNT];
}
} catch (OutOfMemoryError e) {
// For compatibility, use same default value as RI
colInfo = new ColInfo[DEFAULT_COLUMN_COUNT];
- }
+ }
colCount = columnCount;
}
@@ -170,7 +170,7 @@
public void setColumnDisplaySize(int columnIndex, int size)
throws SQLException {
checkNegativeValue(size, "sql.30"); //$NON-NLS-1$
-
+
checkColumnIndex(columnIndex);
colInfo[columnIndex].columnDisplaySize = size;
}
@@ -218,7 +218,7 @@
public void setPrecision(int columnIndex, int precision)
throws SQLException {
checkNegativeValue(precision, "sql.31"); //$NON-NLS-1$
-
+
checkColumnIndex(columnIndex);
colInfo[columnIndex].precision = precision;
}
@@ -230,7 +230,7 @@
*/
public void setScale(int columnIndex, int scale) throws SQLException {
checkNegativeValue(scale, "sql.32"); //$NON-NLS-1$
-
+
checkColumnIndex(columnIndex);
colInfo[columnIndex].scale = scale;
}
@@ -266,8 +266,8 @@
*/
public void setColumnType(int columnIndex, int SQLType) throws SQLException {
SqlUtil.validateType(SQLType);
-
- checkColumnIndex(columnIndex);
+
+ checkColumnIndex(columnIndex);
colInfo[columnIndex].colType = SQLType;
}
@@ -299,7 +299,7 @@
*/
public boolean isAutoIncrement(int columnIndex) throws SQLException {
checkColumnIndex(columnIndex);
- return colInfo[columnIndex].autoIncrement;
+ return colInfo[columnIndex].autoIncrement;
}
/**
@@ -468,24 +468,24 @@
*/
public boolean isWritable(int columnIndex) throws SQLException {
checkColumnIndex(columnIndex);
- return colInfo[columnIndex].writeable;
+ return colInfo[columnIndex].writeable;
}
/**
* {@inheritDoc}
*
* @see java.sql.ResultSetMetaData#isDefinitelyWritable(int)
- */
+ */
public boolean isDefinitelyWritable(int columnIndex) throws SQLException {
checkColumnIndex(columnIndex);
- return colInfo[columnIndex].definiteWritable;
+ return colInfo[columnIndex].definiteWritable;
}
/**
* {@inheritDoc}
*
* @see java.sql.ResultSetMetaData#getColumnClassName(int)
- */
+ */
public String getColumnClassName(int columnIndex) throws SQLException {
return SqlUtil.getClassNameByType(getColumnType(columnIndex));
}
@@ -494,13 +494,13 @@
* The inner class to store meta information of columns.
*/
private class ColInfo implements Serializable {
-
+
private static final long serialVersionUID = 5490834817919311283L;
public boolean autoIncrement;
public boolean caseSensitive;
-
+
public boolean currency;
public boolean signed;
@@ -510,7 +510,7 @@
public boolean writeable = true;
public boolean definiteWritable = true;
-
+
public String columnLabel;
public String columnName;
@@ -520,17 +520,17 @@
public String colTypeName;
public int colType;
-
+
public int nullable;
-
+
public int columnDisplaySize;
-
+
public int precision;
-
+
public int scale;
-
+
public String tableName = EMPTY_STRING;
-
+
public String catalogName = EMPTY_STRING;
}
}
Modified: harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/SqlUtil.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/SqlUtil.java?view=diff&rev=556562&r1=556561&r2=556562
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/SqlUtil.java (original)
+++ harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/SqlUtil.java Mon Jul 16 02:02:56 2007
@@ -21,52 +21,52 @@
import java.sql.Types;
import org.apache.harmony.sql.internal.nls.Messages;
-
-class SqlUtil{
+class SqlUtil {
/*
- * FIXME:Validate column types is defined by java.sql.Types, current implementation is ugly, need to find
- * an elegant and effient way to check all constants defined in java.util.sql.Types
+ * FIXME:Validate column types is defined by java.sql.Types, current
+ * implementation is ugly, need to find an elegant and effient way to check
+ * all constants defined in java.util.sql.Types
*/
static void validateType(int type) throws SQLException {
- switch(type){
- case Types.ARRAY:
- case Types.BIGINT:
- case Types.BINARY:
- case Types.BIT:
- case Types.BLOB:
- case Types.BOOLEAN:
- case Types.CHAR:
- case Types.CLOB:
- case Types.DATALINK:
- case Types.DATE:
- case Types.DECIMAL:
- case Types.DISTINCT:
- case Types.DOUBLE:
- case Types.FLOAT:
- case Types.INTEGER:
- case Types.JAVA_OBJECT:
- case Types.LONGVARBINARY:
- case Types.LONGVARCHAR:
- case Types.NULL:
- case Types.NUMERIC:
- case Types.OTHER:
- case Types.REAL:
- case Types.REF:
- case Types.SMALLINT:
- case Types.STRUCT:
- case Types.TIME:
- case Types.TIMESTAMP:
- case Types.TINYINT:
- case Types.VARBINARY:
- case Types.VARCHAR:
- return;
+ switch (type) {
+ case Types.ARRAY:
+ case Types.BIGINT:
+ case Types.BINARY:
+ case Types.BIT:
+ case Types.BLOB:
+ case Types.BOOLEAN:
+ case Types.CHAR:
+ case Types.CLOB:
+ case Types.DATALINK:
+ case Types.DATE:
+ case Types.DECIMAL:
+ case Types.DISTINCT:
+ case Types.DOUBLE:
+ case Types.FLOAT:
+ case Types.INTEGER:
+ case Types.JAVA_OBJECT:
+ case Types.LONGVARBINARY:
+ case Types.LONGVARCHAR:
+ case Types.NULL:
+ case Types.NUMERIC:
+ case Types.OTHER:
+ case Types.REAL:
+ case Types.REF:
+ case Types.SMALLINT:
+ case Types.STRUCT:
+ case Types.TIME:
+ case Types.TIMESTAMP:
+ case Types.TINYINT:
+ case Types.VARBINARY:
+ case Types.VARCHAR:
+ return;
}
throw new SQLException(Messages.getString("sql.28")); //$NON-NLS-1$
}
- static String getClassNameByType(int type){
+ static String getClassNameByType(int type) {
String className = null;
- switch (type) {
+ switch (type) {
case Types.BINARY:
case Types.BLOB:
case Types.LONGVARBINARY:
Modified: harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/WebRowSet.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/WebRowSet.java?view=diff&rev=556562&r1=556561&r2=556562
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/WebRowSet.java (original)
+++ harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/WebRowSet.java Mon Jul 16 02:02:56 2007
@@ -37,7 +37,8 @@
void writeXml(ResultSet rs, Writer writer) throws SQLException;
- void writeXml(ResultSet rs, OutputStream oStream) throws SQLException, IOException;
+ void writeXml(ResultSet rs, OutputStream oStream) throws SQLException,
+ IOException;
void writeXml(Writer writer) throws SQLException;
Modified: harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/serial/DefaultUDTMap.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/serial/DefaultUDTMap.java?view=diff&rev=556562&r1=556561&r2=556562
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/serial/DefaultUDTMap.java (original)
+++ harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/serial/DefaultUDTMap.java Mon Jul 16 02:02:56 2007
@@ -39,7 +39,7 @@
throws SerialException {
SerialDatalink[] ret = new SerialDatalink[elements.length];
for (int i = 0; i < elements.length; i++) {
- ret[i] = new SerialDatalink((URL)elements[i]);
+ ret[i] = new SerialDatalink((URL) elements[i]);
}
return ret;
}
@@ -48,7 +48,7 @@
throws SerialException {
Struct[] ret = new Struct[elements.length];
for (int i = 0; i < elements.length; i++) {
- ret[i] = (Struct)elements[i];
+ ret[i] = (Struct) elements[i];
}
return ret;
}
@@ -57,7 +57,7 @@
throws SerialException {
Array[] ret = new Array[elements.length];
for (int i = 0; i < elements.length; i++) {
- ret[i] = (Array)elements[i];
+ ret[i] = (Array) elements[i];
}
return ret;
}
@@ -65,7 +65,7 @@
public static Clob[] processClob(Object[] elements) throws SQLException {
Clob[] ret = new Clob[elements.length];
for (int i = 0; i < elements.length; i++) {
- ret[i] = new SerialClob((Clob)elements[i]);
+ ret[i] = new SerialClob((Clob) elements[i]);
}
return ret;
}
@@ -73,7 +73,7 @@
public static Blob[] processBlob(Object[] elements) throws SQLException {
Blob[] ret = new Blob[elements.length];
for (int i = 0; i < elements.length; i++) {
- ret[i] = new SerialBlob((Blob)elements[i]);
+ ret[i] = new SerialBlob((Blob) elements[i]);
}
return ret;
}
@@ -90,4 +90,3 @@
return ret;
}
}
-
Modified: harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/serial/SQLInputImpl.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/serial/SQLInputImpl.java?view=diff&rev=556562&r1=556561&r2=556562
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/serial/SQLInputImpl.java (original)
+++ harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/serial/SQLInputImpl.java Mon Jul 16 02:02:56 2007
@@ -38,22 +38,24 @@
import org.apache.harmony.sql.internal.nls.Messages;
/**
- * A concrete implementation of SQLInput. The readXXX methods will be called
- * by SQLData.readSQL, which read different objects such as Array, BigDecimal
- * from this SQLInputImpl object.
+ * A concrete implementation of SQLInput. The readXXX methods will be called by
+ * SQLData.readSQL, which read different objects such as Array, BigDecimal from
+ * this SQLInputImpl object.
*
* Different JDBC drivers may have their own implementation of SQLInput and
* won't use this class.
*/
public class SQLInputImpl implements SQLInput {
-
+
private Object[] attributes;
- private Map<String,Class<?>> map;
+
+ private Map<String, Class<?>> map;
+
private int readPosition = 0;
-
+
/**
* Constructs a new SQLInputImpl object using an array of attributes and a
- * custom name-type map.
+ * custom name-type map.
*
* @param attributes -
* the array of given attribute objects.
@@ -62,7 +64,8 @@
* @throws SQLException -
* if the attributes or the map is null
*/
- public SQLInputImpl(Object[] attributes, Map<String,Class<?>> map)throws SQLException {
+ public SQLInputImpl(Object[] attributes, Map<String, Class<?>> map)
+ throws SQLException {
if (null == attributes || null == map) {
throw new SQLException(Messages.getString("sql.34")); //$NON-NLS-1$
}
@@ -76,10 +79,10 @@
* @see java.sql.SQLInput#readArray()
*/
public Array readArray() throws SQLException {
- if(readPosition >= attributes.length) {
+ if (readPosition >= attributes.length) {
throw new SQLException(Messages.getString("sql.35")); //$NON-NLS-1$
}
- Object o = attributes[readPosition++];
+ Object o = attributes[readPosition++];
return (Array) o;
}
@@ -89,7 +92,7 @@
* @see java.sql.SQLInput#readAsciiStream()
*/
public InputStream readAsciiStream() throws SQLException {
- if(readPosition >= attributes.length) {
+ if (readPosition >= attributes.length) {
throw new SQLException(Messages.getString("sql.35")); //$NON-NLS-1$
}
Object o = attributes[readPosition++];
@@ -102,7 +105,7 @@
* @see java.sql.SQLInput#readBigDecimal()
*/
public BigDecimal readBigDecimal() throws SQLException {
- if(readPosition >= attributes.length) {
+ if (readPosition >= attributes.length) {
throw new SQLException(Messages.getString("sql.35")); //$NON-NLS-1$
}
Object o = attributes[readPosition++];
@@ -115,7 +118,7 @@
* @see java.sql.SQLInput#readBinaryStream()
*/
public InputStream readBinaryStream() throws SQLException {
- if(readPosition >= attributes.length) {
+ if (readPosition >= attributes.length) {
throw new SQLException(Messages.getString("sql.35")); //$NON-NLS-1$
}
Object o = attributes[readPosition++];
@@ -128,7 +131,7 @@
* @see java.sql.SQLInput#readBlob()
*/
public Blob readBlob() throws SQLException {
- if(readPosition >= attributes.length) {
+ if (readPosition >= attributes.length) {
throw new SQLException(Messages.getString("sql.35")); //$NON-NLS-1$
}
Object o = attributes[readPosition++];
@@ -141,7 +144,7 @@
* @see java.sql.SQLInput#readBoolean()
*/
public boolean readBoolean() throws SQLException {
- if(readPosition >= attributes.length) {
+ if (readPosition >= attributes.length) {
throw new SQLException(Messages.getString("sql.35")); //$NON-NLS-1$
}
Object o = attributes[readPosition++];
@@ -154,10 +157,10 @@
* @see java.sql.SQLInput#readByte()
*/
public byte readByte() throws SQLException {
- if(readPosition >= attributes.length) {
+ if (readPosition >= attributes.length) {
throw new SQLException(Messages.getString("sql.35")); //$NON-NLS-1$
}
- Object o = attributes[readPosition++];
+ Object o = attributes[readPosition++];
return o == null ? (byte) 0 : ((Byte) o).byteValue();
}
@@ -167,10 +170,10 @@
* @see java.sql.SQLInput#readBytes()
*/
public byte[] readBytes() throws SQLException {
- if(readPosition >= attributes.length) {
+ if (readPosition >= attributes.length) {
throw new SQLException(Messages.getString("sql.35")); //$NON-NLS-1$
}
- Object o = attributes[readPosition++];
+ Object o = attributes[readPosition++];
return (byte[]) o;
}
@@ -180,23 +183,23 @@
* @see java.sql.SQLInput#readCharacterStream()
*/
public Reader readCharacterStream() throws SQLException {
- if(readPosition >= attributes.length) {
+ if (readPosition >= attributes.length) {
throw new SQLException(Messages.getString("sql.35")); //$NON-NLS-1$
}
Object o = attributes[readPosition++];
return (Reader) o;
}
- /**
+ /**
* {@inheritDoc}
*
* @see java.sql.SQLInput#readClob()
*/
public Clob readClob() throws SQLException {
- if(readPosition >= attributes.length) {
+ if (readPosition >= attributes.length) {
throw new SQLException(Messages.getString("sql.35")); //$NON-NLS-1$
}
- Object o = attributes[readPosition++];
+ Object o = attributes[readPosition++];
return (Clob) o;
}
@@ -206,7 +209,7 @@
* @see java.sql.SQLInput#readDate()
*/
public Date readDate() throws SQLException {
- if(readPosition >= attributes.length) {
+ if (readPosition >= attributes.length) {
throw new SQLException(Messages.getString("sql.35")); //$NON-NLS-1$
}
Object o = attributes[readPosition++];
@@ -219,7 +222,7 @@
* @see java.sql.SQLInput#readDouble()
*/
public double readDouble() throws SQLException {
- if(readPosition >= attributes.length) {
+ if (readPosition >= attributes.length) {
throw new SQLException(Messages.getString("sql.35")); //$NON-NLS-1$
}
Object o = attributes[readPosition++];
@@ -232,7 +235,7 @@
* @see java.sql.SQLInput#readFloat()
*/
public float readFloat() throws SQLException {
- if(readPosition >= attributes.length) {
+ if (readPosition >= attributes.length) {
throw new SQLException(Messages.getString("sql.35")); //$NON-NLS-1$
}
Object o = attributes[readPosition++];
@@ -245,7 +248,7 @@
* @see java.sql.SQLInput#readInt()
*/
public int readInt() throws SQLException {
- if(readPosition >= attributes.length) {
+ if (readPosition >= attributes.length) {
throw new SQLException(Messages.getString("sql.35")); //$NON-NLS-1$
}
Object o = attributes[readPosition++];
@@ -258,7 +261,7 @@
* @see java.sql.SQLInput#readLong()
*/
public long readLong() throws SQLException {
- if(readPosition >= attributes.length) {
+ if (readPosition >= attributes.length) {
throw new SQLException(Messages.getString("sql.35")); //$NON-NLS-1$
}
Object o = attributes[readPosition++];
@@ -271,18 +274,19 @@
* @see java.sql.SQLInput#readObject()
*/
public Object readObject() throws SQLException {
- if(readPosition >= attributes.length) {
+ if (readPosition >= attributes.length) {
throw new SQLException(Messages.getString("sql.35")); //$NON-NLS-1$
}
Object o = attributes[readPosition++];
if (o instanceof Struct) {
- Struct structuredType = (Struct)o;
+ Struct structuredType = (Struct) o;
String typeName = structuredType.getSQLTypeName();
Class<?> c = map.get(typeName);
- if(c != null) {
+ if (c != null) {
try {
- SQLData data = (SQLData)c.newInstance();
- SQLInputImpl input = new SQLInputImpl(structuredType.getAttributes(), map);
+ SQLData data = (SQLData) c.newInstance();
+ SQLInputImpl input = new SQLInputImpl(structuredType
+ .getAttributes(), map);
data.readSQL(input, typeName);
return data;
} catch (IllegalAccessException e) {
@@ -290,7 +294,7 @@
} catch (InstantiationException e) {
throw new SQLException(e.getMessage());
}
-
+
}
}
return o;
@@ -302,10 +306,10 @@
* @see java.sql.SQLInput#readRef()
*/
public Ref readRef() throws SQLException {
- if(readPosition >= attributes.length) {
+ if (readPosition >= attributes.length) {
throw new SQLException(Messages.getString("sql.35")); //$NON-NLS-1$
}
- Object o = attributes[readPosition++];
+ Object o = attributes[readPosition++];
return (Ref) o;
}
@@ -315,7 +319,7 @@
* @see java.sql.SQLInput#readShort()
*/
public short readShort() throws SQLException {
- if(readPosition >= attributes.length) {
+ if (readPosition >= attributes.length) {
throw new SQLException(Messages.getString("sql.35")); //$NON-NLS-1$
}
Object o = attributes[readPosition++];
@@ -328,10 +332,10 @@
* @see java.sql.SQLInput#readString()
*/
public String readString() throws SQLException {
- if(readPosition >= attributes.length) {
+ if (readPosition >= attributes.length) {
throw new SQLException(Messages.getString("sql.35")); //$NON-NLS-1$
}
- Object o = attributes[readPosition++];
+ Object o = attributes[readPosition++];
return (String) o;
}
@@ -341,7 +345,7 @@
* @see java.sql.SQLInput#readTime()
*/
public Time readTime() throws SQLException {
- if(readPosition >= attributes.length) {
+ if (readPosition >= attributes.length) {
throw new SQLException(Messages.getString("sql.35")); //$NON-NLS-1$
}
Object o = attributes[readPosition++];
@@ -354,7 +358,7 @@
* @see java.sql.SQLInput#readTimestamp()
*/
public Timestamp readTimestamp() throws SQLException {
- if(readPosition >= attributes.length) {
+ if (readPosition >= attributes.length) {
throw new SQLException(Messages.getString("sql.35")); //$NON-NLS-1$
}
Object o = attributes[readPosition++];
@@ -367,9 +371,9 @@
* @see java.sql.SQLInput#readURL()
*/
public URL readURL() throws SQLException {
- if(readPosition >= attributes.length) {
+ if (readPosition >= attributes.length) {
throw new SQLException(Messages.getString("sql.35")); //$NON-NLS-1$
- }
+ }
throw new SQLException(Messages.getString("sql.37")); //$NON-NLS-1$
}
Modified: harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/serial/SQLOutputImpl.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/serial/SQLOutputImpl.java?view=diff&rev=556562&r1=556561&r2=556562
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/serial/SQLOutputImpl.java (original)
+++ harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/serial/SQLOutputImpl.java Mon Jul 16 02:02:56 2007
@@ -46,7 +46,7 @@
private Vector attributes;
private Map map;
-
+
/**
* Constructs a new SQLOutputImpl object using a list of attributes and a
* custom name-type map. JDBC drivers will use this map to identify which
@@ -102,7 +102,7 @@
attributes.addElement(stringBuffer.toString());
} catch (IOException e) {
throw new SQLException();
- }
+ }
}
/**
@@ -137,19 +137,19 @@
@SuppressWarnings("unchecked")
public void writeBlob(Blob theBlob) throws SQLException {
if (theBlob != null) {
- SerialBlob serialBlob = new SerialBlob (theBlob);
+ SerialBlob serialBlob = new SerialBlob(theBlob);
attributes.addElement(serialBlob);
} else {
attributes.addElement(theBlob);
}
}
-
+
/**
* {@inheritDoc}
*
* @see java.sql.SQLOutput#writeBoolean(boolean)
*/
- @SuppressWarnings({ "boxing", "unchecked" })
+ @SuppressWarnings( { "boxing", "unchecked" })
public void writeBoolean(boolean theFlag) throws SQLException {
attributes.addElement(theFlag);
}
@@ -159,7 +159,7 @@
*
* @see java.sql.SQLOutput#writeByte(byte)
*/
- @SuppressWarnings({ "boxing", "unchecked" })
+ @SuppressWarnings( { "boxing", "unchecked" })
public void writeByte(byte theByte) throws SQLException {
attributes.addElement(theByte);
}
@@ -169,7 +169,7 @@
*
* @see java.sql.SQLOutput#writeBytes(byte[])
*/
- @SuppressWarnings({ "boxing", "unchecked" })
+ @SuppressWarnings( { "boxing", "unchecked" })
public void writeBytes(byte[] theBytes) throws SQLException {
attributes.addElement(theBytes);
}
@@ -193,7 +193,7 @@
attributes.addElement(stringBuffer.toString());
} catch (IOException e) {
throw new SQLException();
- }
+ }
}
/**
@@ -220,7 +220,7 @@
public void writeDate(Date theDate) throws SQLException {
attributes.addElement(theDate);
}
-
+
/**
* {@inheritDoc}
*
@@ -268,10 +268,11 @@
*/
@SuppressWarnings("unchecked")
public void writeObject(SQLData theObject) throws SQLException {
- if(theObject == null) {
+ if (theObject == null) {
attributes.addElement(null);
} else {
- attributes.addElement(new SerialStruct(theObject, new HashMap(map)));
+ attributes
+ .addElement(new SerialStruct(theObject, new HashMap(map)));
}
}
Modified: harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/serial/SerialArray.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/serial/SerialArray.java?view=diff&rev=556562&r1=556561&r2=556562
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/serial/SerialArray.java (original)
+++ harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/serial/SerialArray.java Mon Jul 16 02:02:56 2007
@@ -69,57 +69,59 @@
transferElements(baseType, element);
}
}
-
+
/**
- * Transfers primitive objects to SerialXXX objects according to the given
- * type.
- * @throws SQLException
- */
- private void transferElements(int type, Object[] element) throws SQLException {
- switch (type) {
- case Types.STRUCT:
- elements = DefaultUDTMap.processStruct(element);
- break;
- case Types.ARRAY:
- elements = DefaultUDTMap.processArray(element);
- break;
- case Types.CLOB:
- elements = DefaultUDTMap.processClob(element);
- break;
- case Types.BLOB:
- elements = DefaultUDTMap.processBlob(element);
- break;
- case Types.DATALINK:
- elements = DefaultUDTMap.processDatalink(element);
- break;
- case Types.JAVA_OBJECT:
- elements = DefaultUDTMap.processObject(element);
- break;
- default:
- elements = new Object[element.length];
- for (int i = 0; i < element.length; i++) {
- elements[i] = element[i];
- }
- }
+ * Transfers primitive objects to SerialXXX objects according to the given
+ * type.
+ *
+ * @throws SQLException
+ */
+ private void transferElements(int type, Object[] element)
+ throws SQLException {
+ switch (type) {
+ case Types.STRUCT:
+ elements = DefaultUDTMap.processStruct(element);
+ break;
+ case Types.ARRAY:
+ elements = DefaultUDTMap.processArray(element);
+ break;
+ case Types.CLOB:
+ elements = DefaultUDTMap.processClob(element);
+ break;
+ case Types.BLOB:
+ elements = DefaultUDTMap.processBlob(element);
+ break;
+ case Types.DATALINK:
+ elements = DefaultUDTMap.processDatalink(element);
+ break;
+ case Types.JAVA_OBJECT:
+ elements = DefaultUDTMap.processObject(element);
+ break;
+ default:
+ elements = new Object[element.length];
+ for (int i = 0; i < element.length; i++) {
+ elements[i] = element[i];
+ }
+ }
}
/**
- * The constructor
- *
- * @param array
- * array to be serializated
- * @throws SerialException
- * when any error occurs during serializing
- * @throws SQLException
- * if array is null
- */
+ * The constructor
+ *
+ * @param array
+ * array to be serializated
+ * @throws SerialException
+ * when any error occurs during serializing
+ * @throws SQLException
+ * if array is null
+ */
public SerialArray(Array array) throws SerialException, SQLException {
- if (null == array || null == array.getArray()) {
+ if (null == array || null == array.getArray()) {
throw new SQLException(Messages.getString("sql.39")); //$NON-NLS-1$
}
baseType = array.getBaseType();
baseTypeName = array.getBaseTypeName();
-
+
Object[] element = (Object[]) array.getArray();
if (element.length == 0) {
elements = new Object[0];
@@ -178,7 +180,7 @@
*/
public Object getArray(long index, int count, Map<String, Class<?>> map)
throws SerialException {
- if (index < 0 || count + index > elements.length ) {
+ if (index < 0 || count + index > elements.length) {
throw new SerialException(Messages.getString("sql.40")); //$NON-NLS-1$
}
Object[] ret = new Object[count];
Modified: harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/serial/SerialClob.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/serial/SerialClob.java?view=diff&rev=556562&r1=556561&r2=556562
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/serial/SerialClob.java (original)
+++ harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/serial/SerialClob.java Mon Jul 16 02:02:56 2007
@@ -61,9 +61,9 @@
throw new SQLException(Messages.getString("sql.19"));//$NON-NLS-1$
}
if ((characterStream = clob.getCharacterStream()) == null
- && (asciiStream = clob.getAsciiStream()) == null) {
- throw new SQLException(Messages.getString("sql.20"));//$NON-NLS-1$
- }
+ && (asciiStream = clob.getAsciiStream()) == null) {
+ throw new SQLException(Messages.getString("sql.20"));//$NON-NLS-1$
+ }
this.clob = clob;
origLen = clob.length();
@@ -72,8 +72,8 @@
try {
characterStream.read(buf);
} catch (IOException e) {
- SerialException se = new SerialException(
- "SerialClob: " + e.getMessage());
+ SerialException se = new SerialException("SerialClob: "
+ + e.getMessage());
se.initCause(e);
throw se;
@@ -116,12 +116,13 @@
public long position(Clob searchClob, long start) throws SerialException,
SQLException {
checkValidation();
- String searchString = searchClob.getSubString(1, (int)searchClob.length());
+ String searchString = searchClob.getSubString(1, (int) searchClob
+ .length());
return position(searchString, start);
}
- public long position(String searchString, long start) throws SerialException,
- SQLException {
+ public long position(String searchString, long start)
+ throws SerialException, SQLException {
checkValidation();
if (start < 1 || len - (start - 1) < searchString.length()) {
return -1;
@@ -156,7 +157,7 @@
throw new SerialException(Messages.getString("sql.25")); // $NON-NLS-1$
}
OutputStream os = clob.setAsciiStream(pos);
- if(os == null){
+ if (os == null) {
throw new SerialException(Messages.getString("sql.46")); // $NON-NLS-1$
}
return os;
@@ -169,7 +170,7 @@
throw new SerialException(Messages.getString("sql.25")); // $NON-NLS-1$
}
Writer writer = clob.setCharacterStream(pos);
- if(writer == null){
+ if (writer == null) {
throw new SerialException(Messages.getString("sql.45")); // $NON-NLS-1$
}
return writer;
@@ -186,29 +187,29 @@
if (pos < 1 || length < 0 || pos > (len - length + 1)) {
throw new SerialException(Messages.getString("sql.21")); // $NON-NLS-1$
}
- if (offset < 0 || offset > (str.length() - length)) {
+ if (offset < 0 || offset > (str.length() - length)) {
throw new SerialException(Messages.getString("sql.21")); // $NON-NLS-1$
}
if (length > len + offset) {
throw new SerialException(Messages.getString("sql.23")); // $NON-NLS-1$
}
- str.getChars(offset, offset+length, buf, (int)pos-1);
+ str.getChars(offset, offset + length, buf, (int) pos - 1);
return length;
}
public void truncate(long length) throws SerialException {
checkValidation();
- if(length > len || length < 0) {
+ if (length > len || length < 0) {
throw new SerialException(Messages.getString("sql.24"));
}
char[] truncatedBuffer = new char[(int) length];
- System.arraycopy(buf, 0, truncatedBuffer, 0, (int)length);
+ System.arraycopy(buf, 0, truncatedBuffer, 0, (int) length);
buf = truncatedBuffer;
- len = length;
+ len = length;
}
-
+
private void checkValidation() throws SerialException {
- if(len == -1){
+ if (len == -1) {
throw new SerialException(Messages.getString("sql.38")); //$NON-NLS-1$
}
}
Modified: harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/serial/SerialDatalink.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/serial/SerialDatalink.java?view=diff&rev=556562&r1=556561&r2=556562
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/serial/SerialDatalink.java (original)
+++ harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/serial/SerialDatalink.java Mon Jul 16 02:02:56 2007
@@ -39,8 +39,10 @@
/**
* Constructor.
*
- * @param url The URL to link to.
- * @throws SerialException if <code>url</code> is null
+ * @param url
+ * The URL to link to.
+ * @throws SerialException
+ * if <code>url</code> is null
*/
public SerialDatalink(URL url) throws SerialException {
if (url == null) {
@@ -52,9 +54,10 @@
/**
* Gets a copied url object of this SerialDatalink object.
*
- * @return a url object in the java programming language which represents this
- * SerialDatalink object.
- * @throws SerialException if <code>url</code> can not be copied.
+ * @return a url object in the java programming language which represents
+ * this SerialDatalink object.
+ * @throws SerialException
+ * if <code>url</code> can not be copied.
*/
public URL getDatalink() throws SerialException {
URL copyUrl;
Modified: harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/serial/SerialException.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/serial/SerialException.java?view=diff&rev=556562&r1=556561&r2=556562
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/serial/SerialException.java (original)
+++ harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/serial/SerialException.java Mon Jul 16 02:02:56 2007
@@ -26,13 +26,13 @@
*/
public class SerialException extends SQLException {
- private static final long serialVersionUID = -489794565168592690L;
+ private static final long serialVersionUID = -489794565168592690L;
- public SerialException() {
- super();
- }
+ public SerialException() {
+ super();
+ }
- public SerialException(String msg) {
- super(msg);
- }
+ public SerialException(String msg) {
+ super(msg);
+ }
}
Modified: harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/serial/SerialJavaObject.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/serial/SerialJavaObject.java?view=diff&rev=556562&r1=556561&r2=556562
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/serial/SerialJavaObject.java (original)
+++ harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/serial/SerialJavaObject.java Mon Jul 16 02:02:56 2007
@@ -25,19 +25,20 @@
public class SerialJavaObject implements Serializable, Cloneable {
- private static final long serialVersionUID = -1465795139032831023L;
+ private static final long serialVersionUID = -1465795139032831023L;
- /**
- * obj and chain are defined in serialized form.
- */
- private Object obj;
+ /**
+ * obj and chain are defined in serialized form.
+ */
+ private Object obj;
- @SuppressWarnings({ "unchecked", "unused" }) // Required by serialized form
+ @SuppressWarnings( { "unchecked", "unused" })
+ // Required by serialized form
private Vector chain;
- private transient Field[] fields;
+ private transient Field[] fields;
- public SerialJavaObject(Object obj) throws SerialException {
+ public SerialJavaObject(Object obj) throws SerialException {
if (null == obj) {
throw new NullPointerException();
}
@@ -47,14 +48,14 @@
this.obj = obj;
}
- public Field[] getFields() throws SerialException {
- if (fields == null) {
- fields = obj.getClass().getFields();
- }
- return fields;
- }
-
- public Object getObject() throws SerialException {
- return obj;
- }
+ public Field[] getFields() throws SerialException {
+ if (fields == null) {
+ fields = obj.getClass().getFields();
+ }
+ return fields;
+ }
+
+ public Object getObject() throws SerialException {
+ return obj;
+ }
}
Modified: harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/serial/SerialRef.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/serial/SerialRef.java?view=diff&rev=556562&r1=556561&r2=556562
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/serial/SerialRef.java (original)
+++ harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/serial/SerialRef.java Mon Jul 16 02:02:56 2007
@@ -25,60 +25,60 @@
import org.apache.harmony.sql.internal.nls.Messages;
public class SerialRef implements Ref, Serializable, Cloneable {
- private static final long serialVersionUID = -4727123500609662274L;
+ private static final long serialVersionUID = -4727123500609662274L;
- /**
- * required by serialized form
- */
- private String baseTypeName;
-
- /**
- * store <code> reference </code> as an object, required by serialized form.
- */
- private Object object;
-
- /**
- * required by serialized form
- */
- private Ref reference;
-
- public SerialRef(Ref ref) throws SerialException, SQLException {
- if (ref == null) {
- throw new SQLException(Messages.getString("sql.9")); //$NON-NLS-1$
- }
- reference = ref;
- object = ref;
- baseTypeName = ref.getBaseTypeName();
- if (baseTypeName == null) {
- throw new SQLException(Messages.getString("sql.10"));//$NON-NLS-1$
- }
- }
-
- public String getBaseTypeName() throws SerialException {
- return baseTypeName;
- }
-
- public Object getObject() throws SerialException {
- try {
- return reference.getObject();
- } catch (SQLException e) {
- throw new SerialException(Messages.getString(
- "sql.11", e.getMessage())); //$NON-NLS-1$
- }
- }
-
- public Object getObject(Map<String, Class<?>> map) throws SerialException {
- return map.get(object);
- }
-
- public void setObject(Object value) throws SerialException {
- try {
- reference.setObject(value);
- object = value;
- } catch (SQLException e) {
- throw new SerialException(Messages.getString(
- "sql.11", e.getMessage())); //$NON-NLS-1$
- }
- }
+ /**
+ * required by serialized form
+ */
+ private String baseTypeName;
+
+ /**
+ * store <code> reference </code> as an object, required by serialized form.
+ */
+ private Object object;
+
+ /**
+ * required by serialized form
+ */
+ private Ref reference;
+
+ public SerialRef(Ref ref) throws SerialException, SQLException {
+ if (ref == null) {
+ throw new SQLException(Messages.getString("sql.9")); //$NON-NLS-1$
+ }
+ reference = ref;
+ object = ref;
+ baseTypeName = ref.getBaseTypeName();
+ if (baseTypeName == null) {
+ throw new SQLException(Messages.getString("sql.10"));//$NON-NLS-1$
+ }
+ }
+
+ public String getBaseTypeName() throws SerialException {
+ return baseTypeName;
+ }
+
+ public Object getObject() throws SerialException {
+ try {
+ return reference.getObject();
+ } catch (SQLException e) {
+ throw new SerialException(Messages.getString(
+ "sql.11", e.getMessage())); //$NON-NLS-1$
+ }
+ }
+
+ public Object getObject(Map<String, Class<?>> map) throws SerialException {
+ return map.get(object);
+ }
+
+ public void setObject(Object value) throws SerialException {
+ try {
+ reference.setObject(value);
+ object = value;
+ } catch (SQLException e) {
+ throw new SerialException(Messages.getString(
+ "sql.11", e.getMessage())); //$NON-NLS-1$
+ }
+ }
}
Modified: harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/spi/ProviderImpl.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/spi/ProviderImpl.java?view=diff&rev=556562&r1=556561&r2=556562
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/spi/ProviderImpl.java (original)
+++ harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/spi/ProviderImpl.java Mon Jul 16 02:02:56 2007
@@ -25,8 +25,8 @@
className = name;
try {
- Class<?> implClass = Class.forName(className, true, Thread
- .currentThread().getContextClassLoader());
+ Class<?> implClass = Class.forName(className, true, Thread
+ .currentThread().getContextClassLoader());
impl = (SyncProvider) implClass.newInstance();
} catch (ClassNotFoundException e) {
errMsg = Messages.getString("sql.40", className); //$NON-NLS-1$
@@ -34,19 +34,19 @@
// ignore
}
}
-
+
public ProviderImpl(String name, String vendor, String version) {
this(name);
-
+
this.vendor = vendor;
this.version = version;
}
public SyncProvider getImpl() throws SyncFactoryException {
- if (null == impl) {
- throw new SyncFactoryException(Messages.getString(
- "sql.40", className)); //$NON-NLS-1$
- }
+ if (null == impl) {
+ throw new SyncFactoryException(Messages.getString(
+ "sql.40", className)); //$NON-NLS-1$
+ }
return impl;
}
Modified: harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/spi/SyncFactory.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/spi/SyncFactory.java?view=diff&rev=556562&r1=556561&r2=556562
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/spi/SyncFactory.java (original)
+++ harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/spi/SyncFactory.java Mon Jul 16 02:02:56 2007
@@ -37,7 +37,7 @@
* three places to search SyncProviders: system properties, resource files and
* the JNDI context.
*
- * Applications can also use it to add and remove SyncProviders at runtime.
+ * Applications can also use it to add and remove SyncProviders at runtime.
*/
public class SyncFactory {
public static String ROWSET_SYNC_PROVIDER = "rowset.provider.classname"; //$NON-NLS-1$
@@ -54,15 +54,16 @@
private static Context ctx;
- private static String resLocation;
-
- //TODO: the default provider hasn't been implemented yet
+ private static String resLocation;
+
+ // TODO: the default provider hasn't been implemented yet
private static String defaultProviderName = "org.apache.harmony.sql.rowset.providers.RIOptimisticProvider"; //$NON-NLS-1$
- private static ProviderImpl defaultProvider = new ProviderImpl(defaultProviderName);
-
+ private static ProviderImpl defaultProvider = new ProviderImpl(
+ defaultProviderName);
+
private static Logger logger;
-
+
private static boolean initialized;
static {
@@ -86,13 +87,13 @@
private static Enumeration<SyncProvider> getRegisteredProvidersImpl() {
if (!initialized) {
// 1. load from System property
- String rowsetPropStr = System.getProperty(ROWSET_SYNC_PROVIDER);
- if (rowsetPropStr != null) {
- String[] sysProviders = rowsetPropStr.split(":"); //$NON-NLS-1$
- for (String sysProvider : sysProviders) {
- providers.put(sysProvider, new ProviderImpl(sysProvider));
- }
- }
+ String rowsetPropStr = System.getProperty(ROWSET_SYNC_PROVIDER);
+ if (rowsetPropStr != null) {
+ String[] sysProviders = rowsetPropStr.split(":"); //$NON-NLS-1$
+ for (String sysProvider : sysProviders) {
+ providers.put(sysProvider, new ProviderImpl(sysProvider));
+ }
+ }
// 2. looks in the resource file
Properties rowsetProp = new Properties();
@@ -137,7 +138,7 @@
}
return providers.elements();
}
-
+
/**
* Initializes the registeration table if it is still empty.
*/
@@ -236,7 +237,7 @@
* the logging object
*/
public static void setLogger(Logger logger) {
- SyncFactory.logger = logger;
+ SyncFactory.logger = logger;
}
/**
Modified: harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/spi/SyncProvider.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/spi/SyncProvider.java?view=diff&rev=556562&r1=556561&r2=556562
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/spi/SyncProvider.java (original)
+++ harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/sql/rowset/spi/SyncProvider.java Mon Jul 16 02:02:56 2007
@@ -55,7 +55,8 @@
public abstract int getProviderGrade();
- public abstract void setDataSourceLock(int dataSourceLock) throws SyncProviderException;
+ public abstract void setDataSourceLock(int dataSourceLock)
+ throws SyncProviderException;
public abstract int getDataSourceLock() throws SyncProviderException;
Modified: harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/transaction/xa/XAException.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/transaction/xa/XAException.java?view=diff&rev=556562&r1=556561&r2=556562
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/transaction/xa/XAException.java (original)
+++ harmony/enhanced/classlib/trunk/modules/sql/src/main/java/javax/transaction/xa/XAException.java Mon Jul 16 02:02:56 2007
@@ -166,7 +166,7 @@
* global transaction.
*/
public static final int XAER_OUTSIDE = -9;
-
+
/**
* The errorCode which details the error that has occurred
*/
Modified: harmony/enhanced/classlib/trunk/modules/sql/src/main/java/org/apache/harmony/sql/internal/nls/Messages.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/sql/src/main/java/org/apache/harmony/sql/internal/nls/Messages.java?view=diff&rev=556562&r1=556561&r2=556562
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/sql/src/main/java/org/apache/harmony/sql/internal/nls/Messages.java (original)
+++ harmony/enhanced/classlib/trunk/modules/sql/src/main/java/org/apache/harmony/sql/internal/nls/Messages.java Mon Jul 16 02:02:56 2007
@@ -23,7 +23,6 @@
package org.apache.harmony.sql.internal.nls;
-
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.Locale;
@@ -143,7 +142,7 @@
return format(format, args);
}
-
+
/**
* Generates a formatted text string given a source string containing
* "argument markers" of the form "{argNum}" where each argNum must be in
@@ -166,7 +165,7 @@
String[] argStrings = new String[args.length];
for (int i = 0; i < args.length; ++i) {
if (args[i] == null)
- argStrings[i] = "<null>"; //$NON-NLS-1$
+ argStrings[i] = "<null>"; //$NON-NLS-1$
else
argStrings[i] = args[i].toString();
}
@@ -190,16 +189,16 @@
10);
if (argnum < 0 || format.charAt(i + 2) != '}') {
// Bad format, just print and loop.
- answer.append(format.substring(lastI, i + 1));
- lastI = i + 1;
+ answer.append(format.substring(lastI, i + 1));
+ lastI = i + 1;
} else {
// Got a good one!
answer.append(format.substring(lastI, i));
if (argnum >= argStrings.length)
- answer.append("<missing argument>"); //$NON-NLS-1$
+ answer.append("<missing argument>"); //$NON-NLS-1$
else
answer.append(argStrings[argnum]);
- lastI = i + 3;
+ lastI = i + 3;
}
}
}
@@ -223,7 +222,8 @@
.doPrivileged(new PrivilegedAction<Object>() {
public Object run() {
return ResourceBundle.getBundle(resource, locale,
- loader != null ? loader : ClassLoader.getSystemClassLoader());
+ loader != null ? loader : ClassLoader
+ .getSystemClassLoader());
}
});
} catch (MissingResourceException e) {