Organize imports to disolve ambiguity.

src/main/javassist/CodeConverter.java

@@ -16,8 +16,21 @@
 
 package javassist;
 
-import javassist.bytecode.*;
-import javassist.convert.*;
+import javassist.bytecode.BadBytecode;
+import javassist.bytecode.CodeAttribute;
+import javassist.bytecode.CodeIterator;
+import javassist.bytecode.ConstPool;
+import javassist.bytecode.MethodInfo;
+import javassist.convert.TransformAccessArrayField;
+import javassist.convert.TransformAfter;
+import javassist.convert.TransformBefore;
+import javassist.convert.TransformCall;
+import javassist.convert.TransformFieldAccess;
+import javassist.convert.TransformNew;
+import javassist.convert.TransformNewClass;
+import javassist.convert.TransformReadField;
+import javassist.convert.TransformWriteField;
+import javassist.convert.Transformer;
 
 /**
  * Simple translator of method bodies

src/main/javassist/CtBehavior.java

@@ -16,9 +16,27 @@
 
 package javassist;
 
-import javassist.bytecode.*;
-import javassist.compiler.Javac;
+import javassist.bytecode.AccessFlag;
+import javassist.bytecode.AnnotationsAttribute;
+import javassist.bytecode.AttributeInfo;
+import javassist.bytecode.BadBytecode;
+import javassist.bytecode.Bytecode;
+import javassist.bytecode.CodeAttribute;
+import javassist.bytecode.CodeIterator;
+import javassist.bytecode.ConstPool;
+import javassist.bytecode.Descriptor;
+import javassist.bytecode.ExceptionsAttribute;
+import javassist.bytecode.LineNumberAttribute;
+import javassist.bytecode.LocalVariableAttribute;
+import javassist.bytecode.LocalVariableTypeAttribute;
+import javassist.bytecode.MethodInfo;
+import javassist.bytecode.Opcode;
+import javassist.bytecode.ParameterAnnotationsAttribute;
+import javassist.bytecode.SignatureAttribute;
+import javassist.bytecode.StackMap;
+import javassist.bytecode.StackMapTable;
 import javassist.compiler.CompileError;
+import javassist.compiler.Javac;
 import javassist.expr.ExprEditor;
 
 /**

src/main/javassist/CtClassType.java

@@ -16,15 +16,15 @@
 
 package javassist;
 
-import java.lang.ref.Reference;
-import java.lang.ref.WeakReference;
 import java.io.BufferedInputStream;
-import java.io.ByteArrayOutputStream;
 import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.lang.ref.Reference;
+import java.lang.ref.WeakReference;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -34,15 +34,15 @@ import java.util.Map;
 import java.util.Set;
 
 import javassist.bytecode.AccessFlag;
-import javassist.bytecode.AttributeInfo;
 import javassist.bytecode.AnnotationsAttribute;
+import javassist.bytecode.AttributeInfo;
 import javassist.bytecode.BadBytecode;
 import javassist.bytecode.Bytecode;
 import javassist.bytecode.ClassFile;
 import javassist.bytecode.CodeAttribute;
-import javassist.bytecode.ConstantAttribute;
 import javassist.bytecode.CodeIterator;
 import javassist.bytecode.ConstPool;
+import javassist.bytecode.ConstantAttribute;
 import javassist.bytecode.Descriptor;
 import javassist.bytecode.EnclosingMethodAttribute;
 import javassist.bytecode.FieldInfo;

src/main/javassist/CtConstructor.java

@@ -16,9 +16,17 @@
 
 package javassist;
 
-import javassist.bytecode.*;
-import javassist.compiler.Javac;
+import javassist.bytecode.BadBytecode;
+import javassist.bytecode.Bytecode;
+import javassist.bytecode.ClassFile;
+import javassist.bytecode.CodeAttribute;
+import javassist.bytecode.CodeIterator;
+import javassist.bytecode.ConstPool;
+import javassist.bytecode.Descriptor;
+import javassist.bytecode.MethodInfo;
+import javassist.bytecode.Opcode;
 import javassist.compiler.CompileError;
+import javassist.compiler.Javac;
 
 /**
  * An instance of CtConstructor represents a constructor.

src/main/javassist/CtField.java

@@ -18,13 +18,21 @@ package javassist;
 
 import java.util.List;
 
-import javassist.bytecode.*;
+import javassist.bytecode.AccessFlag;
+import javassist.bytecode.AnnotationsAttribute;
+import javassist.bytecode.AttributeInfo;
+import javassist.bytecode.Bytecode;
+import javassist.bytecode.ClassFile;
+import javassist.bytecode.ConstPool;
+import javassist.bytecode.Descriptor;
+import javassist.bytecode.FieldInfo;
+import javassist.bytecode.SignatureAttribute;
+import javassist.compiler.CompileError;
 import javassist.compiler.Javac;
 import javassist.compiler.SymbolTable;
-import javassist.compiler.CompileError;
 import javassist.compiler.ast.ASTree;
-import javassist.compiler.ast.IntConst;
 import javassist.compiler.ast.DoubleConst;
+import javassist.compiler.ast.IntConst;
 import javassist.compiler.ast.StringL;
 
 /**

src/main/javassist/CtMethod.java

@@ -16,7 +16,15 @@
 
 package javassist;
 
-import javassist.bytecode.*;
+import javassist.bytecode.AccessFlag;
+import javassist.bytecode.BadBytecode;
+import javassist.bytecode.Bytecode;
+import javassist.bytecode.CodeAttribute;
+import javassist.bytecode.CodeIterator;
+import javassist.bytecode.ConstPool;
+import javassist.bytecode.Descriptor;
+import javassist.bytecode.MethodInfo;
+import javassist.bytecode.Opcode;
 
 /**
  * An instance of <code>CtMethod</code> represents a method.

src/main/javassist/CtNewClass.java

@@ -18,6 +18,7 @@ package javassist;
 
 import java.io.DataOutputStream;
 import java.io.IOException;
+
 import javassist.bytecode.ClassFile;
 
 class CtNewClass extends CtClassType {

src/main/javassist/CtNewConstructor.java

@@ -16,10 +16,11 @@
 
 package javassist;
 
-import javassist.bytecode.*;
-import javassist.compiler.Javac;
-import javassist.compiler.CompileError;
 import javassist.CtMethod.ConstParameter;
+import javassist.bytecode.Bytecode;
+import javassist.bytecode.ConstPool;
+import javassist.compiler.CompileError;
+import javassist.compiler.Javac;
 
 /**
  * A collection of static methods for creating a <code>CtConstructor</code>.

src/main/javassist/CtNewMethod.java

@@ -16,10 +16,15 @@
 
 package javassist;
 
-import javassist.bytecode.*;
-import javassist.compiler.Javac;
-import javassist.compiler.CompileError;
 import javassist.CtMethod.ConstParameter;
+import javassist.bytecode.AccessFlag;
+import javassist.bytecode.Bytecode;
+import javassist.bytecode.ConstPool;
+import javassist.bytecode.ExceptionsAttribute;
+import javassist.bytecode.FieldInfo;
+import javassist.bytecode.MethodInfo;
+import javassist.compiler.CompileError;
+import javassist.compiler.Javac;
 
 /**
  * A collection of static methods for creating a <code>CtMethod</code>.

src/main/javassist/CtNewWrappedConstructor.java

@@ -16,8 +16,10 @@
 
 package javassist;
 
-import javassist.bytecode.*;
 import javassist.CtMethod.ConstParameter;
+import javassist.bytecode.Bytecode;
+import javassist.bytecode.ClassFile;
+import javassist.bytecode.Descriptor;
 
 class CtNewWrappedConstructor extends CtNewWrappedMethod {
     private static final int PASS_NONE = CtNewConstructor.PASS_NONE;

src/main/javassist/CtNewWrappedMethod.java

@@ -16,11 +16,16 @@
 
 package javassist;
 
-import javassist.bytecode.*;
-import javassist.compiler.JvstCodeGen;
 import java.util.Map;
 
 import javassist.CtMethod.ConstParameter;
+import javassist.bytecode.AccessFlag;
+import javassist.bytecode.BadBytecode;
+import javassist.bytecode.Bytecode;
+import javassist.bytecode.ClassFile;
+import javassist.bytecode.MethodInfo;
+import javassist.bytecode.SyntheticAttribute;
+import javassist.compiler.JvstCodeGen;
 
 class CtNewWrappedMethod {
 

src/main/javassist/Loader.java

@@ -16,12 +16,12 @@
 
 package javassist;
 
-import java.io.*;
+import java.io.InputStream;
 import java.lang.reflect.InvocationTargetException;
+import java.security.ProtectionDomain;
 import java.util.Arrays;
 import java.util.Hashtable;
 import java.util.Vector;
-import java.security.ProtectionDomain;
 
 /**
  * The class loader for Javassist.

src/main/javassist/LoaderClassPath.java

@@ -17,9 +17,9 @@
 package javassist;
 
 import java.io.InputStream;
-import java.net.URL;
 import java.lang.ref.Reference;
 import java.lang.ref.WeakReference;
+import java.net.URL;
 
 /**
  * A class search-path representing a class loader.

src/main/javassist/SerialVersionUID.java

@@ -16,12 +16,17 @@
 
 package javassist;
 
-import java.io.*;
+import java.io.ByteArrayOutputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
 import java.lang.reflect.Modifier;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Arrays;
+import java.util.Comparator;
 
-import javassist.bytecode.*;
-import java.util.*;
-import java.security.*;
+import javassist.bytecode.ClassFile;
+import javassist.bytecode.Descriptor;
 
 /**
  * Utility for calculating serialVersionUIDs for Serializable classes.

src/main/javassist/URLClassPath.java

@@ -16,8 +16,11 @@
 
 package javassist;
 
-import java.io.*;
-import java.net.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLConnection;
 
 /**
  * A class search-path specified with URL (http).

src/main/javassist/bytecode/AnnotationDefaultAttribute.java

@@ -16,15 +16,15 @@
 
 package javassist.bytecode;
 
-import javassist.CtClass;
-import javassist.bytecode.annotation.AnnotationsWriter;
-import javassist.bytecode.annotation.MemberValue;
-
 import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
 import java.io.IOException;
 import java.util.Map;
 
+import javassist.CtClass;
+import javassist.bytecode.annotation.AnnotationsWriter;
+import javassist.bytecode.annotation.MemberValue;
+
 /**
  * A class representing <code>AnnotationDefault_attribute</code>.
  *

src/main/javassist/bytecode/AnnotationsAttribute.java

@@ -16,12 +16,28 @@
 
 package javassist.bytecode;
 
-import java.util.Map;
-import java.util.HashMap;
-import java.io.IOException;
-import java.io.DataInputStream;
 import java.io.ByteArrayOutputStream;
-import javassist.bytecode.annotation.*;
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import javassist.bytecode.annotation.Annotation;
+import javassist.bytecode.annotation.AnnotationMemberValue;
+import javassist.bytecode.annotation.AnnotationsWriter;
+import javassist.bytecode.annotation.ArrayMemberValue;
+import javassist.bytecode.annotation.BooleanMemberValue;
+import javassist.bytecode.annotation.ByteMemberValue;
+import javassist.bytecode.annotation.CharMemberValue;
+import javassist.bytecode.annotation.ClassMemberValue;
+import javassist.bytecode.annotation.DoubleMemberValue;
+import javassist.bytecode.annotation.EnumMemberValue;
+import javassist.bytecode.annotation.FloatMemberValue;
+import javassist.bytecode.annotation.IntegerMemberValue;
+import javassist.bytecode.annotation.LongMemberValue;
+import javassist.bytecode.annotation.MemberValue;
+import javassist.bytecode.annotation.ShortMemberValue;
+import javassist.bytecode.annotation.StringMemberValue;
 
 /**
  * A class representing

src/main/javassist/bytecode/AttributeInfo.java

@@ -21,9 +21,7 @@ import java.io.DataOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Iterator;
 import java.util.List;
-import java.util.ListIterator;
 import java.util.Map;
 
 // Note: if you define a new subclass of AttributeInfo, then

src/main/javassist/bytecode/ByteStream.java

@@ -16,8 +16,8 @@
 
 package javassist.bytecode;
 
-import java.io.OutputStream;
 import java.io.IOException;
+import java.io.OutputStream;
 
 final class ByteStream extends OutputStream {
     private byte[] buf;

src/main/javassist/bytecode/ClassFilePrinter.java

@@ -17,9 +17,10 @@
 package javassist.bytecode;
 
 import java.io.PrintWriter;
-import javassist.Modifier;
 import java.util.List;
 
+import javassist.Modifier;
+
 /**
  * A utility class for priting the contents of a class file.
  * It prints a constant pool table, fields, and methods in a

src/main/javassist/bytecode/ClassFileWriter.java

@@ -16,10 +16,9 @@
 
 package javassist.bytecode;
 
-import java.io.OutputStream;
 import java.io.DataOutputStream;
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.io.OutputStream;
 
 /**
  * A quick class-file writer.  This is useful when a generated

src/main/javassist/bytecode/ConstPool.java

@@ -16,11 +16,11 @@
 
 package javassist.bytecode;
 
+import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.PrintWriter;
 import java.io.IOException;
+import java.io.PrintWriter;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;

src/main/javassist/bytecode/ConstantAttribute.java

@@ -17,8 +17,8 @@
 package javassist.bytecode;
 
 import java.io.DataInputStream;
-import java.util.Map;
 import java.io.IOException;
+import java.util.Map;
 
 /**
  * <code>ConstantValue_attribute</code>.

src/main/javassist/bytecode/Descriptor.java

@@ -16,11 +16,12 @@
 
 package javassist.bytecode;
 
+import java.util.Map;
+
 import javassist.ClassPool;
 import javassist.CtClass;
 import javassist.CtPrimitiveType;
 import javassist.NotFoundException;
-import java.util.Map;
 
 /**
  * A support class for dealing with descriptors.

src/main/javassist/bytecode/EnclosingMethodAttribute.java

@@ -20,8 +20,6 @@ import java.io.DataInputStream;
 import java.io.IOException;
 import java.util.Map;
 
-import javassist.CtConstructor;
-
 /**
  * <code>EnclosingMethod_attribute</code>.
  */

