cleaned up imports

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

dexlib/src/main/java/org/jf/dexlib/AnnotationDirectoryItem.java

@@ -28,9 +28,9 @@
 
 package org.jf.dexlib;
 
+import org.jf.dexlib.Util.AnnotatedOutput;
 import org.jf.dexlib.Util.ExceptionWithContext;
 import org.jf.dexlib.Util.Input;
-import org.jf.dexlib.Util.AnnotatedOutput;
 
 import java.util.Collections;
 import java.util.List;

dexlib/src/main/java/org/jf/dexlib/AnnotationItem.java

@@ -29,8 +29,8 @@
 package org.jf.dexlib;
 
 import org.jf.dexlib.EncodedValue.AnnotationEncodedSubValue;
-import org.jf.dexlib.Util.Input;
 import org.jf.dexlib.Util.AnnotatedOutput;
+import org.jf.dexlib.Util.Input;
 
 public class AnnotationItem extends Item<AnnotationItem> {
     private int hashCode = 0;

dexlib/src/main/java/org/jf/dexlib/AnnotationSetItem.java

@@ -28,8 +28,8 @@
 
 package org.jf.dexlib;
 
-import org.jf.dexlib.Util.Input;
 import org.jf.dexlib.Util.AnnotatedOutput;
+import org.jf.dexlib.Util.Input;
 
 import java.util.List;
 

dexlib/src/main/java/org/jf/dexlib/AnnotationSetRefList.java

@@ -28,8 +28,8 @@
 
 package org.jf.dexlib;
 
-import org.jf.dexlib.Util.Input;
 import org.jf.dexlib.Util.AnnotatedOutput;
+import org.jf.dexlib.Util.Input;
 
 import java.util.List;
 

dexlib/src/main/java/org/jf/dexlib/AnnotationVisibility.java

@@ -28,8 +28,6 @@
 
 package org.jf.dexlib;
 
-import org.jf.dexlib.Util.ExceptionWithContext;
-
 public enum AnnotationVisibility {
     BUILD((byte)0, "build"),
     RUNTIME((byte)1, "runtime"),

dexlib/src/main/java/org/jf/dexlib/ClassDataItem.java

@@ -30,8 +30,8 @@ package org.jf.dexlib;
 
 import org.jf.dexlib.Util.*;
 
-import java.util.List;
 import java.util.Collections;
+import java.util.List;
 
 public class ClassDataItem extends Item<ClassDataItem> {
     private EncodedField[] staticFields;

dexlib/src/main/java/org/jf/dexlib/ClassDefItem.java

@@ -28,14 +28,17 @@
 
 package org.jf.dexlib;
 
-import org.jf.dexlib.Util.Input;
-import org.jf.dexlib.Util.AnnotatedOutput;
-import org.jf.dexlib.Util.AccessFlags;
-import org.jf.dexlib.Util.TypeUtils;
-import org.jf.dexlib.EncodedValue.EncodedValue;
 import org.jf.dexlib.EncodedValue.ArrayEncodedSubValue;
+import org.jf.dexlib.EncodedValue.EncodedValue;
+import org.jf.dexlib.Util.AccessFlags;
+import org.jf.dexlib.Util.AnnotatedOutput;
+import org.jf.dexlib.Util.Input;
+import org.jf.dexlib.Util.TypeUtils;
 
-import java.util.*;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
 
 public class ClassDefItem extends Item<ClassDefItem> {
     private TypeIdItem classType;

dexlib/src/main/java/org/jf/dexlib/Code/Analysis/ClassPath.java

@@ -29,9 +29,6 @@
 package org.jf.dexlib.Code.Analysis;
 
 import org.jf.dexlib.*;
-import static org.jf.dexlib.ClassDataItem.EncodedMethod;
-import static org.jf.dexlib.ClassDataItem.EncodedField;
-
 import org.jf.dexlib.Util.AccessFlags;
 import org.jf.dexlib.Util.ExceptionWithContext;
 import org.jf.dexlib.Util.SparseArray;
@@ -41,6 +38,9 @@ import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import static org.jf.dexlib.ClassDataItem.EncodedField;
+import static org.jf.dexlib.ClassDataItem.EncodedMethod;
+
 public class ClassPath {
     private static ClassPath theClassPath = null;
 

dexlib/src/main/java/org/jf/dexlib/Code/Analysis/Deodexerant.java

@@ -28,10 +28,10 @@
 
 package org.jf.dexlib.Code.Analysis;
 
-import java.net.Socket;
-import java.io.PrintWriter;
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
+import java.io.PrintWriter;
+import java.net.Socket;
 import java.util.ArrayList;
 
 /**

dexlib/src/main/java/org/jf/dexlib/Code/Analysis/MethodAnalyzer.java

@@ -31,10 +31,13 @@ package org.jf.dexlib.Code.Analysis;
 import org.jf.dexlib.*;
 import org.jf.dexlib.Code.*;
 import org.jf.dexlib.Code.Format.*;
-import org.jf.dexlib.Util.*;
+import org.jf.dexlib.Util.AccessFlags;
+import org.jf.dexlib.Util.ExceptionWithContext;
+import org.jf.dexlib.Util.SparseArray;
 
-
+import java.util.BitSet;
-import java.util.*;
+import java.util.EnumSet;
+import java.util.List;
 
 /**
  * The MethodAnalyzer performs several functions. It "analyzes" the instructions and infers the register types

dexlib/src/main/java/org/jf/dexlib/Code/Analysis/RegisterType.java

@@ -29,12 +29,13 @@
 package org.jf.dexlib.Code.Analysis;
 
 import org.jf.dexlib.TypeIdItem;
-import static org.jf.dexlib.Code.Analysis.ClassPath.ClassDef;
 
 import java.io.IOException;
 import java.io.Writer;
 import java.util.HashMap;
 
+import static org.jf.dexlib.Code.Analysis.ClassPath.ClassDef;
+
 public class RegisterType {
     private final static HashMap<RegisterType, RegisterType> internedRegisterTypes =
             new HashMap<RegisterType, RegisterType>();

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

@@ -30,9 +30,10 @@ package org.jf.dexlib.Code.Format;
 
 import org.jf.dexlib.Code.Instruction;
 import org.jf.dexlib.Code.Opcode;
-import org.jf.dexlib.Util.NumberUtils;
-import org.jf.dexlib.Util.AnnotatedOutput;
 import org.jf.dexlib.DexFile;
+import org.jf.dexlib.Util.AnnotatedOutput;
+import org.jf.dexlib.Util.NumberUtils;
+
 import java.util.Iterator;
 
 public class ArrayDataPseudoInstruction extends Instruction {

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

@@ -29,8 +29,8 @@
 package org.jf.dexlib.Code.Format;
 
 import org.jf.dexlib.Code.Instruction;
-import org.jf.dexlib.Code.Opcode;
 import org.jf.dexlib.Code.OffsetInstruction;
+import org.jf.dexlib.Code.Opcode;
 import org.jf.dexlib.DexFile;
 import org.jf.dexlib.Util.AnnotatedOutput;
 

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

@@ -29,12 +29,12 @@
 package org.jf.dexlib.Code.Format;
 
 import org.jf.dexlib.Code.Instruction;
+import org.jf.dexlib.Code.LiteralInstruction;
 import org.jf.dexlib.Code.Opcode;
 import org.jf.dexlib.Code.SingleRegisterInstruction;
-import org.jf.dexlib.Code.LiteralInstruction;
 import org.jf.dexlib.DexFile;
-import org.jf.dexlib.Util.NumberUtils;
 import org.jf.dexlib.Util.AnnotatedOutput;
+import org.jf.dexlib.Util.NumberUtils;
 
 public class Instruction11n extends Instruction implements SingleRegisterInstruction, LiteralInstruction {
     public static final InstructionFactory Factory = new Factory();

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

@@ -32,8 +32,8 @@ import org.jf.dexlib.Code.Instruction;
 import org.jf.dexlib.Code.Opcode;
 import org.jf.dexlib.Code.SingleRegisterInstruction;
 import org.jf.dexlib.DexFile;
-import org.jf.dexlib.Util.NumberUtils;
 import org.jf.dexlib.Util.AnnotatedOutput;
+import org.jf.dexlib.Util.NumberUtils;
 
 public class Instruction11x extends Instruction implements SingleRegisterInstruction {
     public static final Instruction.InstructionFactory Factory = new Factory();

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

@@ -32,8 +32,8 @@ import org.jf.dexlib.Code.Instruction;
 import org.jf.dexlib.Code.Opcode;
 import org.jf.dexlib.Code.TwoRegisterInstruction;
 import org.jf.dexlib.DexFile;
-import org.jf.dexlib.Util.NumberUtils;
 import org.jf.dexlib.Util.AnnotatedOutput;
+import org.jf.dexlib.Util.NumberUtils;
 
 public class Instruction12x extends Instruction implements TwoRegisterInstruction {
     public static final Instruction.InstructionFactory Factory = new Factory();

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

@@ -29,8 +29,8 @@
 package org.jf.dexlib.Code.Format;
 
 import org.jf.dexlib.Code.Instruction;
-import org.jf.dexlib.Code.Opcode;
 import org.jf.dexlib.Code.OffsetInstruction;
+import org.jf.dexlib.Code.Opcode;
 import org.jf.dexlib.DexFile;
 import org.jf.dexlib.Util.AnnotatedOutput;
 import org.jf.dexlib.Util.NumberUtils;

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

@@ -29,12 +29,12 @@
 package org.jf.dexlib.Code.Format;
 
 import org.jf.dexlib.Code.Instruction;
-import org.jf.dexlib.Code.Opcode;
 import org.jf.dexlib.Code.LiteralInstruction;
+import org.jf.dexlib.Code.Opcode;
 import org.jf.dexlib.Code.SingleRegisterInstruction;
 import org.jf.dexlib.DexFile;
-import org.jf.dexlib.Util.NumberUtils;
 import org.jf.dexlib.Util.AnnotatedOutput;
+import org.jf.dexlib.Util.NumberUtils;
 
 public class Instruction21h extends Instruction implements SingleRegisterInstruction, LiteralInstruction {
     public static final Instruction.InstructionFactory Factory = new Factory();

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

@@ -29,12 +29,12 @@
 package org.jf.dexlib.Code.Format;
 
 import org.jf.dexlib.Code.Instruction;
-import org.jf.dexlib.Code.Opcode;
 import org.jf.dexlib.Code.LiteralInstruction;
+import org.jf.dexlib.Code.Opcode;
 import org.jf.dexlib.Code.SingleRegisterInstruction;
 import org.jf.dexlib.DexFile;
-import org.jf.dexlib.Util.NumberUtils;
 import org.jf.dexlib.Util.AnnotatedOutput;
+import org.jf.dexlib.Util.NumberUtils;
 
 public class Instruction21s extends Instruction implements SingleRegisterInstruction, LiteralInstruction {
     public static final Instruction.InstructionFactory Factory = new Factory();

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

@@ -28,10 +28,13 @@
 
 package org.jf.dexlib.Code.Format;
 
-import org.jf.dexlib.Code.*;
+import org.jf.dexlib.Code.Instruction;
+import org.jf.dexlib.Code.OffsetInstruction;
+import org.jf.dexlib.Code.Opcode;
+import org.jf.dexlib.Code.SingleRegisterInstruction;
 import org.jf.dexlib.DexFile;
-import org.jf.dexlib.Util.NumberUtils;
 import org.jf.dexlib.Util.AnnotatedOutput;
+import org.jf.dexlib.Util.NumberUtils;
 
 public class Instruction21t extends Instruction implements OffsetInstruction, SingleRegisterInstruction {
     public static final Instruction.InstructionFactory Factory = new Factory();

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

@@ -34,8 +34,8 @@ import org.jf.dexlib.Code.Opcode;
 import org.jf.dexlib.Code.TwoRegisterInstruction;
 import org.jf.dexlib.DexFile;
 import org.jf.dexlib.Item;
-import org.jf.dexlib.Util.NumberUtils;
 import org.jf.dexlib.Util.AnnotatedOutput;
+import org.jf.dexlib.Util.NumberUtils;
 
 public class Instruction22c extends InstructionWithReference implements TwoRegisterInstruction {
     public static final Instruction.InstructionFactory Factory = new Factory();

dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction22cs.java

@@ -32,9 +32,9 @@ import org.jf.dexlib.Code.Instruction;
 import org.jf.dexlib.Code.OdexedFieldAccess;
 import org.jf.dexlib.Code.Opcode;
 import org.jf.dexlib.Code.TwoRegisterInstruction;
-import org.jf.dexlib.Util.NumberUtils;
-import org.jf.dexlib.Util.AnnotatedOutput;
 import org.jf.dexlib.DexFile;
+import org.jf.dexlib.Util.AnnotatedOutput;
+import org.jf.dexlib.Util.NumberUtils;
 
 public class Instruction22cs extends Instruction implements TwoRegisterInstruction, OdexedFieldAccess {
     public static final Instruction.InstructionFactory Factory = new Factory();

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

@@ -33,8 +33,8 @@ import org.jf.dexlib.Code.LiteralInstruction;
 import org.jf.dexlib.Code.Opcode;
 import org.jf.dexlib.Code.TwoRegisterInstruction;
 import org.jf.dexlib.DexFile;
-import org.jf.dexlib.Util.NumberUtils;
 import org.jf.dexlib.Util.AnnotatedOutput;
+import org.jf.dexlib.Util.NumberUtils;
 
 public class Instruction22s extends Instruction implements TwoRegisterInstruction, LiteralInstruction {
     public static final Instruction.InstructionFactory Factory = new Factory();

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

@@ -29,12 +29,12 @@
 package org.jf.dexlib.Code.Format;
 
 import org.jf.dexlib.Code.Instruction;
-import org.jf.dexlib.Code.Opcode;
 import org.jf.dexlib.Code.OffsetInstruction;
+import org.jf.dexlib.Code.Opcode;
 import org.jf.dexlib.Code.TwoRegisterInstruction;
 import org.jf.dexlib.DexFile;
-import org.jf.dexlib.Util.NumberUtils;
 import org.jf.dexlib.Util.AnnotatedOutput;
+import org.jf.dexlib.Util.NumberUtils;
 
 public class Instruction22t extends Instruction implements OffsetInstruction, TwoRegisterInstruction {
     public static final Instruction.InstructionFactory Factory = new Factory();

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

@@ -32,8 +32,8 @@ import org.jf.dexlib.Code.Instruction;
 import org.jf.dexlib.Code.Opcode;
 import org.jf.dexlib.Code.TwoRegisterInstruction;
 import org.jf.dexlib.DexFile;
-import org.jf.dexlib.Util.NumberUtils;
 import org.jf.dexlib.Util.AnnotatedOutput;
+import org.jf.dexlib.Util.NumberUtils;
 
 public class Instruction22x extends Instruction implements TwoRegisterInstruction {
     public static final Instruction.InstructionFactory Factory = new Factory();

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.DexFile;
 import org.jf.dexlib.Code.Instruction;
-import org.jf.dexlib.Code.Opcode;
 import org.jf.dexlib.Code.OffsetInstruction;
+import org.jf.dexlib.Code.Opcode;
+import org.jf.dexlib.DexFile;
 import org.jf.dexlib.Util.AnnotatedOutput;
 import org.jf.dexlib.Util.NumberUtils;
 

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

@@ -34,8 +34,8 @@ import org.jf.dexlib.Code.Opcode;
 import org.jf.dexlib.Code.SingleRegisterInstruction;
 import org.jf.dexlib.DexFile;
 import org.jf.dexlib.Item;
-import org.jf.dexlib.Util.NumberUtils;
 import org.jf.dexlib.Util.AnnotatedOutput;
+import org.jf.dexlib.Util.NumberUtils;
 
 public class Instruction31c extends InstructionWithReference implements SingleRegisterInstruction {
     public static final Instruction.InstructionFactory Factory = new Factory();

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

@@ -29,12 +29,12 @@
 package org.jf.dexlib.Code.Format;
 
 import org.jf.dexlib.Code.Instruction;
-import org.jf.dexlib.Code.Opcode;
 import org.jf.dexlib.Code.LiteralInstruction;
+import org.jf.dexlib.Code.Opcode;
 import org.jf.dexlib.Code.SingleRegisterInstruction;
 import org.jf.dexlib.DexFile;
-import org.jf.dexlib.Util.NumberUtils;
 import org.jf.dexlib.Util.AnnotatedOutput;
+import org.jf.dexlib.Util.NumberUtils;
 
 public class Instruction31i extends Instruction implements SingleRegisterInstruction, LiteralInstruction {
     public static final Instruction.InstructionFactory Factory = new Factory();

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

@@ -29,12 +29,12 @@
 package org.jf.dexlib.Code.Format;
 
 import org.jf.dexlib.Code.Instruction;
-import org.jf.dexlib.Code.Opcode;
 import org.jf.dexlib.Code.OffsetInstruction;
+import org.jf.dexlib.Code.Opcode;
 import org.jf.dexlib.Code.SingleRegisterInstruction;
 import org.jf.dexlib.DexFile;
-import org.jf.dexlib.Util.NumberUtils;
 import org.jf.dexlib.Util.AnnotatedOutput;
+import org.jf.dexlib.Util.NumberUtils;
 
 public class Instruction31t extends Instruction implements OffsetInstruction, SingleRegisterInstruction {
     public static final Instruction.InstructionFactory Factory = new Factory();

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

@@ -28,12 +28,12 @@
 
 package org.jf.dexlib.Code.Format;
 
-import org.jf.dexlib.DexFile;
 import org.jf.dexlib.Code.Instruction;
 import org.jf.dexlib.Code.Opcode;
 import org.jf.dexlib.Code.TwoRegisterInstruction;
-import org.jf.dexlib.Util.NumberUtils;
+import org.jf.dexlib.DexFile;
 import org.jf.dexlib.Util.AnnotatedOutput;
+import org.jf.dexlib.Util.NumberUtils;
 
 public class Instruction32x extends Instruction implements TwoRegisterInstruction {
     public static final Instruction.InstructionFactory Factory = new Factory();

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

@@ -32,13 +32,14 @@ import org.jf.dexlib.Code.FiveRegisterInstruction;
 import org.jf.dexlib.Code.Instruction;
 import org.jf.dexlib.Code.InstructionWithReference;
 import org.jf.dexlib.Code.Opcode;
-import static org.jf.dexlib.Code.Opcode.*;
 import org.jf.dexlib.DexFile;
 import org.jf.dexlib.Item;
 import org.jf.dexlib.MethodIdItem;
 import org.jf.dexlib.TypeIdItem;
-import org.jf.dexlib.Util.NumberUtils;
 import org.jf.dexlib.Util.AnnotatedOutput;
+import org.jf.dexlib.Util.NumberUtils;
+
+import static org.jf.dexlib.Code.Opcode.*;
 
 public class Instruction35c extends InstructionWithReference implements FiveRegisterInstruction {
     public static final Instruction.InstructionFactory Factory = new Factory();

dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction35ms.java

@@ -32,9 +32,9 @@ import org.jf.dexlib.Code.FiveRegisterInstruction;
 import org.jf.dexlib.Code.Instruction;
 import org.jf.dexlib.Code.OdexedInvokeVirtual;
 import org.jf.dexlib.Code.Opcode;
-import org.jf.dexlib.Util.NumberUtils;
-import org.jf.dexlib.Util.AnnotatedOutput;
 import org.jf.dexlib.DexFile;
+import org.jf.dexlib.Util.AnnotatedOutput;
+import org.jf.dexlib.Util.NumberUtils;
 
 
 public class Instruction35ms extends Instruction implements FiveRegisterInstruction, OdexedInvokeVirtual {

dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction35s.java

@@ -30,15 +30,16 @@ package org.jf.dexlib.Code.Format;
 
 import org.jf.dexlib.Code.FiveRegisterInstruction;
 import org.jf.dexlib.Code.Instruction;
-import org.jf.dexlib.Code.Opcode;
 import org.jf.dexlib.Code.InstructionWithReference;
-import static org.jf.dexlib.Code.Opcode.*;
+import org.jf.dexlib.Code.Opcode;
+import org.jf.dexlib.DexFile;
+import org.jf.dexlib.Item;
+import org.jf.dexlib.MethodIdItem;
+import org.jf.dexlib.TypeIdItem;
 import org.jf.dexlib.Util.AnnotatedOutput;
 import org.jf.dexlib.Util.NumberUtils;
-import org.jf.dexlib.Item;
+
-import org.jf.dexlib.DexFile;
+import static org.jf.dexlib.Code.Opcode.*;
-import org.jf.dexlib.TypeIdItem;
-import org.jf.dexlib.MethodIdItem;
 
 public class Instruction35s extends InstructionWithReference implements FiveRegisterInstruction {
     public static final Instruction.InstructionFactory Factory = new Factory();

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

@@ -31,15 +31,15 @@ package org.jf.dexlib.Code.Format;
 import org.jf.dexlib.Code.Instruction;
 import org.jf.dexlib.Code.InstructionWithReference;
 import org.jf.dexlib.Code.Opcode;
-import static org.jf.dexlib.Code.Opcode.*;
-
 import org.jf.dexlib.Code.RegisterRangeInstruction;
 import org.jf.dexlib.DexFile;
 import org.jf.dexlib.Item;
 import org.jf.dexlib.MethodIdItem;
 import org.jf.dexlib.TypeIdItem;
-import org.jf.dexlib.Util.NumberUtils;
 import org.jf.dexlib.Util.AnnotatedOutput;
+import org.jf.dexlib.Util.NumberUtils;
+
+import static org.jf.dexlib.Code.Opcode.*;
 
 public class Instruction3rc extends InstructionWithReference implements RegisterRangeInstruction {
     public static final Instruction.InstructionFactory Factory = new Factory();

dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction3rms.java

@@ -32,9 +32,9 @@ import org.jf.dexlib.Code.Instruction;
 import org.jf.dexlib.Code.OdexedInvokeVirtual;
 import org.jf.dexlib.Code.Opcode;
 import org.jf.dexlib.Code.RegisterRangeInstruction;
-import org.jf.dexlib.Util.NumberUtils;
-import org.jf.dexlib.Util.AnnotatedOutput;
 import org.jf.dexlib.DexFile;
+import org.jf.dexlib.Util.AnnotatedOutput;
+import org.jf.dexlib.Util.NumberUtils;
 
 public class Instruction3rms extends Instruction implements RegisterRangeInstruction, OdexedInvokeVirtual {
  public static final Instruction.InstructionFactory Factory = new Factory();

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

@@ -29,12 +29,12 @@
 package org.jf.dexlib.Code.Format;
 
 import org.jf.dexlib.Code.Instruction;
+import org.jf.dexlib.Code.LiteralInstruction;
 import org.jf.dexlib.Code.Opcode;
 import org.jf.dexlib.Code.SingleRegisterInstruction;
-import org.jf.dexlib.Code.LiteralInstruction;
 import org.jf.dexlib.DexFile;
-import org.jf.dexlib.Util.NumberUtils;
 import org.jf.dexlib.Util.AnnotatedOutput;
+import org.jf.dexlib.Util.NumberUtils;
 
 public class Instruction51l extends Instruction implements SingleRegisterInstruction, LiteralInstruction {
     public static final Instruction.InstructionFactory Factory = new Factory();

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

@@ -29,11 +29,11 @@
 package org.jf.dexlib.Code.Format;
 
 import org.jf.dexlib.Code.Instruction;
-import org.jf.dexlib.Code.Opcode;
 import org.jf.dexlib.Code.MultiOffsetInstruction;
-import org.jf.dexlib.Util.NumberUtils;
+import org.jf.dexlib.Code.Opcode;
-import org.jf.dexlib.Util.AnnotatedOutput;
 import org.jf.dexlib.DexFile;
+import org.jf.dexlib.Util.AnnotatedOutput;
+import org.jf.dexlib.Util.NumberUtils;
 
 import java.util.Iterator;
 

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

@@ -29,11 +29,11 @@
 package org.jf.dexlib.Code.Format;
 
 import org.jf.dexlib.Code.Instruction;
-import org.jf.dexlib.Code.Opcode;
 import org.jf.dexlib.Code.MultiOffsetInstruction;
-import org.jf.dexlib.Util.NumberUtils;
+import org.jf.dexlib.Code.Opcode;
-import org.jf.dexlib.Util.AnnotatedOutput;
 import org.jf.dexlib.DexFile;
+import org.jf.dexlib.Util.AnnotatedOutput;
+import org.jf.dexlib.Util.NumberUtils;
 
 import java.util.Iterator;
 

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

@@ -28,9 +28,9 @@
 
 package org.jf.dexlib.Code;
 
-import org.jf.dexlib.*;
-import org.jf.dexlib.Util.AnnotatedOutput;
 import org.jf.dexlib.Code.Format.Format;
+import org.jf.dexlib.DexFile;
+import org.jf.dexlib.Util.AnnotatedOutput;
 
 public abstract class Instruction {
     public final Opcode opcode;

dexlib/src/main/java/org/jf/dexlib/Code/InstructionIterator.java

@@ -28,10 +28,13 @@
 
 package org.jf.dexlib.Code;
 
+import org.jf.dexlib.Code.Format.ArrayDataPseudoInstruction;
+import org.jf.dexlib.Code.Format.Instruction10x;
+import org.jf.dexlib.Code.Format.PackedSwitchDataPseudoInstruction;
+import org.jf.dexlib.Code.Format.SparseSwitchDataPseudoInstruction;
+import org.jf.dexlib.DexFile;
 import org.jf.dexlib.Util.ExceptionWithContext;
 import org.jf.dexlib.Util.Hex;
-import org.jf.dexlib.Code.Format.*;
-import org.jf.dexlib.DexFile;
 
 public class InstructionIterator {
     public static void IterateInstructions(DexFile dexFile, byte[] insns, ProcessInstructionDelegate delegate) {

dexlib/src/main/java/org/jf/dexlib/CodeItem.java

@@ -28,17 +28,17 @@
 
 package org.jf.dexlib;
 
-import org.jf.dexlib.Code.*;
 import org.jf.dexlib.Code.Format.Instruction20t;
-import org.jf.dexlib.Code.Format.Instruction30t;
 import org.jf.dexlib.Code.Format.Instruction21c;
+import org.jf.dexlib.Code.Format.Instruction30t;
 import org.jf.dexlib.Code.Format.Instruction31c;
+import org.jf.dexlib.Code.*;
+import org.jf.dexlib.Debug.DebugInstructionIterator;
 import org.jf.dexlib.Debug.DebugOpcode;
 import org.jf.dexlib.Util.*;
-import org.jf.dexlib.Debug.DebugInstructionIterator;
 
-import java.util.List;
 import java.util.ArrayList;
+import java.util.List;
 
 public class CodeItem extends Item<CodeItem> {
     private int registerCount;

dexlib/src/main/java/org/jf/dexlib/Debug/DebugInstructionIterator.java

@@ -28,12 +28,12 @@
 
 package org.jf.dexlib.Debug;
 
-import org.jf.dexlib.Util.Input;
-import org.jf.dexlib.Util.ByteArrayInput;
-import org.jf.dexlib.TypeIdItem;
-import org.jf.dexlib.StringIdItem;
-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.Util.ByteArrayInput;
+import org.jf.dexlib.Util.Input;
 
 public class DebugInstructionIterator {
     /**

dexlib/src/main/java/org/jf/dexlib/DebugInfoItem.java

@@ -31,9 +31,9 @@ package org.jf.dexlib;
 import org.jf.dexlib.Debug.DebugInstructionIterator;
 import org.jf.dexlib.Debug.DebugOpcode;
 import org.jf.dexlib.Util.AnnotatedOutput;
+import org.jf.dexlib.Util.ByteArrayInput;
 import org.jf.dexlib.Util.Input;
 import org.jf.dexlib.Util.Leb128Utils;
-import org.jf.dexlib.Util.ByteArrayInput;
 
 import java.util.ArrayList;
 import java.util.List;

dexlib/src/main/java/org/jf/dexlib/DexFile.java

@@ -29,19 +29,17 @@
 package org.jf.dexlib;
 
 import org.jf.dexlib.Util.*;
-import org.jf.dexlib.Item;
-import org.jf.dexlib.StringDataItem;
 
 import java.io.*;
 import java.security.DigestException;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.Arrays;
-import java.util.Comparator;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.zip.Adler32;
-import java.util.zip.ZipFile;
 import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
 
 /**
  * <h3>Main use cases</h3>

dexlib/src/main/java/org/jf/dexlib/EncodedArrayItem.java

@@ -29,8 +29,8 @@
 package org.jf.dexlib;
 
 import org.jf.dexlib.EncodedValue.ArrayEncodedSubValue;
-import org.jf.dexlib.Util.Input;
 import org.jf.dexlib.Util.AnnotatedOutput;
+import org.jf.dexlib.Util.Input;
 
 public class EncodedArrayItem extends Item<EncodedArrayItem> {
     private int hashCode = 0;

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

@@ -28,11 +28,11 @@
 
 package org.jf.dexlib.EncodedValue;
 
-import org.jf.dexlib.TypeIdItem;
-import org.jf.dexlib.StringIdItem;
 import org.jf.dexlib.DexFile;
-import org.jf.dexlib.Util.Input;
+import org.jf.dexlib.StringIdItem;
+import org.jf.dexlib.TypeIdItem;
 import org.jf.dexlib.Util.AnnotatedOutput;
+import org.jf.dexlib.Util.Input;
 import org.jf.dexlib.Util.Leb128Utils;
 
 /**

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

@@ -28,11 +28,11 @@
 
 package org.jf.dexlib.EncodedValue;
 
-import org.jf.dexlib.StringIdItem;
 import org.jf.dexlib.DexFile;
+import org.jf.dexlib.StringIdItem;
 import org.jf.dexlib.TypeIdItem;
-import org.jf.dexlib.Util.Input;
 import org.jf.dexlib.Util.AnnotatedOutput;
+import org.jf.dexlib.Util.Input;
 
 public class AnnotationEncodedValue extends AnnotationEncodedSubValue {
     /**

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

@@ -29,8 +29,8 @@
 package org.jf.dexlib.EncodedValue;
 
 import org.jf.dexlib.DexFile;
-import org.jf.dexlib.Util.Input;
 import org.jf.dexlib.Util.AnnotatedOutput;
+import org.jf.dexlib.Util.Input;
 import org.jf.dexlib.Util.Leb128Utils;
 
 /**

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

@@ -28,9 +28,9 @@
 
 package org.jf.dexlib.EncodedValue;
 
-import org.jf.dexlib.Util.Input;
-import org.jf.dexlib.Util.AnnotatedOutput;
 import org.jf.dexlib.DexFile;
+import org.jf.dexlib.Util.AnnotatedOutput;
+import org.jf.dexlib.Util.Input;
 
 public class ArrayEncodedValue extends ArrayEncodedSubValue {
     /**

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

@@ -28,9 +28,9 @@
 
 package org.jf.dexlib.EncodedValue;
 
-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 ByteEncodedValue extends EncodedValue {
     public final byte value;

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

@@ -28,9 +28,9 @@
 
 package org.jf.dexlib.EncodedValue;
 
-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 CharEncodedValue extends EncodedValue {
     public final char value;

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

@@ -28,9 +28,9 @@
 
 package org.jf.dexlib.EncodedValue;
 
-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 DoubleEncodedValue extends EncodedValue {
     public final double value;

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

@@ -28,9 +28,9 @@
 
 package org.jf.dexlib.EncodedValue;
 
-import org.jf.dexlib.Util.Input;
-import org.jf.dexlib.Util.AnnotatedOutput;
 import org.jf.dexlib.DexFile;
+import org.jf.dexlib.Util.AnnotatedOutput;
+import org.jf.dexlib.Util.Input;
 
 public abstract class EncodedValue implements Comparable<EncodedValue> {
     /**

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

@@ -28,11 +28,11 @@
 
 package org.jf.dexlib.EncodedValue;
 
-import org.jf.dexlib.FieldIdItem;
 import org.jf.dexlib.DexFile;
-import org.jf.dexlib.Util.Input;
+import org.jf.dexlib.FieldIdItem;
-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 EnumEncodedValue extends EncodedValue {
     public final FieldIdItem value;

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

@@ -30,9 +30,9 @@ package org.jf.dexlib.EncodedValue;
 
 import org.jf.dexlib.DexFile;
 import org.jf.dexlib.FieldIdItem;
-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 FieldEncodedValue extends EncodedValue {
     public final FieldIdItem value;

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

@@ -28,9 +28,9 @@
 
 package org.jf.dexlib.EncodedValue;
 
-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 FloatEncodedValue extends EncodedValue {
     public final float value;

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

@@ -28,9 +28,9 @@
 
 package org.jf.dexlib.EncodedValue;
 
-import org.jf.dexlib.Util.Input;
 import org.jf.dexlib.Util.AnnotatedOutput;
 import org.jf.dexlib.Util.EncodedValueUtils;
+import org.jf.dexlib.Util.Input;
 
 public class IntEncodedValue extends EncodedValue {
     public final int value;

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

@@ -28,9 +28,9 @@
 
 package org.jf.dexlib.EncodedValue;
 
-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 LongEncodedValue extends EncodedValue {
     public final long value;

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

@@ -30,9 +30,9 @@ package org.jf.dexlib.EncodedValue;
 
 import org.jf.dexlib.DexFile;
 import org.jf.dexlib.MethodIdItem;
-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 MethodEncodedValue extends EncodedValue {
     public final MethodIdItem value;

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

@@ -28,9 +28,9 @@
 
 package org.jf.dexlib.EncodedValue;
 
-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 ShortEncodedValue extends EncodedValue {
     public final short value;

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

@@ -28,12 +28,12 @@
 
 package org.jf.dexlib.EncodedValue;
 
-import org.jf.dexlib.Util.Input;
-import org.jf.dexlib.Util.EncodedValueUtils;
-import org.jf.dexlib.Util.AnnotatedOutput;
-import org.jf.dexlib.Util.Utf8Utils;
-import org.jf.dexlib.StringIdItem;
 import org.jf.dexlib.DexFile;
+import org.jf.dexlib.StringIdItem;
+import org.jf.dexlib.Util.AnnotatedOutput;
+import org.jf.dexlib.Util.EncodedValueUtils;
+import org.jf.dexlib.Util.Input;
+import org.jf.dexlib.Util.Utf8Utils;
 
 public class StringEncodedValue extends EncodedValue {
     public final StringIdItem value;

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

@@ -30,9 +30,9 @@ package org.jf.dexlib.EncodedValue;
 
 import org.jf.dexlib.DexFile;
 import org.jf.dexlib.TypeIdItem;
-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 TypeEncodedValue extends EncodedValue {
     public final TypeIdItem value;

dexlib/src/main/java/org/jf/dexlib/FieldIdItem.java

@@ -28,8 +28,8 @@
 
 package org.jf.dexlib;
 
-import org.jf.dexlib.Util.Input;
 import org.jf.dexlib.Util.AnnotatedOutput;
+import org.jf.dexlib.Util.Input;
 
 public class FieldIdItem extends Item<FieldIdItem> {
     private int hashCode = 0;

dexlib/src/main/java/org/jf/dexlib/MapItem.java

@@ -28,8 +28,8 @@
 
 package org.jf.dexlib;
 
-import org.jf.dexlib.Util.Input;
 import org.jf.dexlib.Util.AnnotatedOutput;
+import org.jf.dexlib.Util.Input;
 
 /**
  * This item represents a map_list item from the dex specification. It contains a

dexlib/src/main/java/org/jf/dexlib/MethodIdItem.java

@@ -28,8 +28,8 @@
 
 package org.jf.dexlib;
 
-import org.jf.dexlib.Util.Input;
 import org.jf.dexlib.Util.AnnotatedOutput;
+import org.jf.dexlib.Util.Input;
 
 public class MethodIdItem extends Item<MethodIdItem> {
     private int hashCode = 0;

dexlib/src/main/java/org/jf/dexlib/OdexDependencies.java

@@ -31,7 +31,6 @@ package org.jf.dexlib;
 import org.jf.dexlib.Util.Input;
 
 import java.io.UnsupportedEncodingException;
-import java.util.Arrays;
 
 public class OdexDependencies {
     public final int modificationTime;

dexlib/src/main/java/org/jf/dexlib/OffsettedSection.java

@@ -29,10 +29,6 @@
 package org.jf.dexlib;
 
 import org.jf.dexlib.Util.Input;
-import org.jf.dexlib.Util.SparseArray;
-import org.jf.dexlib.Util.Hex;
-
-import junit.framework.Assert;
 
 public class OffsettedSection<T extends Item> extends Section<T> {
     public OffsettedSection(DexFile dexFile, ItemType itemType) {

dexlib/src/main/java/org/jf/dexlib/ProtoIdItem.java

@@ -28,8 +28,8 @@
 
 package org.jf.dexlib;
 
-import org.jf.dexlib.Util.Input;
 import org.jf.dexlib.Util.AnnotatedOutput;
+import org.jf.dexlib.Util.Input;
 
 public class ProtoIdItem extends Item<ProtoIdItem> {
     private int hashCode = 0;

dexlib/src/main/java/org/jf/dexlib/Section.java

@@ -28,11 +28,14 @@
 
 package org.jf.dexlib;
 
+import org.jf.dexlib.Util.AlignmentUtils;
 import org.jf.dexlib.Util.AnnotatedOutput;
 import org.jf.dexlib.Util.Input;
-import org.jf.dexlib.Util.AlignmentUtils;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
 
 public abstract class Section<T extends Item> {
     /**

dexlib/src/main/java/org/jf/dexlib/StringDataItem.java

@@ -28,7 +28,10 @@
 
 package org.jf.dexlib;
 
-import org.jf.dexlib.Util.*;
+import org.jf.dexlib.Util.AnnotatedOutput;
+import org.jf.dexlib.Util.Input;
+import org.jf.dexlib.Util.Leb128Utils;
+import org.jf.dexlib.Util.Utf8Utils;
 
 public class StringDataItem extends Item<StringDataItem> {
     private int hashCode = 0;

dexlib/src/main/java/org/jf/dexlib/StringIdItem.java

@@ -28,9 +28,9 @@
 
 package org.jf.dexlib;
 
-import org.jf.dexlib.Util.Utf8Utils;
-import org.jf.dexlib.Util.Input;
 import org.jf.dexlib.Util.AnnotatedOutput;
+import org.jf.dexlib.Util.Input;
+import org.jf.dexlib.Util.Utf8Utils;
 
 public class StringIdItem extends Item<StringIdItem> {
     private StringDataItem stringDataItem;

dexlib/src/main/java/org/jf/dexlib/TypeIdItem.java

@@ -28,8 +28,8 @@
 
 package org.jf.dexlib;
 
-import org.jf.dexlib.Util.Input;
 import org.jf.dexlib.Util.AnnotatedOutput;
+import org.jf.dexlib.Util.Input;
 
 public class TypeIdItem extends Item<TypeIdItem> {
     private StringIdItem typeDescriptor;

dexlib/src/main/java/org/jf/dexlib/TypeListItem.java

@@ -28,8 +28,8 @@
 
 package org.jf.dexlib;
 
-import org.jf.dexlib.Util.Input;
 import org.jf.dexlib.Util.AnnotatedOutput;
+import org.jf.dexlib.Util.Input;
 import org.jf.dexlib.Util.ReadOnlyArrayList;
 
 import java.util.List;

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

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

dexlib/src/main/java/org/jf/dexlib/Util/ArrayUtils.java

@@ -28,9 +28,6 @@
 
 package org.jf.dexlib.Util;
 
-import java.lang.reflect.Array;
-import java.util.TreeMap;
-import java.util.Collections;
 import java.util.Arrays;
 import java.util.Comparator;