You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by ps...@apache.org on 2006/11/25 17:31:28 UTC
svn commit: r479142 - in /jakarta/commons/proper/dbcp/trunk/src:
java/org/apache/commons/dbcp/ java/org/apache/commons/dbcp/datasources/
test/org/apache/commons/dbcp/
Author: psteitz
Date: Sat Nov 25 08:31:27 2006
New Revision: 479142
URL: http://svn.apache.org/viewvc?view=rev&rev=479142
Log:
Formatting only. Eliminated tabs.
Modified:
jakarta/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/DelegatingConnection.java
jakarta/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java
jakarta/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/DelegatingStatement.java
jakarta/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolableConnectionFactory.java
jakarta/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/datasources/InstanceKeyDataSource.java
jakarta/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TestDelegatingConnection.java
jakarta/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TesterResultSet.java
Modified: jakarta/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/DelegatingConnection.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/DelegatingConnection.java?view=diff&rev=479142&r1=479141&r2=479142
==============================================================================
--- jakarta/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/DelegatingConnection.java (original)
+++ jakarta/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/DelegatingConnection.java Sat Nov 25 08:31:27 2006
@@ -81,37 +81,37 @@
}
public String toString() {
- String s = null;
-
- Connection c = this.getInnermostDelegate();
- if (c != null) {
- try {
- if (c.isClosed()) {
- s = "connection is closed";
- }
- else {
- DatabaseMetaData meta = c.getMetaData();
- if (meta != null) {
- StringBuffer sb = new StringBuffer();
- sb.append(meta.getURL());
- sb.append(", UserName=");
- sb.append(meta.getUserName());
- sb.append(", ");
- sb.append(meta.getDriverName());
- s = sb.toString();
- }
- }
- }
- catch (SQLException ex) {
- s = null;
- }
- }
-
- if (s == null) {
- s = super.toString();
- }
-
- return s;
+ String s = null;
+
+ Connection c = this.getInnermostDelegate();
+ if (c != null) {
+ try {
+ if (c.isClosed()) {
+ s = "connection is closed";
+ }
+ else {
+ DatabaseMetaData meta = c.getMetaData();
+ if (meta != null) {
+ StringBuffer sb = new StringBuffer();
+ sb.append(meta.getURL());
+ sb.append(", UserName=");
+ sb.append(meta.getUserName());
+ sb.append(", ");
+ sb.append(meta.getDriverName());
+ s = sb.toString();
+ }
+ }
+ }
+ catch (SQLException ex) {
+ s = null;
+ }
+ }
+
+ if (s == null) {
+ s = super.toString();
+ }
+
+ return s;
}
/**
Modified: jakarta/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java?view=diff&rev=479142&r1=479141&r2=479142
==============================================================================
--- jakarta/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java (original)
+++ jakarta/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java Sat Nov 25 08:31:27 2006
@@ -207,7 +207,7 @@
* @return String
*/
public String toString() {
- return _stmt.toString();
+ return _stmt.toString();
}
// ------------------- JDBC 3.0 -----------------------------------------
Modified: jakarta/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/DelegatingStatement.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/DelegatingStatement.java?view=diff&rev=479142&r1=479141&r2=479142
==============================================================================
--- jakarta/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/DelegatingStatement.java (original)
+++ jakarta/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/DelegatingStatement.java Sat Nov 25 08:31:27 2006
@@ -302,7 +302,7 @@
* @return String
*/
public String toString() {
- return _stmt.toString();
+ return _stmt.toString();
}
// ------------------- JDBC 3.0 -----------------------------------------
Modified: jakarta/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolableConnectionFactory.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolableConnectionFactory.java?view=diff&rev=479142&r1=479141&r2=479142
==============================================================================
--- jakarta/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolableConnectionFactory.java (original)
+++ jakarta/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolableConnectionFactory.java Sat Nov 25 08:31:27 2006
@@ -407,5 +407,5 @@
/**
* Internal constant to indicate the level is not set.
*/
- static final int UNKNOWN_TRANSACTIONISOLATION = -1;
+ static final int UNKNOWN_TRANSACTIONISOLATION = -1;
}
Modified: jakarta/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/datasources/InstanceKeyDataSource.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/datasources/InstanceKeyDataSource.java?view=diff&rev=479142&r1=479141&r2=479142
==============================================================================
--- jakarta/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/datasources/InstanceKeyDataSource.java (original)
+++ jakarta/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/datasources/InstanceKeyDataSource.java Sat Nov 25 08:31:27 2006
@@ -781,7 +781,7 @@
*
* @return The non-null Reference of this object.
* @exception NamingException If a naming exception was encountered
- * while retrieving the reference.
+ * while retrieving the reference.
*/
// TODO: Remove the implementation of this method at next major
// version release.
Modified: jakarta/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TestDelegatingConnection.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TestDelegatingConnection.java?view=diff&rev=479142&r1=479141&r2=479142
==============================================================================
--- jakarta/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TestDelegatingConnection.java (original)
+++ jakarta/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TestDelegatingConnection.java Sat Nov 25 08:31:27 2006
@@ -53,9 +53,9 @@
}
public void testConnectionToString() throws Exception {
- String s = conn.toString();
- assertNotNull(s);
- assertTrue(s.length() > 0);
+ String s = conn.toString();
+ assertNotNull(s);
+ assertTrue(s.length() > 0);
}
public void testHashCodeEqual() {
Modified: jakarta/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TesterResultSet.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TesterResultSet.java?view=diff&rev=479142&r1=479141&r2=479142
==============================================================================
--- jakarta/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TesterResultSet.java (original)
+++ jakarta/commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TesterResultSet.java Sat Nov 25 08:31:27 2006
@@ -474,20 +474,20 @@
public void updateAsciiStream(int columnIndex,
- java.io.InputStream x,
- int length) throws SQLException {
+ java.io.InputStream x,
+ int length) throws SQLException {
checkOpen();
}
public void updateBinaryStream(int columnIndex,
- java.io.InputStream x,
- int length) throws SQLException {
+ java.io.InputStream x,
+ int length) throws SQLException {
checkOpen();
}
public void updateCharacterStream(int columnIndex,
- java.io.Reader x,
- int length) throws SQLException {
+ java.io.Reader x,
+ int length) throws SQLException {
checkOpen();
}
@@ -558,20 +558,20 @@
}
public void updateAsciiStream(String columnName,
- java.io.InputStream x,
- int length) throws SQLException {
+ java.io.InputStream x,
+ int length) throws SQLException {
checkOpen();
}
public void updateBinaryStream(String columnName,
- java.io.InputStream x,
- int length) throws SQLException {
+ java.io.InputStream x,
+ int length) throws SQLException {
checkOpen();
}
public void updateCharacterStream(String columnName,
- java.io.Reader reader,
- int length) throws SQLException {
+ java.io.Reader reader,
+ int length) throws SQLException {
checkOpen();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org