src/main/javassist/bytecode/FieldInfo.java

@@ -19,8 +19,8 @@ package javassist.bytecode;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
-import java.util.List;
 import java.util.ArrayList;
+import java.util.List;
 
 /**
  * <code>field_info</code> structure.

src/main/javassist/bytecode/InnerClassesAttribute.java

@@ -17,8 +17,8 @@
 package javassist.bytecode;
 
 import java.io.DataInputStream;
-import java.util.Map;
 import java.io.IOException;
+import java.util.Map;
 
 /**
  * <code>InnerClasses_attribute</code>.

src/main/javassist/bytecode/ParameterAnnotationsAttribute.java

@@ -16,16 +16,17 @@
 
 package javassist.bytecode;
 
+import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
+import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
-import java.io.IOException;
-import java.io.DataInputStream;
-import java.io.ByteArrayOutputStream;
 
 import javassist.bytecode.AnnotationsAttribute.Copier;
 import javassist.bytecode.AnnotationsAttribute.Parser;
 import javassist.bytecode.AnnotationsAttribute.Renamer;
-import javassist.bytecode.annotation.*;
+import javassist.bytecode.annotation.Annotation;
+import javassist.bytecode.annotation.AnnotationsWriter;
 
 /**
  * A class representing <code>RuntimeVisibleAnnotations_attribute</code> and

src/main/javassist/bytecode/SignatureAttribute.java

@@ -18,10 +18,10 @@ package javassist.bytecode;
 
 import java.io.DataInputStream;
 import java.io.IOException;
-import java.util.Map;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import javassist.CtClass;
 

src/main/javassist/bytecode/StackMapTable.java

@@ -16,12 +16,13 @@
 
 package javassist.bytecode;
 
+import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.PrintWriter;
 import java.io.IOException;
+import java.io.PrintWriter;
 import java.util.Map;
+
 import javassist.CannotCompileException;
 
 /**

src/main/javassist/bytecode/TypeAnnotationsAttribute.java

@@ -4,6 +4,7 @@ import java.io.DataInputStream;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
+
 import javassist.bytecode.annotation.TypeAnnotationsWriter;
 
 /**

src/main/javassist/bytecode/annotation/Annotation.java

@@ -16,18 +16,18 @@
 
 package javassist.bytecode.annotation;
 
-import javassist.bytecode.ConstPool;
-import javassist.bytecode.Descriptor;
-import javassist.ClassPool;
-import javassist.CtClass;
-import javassist.CtMethod;
-import javassist.NotFoundException;
-
 import java.io.IOException;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Set;
 
+import javassist.ClassPool;
+import javassist.CtClass;
+import javassist.CtMethod;
+import javassist.NotFoundException;
+import javassist.bytecode.ConstPool;
+import javassist.bytecode.Descriptor;
+
 /**
  * The <code>annotation</code> structure.
  *

src/main/javassist/bytecode/annotation/AnnotationMemberValue.java

@@ -15,11 +15,12 @@
  */
 package javassist.bytecode.annotation;
 
