You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ibatis.apache.org by cb...@apache.org on 2009/01/23 07:32:46 UTC
svn commit: r736963 [3/21] - in /ibatis/trunk/java/ibatis-3:
ibatis-3-compat/src/main/java/com/ibatis/common/jdbc/
ibatis-3-compat/src/main/java/com/ibatis/common/resources/
ibatis-3-compat/src/main/java/com/ibatis/common/util/
ibatis-3-compat/src/main...
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/cache/decorators/SoftCache.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/cache/decorators/SoftCache.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/cache/decorators/SoftCache.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/cache/decorators/SoftCache.java Thu Jan 22 22:32:36 2009
@@ -2,8 +2,9 @@
import org.apache.ibatis.cache.Cache;
-import java.lang.ref.*;
-import java.util.*;
+import java.lang.ref.ReferenceQueue;
+import java.lang.ref.SoftReference;
+import java.util.LinkedList;
import java.util.concurrent.locks.ReadWriteLock;
/**
@@ -86,6 +87,7 @@
private static class SoftEntry extends SoftReference {
private final Object key;
+
private SoftEntry(Object key, Object value, ReferenceQueue garbageCollectionQueue) {
super(value, garbageCollectionQueue);
this.key = key;
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/cache/decorators/SynchronizedCache.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/cache/decorators/SynchronizedCache.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/cache/decorators/SynchronizedCache.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/cache/decorators/SynchronizedCache.java Thu Jan 22 22:32:36 2009
@@ -1,6 +1,6 @@
package org.apache.ibatis.cache.decorators;
-import org.apache.ibatis.cache.*;
+import org.apache.ibatis.cache.Cache;
import java.util.concurrent.locks.ReadWriteLock;
@@ -19,7 +19,7 @@
public int getSize() {
acquireReadLock();
try {
- return delegate.getSize();
+ return delegate.getSize();
} finally {
releaseReadLock();
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/cache/decorators/TransactionalCache.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/cache/decorators/TransactionalCache.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/cache/decorators/TransactionalCache.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/cache/decorators/TransactionalCache.java Thu Jan 22 22:32:36 2009
@@ -1,8 +1,9 @@
package org.apache.ibatis.cache.decorators;
-import org.apache.ibatis.cache.*;
+import org.apache.ibatis.cache.Cache;
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
import java.util.concurrent.locks.ReadWriteLock;
public class TransactionalCache implements Cache {
@@ -41,12 +42,12 @@
public void putObject(Object key, Object object) {
entriesToRemoveOnCommit.remove(key);
- entriesToAddOnCommit.put(key, new AddEntry(delegate,key,object));
+ entriesToAddOnCommit.put(key, new AddEntry(delegate, key, object));
}
public Object removeObject(Object key) {
entriesToAddOnCommit.remove(key);
- entriesToRemoveOnCommit.put(key, new RemoveEntry(delegate,key));
+ entriesToRemoveOnCommit.put(key, new RemoveEntry(delegate, key));
return delegate.getObject(key);
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/cache/decorators/WeakCache.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/cache/decorators/WeakCache.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/cache/decorators/WeakCache.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/cache/decorators/WeakCache.java Thu Jan 22 22:32:36 2009
@@ -2,9 +2,10 @@
import org.apache.ibatis.cache.Cache;
-import java.util.*;
+import java.lang.ref.ReferenceQueue;
+import java.lang.ref.WeakReference;
+import java.util.LinkedList;
import java.util.concurrent.locks.ReadWriteLock;
-import java.lang.ref.*;
/**
* Weak Reference cache decorator
@@ -86,6 +87,7 @@
private static class WeakEntry extends WeakReference {
private final Object key;
+
private WeakEntry(Object key, Object value, ReferenceQueue garbageCollectionQueue) {
super(value, garbageCollectionQueue);
this.key = key;
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/cache/impl/PerpetualCache.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/cache/impl/PerpetualCache.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/cache/impl/PerpetualCache.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/cache/impl/PerpetualCache.java Thu Jan 22 22:32:36 2009
@@ -1,10 +1,13 @@
package org.apache.ibatis.cache.impl;
-import org.apache.ibatis.cache.*;
+import org.apache.ibatis.cache.Cache;
+import org.apache.ibatis.cache.CacheException;
-import java.util.*;
-import java.util.concurrent.locks.*;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
public class PerpetualCache implements Cache {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/DataSourceException.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/DataSourceException.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/DataSourceException.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/DataSourceException.java Thu Jan 22 22:32:36 2009
@@ -17,5 +17,5 @@
public DataSourceException(Throwable cause) {
super(cause);
}
-
+
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/DataSourceFactory.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/DataSourceFactory.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/DataSourceFactory.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/DataSourceFactory.java Thu Jan 22 22:32:36 2009
@@ -6,6 +6,7 @@
public interface DataSourceFactory {
void setProperties(Properties props);
+
DataSource getDataSource();
-
+
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/jndi/JndiDataSourceFactory.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/jndi/JndiDataSourceFactory.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/jndi/JndiDataSourceFactory.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/jndi/JndiDataSourceFactory.java Thu Jan 22 22:32:36 2009
@@ -1,11 +1,16 @@
package org.apache.ibatis.datasource.jndi;
-import org.apache.ibatis.datasource.DataSourceFactory;
import org.apache.ibatis.datasource.DataSourceException;
+import org.apache.ibatis.datasource.DataSourceFactory;
-import javax.naming.*;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
import javax.sql.DataSource;
-import java.util.*;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Properties;
public class JndiDataSourceFactory implements DataSourceFactory {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/pooled/PoolState.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/pooled/PoolState.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/pooled/PoolState.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/pooled/PoolState.java Thu Jan 22 22:32:36 2009
@@ -1,6 +1,7 @@
package org.apache.ibatis.datasource.pooled;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
public class PoolState {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/pooled/PooledConnection.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/pooled/PooledConnection.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/pooled/PooledConnection.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/pooled/PooledConnection.java Thu Jan 22 22:32:36 2009
@@ -1,10 +1,12 @@
package org.apache.ibatis.datasource.pooled;
-import org.apache.ibatis.reflection.ExceptionUtil;
import org.apache.ibatis.datasource.unpooled.DataSourceException;
+import org.apache.ibatis.reflection.ExceptionUtil;
-import java.lang.reflect.*;
-import java.sql.*;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.sql.Connection;
class PooledConnection implements InvocationHandler {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/pooled/PooledDataSource.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/pooled/PooledDataSource.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/pooled/PooledDataSource.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/pooled/PooledDataSource.java Thu Jan 22 22:32:36 2009
@@ -1,12 +1,13 @@
package org.apache.ibatis.datasource.pooled;
-import org.apache.ibatis.logging.*;
import org.apache.ibatis.datasource.unpooled.UnpooledDataSource;
+import org.apache.ibatis.logging.Log;
+import org.apache.ibatis.logging.LogFactory;
import javax.sql.DataSource;
import java.io.PrintWriter;
import java.sql.*;
-import java.util.*;
+import java.util.Properties;
/**
* This is a simple, synchronous, thread-safe database connection pool.
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/pooled/PooledDataSourceFactory.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/pooled/PooledDataSourceFactory.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/pooled/PooledDataSourceFactory.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/pooled/PooledDataSourceFactory.java Thu Jan 22 22:32:36 2009
@@ -1,6 +1,5 @@
package org.apache.ibatis.datasource.pooled;
-import org.apache.ibatis.datasource.pooled.PooledDataSource;
import org.apache.ibatis.datasource.unpooled.UnpooledDataSourceFactory;
public class PooledDataSourceFactory extends UnpooledDataSourceFactory {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/unpooled/UnpooledDataSourceFactory.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/unpooled/UnpooledDataSourceFactory.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/unpooled/UnpooledDataSourceFactory.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/unpooled/UnpooledDataSourceFactory.java Thu Jan 22 22:32:36 2009
@@ -1,8 +1,8 @@
package org.apache.ibatis.datasource.unpooled;
-import org.apache.ibatis.reflection.MetaObject;
-import org.apache.ibatis.datasource.DataSourceFactory;
import org.apache.ibatis.datasource.DataSourceException;
+import org.apache.ibatis.datasource.DataSourceFactory;
+import org.apache.ibatis.reflection.MetaObject;
import javax.sql.DataSource;
import java.util.Properties;
@@ -21,7 +21,7 @@
public void setProperties(Properties properties) {
Properties driverProperties = new Properties();
MetaObject metaDataSource = MetaObject.forObject(dataSource);
- for (Object key : properties.keySet()){
+ for (Object key : properties.keySet()) {
String propertyName = (String) key;
if (propertyName.startsWith(DRIVER_PROPERTY_PREFIX)) {
String value = properties.getProperty(propertyName);
@@ -35,7 +35,7 @@
}
}
if (driverProperties.size() > 0) {
- metaDataSource.setValue("driverProperties",driverProperties);
+ metaDataSource.setValue("driverProperties", driverProperties);
}
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/BaseExecutor.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/BaseExecutor.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/BaseExecutor.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/BaseExecutor.java Thu Jan 22 22:32:36 2009
@@ -3,16 +3,18 @@
import org.apache.ibatis.cache.CacheKey;
import org.apache.ibatis.cache.impl.PerpetualCache;
import org.apache.ibatis.executor.result.ResultHandler;
-import org.apache.ibatis.mapping.*;
+import org.apache.ibatis.mapping.MappedStatement;
+import org.apache.ibatis.mapping.ParameterMapping;
import org.apache.ibatis.reflection.MetaObject;
-import org.apache.ibatis.type.TypeHandlerRegistry;
import org.apache.ibatis.transaction.Transaction;
+import org.apache.ibatis.type.TypeHandlerRegistry;
-import java.sql.*;
+import java.sql.SQLException;
+import java.sql.Statement;
import java.util.*;
public abstract class BaseExecutor implements Executor {
-
+
private static final Object EXECUTION_PLACEHOLDER = new Object();
protected final Transaction transaction;
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/BatchExecutor.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/BatchExecutor.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/BatchExecutor.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/BatchExecutor.java Thu Jan 22 22:32:36 2009
@@ -2,11 +2,16 @@
import org.apache.ibatis.executor.result.ResultHandler;
import org.apache.ibatis.executor.statement.StatementHandler;
-import org.apache.ibatis.mapping.*;
+import org.apache.ibatis.mapping.Configuration;
+import org.apache.ibatis.mapping.MappedStatement;
import org.apache.ibatis.transaction.Transaction;
-import java.sql.*;
-import java.util.*;
+import java.sql.BatchUpdateException;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.List;
public class BatchExecutor extends BaseExecutor {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/CachingExecutor.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/CachingExecutor.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/CachingExecutor.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/CachingExecutor.java Thu Jan 22 22:32:36 2009
@@ -1,13 +1,15 @@
package org.apache.ibatis.executor;
-import org.apache.ibatis.cache.*;
+import org.apache.ibatis.cache.Cache;
+import org.apache.ibatis.cache.CacheKey;
+import org.apache.ibatis.cache.TransactionalCacheManager;
import org.apache.ibatis.executor.result.ResultHandler;
import org.apache.ibatis.mapping.MappedStatement;
import org.apache.ibatis.reflection.MetaObject;
import org.apache.ibatis.transaction.Transaction;
-import java.sql.*;
-import java.util.*;
+import java.sql.SQLException;
+import java.util.List;
public class CachingExecutor implements Executor {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/ErrorContext.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/ErrorContext.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/ErrorContext.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/ErrorContext.java Thu Jan 22 22:32:36 2009
@@ -107,7 +107,7 @@
if (sql != null) {
description.append(NEWLINE);
description.append("### SQL: ");
- description.append(sql.replace('\n',' ').replace('\r',' ').replace('\t',' ').trim());
+ description.append(sql.replace('\n', ' ').replace('\r', ' ').replace('\t', ' ').trim());
}
// cause
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/Executor.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/Executor.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/Executor.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/Executor.java Thu Jan 22 22:32:36 2009
@@ -6,7 +6,7 @@
import org.apache.ibatis.reflection.MetaObject;
import org.apache.ibatis.transaction.Transaction;
-import java.sql.*;
+import java.sql.SQLException;
import java.util.List;
public interface Executor {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/ReuseExecutor.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/ReuseExecutor.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/ReuseExecutor.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/ReuseExecutor.java Thu Jan 22 22:32:36 2009
@@ -2,11 +2,17 @@
import org.apache.ibatis.executor.result.ResultHandler;
import org.apache.ibatis.executor.statement.StatementHandler;
-import org.apache.ibatis.mapping.*;
+import org.apache.ibatis.mapping.Configuration;
+import org.apache.ibatis.mapping.MappedStatement;
import org.apache.ibatis.transaction.Transaction;
-import java.sql.*;
-import java.util.*;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
public class ReuseExecutor extends BaseExecutor {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/SimpleExecutor.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/SimpleExecutor.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/SimpleExecutor.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/SimpleExecutor.java Thu Jan 22 22:32:36 2009
@@ -2,11 +2,15 @@
import org.apache.ibatis.executor.result.ResultHandler;
import org.apache.ibatis.executor.statement.StatementHandler;
-import org.apache.ibatis.mapping.*;
+import org.apache.ibatis.mapping.Configuration;
+import org.apache.ibatis.mapping.MappedStatement;
import org.apache.ibatis.transaction.Transaction;
-import java.sql.*;
-import java.util.*;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Collections;
+import java.util.List;
public class SimpleExecutor extends BaseExecutor {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/loader/ResultLoader.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/loader/ResultLoader.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/loader/ResultLoader.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/loader/ResultLoader.java Thu Jan 22 22:32:36 2009
@@ -5,7 +5,10 @@
import org.apache.ibatis.mapping.MappedStatement;
import java.sql.SQLException;
-import java.util.*;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
public class ResultLoader {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/loader/ResultLoaderRegistry.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/loader/ResultLoaderRegistry.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/loader/ResultLoaderRegistry.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/loader/ResultLoaderRegistry.java Thu Jan 22 22:32:36 2009
@@ -4,7 +4,8 @@
import java.io.Serializable;
import java.sql.SQLException;
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
public class ResultLoaderRegistry implements Serializable {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/loader/ResultObjectProxy.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/loader/ResultObjectProxy.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/loader/ResultObjectProxy.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/loader/ResultObjectProxy.java Thu Jan 22 22:32:36 2009
@@ -1,7 +1,9 @@
package org.apache.ibatis.executor.loader;
-import net.sf.cglib.proxy.*;
-import org.apache.ibatis.reflection.*;
+import net.sf.cglib.proxy.Enhancer;
+import net.sf.cglib.proxy.InvocationHandler;
+import org.apache.ibatis.reflection.ExceptionUtil;
+import org.apache.ibatis.reflection.PropertyNamer;
import java.io.Serializable;
import java.lang.reflect.Method;
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/parameter/DefaultParameterHandler.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/parameter/DefaultParameterHandler.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/parameter/DefaultParameterHandler.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/parameter/DefaultParameterHandler.java Thu Jan 22 22:32:36 2009
@@ -1,11 +1,16 @@
package org.apache.ibatis.executor.parameter;
-import org.apache.ibatis.mapping.*;
+import org.apache.ibatis.executor.ErrorContext;
+import org.apache.ibatis.executor.ExecutorException;
+import org.apache.ibatis.mapping.MappedStatement;
+import org.apache.ibatis.mapping.ParameterMapping;
+import org.apache.ibatis.mapping.ParameterMode;
import org.apache.ibatis.reflection.MetaObject;
-import org.apache.ibatis.type.*;
-import org.apache.ibatis.executor.*;
+import org.apache.ibatis.type.TypeHandler;
+import org.apache.ibatis.type.TypeHandlerRegistry;
-import java.sql.*;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
import java.util.List;
public class DefaultParameterHandler implements ParameterHandler {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/parameter/ParameterHandler.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/parameter/ParameterHandler.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/parameter/ParameterHandler.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/parameter/ParameterHandler.java Thu Jan 22 22:32:36 2009
@@ -1,6 +1,7 @@
package org.apache.ibatis.executor.parameter;
-import java.sql.*;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
public interface ParameterHandler {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/result/DefaultResultHandler.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/result/DefaultResultHandler.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/result/DefaultResultHandler.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/result/DefaultResultHandler.java Thu Jan 22 22:32:36 2009
@@ -1,6 +1,7 @@
package org.apache.ibatis.executor.result;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
public class DefaultResultHandler implements ResultHandler {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/DefaultResultSetHandler.java Thu Jan 22 22:32:36 2009
@@ -1,13 +1,20 @@
package org.apache.ibatis.executor.resultset;
import org.apache.ibatis.cache.CacheKey;
-import org.apache.ibatis.executor.*;
-import org.apache.ibatis.executor.loader.*;
+import org.apache.ibatis.executor.ErrorContext;
+import org.apache.ibatis.executor.Executor;
+import org.apache.ibatis.executor.ExecutorException;
+import org.apache.ibatis.executor.loader.ResultLoader;
+import org.apache.ibatis.executor.loader.ResultLoaderRegistry;
+import org.apache.ibatis.executor.loader.ResultObjectProxy;
import org.apache.ibatis.executor.parameter.ParameterHandler;
-import org.apache.ibatis.executor.result.*;
+import org.apache.ibatis.executor.result.DefaultResultHandler;
+import org.apache.ibatis.executor.result.ResultHandler;
import org.apache.ibatis.mapping.*;
-import org.apache.ibatis.reflection.*;
-import org.apache.ibatis.type.*;
+import org.apache.ibatis.reflection.MetaObject;
+import org.apache.ibatis.reflection.ObjectFactory;
+import org.apache.ibatis.type.TypeHandler;
+import org.apache.ibatis.type.TypeHandlerRegistry;
import java.sql.*;
import java.util.*;
@@ -377,7 +384,7 @@
} catch (Exception e) {
subMap = rm;
}
-
+
if (subMap != rm) {
subMap = resolveSubMap(rs, subMap);
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/ResultSetHandler.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/ResultSetHandler.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/ResultSetHandler.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/resultset/ResultSetHandler.java Thu Jan 22 22:32:36 2009
@@ -1,6 +1,8 @@
package org.apache.ibatis.executor.resultset;
-import java.sql.*;
+import java.sql.CallableStatement;
+import java.sql.SQLException;
+import java.sql.Statement;
import java.util.List;
public interface ResultSetHandler {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/statement/BaseStatementHandler.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/statement/BaseStatementHandler.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/statement/BaseStatementHandler.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/statement/BaseStatementHandler.java Thu Jan 22 22:32:36 2009
@@ -1,14 +1,20 @@
package org.apache.ibatis.executor.statement;
-import org.apache.ibatis.executor.*;
+import org.apache.ibatis.executor.ErrorContext;
+import org.apache.ibatis.executor.Executor;
+import org.apache.ibatis.executor.ExecutorException;
import org.apache.ibatis.executor.parameter.ParameterHandler;
import org.apache.ibatis.executor.result.ResultHandler;
import org.apache.ibatis.executor.resultset.ResultSetHandler;
-import org.apache.ibatis.mapping.*;
+import org.apache.ibatis.mapping.Configuration;
+import org.apache.ibatis.mapping.MappedStatement;
import org.apache.ibatis.reflection.ObjectFactory;
import org.apache.ibatis.type.TypeHandlerRegistry;
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
public abstract class BaseStatementHandler implements StatementHandler {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/statement/CallableStatementHandler.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/statement/CallableStatementHandler.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/statement/CallableStatementHandler.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/statement/CallableStatementHandler.java Thu Jan 22 22:32:36 2009
@@ -3,7 +3,9 @@
import org.apache.ibatis.executor.Executor;
import org.apache.ibatis.executor.ExecutorException;
import org.apache.ibatis.executor.result.ResultHandler;
-import org.apache.ibatis.mapping.*;
+import org.apache.ibatis.mapping.MappedStatement;
+import org.apache.ibatis.mapping.ParameterMapping;
+import org.apache.ibatis.mapping.ParameterMode;
import org.apache.ibatis.type.JdbcType;
import java.sql.*;
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/statement/RoutingStatementHandler.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/statement/RoutingStatementHandler.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/statement/RoutingStatementHandler.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/statement/RoutingStatementHandler.java Thu Jan 22 22:32:36 2009
@@ -6,7 +6,9 @@
import org.apache.ibatis.executor.result.ResultHandler;
import org.apache.ibatis.mapping.MappedStatement;
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.sql.Statement;
import java.util.List;
public class RoutingStatementHandler implements StatementHandler {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/statement/SimpleStatementHandler.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/statement/SimpleStatementHandler.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/statement/SimpleStatementHandler.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/statement/SimpleStatementHandler.java Thu Jan 22 22:32:36 2009
@@ -4,7 +4,10 @@
import org.apache.ibatis.executor.result.ResultHandler;
import org.apache.ibatis.mapping.MappedStatement;
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
import java.util.List;
public class SimpleStatementHandler extends BaseStatementHandler {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/statement/StatementHandler.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/statement/StatementHandler.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/statement/StatementHandler.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/statement/StatementHandler.java Thu Jan 22 22:32:36 2009
@@ -3,7 +3,9 @@
import org.apache.ibatis.executor.parameter.ParameterHandler;
import org.apache.ibatis.executor.result.ResultHandler;
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.sql.Statement;
import java.util.List;
public interface StatementHandler {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/io/Resources.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/io/Resources.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/io/Resources.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/io/Resources.java Thu Jan 22 22:32:36 2009
@@ -1,7 +1,8 @@
package org.apache.ibatis.io;
import java.io.*;
-import java.net.*;
+import java.net.URL;
+import java.net.URLConnection;
import java.nio.charset.Charset;
import java.util.Properties;
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/jdbc/ScriptRunner.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/jdbc/ScriptRunner.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/jdbc/ScriptRunner.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/jdbc/ScriptRunner.java Thu Jan 22 22:32:36 2009
@@ -1,6 +1,9 @@
package org.apache.ibatis.jdbc;
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.Reader;
import java.sql.*;
public class ScriptRunner {
@@ -57,7 +60,7 @@
public void closeConnection() {
try {
connection.close();
- } catch(Exception e) {
+ } catch (Exception e) {
// ignore
}
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/jdbc/SqlRunner.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/jdbc/SqlRunner.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/jdbc/SqlRunner.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/jdbc/SqlRunner.java Thu Jan 22 22:32:36 2009
@@ -1,7 +1,7 @@
package org.apache.ibatis.jdbc;
-import org.apache.ibatis.type.*;
-import org.apache.ibatis.jdbc.Null;
+import org.apache.ibatis.type.TypeHandler;
+import org.apache.ibatis.type.TypeHandlerRegistry;
import java.sql.*;
import java.util.*;
@@ -217,5 +217,5 @@
}
}
}
-
+
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/logging/commons/JakartaCommonsLoggingImpl.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/logging/commons/JakartaCommonsLoggingImpl.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/logging/commons/JakartaCommonsLoggingImpl.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/logging/commons/JakartaCommonsLoggingImpl.java Thu Jan 22 22:32:36 2009
@@ -1,6 +1,7 @@
package org.apache.ibatis.logging.commons;
-import org.apache.commons.logging.*;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
public class JakartaCommonsLoggingImpl implements org.apache.ibatis.logging.Log {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/logging/jdbc/ConnectionLogger.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/logging/jdbc/ConnectionLogger.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/logging/jdbc/ConnectionLogger.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/logging/jdbc/ConnectionLogger.java Thu Jan 22 22:32:36 2009
@@ -1,10 +1,15 @@
package org.apache.ibatis.logging.jdbc;
-import org.apache.ibatis.logging.*;
+import org.apache.ibatis.logging.Log;
+import org.apache.ibatis.logging.LogFactory;
import org.apache.ibatis.reflection.ExceptionUtil;
-import java.lang.reflect.*;
-import java.sql.*;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.Statement;
/**
* Connection proxy to add logging
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/logging/jdbc/PreparedStatementLogger.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/logging/jdbc/PreparedStatementLogger.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/logging/jdbc/PreparedStatementLogger.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/logging/jdbc/PreparedStatementLogger.java Thu Jan 22 22:32:36 2009
@@ -1,10 +1,15 @@
package org.apache.ibatis.logging.jdbc;
-import org.apache.ibatis.logging.*;
+import org.apache.ibatis.logging.Log;
+import org.apache.ibatis.logging.LogFactory;
import org.apache.ibatis.reflection.ExceptionUtil;
-import java.lang.reflect.*;
-import java.sql.*;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
/**
* PreparedStatement proxy to add logging
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/logging/jdbc/ResultSetLogger.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/logging/jdbc/ResultSetLogger.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/logging/jdbc/ResultSetLogger.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/logging/jdbc/ResultSetLogger.java Thu Jan 22 22:32:36 2009
@@ -1,9 +1,12 @@
package org.apache.ibatis.logging.jdbc;
-import org.apache.ibatis.logging.*;
+import org.apache.ibatis.logging.Log;
+import org.apache.ibatis.logging.LogFactory;
import org.apache.ibatis.reflection.ExceptionUtil;
-import java.lang.reflect.*;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
import java.sql.ResultSet;
/**
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/logging/jdbc/StatementLogger.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/logging/jdbc/StatementLogger.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/logging/jdbc/StatementLogger.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/logging/jdbc/StatementLogger.java Thu Jan 22 22:32:36 2009
@@ -1,10 +1,14 @@
package org.apache.ibatis.logging.jdbc;
-import org.apache.ibatis.logging.*;
+import org.apache.ibatis.logging.Log;
+import org.apache.ibatis.logging.LogFactory;
import org.apache.ibatis.reflection.ExceptionUtil;
-import java.lang.reflect.*;
-import java.sql.*;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.sql.ResultSet;
+import java.sql.Statement;
/**
* Statement proxy to add logging
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/logging/jdk14/Jdk14LoggingImpl.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/logging/jdk14/Jdk14LoggingImpl.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/logging/jdk14/Jdk14LoggingImpl.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/logging/jdk14/Jdk14LoggingImpl.java Thu Jan 22 22:32:36 2009
@@ -2,7 +2,8 @@
import org.apache.ibatis.logging.Log;
-import java.util.logging.*;
+import java.util.logging.Level;
+import java.util.logging.Logger;
public class Jdk14LoggingImpl implements Log {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/CacheBuilder.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/CacheBuilder.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/CacheBuilder.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/CacheBuilder.java Thu Jan 22 22:32:36 2009
@@ -1,12 +1,16 @@
package org.apache.ibatis.mapping;
-import org.apache.ibatis.cache.*;
+import org.apache.ibatis.cache.Cache;
+import org.apache.ibatis.cache.CacheException;
import org.apache.ibatis.cache.decorators.*;
import org.apache.ibatis.cache.impl.PerpetualCache;
import org.apache.ibatis.reflection.MetaObject;
import java.lang.reflect.Constructor;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
public class CacheBuilder {
private String id;
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/Configuration.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/Configuration.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/Configuration.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/Configuration.java Thu Jan 22 22:32:36 2009
@@ -1,25 +1,31 @@
package org.apache.ibatis.mapping;
import org.apache.ibatis.cache.Cache;
+import org.apache.ibatis.datasource.jndi.JndiDataSourceFactory;
+import org.apache.ibatis.datasource.pooled.PooledDataSourceFactory;
+import org.apache.ibatis.datasource.unpooled.UnpooledDataSourceFactory;
import org.apache.ibatis.executor.*;
-import org.apache.ibatis.executor.parameter.*;
+import org.apache.ibatis.executor.parameter.DefaultParameterHandler;
+import org.apache.ibatis.executor.parameter.ParameterHandler;
import org.apache.ibatis.executor.result.ResultHandler;
-import org.apache.ibatis.executor.resultset.*;
-import org.apache.ibatis.executor.statement.*;
-import org.apache.ibatis.plugin.*;
-import org.apache.ibatis.reflection.*;
-import org.apache.ibatis.type.*;
-import org.apache.ibatis.transaction.jdbc.JdbcTransaction;
+import org.apache.ibatis.executor.resultset.DefaultResultSetHandler;
+import org.apache.ibatis.executor.resultset.ResultSetHandler;
+import org.apache.ibatis.executor.statement.RoutingStatementHandler;
+import org.apache.ibatis.executor.statement.StatementHandler;
+import org.apache.ibatis.plugin.Interceptor;
+import org.apache.ibatis.plugin.InterceptorChain;
+import org.apache.ibatis.reflection.DefaultObjectFactory;
+import org.apache.ibatis.reflection.ObjectFactory;
+import org.apache.ibatis.transaction.Transaction;
import org.apache.ibatis.transaction.jdbc.JdbcTransactionFactory;
-import org.apache.ibatis.transaction.managed.ManagedTransaction;
import org.apache.ibatis.transaction.managed.ManagedTransactionFactory;
-import org.apache.ibatis.transaction.Transaction;
-import org.apache.ibatis.datasource.jndi.JndiDataSourceFactory;
-import org.apache.ibatis.datasource.pooled.PooledDataSourceFactory;
-import org.apache.ibatis.datasource.unpooled.UnpooledDataSourceFactory;
+import org.apache.ibatis.type.TypeAliasRegistry;
+import org.apache.ibatis.type.TypeHandlerRegistry;
-import java.sql.Connection;
-import java.util.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
public class Configuration {
@@ -50,7 +56,7 @@
typeAliasRegistry.registerAlias("MANAGED", ManagedTransactionFactory.class.getName());
typeAliasRegistry.registerAlias("JNDI", JndiDataSourceFactory.class.getName());
typeAliasRegistry.registerAlias("POOLED", PooledDataSourceFactory.class.getName());
- typeAliasRegistry.registerAlias("UNPOOLED", UnpooledDataSourceFactory.class.getName());
+ typeAliasRegistry.registerAlias("UNPOOLED", UnpooledDataSourceFactory.class.getName());
}
public Environment getEnvironment() {
@@ -170,7 +176,7 @@
public Executor newExecutor(Transaction transaction) {
return newExecutor(transaction, defaultExecutorType);
}
-
+
public Executor newExecutor(Transaction transaction, ExecutorType executorType) {
executorType = executorType == null ? defaultExecutorType : executorType;
executorType = executorType == null ? ExecutorType.SIMPLE : executorType;
@@ -257,7 +263,7 @@
interceptorChain.addInterceptor(interceptor);
}
- private static class StrictMap<J,K> extends HashMap<J,K> {
+ private static class StrictMap<J, K> extends HashMap<J, K> {
private String name;
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/Discriminator.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/Discriminator.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/Discriminator.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/Discriminator.java Thu Jan 22 22:32:36 2009
@@ -1,6 +1,7 @@
package org.apache.ibatis.mapping;
-import java.util.*;
+import java.util.Collections;
+import java.util.Map;
public class Discriminator {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/Environment.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/Environment.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/Environment.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/Environment.java Thu Jan 22 22:32:36 2009
@@ -9,23 +9,28 @@
private TransactionFactory transactionFactory;
private DataSource dataSource;
- private Environment() {}
+ private Environment() {
+ }
public static class Builder {
private Environment environment = new Environment();
+
public Builder(String id, TransactionFactory transactionManager, DataSource dataSource) {
environment.id = id;
environment.transactionFactory = transactionManager;
environment.dataSource = dataSource;
}
+
public Builder transactionFactory(TransactionFactory transactionFactory) {
environment.transactionFactory = transactionFactory;
return this;
}
+
public Builder dataSource(DataSource dataSource) {
environment.dataSource = dataSource;
return this;
}
+
public String id() {
return environment.id;
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/MappedStatement.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/MappedStatement.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/MappedStatement.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/MappedStatement.java Thu Jan 22 22:32:36 2009
@@ -2,7 +2,9 @@
import org.apache.ibatis.cache.Cache;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
public class MappedStatement {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/ParameterMap.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/ParameterMap.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/ParameterMap.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/ParameterMap.java Thu Jan 22 22:32:36 2009
@@ -1,6 +1,7 @@
package org.apache.ibatis.mapping;
-import java.util.*;
+import java.util.Collections;
+import java.util.List;
public class ParameterMap {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/ParameterMapping.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/ParameterMapping.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/ParameterMapping.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/ParameterMapping.java Thu Jan 22 22:32:36 2009
@@ -1,6 +1,8 @@
package org.apache.ibatis.mapping;
-import org.apache.ibatis.type.*;
+import org.apache.ibatis.type.JdbcType;
+import org.apache.ibatis.type.TypeHandler;
+import org.apache.ibatis.type.TypeHandlerRegistry;
public class ParameterMapping {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/ResultMap.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/ResultMap.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/ResultMap.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/ResultMap.java Thu Jan 22 22:32:36 2009
@@ -1,6 +1,8 @@
package org.apache.ibatis.mapping;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
public class ResultMap {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/ResultMapping.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/ResultMapping.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/ResultMapping.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/ResultMapping.java Thu Jan 22 22:32:36 2009
@@ -1,8 +1,12 @@
package org.apache.ibatis.mapping;
-import org.apache.ibatis.type.*;
-
-import java.util.*;
+import org.apache.ibatis.type.JdbcType;
+import org.apache.ibatis.type.TypeHandler;
+import org.apache.ibatis.type.TypeHandlerRegistry;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
public class ResultMapping {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/metadata/Database.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/metadata/Database.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/metadata/Database.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/metadata/Database.java Thu Jan 22 22:32:36 2009
@@ -28,13 +28,13 @@
}
public Table getTable(String name) {
- return (Table)tables.get(name.toUpperCase());
+ return (Table) tables.get(name.toUpperCase());
}
public String[] getTableNames() {
- return (String[])tables.keySet().toArray(new String[tables.size()]);
+ return (String[]) tables.keySet().toArray(new String[tables.size()]);
}
-
+
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/metadata/DatabaseFactory.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/metadata/DatabaseFactory.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/metadata/DatabaseFactory.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/metadata/DatabaseFactory.java Thu Jan 22 22:32:36 2009
@@ -1,7 +1,9 @@
package org.apache.ibatis.metadata;
-import javax.sql.DataSource;
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.ResultSet;
+import java.sql.SQLException;
public class DatabaseFactory {
private DatabaseFactory() {
@@ -36,12 +38,12 @@
try {
String[] tableNames = database.getTableNames();
- for (int i=0; i < tableNames.length; i++) {
+ for (int i = 0; i < tableNames.length; i++) {
Table table = database.getTable(tableNames[i]);
rs = dbmd.getPrimaryKeys(catalogFilter, schemaFilter, table.getName());
if (rs.next()) {
String columnName = rs.getString("COLUMN_NAME");
- table.setPrimaryKey (table.getColumn(columnName));
+ table.setPrimaryKey(table.getColumn(columnName));
}
}
} finally {
@@ -49,7 +51,9 @@
}
} finally {
- try { conn.rollback(); } catch (Exception e) { /*ignore*/ }
+ try {
+ conn.rollback();
+ } catch (Exception e) { /*ignore*/ }
}
return database;
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/CommandLine.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/CommandLine.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/CommandLine.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/CommandLine.java Thu Jan 22 22:32:36 2009
@@ -2,8 +2,12 @@
import org.apache.ibatis.migration.commands.*;
-import java.io.*;
-import java.util.*;
+import java.io.File;
+import java.io.PrintStream;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
public class CommandLine {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/MigrationReader.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/MigrationReader.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/MigrationReader.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/MigrationReader.java Thu Jan 22 22:32:36 2009
@@ -2,7 +2,10 @@
import org.apache.ibatis.xml.PropertyParser;
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.Reader;
+import java.io.StringReader;
import java.util.Properties;
public class MigrationReader extends Reader {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/BaseCommand.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/BaseCommand.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/BaseCommand.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/BaseCommand.java Thu Jan 22 22:32:36 2009
@@ -1,15 +1,17 @@
package org.apache.ibatis.migration.commands;
-import org.apache.ibatis.jdbc.SqlRunner;
-import org.apache.ibatis.io.Resources;
-import org.apache.ibatis.migration.*;
import org.apache.ibatis.datasource.unpooled.UnpooledDataSource;
+import org.apache.ibatis.io.Resources;
import org.apache.ibatis.jdbc.ScriptRunner;
+import org.apache.ibatis.jdbc.SqlRunner;
+import org.apache.ibatis.migration.Change;
+import org.apache.ibatis.migration.MigrationException;
import org.apache.ibatis.xml.PropertyParser;
import java.io.*;
import java.math.BigDecimal;
-import java.net.*;
+import java.net.URL;
+import java.net.URLClassLoader;
import java.sql.SQLException;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -56,7 +58,7 @@
protected List<Change> getChangelog() {
SqlRunner runner = getSqlRunner();
try {
- List<Map<String, Object>> changelog = runner.selectAll("select ID, APPLIED_AT, DESCRIPTION from "+changelogTable()+" order by id");
+ List<Map<String, Object>> changelog = runner.selectAll("select ID, APPLIED_AT, DESCRIPTION from " + changelogTable() + " order by id");
List<Change> changes = new ArrayList<Change>();
for (Map<String, Object> change : changelog) {
String id = change.get("ID") == null ? null : change.get("ID").toString();
@@ -104,7 +106,7 @@
caption = " " + caption + " ";
builder.append(caption);
}
- for (int i = 0; i < length - caption.length()-10; i++) {
+ for (int i = 0; i < length - caption.length() - 10; i++) {
builder.append("=");
}
return builder.toString();
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/BootstrapCommand.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/BootstrapCommand.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/BootstrapCommand.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/BootstrapCommand.java Thu Jan 22 22:32:36 2009
@@ -1,9 +1,11 @@
package org.apache.ibatis.migration.commands;
-import org.apache.ibatis.migration.*;
import org.apache.ibatis.jdbc.ScriptRunner;
+import org.apache.ibatis.migration.MigrationException;
+import org.apache.ibatis.migration.MigrationReader;
-import java.io.*;
+import java.io.File;
+import java.io.FileReader;
public class BootstrapCommand extends BaseCommand {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/DownCommand.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/DownCommand.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/DownCommand.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/DownCommand.java Thu Jan 22 22:32:36 2009
@@ -1,12 +1,18 @@
package org.apache.ibatis.migration.commands;
-import org.apache.ibatis.jdbc.SqlRunner;
-import org.apache.ibatis.migration.*;
import org.apache.ibatis.jdbc.ScriptRunner;
+import org.apache.ibatis.jdbc.SqlRunner;
+import org.apache.ibatis.migration.Change;
+import org.apache.ibatis.migration.MigrationException;
+import org.apache.ibatis.migration.MigrationReader;
-import java.io.*;
+import java.io.File;
+import java.io.FileReader;
import java.sql.SQLException;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
public class DownCommand extends BaseCommand {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/StatusCommand.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/StatusCommand.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/StatusCommand.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/StatusCommand.java Thu Jan 22 22:32:36 2009
@@ -3,7 +3,9 @@
import org.apache.ibatis.migration.Change;
import java.io.File;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
public class StatusCommand extends BaseCommand {
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/UpCommand.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/UpCommand.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/UpCommand.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/UpCommand.java Thu Jan 22 22:32:36 2009
@@ -1,10 +1,13 @@
package org.apache.ibatis.migration.commands;
-import org.apache.ibatis.jdbc.SqlRunner;
-import org.apache.ibatis.migration.*;
import org.apache.ibatis.jdbc.ScriptRunner;
+import org.apache.ibatis.jdbc.SqlRunner;
+import org.apache.ibatis.migration.Change;
+import org.apache.ibatis.migration.MigrationException;
+import org.apache.ibatis.migration.MigrationReader;
-import java.io.*;
+import java.io.File;
+import java.io.FileReader;
import java.sql.SQLException;
import java.text.SimpleDateFormat;
import java.util.List;
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/VersionCommand.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/VersionCommand.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/VersionCommand.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/commands/VersionCommand.java Thu Jan 22 22:32:36 2009
@@ -1,6 +1,7 @@
package org.apache.ibatis.migration.commands;
-import org.apache.ibatis.migration.*;
+import org.apache.ibatis.migration.Change;
+import org.apache.ibatis.migration.MigrationException;
import java.io.File;
import java.math.BigDecimal;
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/ASTAdd.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/ASTAdd.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/ASTAdd.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/ASTAdd.java Thu Jan 22 22:32:36 2009
@@ -34,30 +34,27 @@
* @author Luke Blanshard (blanshlu@netscape.net)
* @author Drew Davidson (drew@ognl.org)
*/
-class ASTAdd extends ExpressionNode
-{
- public ASTAdd(int id) {
- super(id);
- }
+class ASTAdd extends ExpressionNode {
+ public ASTAdd(int id) {
+ super(id);
+ }
- public ASTAdd(OgnlParser p, int id) {
- super(p, id);
- }
+ public ASTAdd(OgnlParser p, int id) {
+ super(p, id);
+ }
- public void jjtClose() {
- flattenTree();
- }
+ public void jjtClose() {
+ flattenTree();
+ }
- protected Object getValueBody( OgnlContext context, Object source ) throws OgnlException
- {
- Object result = children[0].getValue( context, source );
- for ( int i=1; i < children.length; ++i )
- result = OgnlOps.add( result, children[i].getValue(context, source) );
- return result;
- }
+ protected Object getValueBody(OgnlContext context, Object source) throws OgnlException {
+ Object result = children[0].getValue(context, source);
+ for (int i = 1; i < children.length; ++i)
+ result = OgnlOps.add(result, children[i].getValue(context, source));
+ return result;
+ }
- public String getExpressionOperator(int index)
- {
- return "+";
- }
+ public String getExpressionOperator(int index) {
+ return "+";
+ }
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/ASTAnd.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/ASTAnd.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/ASTAnd.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/ASTAnd.java Thu Jan 22 22:32:36 2009
@@ -34,45 +34,41 @@
* @author Luke Blanshard (blanshlu@netscape.net)
* @author Drew Davidson (drew@ognl.org)
*/
-class ASTAnd extends ExpressionNode
-{
- public ASTAnd(int id) {
- super(id);
- }
+class ASTAnd extends ExpressionNode {
+ public ASTAnd(int id) {
+ super(id);
+ }
- public ASTAnd(OgnlParser p, int id) {
- super(p, id);
- }
+ public ASTAnd(OgnlParser p, int id) {
+ super(p, id);
+ }
- public void jjtClose() {
- flattenTree();
- }
+ public void jjtClose() {
+ flattenTree();
+ }
- protected Object getValueBody( OgnlContext context, Object source ) throws OgnlException
- {
- Object result = null;
- int last = children.length - 1;
- for ( int i=0; i <= last; ++i ) {
- result = children[i].getValue( context, source );
- if ( i != last && ! OgnlOps.booleanValue(result) )
- break;
- }
- return result;
+ protected Object getValueBody(OgnlContext context, Object source) throws OgnlException {
+ Object result = null;
+ int last = children.length - 1;
+ for (int i = 0; i <= last; ++i) {
+ result = children[i].getValue(context, source);
+ if (i != last && !OgnlOps.booleanValue(result))
+ break;
}
+ return result;
+ }
- protected void setValueBody( OgnlContext context, Object target, Object value ) throws OgnlException
- {
- int last = children.length - 1;
- for ( int i=0; i < last; ++i ) {
- Object v = children[i].getValue( context, target );
- if ( ! OgnlOps.booleanValue(v) )
- return;
- }
- children[last].setValue( context, target, value );
+ protected void setValueBody(OgnlContext context, Object target, Object value) throws OgnlException {
+ int last = children.length - 1;
+ for (int i = 0; i < last; ++i) {
+ Object v = children[i].getValue(context, target);
+ if (!OgnlOps.booleanValue(v))
+ return;
}
+ children[last].setValue(context, target, value);
+ }
- public String getExpressionOperator(int index)
- {
- return "&&";
- }
+ public String getExpressionOperator(int index) {
+ return "&&";
+ }
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/ASTAssign.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/ASTAssign.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/ASTAssign.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/ASTAssign.java Thu Jan 22 22:32:36 2009
@@ -34,25 +34,22 @@
* @author Luke Blanshard (blanshlu@netscape.net)
* @author Drew Davidson (drew@ognl.org)
*/
-class ASTAssign extends SimpleNode
-{
- public ASTAssign(int id) {
- super(id);
- }
+class ASTAssign extends SimpleNode {
+ public ASTAssign(int id) {
+ super(id);
+ }
- public ASTAssign(OgnlParser p, int id) {
- super(p, id);
- }
+ public ASTAssign(OgnlParser p, int id) {
+ super(p, id);
+ }
- protected Object getValueBody( OgnlContext context, Object source ) throws OgnlException
- {
- Object result = children[1].getValue( context, source );
- children[0].setValue( context, source, result );
- return result;
- }
+ protected Object getValueBody(OgnlContext context, Object source) throws OgnlException {
+ Object result = children[1].getValue(context, source);
+ children[0].setValue(context, source, result);
+ return result;
+ }
- public String toString()
- {
- return children[0] + " = " + children[1];
- }
+ public String toString() {
+ return children[0] + " = " + children[1];
+ }
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/ASTBitAnd.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/ASTBitAnd.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/ASTBitAnd.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/ASTBitAnd.java Thu Jan 22 22:32:36 2009
@@ -34,30 +34,27 @@
* @author Luke Blanshard (blanshlu@netscape.net)
* @author Drew Davidson (drew@ognl.org)
*/
-class ASTBitAnd extends ExpressionNode
-{
- public ASTBitAnd(int id) {
- super(id);
- }
+class ASTBitAnd extends ExpressionNode {
+ public ASTBitAnd(int id) {
+ super(id);
+ }
- public ASTBitAnd(OgnlParser p, int id) {
- super(p, id);
- }
+ public ASTBitAnd(OgnlParser p, int id) {
+ super(p, id);
+ }
- public void jjtClose() {
- flattenTree();
- }
+ public void jjtClose() {
+ flattenTree();
+ }
- protected Object getValueBody( OgnlContext context, Object source ) throws OgnlException
- {
- Object result = children[0].getValue( context, source );
- for ( int i=1; i < children.length; ++i )
- result = OgnlOps.binaryAnd( result, children[i].getValue(context, source) );
- return result;
- }
+ protected Object getValueBody(OgnlContext context, Object source) throws OgnlException {
+ Object result = children[0].getValue(context, source);
+ for (int i = 1; i < children.length; ++i)
+ result = OgnlOps.binaryAnd(result, children[i].getValue(context, source));
+ return result;
+ }
- public String getExpressionOperator(int index)
- {
- return "&";
- }
+ public String getExpressionOperator(int index) {
+ return "&";
+ }
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/ASTBitNegate.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/ASTBitNegate.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/ASTBitNegate.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/ASTBitNegate.java Thu Jan 22 22:32:36 2009
@@ -34,23 +34,20 @@
* @author Luke Blanshard (blanshlu@netscape.net)
* @author Drew Davidson (drew@ognl.org)
*/
-class ASTBitNegate extends ExpressionNode
-{
- public ASTBitNegate(int id) {
- super(id);
- }
+class ASTBitNegate extends ExpressionNode {
+ public ASTBitNegate(int id) {
+ super(id);
+ }
- public ASTBitNegate(OgnlParser p, int id) {
- super(p, id);
- }
+ public ASTBitNegate(OgnlParser p, int id) {
+ super(p, id);
+ }
- protected Object getValueBody( OgnlContext context, Object source ) throws OgnlException
- {
- return OgnlOps.bitNegate( children[0].getValue(context, source) );
- }
+ protected Object getValueBody(OgnlContext context, Object source) throws OgnlException {
+ return OgnlOps.bitNegate(children[0].getValue(context, source));
+ }
- public String toString()
- {
- return "~" + children[0];
- }
+ public String toString() {
+ return "~" + children[0];
+ }
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/ASTBitOr.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/ASTBitOr.java?rev=736963&r1=736962&r2=736963&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/ASTBitOr.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/ognl/ASTBitOr.java Thu Jan 22 22:32:36 2009
@@ -34,30 +34,27 @@
* @author Luke Blanshard (blanshlu@netscape.net)
* @author Drew Davidson (drew@ognl.org)
*/
-class ASTBitOr extends ExpressionNode
-{
- public ASTBitOr(int id) {
- super(id);
- }
+class ASTBitOr extends ExpressionNode {
+ public ASTBitOr(int id) {
+ super(id);
+ }
- public ASTBitOr(OgnlParser p, int id) {
- super(p, id);
- }
+ public ASTBitOr(OgnlParser p, int id) {
+ super(p, id);
+ }
- public void jjtClose() {
- flattenTree();
- }
+ public void jjtClose() {
+ flattenTree();
+ }
- protected Object getValueBody( OgnlContext context, Object source ) throws OgnlException
- {
- Object result = children[0].getValue( context, source );
- for ( int i=1; i < children.length; ++i )
- result = OgnlOps.binaryOr( result, children[i].getValue(context, source) );
- return result;
- }
+ protected Object getValueBody(OgnlContext context, Object source) throws OgnlException {
+ Object result = children[0].getValue(context, source);
+ for (int i = 1; i < children.length; ++i)
+ result = OgnlOps.binaryOr(result, children[i].getValue(context, source));
+ return result;
+ }
- public String getExpressionOperator(int index)
- {
- return "|";
- }
+ public String getExpressionOperator(int index) {
+ return "|";
+ }
}