Issue 93: run an optimize-imports over all the source.
git-svn-id: https://google-guice.googlecode.com/svn/trunk@316 d779f126-a31b-0410-b53b-1d3aecad763e
diff --git a/servlet/src/com/google/inject/servlet/RequestScoped.java b/servlet/src/com/google/inject/servlet/RequestScoped.java
index 260af5d..47d2a37 100644
--- a/servlet/src/com/google/inject/servlet/RequestScoped.java
+++ b/servlet/src/com/google/inject/servlet/RequestScoped.java
@@ -16,11 +16,11 @@
package com.google.inject.servlet;
+import com.google.inject.ScopeAnnotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import com.google.inject.ScopeAnnotation;
/**
* Apply this to implementation classes when you want one instance per request.
diff --git a/servlet/src/com/google/inject/servlet/ServletModule.java b/servlet/src/com/google/inject/servlet/ServletModule.java
index 0472dec..12aa025 100644
--- a/servlet/src/com/google/inject/servlet/ServletModule.java
+++ b/servlet/src/com/google/inject/servlet/ServletModule.java
@@ -17,13 +17,11 @@
package com.google.inject.servlet;
import com.google.inject.AbstractModule;
-import com.google.inject.TypeLiteral;
import com.google.inject.Provider;
+import com.google.inject.TypeLiteral;
import static com.google.inject.servlet.ServletScopes.REQUEST;
import static com.google.inject.servlet.ServletScopes.SESSION;
-
import java.util.Map;
-
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
diff --git a/spring/src/com/google/inject/spring/SpringIntegration.java b/spring/src/com/google/inject/spring/SpringIntegration.java
index 3a67147..1d60c24 100644
--- a/spring/src/com/google/inject/spring/SpringIntegration.java
+++ b/spring/src/com/google/inject/spring/SpringIntegration.java
@@ -16,13 +16,12 @@
package com.google.inject.spring;
-import static com.google.inject.util.Objects.nonNull;
-import com.google.inject.Provider;
-import com.google.inject.Inject;
import com.google.inject.Binder;
+import com.google.inject.Inject;
+import com.google.inject.Provider;
import com.google.inject.name.Names;
import com.google.inject.spi.SourceProviders;
-import com.google.inject.util.Objects;
+import static com.google.inject.util.Objects.nonNull;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.ListableBeanFactory;
diff --git a/spring/test/com/google/inject/spring/SpringIntegrationTest.java b/spring/test/com/google/inject/spring/SpringIntegrationTest.java
index c110ca4..15b9818 100644
--- a/spring/test/com/google/inject/spring/SpringIntegrationTest.java
+++ b/spring/test/com/google/inject/spring/SpringIntegrationTest.java
@@ -16,19 +16,17 @@
package com.google.inject.spring;
-import junit.framework.TestCase;
-import org.springframework.beans.factory.support.DefaultListableBeanFactory;
-import org.springframework.beans.factory.support.RootBeanDefinition;
-import org.springframework.beans.factory.config.ConstructorArgumentValues;
-import org.springframework.beans.factory.BeanFactory;
-import com.google.inject.PerformanceComparison.TeeImpl;
-import com.google.inject.Injector;
-import com.google.inject.Guice;
import com.google.inject.AbstractModule;
import com.google.inject.CreationException;
+import com.google.inject.Guice;
+import com.google.inject.Injector;
import com.google.inject.Key;
import com.google.inject.name.Names;
-import static com.google.inject.spring.SpringIntegration.*;
+import static com.google.inject.spring.SpringIntegration.fromSpring;
+import junit.framework.TestCase;
+import org.springframework.beans.factory.BeanFactory;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.beans.factory.support.RootBeanDefinition;
/**
* @author crazybob@google.com (Bob Lee)
diff --git a/src/com/google/inject/AbstractModule.java b/src/com/google/inject/AbstractModule.java
index 0fc4899..e5e89ff 100644
--- a/src/com/google/inject/AbstractModule.java
+++ b/src/com/google/inject/AbstractModule.java
@@ -16,10 +16,9 @@
package com.google.inject;
-import com.google.inject.binder.ConstantBindingBuilder;
import com.google.inject.binder.AnnotatedBindingBuilder;
-import com.google.inject.binder.LinkedBindingBuilder;
import com.google.inject.binder.AnnotatedConstantBindingBuilder;
+import com.google.inject.binder.LinkedBindingBuilder;
import com.google.inject.matcher.Matcher;
import com.google.inject.spi.SourceProviders;
import com.google.inject.util.Objects;
diff --git a/src/com/google/inject/BindingAnnotation.java b/src/com/google/inject/BindingAnnotation.java
index 664d95e..707b3e7 100644
--- a/src/com/google/inject/BindingAnnotation.java
+++ b/src/com/google/inject/BindingAnnotation.java
@@ -16,11 +16,10 @@
package com.google.inject;
-import java.lang.annotation.ElementType;
+import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
import java.lang.annotation.Retention;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
-import static java.lang.annotation.ElementType.*;
/**
* Annotates annotations which are used for binding. Only one such annotation
diff --git a/src/com/google/inject/BindingBuilderImpl.java b/src/com/google/inject/BindingBuilderImpl.java
index f01af3a..e70f6c4 100644
--- a/src/com/google/inject/BindingBuilderImpl.java
+++ b/src/com/google/inject/BindingBuilderImpl.java
@@ -17,8 +17,8 @@
package com.google.inject;
import com.google.inject.BinderImpl.CreationListener;
-import com.google.inject.binder.ScopedBindingBuilder;
import com.google.inject.binder.AnnotatedBindingBuilder;
+import com.google.inject.binder.ScopedBindingBuilder;
import com.google.inject.util.Annotations;
import com.google.inject.util.Objects;
import com.google.inject.util.StackTraceElements;
diff --git a/src/com/google/inject/ConstantBindingBuilderImpl.java b/src/com/google/inject/ConstantBindingBuilderImpl.java
index cc9ff68..5c03354 100644
--- a/src/com/google/inject/ConstantBindingBuilderImpl.java
+++ b/src/com/google/inject/ConstantBindingBuilderImpl.java
@@ -17,12 +17,11 @@
package com.google.inject;
import com.google.inject.Key.AnnotationStrategy;
-import com.google.inject.binder.ConstantBindingBuilder;
import com.google.inject.binder.AnnotatedConstantBindingBuilder;
-import com.google.inject.spi.SourceProviders;
+import com.google.inject.binder.ConstantBindingBuilder;
import com.google.inject.util.Annotations;
-import com.google.inject.util.StackTraceElements;
import com.google.inject.util.Objects;
+import com.google.inject.util.StackTraceElements;
import java.lang.annotation.Annotation;
/**
diff --git a/src/com/google/inject/ImplementedBy.java b/src/com/google/inject/ImplementedBy.java
index 7e664dd..e0ba497 100644
--- a/src/com/google/inject/ImplementedBy.java
+++ b/src/com/google/inject/ImplementedBy.java
@@ -16,10 +16,10 @@
package com.google.inject;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
import static java.lang.annotation.ElementType.TYPE;
+import java.lang.annotation.Retention;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import java.lang.annotation.Target;
/**
* A pointer to the default implementation of a type.
diff --git a/src/com/google/inject/Key.java b/src/com/google/inject/Key.java
index b803adb..c4bda5d 100644
--- a/src/com/google/inject/Key.java
+++ b/src/com/google/inject/Key.java
@@ -16,10 +16,10 @@
package com.google.inject;
+import com.google.inject.util.Annotations;
import static com.google.inject.util.Objects.nonNull;
import com.google.inject.util.StackTraceElements;
import com.google.inject.util.ToStringBuilder;
-import com.google.inject.util.Annotations;
import java.lang.annotation.Annotation;
import java.lang.reflect.Member;
import java.lang.reflect.Type;
diff --git a/src/com/google/inject/ScopeAnnotation.java b/src/com/google/inject/ScopeAnnotation.java
index 85d0972..f934852 100644
--- a/src/com/google/inject/ScopeAnnotation.java
+++ b/src/com/google/inject/ScopeAnnotation.java
@@ -16,12 +16,10 @@
package com.google.inject;
-import java.lang.annotation.Target;
-import java.lang.annotation.ElementType;
+import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import static java.lang.annotation.RetentionPolicy.*;
-import static java.lang.annotation.ElementType.*;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import java.lang.annotation.Target;
/**
* Annotates annotations which are used for scoping. Only one such annotation
diff --git a/src/com/google/inject/TypeLiteral.java b/src/com/google/inject/TypeLiteral.java
index 78b34d3..52ae0c1 100644
--- a/src/com/google/inject/TypeLiteral.java
+++ b/src/com/google/inject/TypeLiteral.java
@@ -17,11 +17,9 @@
package com.google.inject;
import static com.google.inject.util.Objects.nonNull;
+import java.lang.reflect.GenericArrayType;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
-import java.lang.reflect.GenericArrayType;
-import java.lang.reflect.Array;
-import java.util.Arrays;
/**
* Represents a generic type {@code T}. Java doesn't yet provide a way to
diff --git a/src/com/google/inject/jndi/JndiIntegration.java b/src/com/google/inject/jndi/JndiIntegration.java
index fea706b..38ec25f 100644
--- a/src/com/google/inject/jndi/JndiIntegration.java
+++ b/src/com/google/inject/jndi/JndiIntegration.java
@@ -16,8 +16,8 @@
package com.google.inject.jndi;
-import com.google.inject.Provider;
import com.google.inject.Inject;
+import com.google.inject.Provider;
import javax.naming.Context;
import javax.naming.NamingException;
diff --git a/src/com/google/inject/matcher/Matchers.java b/src/com/google/inject/matcher/Matchers.java
index 49fd4d0..9bbb8e3 100644
--- a/src/com/google/inject/matcher/Matchers.java
+++ b/src/com/google/inject/matcher/Matchers.java
@@ -17,7 +17,6 @@
package com.google.inject.matcher;
import com.google.inject.util.Objects;
-
import java.lang.annotation.Annotation;
import java.lang.reflect.AnnotatedElement;
import java.lang.reflect.Method;
diff --git a/src/com/google/inject/name/NamedImpl.java b/src/com/google/inject/name/NamedImpl.java
index 4017715..b88a63e 100644
--- a/src/com/google/inject/name/NamedImpl.java
+++ b/src/com/google/inject/name/NamedImpl.java
@@ -16,9 +16,8 @@
package com.google.inject.name;
-import java.lang.annotation.Annotation;
import com.google.inject.util.Objects;
-import com.google.inject.name.Named;
+import java.lang.annotation.Annotation;
class NamedImpl implements Named {
diff --git a/src/com/google/inject/name/Names.java b/src/com/google/inject/name/Names.java
index 0f06f1b..e0059f9 100644
--- a/src/com/google/inject/name/Names.java
+++ b/src/com/google/inject/name/Names.java
@@ -18,8 +18,8 @@
import com.google.inject.Binder;
import com.google.inject.Key;
-import com.google.inject.spi.SourceProviders;
import com.google.inject.spi.SourceProvider;
+import com.google.inject.spi.SourceProviders;
import java.util.Map;
import java.util.Properties;
diff --git a/src/com/google/inject/util/GuiceFastClass.java b/src/com/google/inject/util/GuiceFastClass.java
index 57d1b54..f8a6efc 100644
--- a/src/com/google/inject/util/GuiceFastClass.java
+++ b/src/com/google/inject/util/GuiceFastClass.java
@@ -17,7 +17,6 @@
package com.google.inject.util;
import net.sf.cglib.reflect.FastClass;
-import com.google.inject.util.GuiceNamingPolicy;
/**
* Gives Guice classes custom names.
diff --git a/src/com/google/inject/util/LineNumbers.java b/src/com/google/inject/util/LineNumbers.java
index 0aee1f2..a5d707b 100644
--- a/src/com/google/inject/util/LineNumbers.java
+++ b/src/com/google/inject/util/LineNumbers.java
@@ -18,10 +18,20 @@
import java.io.IOException;
import java.io.InputStream;
-import java.lang.reflect.*;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.Member;
+import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.Map;
-import org.objectweb.asm.*;
+import org.objectweb.asm.AnnotationVisitor;
+import org.objectweb.asm.Attribute;
+import org.objectweb.asm.ClassReader;
+import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.FieldVisitor;
+import org.objectweb.asm.Label;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
import org.objectweb.asm.Type;
/**
diff --git a/src/com/google/inject/util/ReferenceMap.java b/src/com/google/inject/util/ReferenceMap.java
index 03073f0..c1506fb 100644
--- a/src/com/google/inject/util/ReferenceMap.java
+++ b/src/com/google/inject/util/ReferenceMap.java
@@ -17,7 +17,6 @@
package com.google.inject.util;
import static com.google.inject.util.ReferenceType.STRONG;
-
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
diff --git a/src/com/google/inject/util/ToStringBuilder.java b/src/com/google/inject/util/ToStringBuilder.java
index a23a376..4142853 100644
--- a/src/com/google/inject/util/ToStringBuilder.java
+++ b/src/com/google/inject/util/ToStringBuilder.java
@@ -16,8 +16,8 @@
package com.google.inject.util;
-import java.util.Map;
import java.util.LinkedHashMap;
+import java.util.Map;
/**
* Helps with {@code toString()} methods.
diff --git a/struts2/example/src/com/google/inject/struts2/example/Count.java b/struts2/example/src/com/google/inject/struts2/example/Count.java
index 5f0b47f..76e7ec9 100644
--- a/struts2/example/src/com/google/inject/struts2/example/Count.java
+++ b/struts2/example/src/com/google/inject/struts2/example/Count.java
@@ -17,7 +17,6 @@
package com.google.inject.struts2.example;
import com.google.inject.Inject;
-
import static com.opensymphony.xwork2.Action.SUCCESS;
public class Count {
diff --git a/struts2/example/src/com/google/inject/struts2/example/Main.java b/struts2/example/src/com/google/inject/struts2/example/Main.java
index 60fd0be..eb4f0e2 100644
--- a/struts2/example/src/com/google/inject/struts2/example/Main.java
+++ b/struts2/example/src/com/google/inject/struts2/example/Main.java
@@ -18,8 +18,8 @@
import org.mortbay.jetty.Connector;
import org.mortbay.jetty.Server;
-import org.mortbay.jetty.webapp.WebAppContext;
import org.mortbay.jetty.nio.SelectChannelConnector;
+import org.mortbay.jetty.webapp.WebAppContext;
/**
* Starts the example web server on port 8080. Run from "./struts2/example".
diff --git a/struts2/plugin/src/com/google/inject/struts2/GuiceObjectFactory.java b/struts2/plugin/src/com/google/inject/struts2/GuiceObjectFactory.java
index 4916f6e..ade3297 100644
--- a/struts2/plugin/src/com/google/inject/struts2/GuiceObjectFactory.java
+++ b/struts2/plugin/src/com/google/inject/struts2/GuiceObjectFactory.java
@@ -17,11 +17,11 @@
package com.google.inject.struts2;
import com.google.inject.AbstractModule;
+import com.google.inject.Binder;
import com.google.inject.Guice;
import com.google.inject.Injector;
import com.google.inject.Module;
import com.google.inject.ScopeAnnotation;
-import com.google.inject.Binder;
import com.google.inject.servlet.ServletModule;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.ObjectFactory;
@@ -29,13 +29,13 @@
import com.opensymphony.xwork2.config.entities.InterceptorConfig;
import com.opensymphony.xwork2.inject.Inject;
import com.opensymphony.xwork2.interceptor.Interceptor;
+import java.lang.annotation.Annotation;
+import java.util.ArrayList;
import java.util.HashSet;
+import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.List;
-import java.util.ArrayList;
import java.util.logging.Logger;
-import java.lang.annotation.Annotation;
public class GuiceObjectFactory extends ObjectFactory {
diff --git a/test/com/google/inject/ProxyFactoryTest.java b/test/com/google/inject/ProxyFactoryTest.java
index 4b8f9e4..af1bebf 100644
--- a/test/com/google/inject/ProxyFactoryTest.java
+++ b/test/com/google/inject/ProxyFactoryTest.java
@@ -16,18 +16,16 @@
package com.google.inject;
-import com.google.inject.ConstructionProxy;
-import static com.google.inject.matcher.Matchers.*;
-import com.google.inject.Provider;
-
-import junit.framework.TestCase;
-
-import org.aopalliance.intercept.MethodInterceptor;
-import org.aopalliance.intercept.MethodInvocation;
-
-import java.lang.reflect.InvocationTargetException;
+import static com.google.inject.matcher.Matchers.annotatedWith;
+import static com.google.inject.matcher.Matchers.any;
+import static com.google.inject.matcher.Matchers.not;
+import static com.google.inject.matcher.Matchers.only;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
+import java.lang.reflect.InvocationTargetException;
+import junit.framework.TestCase;
+import org.aopalliance.intercept.MethodInterceptor;
+import org.aopalliance.intercept.MethodInvocation;
/**
* @author crazybob@google.com (Bob Lee)
diff --git a/test/com/google/inject/TypeLiteralTest.java b/test/com/google/inject/TypeLiteralTest.java
index 0aa70ff..389c74d 100644
--- a/test/com/google/inject/TypeLiteralTest.java
+++ b/test/com/google/inject/TypeLiteralTest.java
@@ -16,10 +16,8 @@
package com.google.inject;
-import junit.framework.TestCase;
-
import java.util.List;
-import java.lang.reflect.Type;
+import junit.framework.TestCase;
/**
* @author crazybob@google.com (Bob Lee)
diff --git a/test/com/google/inject/example/ClientServiceWithDependencyInjection.java b/test/com/google/inject/example/ClientServiceWithDependencyInjection.java
index 5616dd1..838a60b 100644
--- a/test/com/google/inject/example/ClientServiceWithDependencyInjection.java
+++ b/test/com/google/inject/example/ClientServiceWithDependencyInjection.java
@@ -17,7 +17,6 @@
package com.google.inject.example;
import static junit.framework.Assert.assertTrue;
-import junit.framework.Assert;
/**
* @author crazybob@google.com (Bob Lee)
diff --git a/test/com/google/inject/example/ClientServiceWithGuiceDefaults.java b/test/com/google/inject/example/ClientServiceWithGuiceDefaults.java
index bfa4d46..d53c2bb 100644
--- a/test/com/google/inject/example/ClientServiceWithGuiceDefaults.java
+++ b/test/com/google/inject/example/ClientServiceWithGuiceDefaults.java
@@ -16,11 +16,11 @@
package com.google.inject.example;
-import com.google.inject.Inject;
import com.google.inject.CreationException;
-import com.google.inject.Injector;
import com.google.inject.Guice;
import com.google.inject.ImplementedBy;
+import com.google.inject.Inject;
+import com.google.inject.Injector;
import com.google.inject.Singleton;
import junit.framework.Assert;
diff --git a/test/com/google/inject/matcher/MatcherTest.java b/test/com/google/inject/matcher/MatcherTest.java
index ec0d0ca..39a9ebe 100644
--- a/test/com/google/inject/matcher/MatcherTest.java
+++ b/test/com/google/inject/matcher/MatcherTest.java
@@ -16,13 +16,17 @@
package com.google.inject.matcher;
-import static com.google.inject.matcher.Matchers.*;
-
-import junit.framework.TestCase;
-
+import static com.google.inject.matcher.Matchers.annotatedWith;
+import static com.google.inject.matcher.Matchers.any;
+import static com.google.inject.matcher.Matchers.inPackage;
+import static com.google.inject.matcher.Matchers.not;
+import static com.google.inject.matcher.Matchers.only;
+import static com.google.inject.matcher.Matchers.returns;
+import static com.google.inject.matcher.Matchers.subclassesOf;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.reflect.Method;
+import junit.framework.TestCase;
/**
* @author crazybob@google.com (Bob Lee)
diff --git a/test/com/google/inject/util/ReferenceCacheTest.java b/test/com/google/inject/util/ReferenceCacheTest.java
index 0506306..a02c012 100644
--- a/test/com/google/inject/util/ReferenceCacheTest.java
+++ b/test/com/google/inject/util/ReferenceCacheTest.java
@@ -19,10 +19,8 @@
import static com.google.inject.util.ReferenceType.SOFT;
import static com.google.inject.util.ReferenceType.STRONG;
import static com.google.inject.util.ReferenceType.WEAK;
-
-import junit.framework.TestCase;
-
import java.util.concurrent.CountDownLatch;
+import junit.framework.TestCase;
/**
* @author crazybob@google.com (Bob Lee)
diff --git a/test/com/google/inject/util/ReferenceMapTest.java b/test/com/google/inject/util/ReferenceMapTest.java
index 24d0d33..2f96d60 100644
--- a/test/com/google/inject/util/ReferenceMapTest.java
+++ b/test/com/google/inject/util/ReferenceMapTest.java
@@ -19,12 +19,10 @@
import static com.google.inject.util.ReferenceType.SOFT;
import static com.google.inject.util.ReferenceType.STRONG;
import static com.google.inject.util.ReferenceType.WEAK;
-
-import junit.framework.TestCase;
-
import java.lang.ref.Reference;
import java.util.Iterator;
import java.util.concurrent.ConcurrentMap;
+import junit.framework.TestCase;
/**
* Tests for {@link ReferenceMap}.
diff --git a/test/com/google/inject/util/ReferenceMapTestSuite.java b/test/com/google/inject/util/ReferenceMapTestSuite.java
index 50a31f4..6a59925 100644
--- a/test/com/google/inject/util/ReferenceMapTestSuite.java
+++ b/test/com/google/inject/util/ReferenceMapTestSuite.java
@@ -16,10 +16,6 @@
package com.google.inject.util;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -31,6 +27,9 @@
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
/**
* @author crazybob@google.com (Bob Lee)