-import javassist.ClassPool;
-import javassist.bytecode.ConstPool;
 import java.io.IOException;
 import java.lang.reflect.Method;
 
+import javassist.ClassPool;
+import javassist.bytecode.ConstPool;
+
 /**
  * Nested annotation.
  *

src/main/javassist/bytecode/annotation/AnnotationsWriter.java

@@ -16,7 +16,8 @@
 
 package javassist.bytecode.annotation;
 
-import java.io.*;
+import java.io.IOException;
+import java.io.OutputStream;
 
 import javassist.bytecode.ByteArray;
 import javassist.bytecode.ConstPool;

src/main/javassist/bytecode/annotation/ArrayMemberValue.java

@@ -15,12 +15,13 @@
  */
 package javassist.bytecode.annotation;
 
-import javassist.ClassPool;
-import javassist.bytecode.ConstPool;
 import java.io.IOException;
 import java.lang.reflect.Array;
 import java.lang.reflect.Method;
 
+import javassist.ClassPool;
+import javassist.bytecode.ConstPool;
+
 /**
  * Array member.
  *

src/main/javassist/bytecode/annotation/BooleanMemberValue.java

@@ -15,11 +15,12 @@
  */
 package javassist.bytecode.annotation;
 
-import javassist.ClassPool;
-import javassist.bytecode.ConstPool;
 import java.io.IOException;
 import java.lang.reflect.Method;
 
+import javassist.ClassPool;
+import javassist.bytecode.ConstPool;
+
 /**
  * Boolean constant value.
  *

src/main/javassist/bytecode/annotation/ByteMemberValue.java

@@ -15,11 +15,12 @@
  */
 package javassist.bytecode.annotation;
 
-import javassist.ClassPool;
-import javassist.bytecode.ConstPool;
 import java.io.IOException;
 import java.lang.reflect.Method;
 
