Cleaned up imports

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

baksmali/src/main/java/org/jf/baksmali/Adaptors/EncodedValue/EncodedValueAdaptor.java

@@ -29,8 +29,8 @@
 package org.jf.baksmali.Adaptors.EncodedValue;
 
 import org.jf.dexlib.EncodedValue.*;
-import org.jf.dexlib.TypeIdItem;
 import org.jf.dexlib.StringIdItem;
+import org.jf.dexlib.TypeIdItem;
 
 public abstract class EncodedValueAdaptor {
     public static EncodedValueAdaptor make(EncodedValue encodedValue) {

baksmali/src/main/java/org/jf/baksmali/Adaptors/EncodedValue/TypeEncodedValueAdaptor.java

@@ -28,9 +28,7 @@
 
 package org.jf.baksmali.Adaptors.EncodedValue;
 
-import org.jf.dexlib.StringIdItem;
 import org.jf.dexlib.TypeIdItem;
-import org.jf.dexlib.util.Utf8Utils;
 
 public class TypeEncodedValueAdaptor extends EncodedValueAdaptor {
     private TypeIdItem typeIdItem;

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

@@ -28,11 +28,9 @@
 
 package org.jf.dexlib;
 
-import org.jf.dexlib.ItemType;
-
 import java.util.ArrayList;
-import java.util.List;
 import java.util.Collections;
+import java.util.List;
 
 public class AnnotationDirectoryItem extends OffsettedItem<AnnotationDirectoryItem> {
     private final ArrayList<FieldAnnotation> fieldAnnotationList = new ArrayList<FieldAnnotation>();

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

@@ -29,7 +29,6 @@
 package org.jf.dexlib;
 
 import org.jf.dexlib.EncodedValue.AnnotationEncodedValueSubField;
-import org.jf.dexlib.ItemType;
 
 public class AnnotationItem extends OffsettedItem<AnnotationItem> {
     private final ByteField visibilityField;

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

@@ -28,8 +28,6 @@
 
 package org.jf.dexlib;
 
-import org.jf.dexlib.ItemType;
-
 import java.util.ArrayList;
 import java.util.List;
 

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

@@ -28,8 +28,6 @@
 
 package org.jf.dexlib;
 
-import org.jf.dexlib.ItemType;
-
 import java.util.ArrayList;
 import java.util.List;
 

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

@@ -28,7 +28,6 @@
 
 package org.jf.dexlib;
 
-import org.jf.dexlib.ItemType;
 import org.jf.dexlib.util.*;
 
 import java.util.ArrayList;

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

@@ -28,13 +28,12 @@
 
 package org.jf.dexlib;
 
-import org.jf.dexlib.ItemType;
 import org.jf.dexlib.EncodedValue.EncodedValue;
 import org.jf.dexlib.EncodedValue.EncodedValueSubField;
 import org.jf.dexlib.util.TypeUtils;
 
-import java.util.HashMap;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 
 public class ClassDefItem extends IndexedItem<ClassDefItem> {

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

@@ -28,16 +28,14 @@
 
 package org.jf.dexlib;
 
-import org.jf.dexlib.code.Instruction;
-import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.code.InstructionField;
-import org.jf.dexlib.ItemType;
+import org.jf.dexlib.code.Opcode;
-import org.jf.dexlib.util.Input;
 import org.jf.dexlib.util.AnnotatedOutput;
+import org.jf.dexlib.util.Input;
 
 import java.util.ArrayList;
-import java.util.List;
 import java.util.HashMap;
+import java.util.List;
 
 public class CodeItem extends OffsettedItem<CodeItem> {
     private final ArrayList<InstructionField> instructionList;

dexlib/src/main/java/org/jf/dexlib/CompositeField.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 abstract class CompositeField<T extends CompositeField<T>> implements Field<T> {

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

@@ -28,12 +28,11 @@
 
 package org.jf.dexlib;
 
-import org.jf.dexlib.ItemType;
+import org.jf.dexlib.debug.DebugInstruction;
 import org.jf.dexlib.debug.DebugInstructionFactory;
 import org.jf.dexlib.debug.EndSequence;
-import org.jf.dexlib.debug.DebugInstruction;
-import org.jf.dexlib.util.Input;
 import org.jf.dexlib.util.AnnotatedOutput;
+import org.jf.dexlib.util.Input;
 
 import java.util.ArrayList;
 import java.util.List;

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

@@ -28,14 +28,17 @@
 
 package org.jf.dexlib;
 
-import org.jf.dexlib.util.*;
+import org.jf.dexlib.util.AnnotatedOutput;
+import org.jf.dexlib.util.ByteArrayInput;
+import org.jf.dexlib.util.FileUtils;
+import org.jf.dexlib.util.Input;
 
-import java.util.HashMap;
-import java.util.zip.Adler32;
 import java.io.File;
+import java.security.DigestException;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
-import java.security.DigestException;
+import java.util.HashMap;
+import java.util.zip.Adler32;
 
 public class DexFile
 {

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

@@ -28,14 +28,12 @@
 
 package org.jf.dexlib;
 
-import org.jf.dexlib.ItemType;
 import org.jf.dexlib.EncodedValue.ArrayEncodedValueSubField;
 import org.jf.dexlib.EncodedValue.EncodedValue;
-import org.jf.dexlib.util.Input;
 import org.jf.dexlib.util.AnnotatedOutput;
+import org.jf.dexlib.util.Input;
 
 import java.util.ArrayList;
-import java.util.List;
 
 public class EncodedArrayItem extends OffsettedItem<EncodedArrayItem> {
     private final ArrayEncodedValueSubField encodedArray;

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

@@ -28,9 +28,11 @@
 
 package org.jf.dexlib.EncodedValue;
 
-import org.jf.dexlib.util.Input;
+import org.jf.dexlib.CompositeField;
+import org.jf.dexlib.DexFile;
+import org.jf.dexlib.Field;
 import org.jf.dexlib.util.AnnotatedOutput;
-import org.jf.dexlib.*;
+import org.jf.dexlib.util.Input;
 
 public class EncodedValue extends CompositeField<EncodedValue> {
     private class ValueTypeArgField implements Field<ValueTypeArgField> {

dexlib/src/main/java/org/jf/dexlib/Field.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 interface Field<T extends Field> {
     public void writeTo(AnnotatedOutput out);

dexlib/src/main/java/org/jf/dexlib/FieldListField.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.ArrayList;
 

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

@@ -28,9 +28,9 @@
 
 package org.jf.dexlib;
 
-import org.jf.dexlib.util.Input;
-import org.jf.dexlib.util.ByteArray;
 import org.jf.dexlib.util.AnnotatedOutput;
+import org.jf.dexlib.util.ByteArray;
+import org.jf.dexlib.util.Input;
 
 public class FixedByteArrayField implements Field<FixedByteArrayField> {
     protected byte[] value;

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

@@ -28,7 +28,6 @@
 
 package org.jf.dexlib;
 
-import org.jf.dexlib.ItemType;
 import org.jf.dexlib.util.AnnotatedOutput;
 
 import java.io.UnsupportedEncodingException;

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

@@ -28,9 +28,8 @@
 
 package org.jf.dexlib;
 
-import org.jf.dexlib.util.Input;
 import org.jf.dexlib.util.AnnotatedOutput;
-import org.jf.dexlib.ItemType;
+import org.jf.dexlib.util.Input;
 
 public abstract class Item<T extends Item> {
     protected int offset = -1;

dexlib/src/main/java/org/jf/dexlib/ListSizeField.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.ArrayList;
 

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

@@ -28,8 +28,6 @@
 
 package org.jf.dexlib;
 
-import org.jf.dexlib.ItemType;
-
 public class MapField extends CompositeField<MapField> {
     private final ShortIntegerField sectionTypeField;
     private final ShortIntegerField unusedField;

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

@@ -28,7 +28,6 @@
 
 package org.jf.dexlib;
 
-import org.jf.dexlib.ItemType;
 import org.jf.dexlib.util.AnnotatedOutput;
 
 import java.util.ArrayList;

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

@@ -28,9 +28,9 @@
 
 package org.jf.dexlib;
 
-import org.jf.dexlib.util.Input;
-import org.jf.dexlib.util.ByteArray;
 import org.jf.dexlib.util.AnnotatedOutput;
+import org.jf.dexlib.util.ByteArray;
+import org.jf.dexlib.util.Input;
 
 public class NullTerminatedByteArrayField implements Field<NullTerminatedByteArrayField> {
     protected byte[] value;

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

@@ -28,8 +28,6 @@
 
 package org.jf.dexlib;
 
-import org.jf.dexlib.ItemType;
-
 import java.util.ArrayList;
 
 public class ProtoIdItem extends IndexedItem<ProtoIdItem> {

dexlib/src/main/java/org/jf/dexlib/Section.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.ArrayList;
 import java.util.HashMap;