Cleaned up imports

git-svn-id: https://smali.googlecode.com/svn/trunk@161 55b6fa8a-2a1e-11de-a435-ffa8d773f76a

baksmali/src/main/java/org/jf/baksmali/Adaptors/ClassDefinition.java

@@ -28,15 +28,15 @@
 
 package org.jf.baksmali.Adaptors;
 
-import org.jf.dexlib.ClassDefItem;
-import org.jf.dexlib.TypeIdItem;
 import org.jf.dexlib.ClassDataItem;
+import org.jf.dexlib.ClassDefItem;
 import org.jf.dexlib.EncodedArrayItem;
 import org.jf.dexlib.EncodedValue.EncodedValue;
+import org.jf.dexlib.TypeIdItem;
 import org.jf.dexlib.util.AccessFlags;
 
-import java.util.List;
 import java.util.ArrayList;
+import java.util.List;
 
 public class ClassDefinition {
     private ClassDefItem classDefItem;

baksmali/src/main/java/org/jf/baksmali/Adaptors/FieldDefinition.java

@@ -28,14 +28,14 @@
 
 package org.jf.baksmali.Adaptors;
 
-import org.jf.dexlib.ClassDataItem;
-import org.jf.dexlib.FieldIdItem;
-import org.jf.dexlib.EncodedValue.EncodedValue;
-import org.jf.dexlib.util.AccessFlags;
 import org.jf.baksmali.Adaptors.EncodedValue.EncodedValueAdaptor;
+import org.jf.dexlib.ClassDataItem;
+import org.jf.dexlib.EncodedValue.EncodedValue;
+import org.jf.dexlib.FieldIdItem;
+import org.jf.dexlib.util.AccessFlags;
 
-import java.util.List;
 import java.util.ArrayList;
+import java.util.List;
 
 public class FieldDefinition {
     private ClassDataItem.EncodedField encodedField;

baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/ArrayDataMethodItem.java

@@ -30,8 +30,8 @@ package org.jf.baksmali.Adaptors.Format;
 
 import org.jf.dexlib.code.Format.ArrayDataPseudoInstruction;
 
-import java.util.List;
 import java.util.ArrayList;
+import java.util.List;
 
 public class ArrayDataMethodItem extends InstructionFormatMethodItem<ArrayDataPseudoInstruction> {
     public ArrayDataMethodItem(int offset, ArrayDataPseudoInstruction instruction) {

baksmali/src/main/java/org/jf/baksmali/Adaptors/MethodDefinition.java

@@ -28,15 +28,15 @@
 
 package org.jf.baksmali.Adaptors;
 
+import org.jf.baksmali.Adaptors.Format.*;
 import org.jf.dexlib.ClassDataItem;
 import org.jf.dexlib.CodeItem;
 import org.jf.dexlib.MethodIdItem;
-import org.jf.dexlib.code.InstructionField;
-import org.jf.dexlib.code.Instruction;
-import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.code.Format.*;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.InstructionField;
+import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.util.AccessFlags;
-import org.jf.baksmali.Adaptors.Format.*;
 
 import java.util.*;
 

baksmali/src/main/java/org/jf/baksmali/baksmali.java

@@ -30,12 +30,12 @@ package org.jf.baksmali;
 
 import org.antlr.stringtemplate.StringTemplate;
 import org.antlr.stringtemplate.StringTemplateGroup;
-import org.jf.dexlib.DexFile;
 import org.jf.baksmali.Adaptors.ClassDefinition;
 import org.jf.baksmali.Renderers.*;
+import org.jf.dexlib.DexFile;
 
-import java.io.FileReader;
 import java.io.File;
+import java.io.FileReader;
 
 public class baksmali {
     public static void main(String[] args) throws Exception

baksmali/src/main/java/org/jf/baksmali/main.java

@@ -16,8 +16,6 @@
 
 package org.jf.baksmali;
 
-import org.jf.baksmali.UsageException;
-
 /**
  * Main class for baksmali. It recognizes enough options to be able to dispatch
  * to the right "actual" main.

dexlib/src/main/java/org/jf/dexlib/EncodedValue/AnnotationEncodedValueSubField.java

@@ -31,8 +31,8 @@ package org.jf.dexlib.EncodedValue;
 import org.jf.dexlib.*;
 
 import java.util.ArrayList;
-import java.util.List;
 import java.util.Collections;
+import java.util.List;
 
 public class AnnotationEncodedValueSubField extends CompositeField<AnnotationEncodedValueSubField>
     implements EncodedValueSubField<AnnotationEncodedValueSubField> {

dexlib/src/main/java/org/jf/dexlib/EncodedValue/BoolEncodedValueSubField.java

@@ -28,8 +28,8 @@
 
 package org.jf.dexlib.EncodedValue;
 
-import org.jf.dexlib.util.Input;
 import org.jf.dexlib.util.AnnotatedOutput;
+import org.jf.dexlib.util.Input;
 
 public class BoolEncodedValueSubField
     extends SimpleEncodedValueSubField<Boolean, BoolEncodedValueSubField>

dexlib/src/main/java/org/jf/dexlib/EncodedValue/ByteEncodedValueSubField.java

@@ -28,8 +28,8 @@
 
 package org.jf.dexlib.EncodedValue;
 
-import org.jf.dexlib.util.Input;
 import org.jf.dexlib.util.AnnotatedOutput;
+import org.jf.dexlib.util.Input;
 
 public class ByteEncodedValueSubField
     extends SimpleEncodedValueSubField<Byte, ByteEncodedValueSubField>

dexlib/src/main/java/org/jf/dexlib/EncodedValue/CharEncodedValueSubField.java

@@ -28,9 +28,9 @@
 
 package org.jf.dexlib.EncodedValue;
 
+import org.jf.dexlib.util.AnnotatedOutput;
 import org.jf.dexlib.util.EncodedValueUtils;
 import org.jf.dexlib.util.Input;
-import org.jf.dexlib.util.AnnotatedOutput;
 
 public class CharEncodedValueSubField
     extends SimpleEncodedValueSubField<Character, CharEncodedValueSubField>

dexlib/src/main/java/org/jf/dexlib/EncodedValue/DoubleEncodedValueSubField.java

@@ -28,9 +28,9 @@
 
 package org.jf.dexlib.EncodedValue;
 
+import org.jf.dexlib.util.AnnotatedOutput;
 import org.jf.dexlib.util.EncodedValueUtils;
 import org.jf.dexlib.util.Input;
-import org.jf.dexlib.util.AnnotatedOutput;
 
 public class DoubleEncodedValueSubField
         extends SimpleEncodedValueSubField<Double, DoubleEncodedValueSubField>

dexlib/src/main/java/org/jf/dexlib/EncodedValue/EncodedIndexedItemReference.java

@@ -29,9 +29,9 @@
 package org.jf.dexlib.EncodedValue;
 
 import org.jf.dexlib.*;
-import org.jf.dexlib.util.Input;
-import org.jf.dexlib.util.EncodedValueUtils;
 import org.jf.dexlib.util.AnnotatedOutput;
+import org.jf.dexlib.util.EncodedValueUtils;
+import org.jf.dexlib.util.Input;
 
 public class EncodedIndexedItemReference<T extends IndexedItem<T>>
     implements EncodedValueSubField<EncodedIndexedItemReference<T>> {

dexlib/src/main/java/org/jf/dexlib/EncodedValue/FloatEncodedValueSubField.java

@@ -28,9 +28,9 @@
 
 package org.jf.dexlib.EncodedValue;
 
+import org.jf.dexlib.util.AnnotatedOutput;
 import org.jf.dexlib.util.EncodedValueUtils;
 import org.jf.dexlib.util.Input;
-import org.jf.dexlib.util.AnnotatedOutput;
 
 public class FloatEncodedValueSubField
         extends SimpleEncodedValueSubField<Float, FloatEncodedValueSubField>

dexlib/src/main/java/org/jf/dexlib/EncodedValue/IntEncodedValueSubField.java

@@ -28,9 +28,9 @@
 
 package org.jf.dexlib.EncodedValue;
 
+import org.jf.dexlib.util.AnnotatedOutput;
 import org.jf.dexlib.util.EncodedValueUtils;
 import org.jf.dexlib.util.Input;
-import org.jf.dexlib.util.AnnotatedOutput;
 
 public class IntEncodedValueSubField
         extends SimpleEncodedValueSubField<Integer, IntEncodedValueSubField>

dexlib/src/main/java/org/jf/dexlib/EncodedValue/LongEncodedValueSubField.java

@@ -28,9 +28,9 @@
 
 package org.jf.dexlib.EncodedValue;
 
+import org.jf.dexlib.util.AnnotatedOutput;
 import org.jf.dexlib.util.EncodedValueUtils;
 import org.jf.dexlib.util.Input;
-import org.jf.dexlib.util.AnnotatedOutput;
 
 public class LongEncodedValueSubField
         extends SimpleEncodedValueSubField<Long, LongEncodedValueSubField>

dexlib/src/main/java/org/jf/dexlib/EncodedValue/NullEncodedValueSubField.java

@@ -28,8 +28,8 @@
 
 package org.jf.dexlib.EncodedValue;
 
-import org.jf.dexlib.util.Input;
 import org.jf.dexlib.util.AnnotatedOutput;
+import org.jf.dexlib.util.Input;
 
 public class NullEncodedValueSubField
     extends SimpleEncodedValueSubField<Object, NullEncodedValueSubField>

dexlib/src/main/java/org/jf/dexlib/EncodedValue/ShortEncodedValueSubField.java

@@ -28,9 +28,9 @@
 
 package org.jf.dexlib.EncodedValue;
 
+import org.jf.dexlib.util.AnnotatedOutput;
 import org.jf.dexlib.util.EncodedValueUtils;
 import org.jf.dexlib.util.Input;
-import org.jf.dexlib.util.AnnotatedOutput;
 
 public class ShortEncodedValueSubField
         extends SimpleEncodedValueSubField<Short, ShortEncodedValueSubField>

dexlib/src/main/java/org/jf/dexlib/code/Format/ArrayDataPseudoInstruction.java

@@ -28,14 +28,14 @@
 
 package org.jf.dexlib.code.Format;
 
-import org.jf.dexlib.code.Instruction;
-import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.DexFile;
 import org.jf.dexlib.IndexedItem;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.util.Input;
 
-import java.util.List;
 import java.util.ArrayList;
+import java.util.List;
 
 public class ArrayDataPseudoInstruction extends Instruction
 {

dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction10t.java

@@ -28,10 +28,10 @@
 
 package org.jf.dexlib.code.Format;
 
-import org.jf.dexlib.code.Instruction;
-import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.DexFile;
 import org.jf.dexlib.IndexedItem;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
 
 public class Instruction10t extends Instruction
 {

dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction10x.java

@@ -28,10 +28,10 @@
 
 package org.jf.dexlib.code.Format;
 
-import org.jf.dexlib.code.Instruction;
-import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.DexFile;
 import org.jf.dexlib.IndexedItem;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
 
 public class Instruction10x extends Instruction
 {

dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction11n.java

@@ -28,10 +28,10 @@
 
 package org.jf.dexlib.code.Format;
 
-import org.jf.dexlib.code.Instruction;
-import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.DexFile;
 import org.jf.dexlib.IndexedItem;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.util.NumberUtils;
 
 public class Instruction11n extends Instruction

dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction11x.java

@@ -28,10 +28,10 @@
 
 package org.jf.dexlib.code.Format;
 
-import org.jf.dexlib.code.Instruction;
-import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.DexFile;
 import org.jf.dexlib.IndexedItem;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.util.NumberUtils;
 
 public class Instruction11x extends Instruction

dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction12x.java

@@ -28,10 +28,10 @@
 
 package org.jf.dexlib.code.Format;
 
-import org.jf.dexlib.code.Instruction;
-import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.DexFile;
 import org.jf.dexlib.IndexedItem;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.util.NumberUtils;
 
 public class Instruction12x extends Instruction

dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction20t.java

@@ -28,10 +28,10 @@
 
 package org.jf.dexlib.code.Format;
 
-import org.jf.dexlib.code.Instruction;
-import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.DexFile;
 import org.jf.dexlib.IndexedItem;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.util.NumberUtils;
 
 public class Instruction20t extends Instruction

dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction21c.java

@@ -28,11 +28,11 @@
 
 package org.jf.dexlib.code.Format;
 
-import org.jf.dexlib.code.Instruction;
-import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.DexFile;
 import org.jf.dexlib.IndexedItem;
 import org.jf.dexlib.TypeIdItem;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.util.NumberUtils;
 
 public class Instruction21c extends Instruction

dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction21h.java

@@ -28,10 +28,10 @@
 
 package org.jf.dexlib.code.Format;
 
-import org.jf.dexlib.code.Instruction;
-import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.DexFile;
 import org.jf.dexlib.IndexedItem;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.util.NumberUtils;
 
 public class Instruction21h extends Instruction

dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction21s.java

@@ -28,10 +28,10 @@
 
 package org.jf.dexlib.code.Format;
 
-import org.jf.dexlib.code.Instruction;
-import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.DexFile;
 import org.jf.dexlib.IndexedItem;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.util.NumberUtils;
 
 public class Instruction21s extends Instruction

dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction21t.java

@@ -28,10 +28,10 @@
 
 package org.jf.dexlib.code.Format;
 
-import org.jf.dexlib.code.Instruction;
-import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.DexFile;
 import org.jf.dexlib.IndexedItem;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.util.NumberUtils;
 
 public class Instruction21t extends Instruction

dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction22b.java

@@ -28,10 +28,10 @@
 
 package org.jf.dexlib.code.Format;
 
-import org.jf.dexlib.code.Instruction;
-import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.DexFile;
 import org.jf.dexlib.IndexedItem;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.util.NumberUtils;
 
 public class Instruction22b extends Instruction

dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction22c.java

@@ -28,10 +28,10 @@
 
 package org.jf.dexlib.code.Format;
 
-import org.jf.dexlib.code.Instruction;
-import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.DexFile;
 import org.jf.dexlib.IndexedItem;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.util.NumberUtils;
 
 public class Instruction22c extends Instruction

dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction22s.java

@@ -28,10 +28,10 @@
 
 package org.jf.dexlib.code.Format;
 
-import org.jf.dexlib.code.Instruction;
-import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.DexFile;
 import org.jf.dexlib.IndexedItem;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.util.NumberUtils;
 
 public class Instruction22s extends Instruction

dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction22t.java

@@ -28,10 +28,10 @@
 
 package org.jf.dexlib.code.Format;
 
-import org.jf.dexlib.code.Instruction;
-import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.DexFile;
 import org.jf.dexlib.IndexedItem;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.util.NumberUtils;
 
 public class Instruction22t extends Instruction

dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction22x.java

@@ -28,10 +28,10 @@
 
 package org.jf.dexlib.code.Format;
 
-import org.jf.dexlib.code.Instruction;
-import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.DexFile;
 import org.jf.dexlib.IndexedItem;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.util.NumberUtils;
 
 public class Instruction22x extends Instruction

dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction23x.java

@@ -28,10 +28,10 @@
 
 package org.jf.dexlib.code.Format;
 
-import org.jf.dexlib.code.Instruction;
-import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.DexFile;
 import org.jf.dexlib.IndexedItem;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.util.NumberUtils;
 
 public class Instruction23x extends Instruction

dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction30t.java

@@ -28,10 +28,10 @@
 
 package org.jf.dexlib.code.Format;
 
-import org.jf.dexlib.code.Instruction;
-import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.DexFile;
 import org.jf.dexlib.IndexedItem;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.util.NumberUtils;
 
 public class Instruction30t extends Instruction

dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction31c.java

@@ -28,10 +28,10 @@
 
 package org.jf.dexlib.code.Format;
 
-import org.jf.dexlib.code.Instruction;
-import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.DexFile;
 import org.jf.dexlib.IndexedItem;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.util.NumberUtils;
 
 public class Instruction31c extends Instruction

dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction31i.java

@@ -28,10 +28,10 @@
 
 package org.jf.dexlib.code.Format;
 
-import org.jf.dexlib.code.Instruction;
-import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.DexFile;
 import org.jf.dexlib.IndexedItem;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.util.NumberUtils;
 
 public class Instruction31i extends Instruction

dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction31t.java

@@ -28,10 +28,10 @@
 
 package org.jf.dexlib.code.Format;
 
-import org.jf.dexlib.code.Instruction;
-import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.DexFile;
 import org.jf.dexlib.IndexedItem;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.util.NumberUtils;
 
 public class Instruction31t extends Instruction

dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction32x.java

@@ -28,10 +28,10 @@
 
 package org.jf.dexlib.code.Format;
 
-import org.jf.dexlib.code.Instruction;
-import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.DexFile;
 import org.jf.dexlib.IndexedItem;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.util.NumberUtils;
 
 public class Instruction32x extends Instruction

dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction35c.java

@@ -28,11 +28,14 @@
 
 package org.jf.dexlib.code.Format;
 
-import org.jf.dexlib.*;
+import org.jf.dexlib.DexFile;
-import org.jf.dexlib.util.NumberUtils;
+import org.jf.dexlib.IndexedItem;
+import org.jf.dexlib.MethodIdItem;
+import org.jf.dexlib.TypeIdItem;
 import org.jf.dexlib.code.Instruction;
 import org.jf.dexlib.code.Opcode;
 import static org.jf.dexlib.code.Opcode.*;
+import org.jf.dexlib.util.NumberUtils;
 
 public class Instruction35c extends Instruction
 {

dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction3rc.java

@@ -28,11 +28,14 @@
 
 package org.jf.dexlib.code.Format;
 
-import org.jf.dexlib.*;
+import org.jf.dexlib.DexFile;
-import org.jf.dexlib.util.NumberUtils;
+import org.jf.dexlib.IndexedItem;
+import org.jf.dexlib.MethodIdItem;
+import org.jf.dexlib.TypeIdItem;
 import org.jf.dexlib.code.Instruction;
 import org.jf.dexlib.code.Opcode;
 import static org.jf.dexlib.code.Opcode.*;
+import org.jf.dexlib.util.NumberUtils;
 
 public class Instruction3rc extends Instruction
 {

dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction51l.java

@@ -28,10 +28,10 @@
 
 package org.jf.dexlib.code.Format;
 
-import org.jf.dexlib.code.Instruction;
-import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.DexFile;
 import org.jf.dexlib.IndexedItem;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.util.NumberUtils;
 
 public class Instruction51l extends Instruction

dexlib/src/main/java/org/jf/dexlib/code/Format/PackedSwitchDataPseudoInstruction.java

@@ -28,10 +28,10 @@
 
 package org.jf.dexlib.code.Format;
 
-import org.jf.dexlib.code.Instruction;
-import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.DexFile;
 import org.jf.dexlib.IndexedItem;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.util.Input;
 
 public class PackedSwitchDataPseudoInstruction extends Instruction

dexlib/src/main/java/org/jf/dexlib/code/Format/SparseSwitchDataPseudoInstruction.java

@@ -28,10 +28,10 @@
 
 package org.jf.dexlib.code.Format;
 
-import org.jf.dexlib.code.Instruction;
-import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.DexFile;
 import org.jf.dexlib.IndexedItem;
+import org.jf.dexlib.code.Instruction;
+import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.util.Input;
 
 public class SparseSwitchDataPseudoInstruction extends Instruction

dexlib/src/main/java/org/jf/dexlib/code/Instruction.java

@@ -30,11 +30,6 @@ package org.jf.dexlib.code;
 
 import org.jf.dexlib.*;
 import org.jf.dexlib.code.Format.Format;
-import org.jf.dexlib.util.Input;
-import org.jf.dexlib.util.AnnotatedOutput;
-
-import java.util.Collections;
-import java.lang.reflect.Array;
 
 public abstract class Instruction {
     private DexFile dexFile;

dexlib/src/main/java/org/jf/dexlib/code/InstructionField.java

@@ -28,12 +28,12 @@
 
 package org.jf.dexlib.code;
 
-import org.jf.dexlib.Field;
 import org.jf.dexlib.DexFile;
+import org.jf.dexlib.Field;
 import org.jf.dexlib.IndexedItem;
+import org.jf.dexlib.code.Format.ArrayDataPseudoInstruction;
 import org.jf.dexlib.code.Format.PackedSwitchDataPseudoInstruction;
 import org.jf.dexlib.code.Format.SparseSwitchDataPseudoInstruction;
-import org.jf.dexlib.code.Format.ArrayDataPseudoInstruction;
 import org.jf.dexlib.util.AnnotatedOutput;
 import org.jf.dexlib.util.Input;
 

dexlib/src/main/java/org/jf/dexlib/code/Opcode.java

@@ -28,7 +28,7 @@
 
 package org.jf.dexlib.code;
 
-import org.jf.dexlib.code.Format.*;
+import org.jf.dexlib.code.Format.Format;
 
 import java.util.ArrayList;
 import java.util.HashMap;

dexlib/src/main/java/org/jf/dexlib/debug/AdvanceLine.java

@@ -28,9 +28,9 @@
 
 package org.jf.dexlib.debug;
 
+import org.jf.dexlib.ByteField;
 import org.jf.dexlib.CompositeField;
 import org.jf.dexlib.Field;
-import org.jf.dexlib.ByteField;
 import org.jf.dexlib.SignedLeb128Field;
 
 public class AdvanceLine extends CompositeField<AdvanceLine> implements DebugInstruction<AdvanceLine> {

dexlib/src/main/java/org/jf/dexlib/debug/AdvancePC.java

@@ -28,7 +28,10 @@
 
 package org.jf.dexlib.debug;
 
-import org.jf.dexlib.*;
+import org.jf.dexlib.ByteField;
+import org.jf.dexlib.CompositeField;
+import org.jf.dexlib.Field;
+import org.jf.dexlib.Leb128Field;
 
 public class AdvancePC extends CompositeField<AdvancePC> implements DebugInstruction<AdvancePC> {
     private final ByteField opcodeField;

dexlib/src/main/java/org/jf/dexlib/debug/EndLocal.java

@@ -28,7 +28,10 @@
 
 package org.jf.dexlib.debug;
 
-import org.jf.dexlib.*;
+import org.jf.dexlib.ByteField;
+import org.jf.dexlib.CompositeField;
+import org.jf.dexlib.Field;
+import org.jf.dexlib.Leb128Field;
 
 public class EndLocal extends CompositeField<EndLocal> implements DebugInstruction<EndLocal> {
     private final ByteField opcode;

dexlib/src/main/java/org/jf/dexlib/debug/EndSequence.java

@@ -28,9 +28,9 @@
 
 package org.jf.dexlib.debug;
 
+import org.jf.dexlib.ByteField;
 import org.jf.dexlib.CompositeField;
 import org.jf.dexlib.Field;
-import org.jf.dexlib.ByteField;
 
 public class EndSequence extends CompositeField<EndSequence> implements DebugInstruction<EndSequence> {
     public EndSequence() {

dexlib/src/main/java/org/jf/dexlib/debug/RestartLocal.java

@@ -28,7 +28,10 @@
 
 package org.jf.dexlib.debug;
 
-import org.jf.dexlib.*;
+import org.jf.dexlib.ByteField;
+import org.jf.dexlib.CompositeField;
+import org.jf.dexlib.Field;
+import org.jf.dexlib.Leb128Field;
 
 public class RestartLocal extends CompositeField<RestartLocal> implements DebugInstruction<RestartLocal> {
     private final ByteField opcode;

dexlib/src/main/java/org/jf/dexlib/debug/SetEpilogueBegin.java

@@ -28,9 +28,9 @@
 
 package org.jf.dexlib.debug;
 
+import org.jf.dexlib.ByteField;
 import org.jf.dexlib.CompositeField;
 import org.jf.dexlib.Field;
-import org.jf.dexlib.ByteField;
 
 public class SetEpilogueBegin extends CompositeField<SetEpilogueBegin> implements DebugInstruction<SetEpilogueBegin> {
     public SetEpilogueBegin() {

dexlib/src/main/java/org/jf/dexlib/debug/SetPrologueEnd.java

@@ -28,9 +28,9 @@
 
 package org.jf.dexlib.debug;
 
+import org.jf.dexlib.ByteField;
 import org.jf.dexlib.CompositeField;
 import org.jf.dexlib.Field;
-import org.jf.dexlib.ByteField;
 
 public class SetPrologueEnd extends CompositeField<SetPrologueEnd> implements DebugInstruction<SetPrologueEnd> {
     public SetPrologueEnd() {

dexlib/src/main/java/org/jf/dexlib/debug/SpecialOpcode.java

@@ -28,9 +28,9 @@
 
 package org.jf.dexlib.debug;
 
+import org.jf.dexlib.ByteField;
 import org.jf.dexlib.CompositeField;
 import org.jf.dexlib.Field;
-import org.jf.dexlib.ByteField;
 
 public class SpecialOpcode extends CompositeField<SpecialOpcode> implements DebugInstruction<SpecialOpcode> {
     private final byte opcode;

dexlib/src/main/java/org/jf/dexlib/util/AccessFlags.java

@@ -28,9 +28,9 @@
 
 package org.jf.dexlib.util;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-import java.util.ArrayList;
 
 public enum AccessFlags
 {

dexlib/src/main/java/org/jf/dexlib/util/DebugInfoBuilder.java

@@ -28,11 +28,11 @@
 
 package org.jf.dexlib.util;
 
-import org.jf.dexlib.debug.*;
-import org.jf.dexlib.DexFile;
 import org.jf.dexlib.DebugInfoItem;
+import org.jf.dexlib.DexFile;
 import org.jf.dexlib.StringIdItem;
 import org.jf.dexlib.TypeIdItem;
+import org.jf.dexlib.debug.*;
 
 import java.util.ArrayList;
 import java.util.List;

dexlib/src/main/java/org/jf/dexlib/util/TryListBuilder.java

@@ -28,11 +28,14 @@
 
 package org.jf.dexlib.util;
 
-import org.jf.dexlib.TypeIdItem;
 import org.jf.dexlib.CodeItem;
 import org.jf.dexlib.DexFile;
+import org.jf.dexlib.TypeIdItem;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
 
 public class TryListBuilder
 {

dexlib/src/main/java/org/jf/dexlib/util/TwoColumnOutput.java

@@ -16,11 +16,7 @@
 
 package org.jf.dexlib.util;
 
-import java.io.IOException;
+import java.io.*;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.StringWriter;
-import java.io.Writer;
 
 /**
  * Class that takes a combined output destination and provides two

dexlib/src/main/java/org/jf/dexlib/util/TypeUtils.java

@@ -28,8 +28,8 @@
 
 package org.jf.dexlib.util;
 
-import org.jf.dexlib.EncodedValue.*;
 import org.jf.dexlib.DexFile;
+import org.jf.dexlib.EncodedValue.*;
 
 public class TypeUtils
 {

dexlib/src/main/java/org/jf/dexlib/util/Utf8Utils.java

@@ -16,9 +16,6 @@
 
 package org.jf.dexlib.util;
 
-import org.jf.dexlib.util.ByteArray;
-import org.jf.dexlib.util.Hex;
-
 /**
  * Constants of type <code>CONSTANT_Utf8_info</code>.
  */

dexlib/src/test/java/TryListBuilderTest.java

@@ -27,12 +27,13 @@
  */
 
 
-import org.jf.dexlib.util.TryListBuilder;
-import org.jf.dexlib.util.Pair;
-import org.jf.dexlib.TypeIdItem;
-import org.jf.dexlib.DexFile;
 import org.jf.dexlib.CodeItem;
-import org.junit.*;
+import org.jf.dexlib.DexFile;
+import org.jf.dexlib.TypeIdItem;
+import org.jf.dexlib.util.Pair;
+import org.jf.dexlib.util.TryListBuilder;
+import org.junit.Assert;
+import org.junit.Test;
 
 import java.util.List;
 

maven-smali-plugin/src/main/java/org/jf/SmaliMojo.java

@@ -20,12 +20,9 @@ package org.jf;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.project.MavenProject;
+import org.jf.smali.smali;
 
 import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-
-import org.jf.smali.smali;
 
 /**
  * Assembles files in the smali assembly language

smali/src/main/java/org/jf/smali/SemanticException.java

@@ -28,8 +28,8 @@
 
 package org.jf.smali;
 
-import org.antlr.runtime.RecognitionException;
 import org.antlr.runtime.IntStream;
+import org.antlr.runtime.RecognitionException;
 
 public class SemanticException extends RecognitionException {
     private String errorMessage;

smali/src/main/java/org/jf/smali/smali.java

@@ -28,12 +28,12 @@
 
 package org.jf.smali;
 
-import org.jf.dexlib.DexFile;
-import org.jf.dexlib.util.ByteArrayAnnotatedOutput;
 import org.antlr.runtime.ANTLRInputStream;
 import org.antlr.runtime.CommonTokenStream;
 import org.antlr.runtime.tree.CommonTree;
 import org.antlr.runtime.tree.CommonTreeNodeStream;
+import org.jf.dexlib.DexFile;
+import org.jf.dexlib.util.ByteArrayAnnotatedOutput;
 
 import java.io.*;
 import java.util.LinkedHashSet;

smali/src/test/java/ByteLiteralTest.java

@@ -26,8 +26,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import org.junit.*;
 import org.jf.smali.literalTools;
+import org.junit.Assert;
+import org.junit.Test;
 
 public class ByteLiteralTest
 {

smali/src/test/java/IntLiteralTest.java

@@ -26,8 +26,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import org.junit.*;
 import org.jf.smali.literalTools;
+import org.junit.Assert;
+import org.junit.Test;
 
 public class IntLiteralTest
 {

smali/src/test/java/LongLiteralTest.java

@@ -26,8 +26,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import org.junit.*;
 import org.jf.smali.literalTools;
+import org.junit.Assert;
+import org.junit.Test;
 
 public class LongLiteralTest
 {

smali/src/test/java/ShortLiteralTest.java

@@ -26,8 +26,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import org.junit.*;
 import org.jf.smali.literalTools;
+import org.junit.Assert;
+import org.junit.Test;
 
 public class ShortLiteralTest
 {