+import javassist.ClassPool;
+import javassist.bytecode.ConstPool;
+
 /**
  * Byte constant value.
  *

src/main/javassist/bytecode/annotation/CharMemberValue.java

@@ -16,11 +16,12 @@
 
 package javassist.bytecode.annotation;
 
-import javassist.ClassPool;
-import javassist.bytecode.ConstPool;
 import java.io.IOException;
 import java.lang.reflect.Method;
 
+import javassist.ClassPool;
+import javassist.bytecode.ConstPool;
+
 /**
  * Char constant value.
  *

src/main/javassist/bytecode/annotation/ClassMemberValue.java

@@ -16,15 +16,15 @@
 
 package javassist.bytecode.annotation;
 
+import java.io.IOException;
+import java.lang.reflect.Method;
+
 import javassist.ClassPool;
 import javassist.bytecode.BadBytecode;
 import javassist.bytecode.ConstPool;
 import javassist.bytecode.Descriptor;
 import javassist.bytecode.SignatureAttribute;
 
-import java.io.IOException;
-import java.lang.reflect.Method;
-
 /**
  * Class value.
  *

src/main/javassist/bytecode/annotation/DoubleMemberValue.java

@@ -16,11 +16,12 @@
 
 package javassist.bytecode.annotation;
 
-import javassist.ClassPool;
-import javassist.bytecode.ConstPool;
 import java.io.IOException;
 import java.lang.reflect.Method;
 
+import javassist.ClassPool;
+import javassist.bytecode.ConstPool;
+
 /**
  * Double floating-point number constant value.
  *

src/main/javassist/bytecode/annotation/FloatMemberValue.java

@@ -16,11 +16,12 @@
 
 package javassist.bytecode.annotation;
 
-import javassist.ClassPool;
-import javassist.bytecode.ConstPool;
 import java.io.IOException;
 import java.lang.reflect.Method;
 
+import javassist.ClassPool;
+import javassist.bytecode.ConstPool;
+
 /**
  * Floating-point number constant value.
  *

src/main/javassist/bytecode/annotation/IntegerMemberValue.java

@@ -16,11 +16,12 @@
 
 package javassist.bytecode.annotation;
 
-import javassist.ClassPool;
-import javassist.bytecode.ConstPool;
 import java.io.IOException;
 import java.lang.reflect.Method;
 
+import javassist.ClassPool;
+import javassist.bytecode.ConstPool;
+
 /**
  * Integer constant value.
  *

src/main/javassist/bytecode/annotation/LongMemberValue.java

@@ -16,11 +16,12 @@
 
 package javassist.bytecode.annotation;
 
-import javassist.ClassPool;
-import javassist.bytecode.ConstPool;
 import java.io.IOException;
 import java.lang.reflect.Method;
 
+import javassist.ClassPool;
+import javassist.bytecode.ConstPool;
+
 /**
  * Long integer constant value.
  *

src/main/javassist/bytecode/annotation/MemberValue.java

@@ -16,14 +16,13 @@
 
 package javassist.bytecode.annotation;
 
+import java.io.IOException;
+import java.lang.reflect.Method;
+
 import javassist.ClassPool;
 import javassist.bytecode.ConstPool;
 import javassist.bytecode.Descriptor;
 
-import java.io.IOException;
-import java.lang.reflect.Array;
-import java.lang.reflect.Method;
-
 /**
  * The value of a member declared in an annotation.
  *

src/main/javassist/bytecode/annotation/ShortMemberValue.java

@@ -16,11 +16,12 @@
 
 package javassist.bytecode.annotation;
 
-import javassist.ClassPool;
-import javassist.bytecode.ConstPool;
 import java.io.IOException;
 import java.lang.reflect.Method;
 
+import javassist.ClassPool;
+import javassist.bytecode.ConstPool;
+
 /**
  * Short integer constant value.
  *

src/main/javassist/bytecode/annotation/StringMemberValue.java

@@ -16,11 +16,12 @@
 
 package javassist.bytecode.annotation;
 
-import javassist.ClassPool;
-import javassist.bytecode.ConstPool;
 import java.io.IOException;
 import java.lang.reflect.Method;
 
+import javassist.ClassPool;
+import javassist.bytecode.ConstPool;
+
 /**
  * String constant value.
  *

src/main/javassist/bytecode/stackmap/BasicBlock.java

@@ -16,12 +16,18 @@
 
 package javassist.bytecode.stackmap;
 
-import javassist.bytecode.*;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.ArrayList;
-import java.util.Arrays;
+
+import javassist.bytecode.BadBytecode;
+import javassist.bytecode.CodeAttribute;
+import javassist.bytecode.CodeIterator;
+import javassist.bytecode.ExceptionTable;
+import javassist.bytecode.MethodInfo;
+import javassist.bytecode.Opcode;
 
 /**
  * A basic block is a sequence of bytecode that does not contain jump/branch

src/main/javassist/bytecode/stackmap/MapMaker.java

@@ -21,7 +21,14 @@ import java.util.List;
 
 import javassist.ClassPool;
 import javassist.NotFoundException;
-import javassist.bytecode.*;
+import javassist.bytecode.BadBytecode;
+import javassist.bytecode.ByteArray;
+import javassist.bytecode.Bytecode;
+import javassist.bytecode.CodeAttribute;
+import javassist.bytecode.ConstPool;
+import javassist.bytecode.MethodInfo;
+import javassist.bytecode.StackMap;
+import javassist.bytecode.StackMapTable;
 
 /**
  * Stack map maker.

src/main/javassist/bytecode/stackmap/Tracer.java

@@ -16,12 +16,12 @@
 
 package javassist.bytecode.stackmap;
 
+import javassist.ClassPool;
+import javassist.bytecode.BadBytecode;
 import javassist.bytecode.ByteArray;
-import javassist.bytecode.Opcode;
 import javassist.bytecode.ConstPool;
 import javassist.bytecode.Descriptor;
-import javassist.bytecode.BadBytecode;
-import javassist.ClassPool;
+import javassist.bytecode.Opcode;
 
 /*
  * A class for performing abstract interpretation.

src/main/javassist/bytecode/stackmap/TypeData.java

@@ -16,18 +16,19 @@
 
 package javassist.bytecode.stackmap;
 
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
 import javassist.ClassPool;
 import javassist.CtClass;
 import javassist.NotFoundException;
+import javassist.bytecode.BadBytecode;
 import javassist.bytecode.ConstPool;
 import javassist.bytecode.Descriptor;
 import javassist.bytecode.StackMapTable;
-import javassist.bytecode.BadBytecode;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-import java.util.ArrayList;
 
 public abstract class TypeData {
     /* Memo:

src/main/javassist/bytecode/stackmap/TypedBlock.java

@@ -16,7 +16,11 @@
 
 package javassist.bytecode.stackmap;
 
-import javassist.bytecode.*;
+import javassist.bytecode.AccessFlag;
+import javassist.bytecode.BadBytecode;
+import javassist.bytecode.CodeAttribute;
+import javassist.bytecode.ConstPool;
+import javassist.bytecode.MethodInfo;
 
 public class TypedBlock extends BasicBlock {
     public int stackTop, numLocals;

src/main/javassist/compiler/AccessorMaker.java

@@ -16,11 +16,23 @@
 
 package javassist.compiler;
 
-import javassist.*;
-import javassist.bytecode.*;
 import java.util.HashMap;
 import java.util.Map;
 
+import javassist.CannotCompileException;
+import javassist.ClassPool;
+import javassist.CtClass;
+import javassist.NotFoundException;
+import javassist.bytecode.AccessFlag;
+import javassist.bytecode.Bytecode;
+import javassist.bytecode.ClassFile;
+import javassist.bytecode.ConstPool;
+import javassist.bytecode.Descriptor;
+import javassist.bytecode.ExceptionsAttribute;
+import javassist.bytecode.FieldInfo;
+import javassist.bytecode.MethodInfo;
+import javassist.bytecode.SyntheticAttribute;
+
 /**
  * AccessorMaker maintains accessors to private members of an enclosing
  * class.  It is necessary for compiling a method in an inner class.

src/main/javassist/compiler/CodeGen.java

@@ -20,8 +20,32 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import javassist.compiler.ast.*;
-import javassist.bytecode.*;
+import javassist.bytecode.Bytecode;
+import javassist.bytecode.Opcode;
+import javassist.compiler.ast.ASTList;
+import javassist.compiler.ast.ASTree;
+import javassist.compiler.ast.ArrayInit;
+import javassist.compiler.ast.AssignExpr;
+import javassist.compiler.ast.BinExpr;
+import javassist.compiler.ast.CallExpr;
+import javassist.compiler.ast.CastExpr;
+import javassist.compiler.ast.CondExpr;
+import javassist.compiler.ast.Declarator;
+import javassist.compiler.ast.DoubleConst;
+import javassist.compiler.ast.Expr;
+import javassist.compiler.ast.FieldDecl;
+import javassist.compiler.ast.InstanceOfExpr;
+import javassist.compiler.ast.IntConst;
+import javassist.compiler.ast.Keyword;
+import javassist.compiler.ast.Member;
+import javassist.compiler.ast.MethodDecl;
+import javassist.compiler.ast.NewExpr;
+import javassist.compiler.ast.Pair;
+import javassist.compiler.ast.Stmnt;
+import javassist.compiler.ast.StringL;
+import javassist.compiler.ast.Symbol;
+import javassist.compiler.ast.Variable;
+import javassist.compiler.ast.Visitor;
 
 /* The code generator is implemented by three files:
  * CodeGen.java, MemberCodeGen.java, and JvstCodeGen.

src/main/javassist/compiler/Javac.java

@@ -16,23 +16,31 @@
 
 package javassist.compiler;
 
+import javassist.CannotCompileException;
+import javassist.CtBehavior;
 import javassist.CtClass;
-import javassist.CtPrimitiveType;
-import javassist.CtMember;
+import javassist.CtConstructor;
 import javassist.CtField;
-import javassist.CtBehavior;
+import javassist.CtMember;
 import javassist.CtMethod;
-import javassist.CtConstructor;
-import javassist.CannotCompileException;
+import javassist.CtPrimitiveType;
 import javassist.Modifier;
+import javassist.NotFoundException;
+import javassist.bytecode.BadBytecode;
 import javassist.bytecode.Bytecode;
 import javassist.bytecode.CodeAttribute;
 import javassist.bytecode.LocalVariableAttribute;
-import javassist.bytecode.BadBytecode;
 import javassist.bytecode.Opcode;
-import javassist.NotFoundException;
-
-import javassist.compiler.ast.*;
+import javassist.compiler.ast.ASTList;
+import javassist.compiler.ast.ASTree;
+import javassist.compiler.ast.CallExpr;
+import javassist.compiler.ast.Declarator;
+import javassist.compiler.ast.Expr;
+import javassist.compiler.ast.FieldDecl;
+import javassist.compiler.ast.Member;
+import javassist.compiler.ast.MethodDecl;
+import javassist.compiler.ast.Stmnt;
+import javassist.compiler.ast.Symbol;
 
 public class Javac {
     JvstCodeGen gen;

src/main/javassist/compiler/JvstCodeGen.java

@@ -16,9 +16,21 @@
 
 package javassist.compiler;
 
-import javassist.*;
-import javassist.bytecode.*;
-import javassist.compiler.ast.*;
+import javassist.ClassPool;
+import javassist.CtClass;
+import javassist.CtPrimitiveType;
+import javassist.NotFoundException;
+import javassist.bytecode.Bytecode;
+import javassist.bytecode.Descriptor;
+import javassist.compiler.ast.ASTList;
+import javassist.compiler.ast.ASTree;
+import javassist.compiler.ast.CallExpr;
+import javassist.compiler.ast.CastExpr;
+import javassist.compiler.ast.Declarator;
+import javassist.compiler.ast.Expr;
+import javassist.compiler.ast.Member;
+import javassist.compiler.ast.Stmnt;
+import javassist.compiler.ast.Symbol;
 
 /* Code generator accepting extended Java syntax for Javassist.
  */

src/main/javassist/compiler/JvstTypeChecker.java

@@ -16,8 +16,17 @@
 
 package javassist.compiler;
 
-import javassist.*;
-import javassist.compiler.ast.*;
+import javassist.ClassPool;
+import javassist.CtClass;
+import javassist.CtPrimitiveType;
+import javassist.NotFoundException;
+import javassist.compiler.ast.ASTList;
+import javassist.compiler.ast.ASTree;
+import javassist.compiler.ast.CallExpr;
+import javassist.compiler.ast.CastExpr;
+import javassist.compiler.ast.Expr;
+import javassist.compiler.ast.Member;
+import javassist.compiler.ast.Symbol;
 
 /* Type checker accepting extended Java syntax for Javassist.
  */

src/main/javassist/compiler/MemberCodeGen.java

@@ -16,13 +16,37 @@
 
 package javassist.compiler;
 
-import javassist.*;
-import javassist.bytecode.*;
-import javassist.compiler.ast.*;
-
 import java.util.ArrayList;
 import java.util.List;
 
+import javassist.ClassPool;
+import javassist.CtClass;
+import javassist.CtField;
+import javassist.CtMethod;
+import javassist.Modifier;
+import javassist.NotFoundException;
+import javassist.bytecode.AccessFlag;
+import javassist.bytecode.Bytecode;
+import javassist.bytecode.ClassFile;
+import javassist.bytecode.ConstPool;
+import javassist.bytecode.Descriptor;
+import javassist.bytecode.FieldInfo;
+import javassist.bytecode.MethodInfo;
+import javassist.bytecode.Opcode;
+import javassist.compiler.ast.ASTList;
+import javassist.compiler.ast.ASTree;
+import javassist.compiler.ast.ArrayInit;
+import javassist.compiler.ast.CallExpr;
+import javassist.compiler.ast.Declarator;
+import javassist.compiler.ast.Expr;
+import javassist.compiler.ast.Keyword;
+import javassist.compiler.ast.Member;
+import javassist.compiler.ast.MethodDecl;
+import javassist.compiler.ast.NewExpr;
+import javassist.compiler.ast.Pair;
+import javassist.compiler.ast.Stmnt;
+import javassist.compiler.ast.Symbol;
+
 /* Code generator methods depending on javassist.* classes.
  */
 public class MemberCodeGen extends CodeGen {

src/main/javassist/compiler/MemberResolver.java

@@ -16,17 +16,28 @@
 
 package javassist.compiler;
 
-import java.util.Hashtable;
 import java.lang.ref.Reference;
 import java.lang.ref.WeakReference;
-import java.util.WeakHashMap;
+import java.util.Hashtable;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Iterator;
+import java.util.WeakHashMap;
 
-import javassist.*;
-import javassist.bytecode.*;
-import javassist.compiler.ast.*;
+import javassist.ClassPool;
+import javassist.CtClass;
+import javassist.CtField;
+import javassist.Modifier;
+import javassist.NotFoundException;
+import javassist.bytecode.AccessFlag;
+import javassist.bytecode.ClassFile;
+import javassist.bytecode.Descriptor;
+import javassist.bytecode.MethodInfo;
+import javassist.compiler.ast.ASTList;
+import javassist.compiler.ast.ASTree;
+import javassist.compiler.ast.Declarator;
+import javassist.compiler.ast.Keyword;
+import javassist.compiler.ast.Symbol;
 
 /* Code generator methods depending on javassist.* classes.
  */

src/main/javassist/compiler/Parser.java

@@ -16,7 +16,29 @@
 
 package javassist.compiler;
 
-import javassist.compiler.ast.*;
+import javassist.compiler.ast.ASTList;
+import javassist.compiler.ast.ASTree;
+import javassist.compiler.ast.ArrayInit;
+import javassist.compiler.ast.AssignExpr;
+import javassist.compiler.ast.BinExpr;
+import javassist.compiler.ast.CallExpr;
+import javassist.compiler.ast.CastExpr;
+import javassist.compiler.ast.CondExpr;
+import javassist.compiler.ast.Declarator;
+import javassist.compiler.ast.DoubleConst;
+import javassist.compiler.ast.Expr;
+import javassist.compiler.ast.FieldDecl;
+import javassist.compiler.ast.InstanceOfExpr;
+import javassist.compiler.ast.IntConst;
+import javassist.compiler.ast.Keyword;
+import javassist.compiler.ast.Member;
+import javassist.compiler.ast.MethodDecl;
+import javassist.compiler.ast.NewExpr;
+import javassist.compiler.ast.Pair;
+import javassist.compiler.ast.Stmnt;
+import javassist.compiler.ast.StringL;
+import javassist.compiler.ast.Symbol;
+import javassist.compiler.ast.Variable;
 
 public final class Parser implements TokenId {
     private Lex lex;

src/main/javassist/compiler/SymbolTable.java

@@ -17,6 +17,7 @@
 package javassist.compiler;
 
 import java.util.HashMap;
+
 import javassist.compiler.ast.Declarator;
 
 public final class SymbolTable extends HashMap<String,Declarator> {

src/main/javassist/compiler/TypeChecker.java

@@ -16,13 +16,34 @@
 
 package javassist.compiler;
 
+import javassist.ClassPool;
 import javassist.CtClass;
 import javassist.CtField;
-import javassist.ClassPool;
 import javassist.Modifier;
 import javassist.NotFoundException;
-import javassist.compiler.ast.*;
-import javassist.bytecode.*;
+import javassist.bytecode.FieldInfo;
+import javassist.bytecode.MethodInfo;
+import javassist.bytecode.Opcode;
+import javassist.compiler.ast.ASTList;
+import javassist.compiler.ast.ASTree;
+import javassist.compiler.ast.ArrayInit;
+import javassist.compiler.ast.AssignExpr;
+import javassist.compiler.ast.BinExpr;
+import javassist.compiler.ast.CallExpr;
+import javassist.compiler.ast.CastExpr;
+import javassist.compiler.ast.CondExpr;
+import javassist.compiler.ast.Declarator;
+import javassist.compiler.ast.DoubleConst;
+import javassist.compiler.ast.Expr;
+import javassist.compiler.ast.InstanceOfExpr;
+import javassist.compiler.ast.IntConst;
+import javassist.compiler.ast.Keyword;
+import javassist.compiler.ast.Member;
+import javassist.compiler.ast.NewExpr;
+import javassist.compiler.ast.StringL;
+import javassist.compiler.ast.Symbol;
+import javassist.compiler.ast.Variable;
+import javassist.compiler.ast.Visitor;
 
 public class TypeChecker extends Visitor implements Opcode, TokenId {
     static final String javaLangObject = "java.lang.Object";

src/main/javassist/compiler/ast/ASTree.java

@@ -17,6 +17,7 @@
 package javassist.compiler.ast;
 
 import java.io.Serializable;
+
 import javassist.compiler.CompileError;
 
 /**

src/main/javassist/compiler/ast/CallExpr.java

@@ -17,8 +17,8 @@
 package javassist.compiler.ast;
 
 import javassist.compiler.CompileError;
-import javassist.compiler.TokenId;
 import javassist.compiler.MemberResolver;
+import javassist.compiler.TokenId;
 
 /**
  * Method call expression.

src/main/javassist/compiler/ast/CastExpr.java

@@ -16,8 +16,8 @@
 
 package javassist.compiler.ast;
 
-import javassist.compiler.TokenId;
 import javassist.compiler.CompileError;
+import javassist.compiler.TokenId;
 
 /**
  * Cast expression.

src/main/javassist/compiler/ast/Declarator.java

@@ -16,8 +16,8 @@
 
 package javassist.compiler.ast;
 
-import javassist.compiler.TokenId;
 import javassist.compiler.CompileError;
+import javassist.compiler.TokenId;
 
 /**
  * Variable declarator.

src/main/javassist/compiler/ast/Expr.java

@@ -16,8 +16,8 @@
 
 package javassist.compiler.ast;
 
-import javassist.compiler.TokenId;
 import javassist.compiler.CompileError;
+import javassist.compiler.TokenId;
 
 /**
  * Expression.

src/main/javassist/compiler/ast/Member.java

@@ -16,8 +16,8 @@
 
 package javassist.compiler.ast;
 
-import javassist.compiler.CompileError;
 import javassist.CtField;
+import javassist.compiler.CompileError;
 
 /**
  * Member name.

src/main/javassist/compiler/ast/NewExpr.java

@@ -16,8 +16,8 @@
 
 package javassist.compiler.ast;
 
-import javassist.compiler.TokenId;
 import javassist.compiler.CompileError;
+import javassist.compiler.TokenId;
 
 /**
  * New Expression.

src/main/javassist/compiler/ast/Stmnt.java

@@ -16,8 +16,8 @@
 
 package javassist.compiler.ast;
 
-import javassist.compiler.TokenId;
 import javassist.compiler.CompileError;
+import javassist.compiler.TokenId;
 
 /**
  * Statement.

src/main/javassist/convert/TransformAccessArrayField.java

@@ -16,9 +16,9 @@
 package javassist.convert;
 
 import javassist.CannotCompileException;
+import javassist.CodeConverter.ArrayAccessReplacementMethodNames;
 import javassist.CtClass;
 import javassist.NotFoundException;
-import javassist.CodeConverter.ArrayAccessReplacementMethodNames;
 import javassist.bytecode.BadBytecode;
 import javassist.bytecode.CodeIterator;
 import javassist.bytecode.ConstPool;

src/main/javassist/convert/TransformAfter.java

@@ -18,7 +18,8 @@ package javassist.convert;
 
 import javassist.CtMethod;
 import javassist.NotFoundException;
-import javassist.bytecode.*;
+import javassist.bytecode.BadBytecode;
+import javassist.bytecode.CodeIterator;
 
 public class TransformAfter extends TransformBefore {
     public TransformAfter(Transformer next,

src/main/javassist/convert/TransformBefore.java

@@ -19,7 +19,12 @@ package javassist.convert;
 import javassist.CtClass;
 import javassist.CtMethod;
 import javassist.NotFoundException;
-import javassist.bytecode.*;
+import javassist.bytecode.BadBytecode;
+import javassist.bytecode.Bytecode;
+import javassist.bytecode.CodeAttribute;
+import javassist.bytecode.CodeIterator;
+import javassist.bytecode.ConstPool;
+import javassist.bytecode.Descriptor;
 
 public class TransformBefore extends TransformCall {
     protected CtClass[] parameterTypes;

src/main/javassist/convert/TransformCall.java

@@ -16,12 +16,15 @@
 
 package javassist.convert;
 
+import javassist.ClassPool;
 import javassist.CtClass;
 import javassist.CtMethod;
-import javassist.ClassPool;
 import javassist.Modifier;
 import javassist.NotFoundException;
-import javassist.bytecode.*;
+import javassist.bytecode.BadBytecode;
+import javassist.bytecode.CodeAttribute;
+import javassist.bytecode.CodeIterator;
+import javassist.bytecode.ConstPool;
 
 public class TransformCall extends Transformer {
     protected String classname, methodname, methodDescriptor;

src/main/javassist/convert/TransformFieldAccess.java

@@ -16,10 +16,12 @@
 
 package javassist.convert;
 
-import javassist.bytecode.*;
 import javassist.CtClass;
 import javassist.CtField;
 import javassist.Modifier;
+import javassist.bytecode.CodeAttribute;
+import javassist.bytecode.CodeIterator;
+import javassist.bytecode.ConstPool;
 
 final public class TransformFieldAccess extends Transformer {
     private String newClassname, newFieldname;

src/main/javassist/convert/TransformNew.java

@@ -16,9 +16,14 @@
 
 package javassist.convert;
 
-import javassist.bytecode.*;
-import javassist.CtClass;
 import javassist.CannotCompileException;
+import javassist.CtClass;
+import javassist.bytecode.CodeAttribute;
+import javassist.bytecode.CodeIterator;
+import javassist.bytecode.ConstPool;
+import javassist.bytecode.Descriptor;
+import javassist.bytecode.StackMap;
+import javassist.bytecode.StackMapTable;
 
 final public class TransformNew extends Transformer {
     private int nested;

src/main/javassist/convert/TransformNewClass.java

@@ -16,9 +16,11 @@
 
 package javassist.convert;
 
-import javassist.bytecode.*;
-import javassist.CtClass;
 import javassist.CannotCompileException;
+import javassist.CtClass;
+import javassist.bytecode.CodeAttribute;
+import javassist.bytecode.CodeIterator;
+import javassist.bytecode.ConstPool;
 
 final public class TransformNewClass extends Transformer {
     private int nested;

src/main/javassist/convert/TransformReadField.java

@@ -16,12 +16,14 @@
 
 package javassist.convert;
 
-import javassist.bytecode.*;
 import javassist.ClassPool;
 import javassist.CtClass;
 import javassist.CtField;
-import javassist.NotFoundException;
 import javassist.Modifier;
+import javassist.NotFoundException;
+import javassist.bytecode.BadBytecode;
+import javassist.bytecode.CodeIterator;
+import javassist.bytecode.ConstPool;
 
 public class TransformReadField extends Transformer {
     protected String fieldname;

src/main/javassist/convert/TransformWriteField.java

@@ -18,7 +18,10 @@ package javassist.convert;
 
 import javassist.CtClass;
 import javassist.CtField;
-import javassist.bytecode.*;
+import javassist.bytecode.BadBytecode;
+import javassist.bytecode.CodeAttribute;
+import javassist.bytecode.CodeIterator;
+import javassist.bytecode.ConstPool;
 
 final public class TransformWriteField extends TransformReadField {
     public TransformWriteField(Transformer next, CtField field,

src/main/javassist/expr/Cast.java

@@ -16,9 +16,23 @@
 
 package javassist.expr;
 
-import javassist.*;
-import javassist.bytecode.*;
-import javassist.compiler.*;
+import javassist.CannotCompileException;
+import javassist.ClassPool;
+import javassist.CtBehavior;
+import javassist.CtClass;
+import javassist.NotFoundException;
+import javassist.bytecode.BadBytecode;
+import javassist.bytecode.Bytecode;
+import javassist.bytecode.CodeAttribute;
+import javassist.bytecode.CodeIterator;
+import javassist.bytecode.ConstPool;
+import javassist.bytecode.MethodInfo;
+import javassist.bytecode.Opcode;
+import javassist.compiler.CompileError;
+import javassist.compiler.Javac;
+import javassist.compiler.JvstCodeGen;
+import javassist.compiler.JvstTypeChecker;
+import javassist.compiler.ProceedHandler;
 import javassist.compiler.ast.ASTList;
 
 /**

src/main/javassist/expr/Expr.java

@@ -16,6 +16,9 @@
 
 package javassist.expr;
 
+import java.util.LinkedList;
+import java.util.List;
+
 import javassist.CannotCompileException;
 import javassist.ClassPool;
 import javassist.CtBehavior;
@@ -36,9 +39,6 @@ import javassist.bytecode.MethodInfo;
 import javassist.bytecode.Opcode;
 import javassist.compiler.Javac;
 
-import java.util.LinkedList;
-import java.util.List;
-
 /**
  * Expression.
  */

src/main/javassist/expr/ExprEditor.java

@@ -16,9 +16,14 @@
 
 package javassist.expr;
 
-import javassist.bytecode.*;
-import javassist.CtClass;
 import javassist.CannotCompileException;
+import javassist.CtClass;
+import javassist.bytecode.BadBytecode;
+import javassist.bytecode.CodeAttribute;
+import javassist.bytecode.CodeIterator;
+import javassist.bytecode.ExceptionTable;
+import javassist.bytecode.MethodInfo;
+import javassist.bytecode.Opcode;
 
 /**
  * A translator of method bodies.

src/main/javassist/expr/FieldAccess.java

@@ -16,9 +16,26 @@
 
 package javassist.expr;
 
-import javassist.*;
-import javassist.bytecode.*;
-import javassist.compiler.*;
+import javassist.CannotCompileException;
+import javassist.ClassPool;
+import javassist.CtBehavior;
+import javassist.CtClass;
+import javassist.CtField;
+import javassist.CtPrimitiveType;
+import javassist.NotFoundException;
+import javassist.bytecode.BadBytecode;
+import javassist.bytecode.Bytecode;
+import javassist.bytecode.CodeAttribute;
+import javassist.bytecode.CodeIterator;
+import javassist.bytecode.ConstPool;
+import javassist.bytecode.Descriptor;
+import javassist.bytecode.MethodInfo;
+import javassist.bytecode.Opcode;
+import javassist.compiler.CompileError;
+import javassist.compiler.Javac;
+import javassist.compiler.JvstCodeGen;
+import javassist.compiler.JvstTypeChecker;
+import javassist.compiler.ProceedHandler;
 import javassist.compiler.ast.ASTList;
 
 /**

src/main/javassist/expr/Handler.java

@@ -16,9 +16,19 @@
 
 package javassist.expr;
 
-import javassist.*;
-import javassist.bytecode.*;
-import javassist.compiler.*;
+import javassist.CannotCompileException;
+import javassist.CtBehavior;
+import javassist.CtClass;
+import javassist.NotFoundException;
+import javassist.bytecode.Bytecode;
+import javassist.bytecode.CodeAttribute;
+import javassist.bytecode.CodeIterator;
+import javassist.bytecode.ConstPool;
+import javassist.bytecode.ExceptionTable;
+import javassist.bytecode.MethodInfo;
+import javassist.bytecode.Opcode;
+import javassist.compiler.CompileError;
+import javassist.compiler.Javac;
 
 /**
  * A <code>catch</code> clause or a <code>finally</code> block.

src/main/javassist/expr/Instanceof.java

@@ -16,9 +16,23 @@
 
 package javassist.expr;
 
-import javassist.*;
-import javassist.bytecode.*;
-import javassist.compiler.*;
+import javassist.CannotCompileException;
+import javassist.ClassPool;
+import javassist.CtBehavior;
+import javassist.CtClass;
+import javassist.NotFoundException;
+import javassist.bytecode.BadBytecode;
+import javassist.bytecode.Bytecode;
+import javassist.bytecode.CodeAttribute;
+import javassist.bytecode.CodeIterator;
+import javassist.bytecode.ConstPool;
+import javassist.bytecode.MethodInfo;
+import javassist.bytecode.Opcode;
+import javassist.compiler.CompileError;
+import javassist.compiler.Javac;
+import javassist.compiler.JvstCodeGen;
+import javassist.compiler.JvstTypeChecker;
+import javassist.compiler.ProceedHandler;
 import javassist.compiler.ast.ASTList;
 
 /**

src/main/javassist/expr/MethodCall.java

@@ -16,9 +16,21 @@
 
 package javassist.expr;
 
-import javassist.*;
-import javassist.bytecode.*;
-import javassist.compiler.*;
+import javassist.CannotCompileException;
+import javassist.ClassPool;
+import javassist.CtBehavior;
+import javassist.CtClass;
+import javassist.CtMethod;
+import javassist.NotFoundException;
+import javassist.bytecode.BadBytecode;
+import javassist.bytecode.Bytecode;
+import javassist.bytecode.CodeAttribute;
+import javassist.bytecode.CodeIterator;
+import javassist.bytecode.ConstPool;
+import javassist.bytecode.Descriptor;
+import javassist.bytecode.MethodInfo;
+import javassist.compiler.CompileError;
+import javassist.compiler.Javac;
 
 /**
  * Method invocation (caller-side expression).

src/main/javassist/expr/NewArray.java

@@ -16,9 +16,24 @@
 
 package javassist.expr;
 
-import javassist.*;
-import javassist.bytecode.*;
-import javassist.compiler.*;
+import javassist.CannotCompileException;
+import javassist.CtBehavior;
+import javassist.CtClass;
+import javassist.CtPrimitiveType;
+import javassist.NotFoundException;
+import javassist.bytecode.BadBytecode;
+import javassist.bytecode.Bytecode;
+import javassist.bytecode.CodeAttribute;
+import javassist.bytecode.CodeIterator;
+import javassist.bytecode.ConstPool;
+import javassist.bytecode.Descriptor;
+import javassist.bytecode.MethodInfo;
+import javassist.bytecode.Opcode;
+import javassist.compiler.CompileError;
+import javassist.compiler.Javac;
+import javassist.compiler.JvstCodeGen;
+import javassist.compiler.JvstTypeChecker;
+import javassist.compiler.ProceedHandler;
 import javassist.compiler.ast.ASTList;
 
 /**

src/main/javassist/expr/NewExpr.java

@@ -16,9 +16,25 @@
 
 package javassist.expr;
 
-import javassist.*;
-import javassist.bytecode.*;
-import javassist.compiler.*;
+import javassist.CannotCompileException;
+import javassist.ClassPool;
+import javassist.CtBehavior;
+import javassist.CtClass;
+import javassist.CtConstructor;
+import javassist.NotFoundException;
+import javassist.bytecode.BadBytecode;
+import javassist.bytecode.Bytecode;
+import javassist.bytecode.CodeAttribute;
+import javassist.bytecode.CodeIterator;
+import javassist.bytecode.ConstPool;
+import javassist.bytecode.Descriptor;
+import javassist.bytecode.MethodInfo;
+import javassist.bytecode.Opcode;
+import javassist.compiler.CompileError;
+import javassist.compiler.Javac;
+import javassist.compiler.JvstCodeGen;
+import javassist.compiler.JvstTypeChecker;
+import javassist.compiler.ProceedHandler;
 import javassist.compiler.ast.ASTList;
 
 /**

src/main/javassist/tools/Callback.java

@@ -16,13 +16,13 @@
 
 package javassist.tools;
 
-import javassist.CannotCompileException;
-import javassist.CtBehavior;
-
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
 
+import javassist.CannotCompileException;
+import javassist.CtBehavior;
+
 /**
  * Creates bytecode that when executed calls back to the instance's result method.
  *

src/main/javassist/tools/Dump.java

@@ -16,7 +16,10 @@
 
 package javassist.tools;
 
-import java.io.*;
+import java.io.DataInputStream;
+import java.io.FileInputStream;
+import java.io.PrintWriter;
+
 import javassist.bytecode.ClassFile;
 import javassist.bytecode.ClassFilePrinter;
 

src/main/javassist/tools/reflect/CannotInvokeException.java

@@ -17,7 +17,6 @@
 package javassist.tools.reflect;
 
 import java.lang.reflect.InvocationTargetException;
-import java.lang.IllegalAccessException;
 
 /**
  * Thrown when method invocation using the reflection API has thrown

src/main/javassist/tools/reflect/CannotReflectException.java

@@ -17,6 +17,7 @@
 package javassist.tools.reflect;
 
 import javassist.CannotCompileException;
+import javassist.CtClass;
 
 /**
  * Thrown by <code>makeReflective()</code> in <code>Reflection</code>

src/main/javassist/tools/reflect/ClassMetaobject.java

@@ -16,12 +16,14 @@
 
 package javassist.tools.reflect;
 
-import java.lang.reflect.*;
-import java.util.Arrays;
-import java.io.Serializable;
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Arrays;
 
 /**
  * A runtime class metaobject.

src/main/javassist/tools/reflect/Compiler.java

@@ -16,10 +16,11 @@
 
 package javassist.tools.reflect;
 
-import javassist.CtClass;
-import javassist.ClassPool;
 import java.io.PrintStream;
 
+import javassist.ClassPool;
+import javassist.CtClass;
+
 class CompiledClass {
     public String classname;
     public String metaobject;

src/main/javassist/tools/reflect/Loader.java

@@ -17,8 +17,8 @@
 package javassist.tools.reflect;
 
 import javassist.CannotCompileException;
-import javassist.NotFoundException;
 import javassist.ClassPool;
+import javassist.NotFoundException;
 
 /**
  * A class loader for reflection.

src/main/javassist/tools/reflect/Metaobject.java

@@ -16,11 +16,11 @@
 
 package javassist.tools.reflect;
 
-import java.lang.reflect.Method;
-import java.io.Serializable;
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.lang.reflect.Method;
 
 /**
  * A runtime metaobject.

src/main/javassist/tools/reflect/Reflection.java

@@ -16,10 +16,19 @@
 
 package javassist.tools.reflect;
 
-import javassist.*;
+import javassist.CannotCompileException;
+import javassist.ClassPool;
+import javassist.CodeConverter;
+import javassist.CtClass;
+import javassist.CtField;
+import javassist.CtMethod;
 import javassist.CtMethod.ConstParameter;
-import javassist.bytecode.ClassFile;
+import javassist.CtNewMethod;
+import javassist.Modifier;
+import javassist.NotFoundException;
+import javassist.Translator;
 import javassist.bytecode.BadBytecode;
+import javassist.bytecode.ClassFile;
 import javassist.bytecode.MethodInfo;
 
 /**

src/main/javassist/tools/rmi/AppletServer.java

@@ -16,18 +16,26 @@
 
 package javassist.tools.rmi;
 
-import java.io.*;
-
-import javassist.tools.web.*;
-import javassist.CannotCompileException;
-import javassist.NotFoundException;
-import javassist.ClassPool;
+import java.io.DataInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InvalidClassException;
+import java.io.NotSerializableException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.OutputStream;
 import java.lang.reflect.Method;
 import java.util.Hashtable;
 import java.util.List;
 import java.util.Map;
 import java.util.Vector;
 
+import javassist.CannotCompileException;
+import javassist.ClassPool;
+import javassist.NotFoundException;
+import javassist.tools.web.BadHttpRequest;
+import javassist.tools.web.Webserver;
+
 /**
  * An AppletServer object is a web server that an ObjectImporter
  * communicates with.  It makes the objects specified by

src/main/javassist/tools/rmi/ObjectImporter.java

@@ -16,9 +16,16 @@
 
 package javassist.tools.rmi;
 
-import java.io.*;
-import java.net.*;
-import java.lang.reflect.*;
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.OutputStream;
+import java.lang.reflect.Constructor;
+import java.net.Socket;
+import java.net.URL;
 
 /**
  * The object importer enables applets to call a method on a remote

src/main/javassist/tools/rmi/StubGenerator.java

@@ -16,12 +16,22 @@
 
 package javassist.tools.rmi;
 
-import javassist.*;
 import java.lang.reflect.Method;
 import java.util.Hashtable;
 import java.util.Map;
 
+import javassist.CannotCompileException;
+import javassist.ClassPool;
+import javassist.CtClass;
+import javassist.CtConstructor;
+import javassist.CtField;
+import javassist.CtMethod;
 import javassist.CtMethod.ConstParameter;
+import javassist.CtNewConstructor;
+import javassist.CtNewMethod;
+import javassist.Modifier;
+import javassist.NotFoundException;
+import javassist.Translator;
 
 /**
  * A stub-code generator.  It is used for producing a proxy class.