From b3abca4c90929e31e6a8c52bc0178c44e3e53c6b Mon Sep 17 00:00:00 2001 From: "JesusFreke@JesusFreke.com" Date: Fri, 16 Apr 2010 07:25:29 +0000 Subject: [PATCH] cleaned up imports git-svn-id: https://smali.googlecode.com/svn/trunk@704 55b6fa8a-2a1e-11de-a435-ffa8d773f76a --- .../org/jf/dexlib/AnnotationDirectoryItem.java | 2 +- .../main/java/org/jf/dexlib/AnnotationItem.java | 2 +- .../java/org/jf/dexlib/AnnotationSetItem.java | 2 +- .../java/org/jf/dexlib/AnnotationSetRefList.java | 2 +- .../java/org/jf/dexlib/AnnotationVisibility.java | 2 -- .../main/java/org/jf/dexlib/ClassDataItem.java | 2 +- .../src/main/java/org/jf/dexlib/ClassDefItem.java | 15 +++++++++------ .../org/jf/dexlib/Code/Analysis/ClassPath.java | 6 +++--- .../org/jf/dexlib/Code/Analysis/Deodexerant.java | 4 ++-- .../jf/dexlib/Code/Analysis/MethodAnalyzer.java | 9 ++++++--- .../org/jf/dexlib/Code/Analysis/RegisterType.java | 3 ++- .../Code/Format/ArrayDataPseudoInstruction.java | 5 +++-- .../org/jf/dexlib/Code/Format/Instruction10t.java | 2 +- .../org/jf/dexlib/Code/Format/Instruction11n.java | 4 ++-- .../org/jf/dexlib/Code/Format/Instruction11x.java | 2 +- .../org/jf/dexlib/Code/Format/Instruction12x.java | 2 +- .../org/jf/dexlib/Code/Format/Instruction20t.java | 2 +- .../org/jf/dexlib/Code/Format/Instruction21h.java | 4 ++-- .../org/jf/dexlib/Code/Format/Instruction21s.java | 4 ++-- .../org/jf/dexlib/Code/Format/Instruction21t.java | 7 +++++-- .../org/jf/dexlib/Code/Format/Instruction22c.java | 2 +- .../jf/dexlib/Code/Format/Instruction22cs.java | 4 ++-- .../org/jf/dexlib/Code/Format/Instruction22s.java | 2 +- .../org/jf/dexlib/Code/Format/Instruction22t.java | 4 ++-- .../org/jf/dexlib/Code/Format/Instruction22x.java | 2 +- .../org/jf/dexlib/Code/Format/Instruction30t.java | 4 ++-- .../org/jf/dexlib/Code/Format/Instruction31c.java | 2 +- .../org/jf/dexlib/Code/Format/Instruction31i.java | 4 ++-- .../org/jf/dexlib/Code/Format/Instruction31t.java | 4 ++-- .../org/jf/dexlib/Code/Format/Instruction32x.java | 4 ++-- .../org/jf/dexlib/Code/Format/Instruction35c.java | 5 +++-- .../jf/dexlib/Code/Format/Instruction35ms.java | 4 ++-- .../org/jf/dexlib/Code/Format/Instruction35s.java | 13 +++++++------ .../org/jf/dexlib/Code/Format/Instruction3rc.java | 6 +++--- .../jf/dexlib/Code/Format/Instruction3rms.java | 4 ++-- .../org/jf/dexlib/Code/Format/Instruction51l.java | 4 ++-- .../Format/PackedSwitchDataPseudoInstruction.java | 6 +++--- .../Format/SparseSwitchDataPseudoInstruction.java | 6 +++--- .../main/java/org/jf/dexlib/Code/Instruction.java | 4 ++-- .../org/jf/dexlib/Code/InstructionIterator.java | 7 +++++-- dexlib/src/main/java/org/jf/dexlib/CodeItem.java | 8 ++++---- .../jf/dexlib/Debug/DebugInstructionIterator.java | 10 +++++----- .../main/java/org/jf/dexlib/DebugInfoItem.java | 2 +- dexlib/src/main/java/org/jf/dexlib/DexFile.java | 6 ++---- .../main/java/org/jf/dexlib/EncodedArrayItem.java | 2 +- .../EncodedValue/AnnotationEncodedSubValue.java | 6 +++--- .../EncodedValue/AnnotationEncodedValue.java | 4 ++-- .../dexlib/EncodedValue/ArrayEncodedSubValue.java | 2 +- .../jf/dexlib/EncodedValue/ArrayEncodedValue.java | 4 ++-- .../jf/dexlib/EncodedValue/ByteEncodedValue.java | 4 ++-- .../jf/dexlib/EncodedValue/CharEncodedValue.java | 4 ++-- .../dexlib/EncodedValue/DoubleEncodedValue.java | 4 ++-- .../org/jf/dexlib/EncodedValue/EncodedValue.java | 4 ++-- .../jf/dexlib/EncodedValue/EnumEncodedValue.java | 6 +++--- .../jf/dexlib/EncodedValue/FieldEncodedValue.java | 4 ++-- .../jf/dexlib/EncodedValue/FloatEncodedValue.java | 4 ++-- .../jf/dexlib/EncodedValue/IntEncodedValue.java | 2 +- .../jf/dexlib/EncodedValue/LongEncodedValue.java | 4 ++-- .../dexlib/EncodedValue/MethodEncodedValue.java | 4 ++-- .../jf/dexlib/EncodedValue/ShortEncodedValue.java | 4 ++-- .../dexlib/EncodedValue/StringEncodedValue.java | 10 +++++----- .../jf/dexlib/EncodedValue/TypeEncodedValue.java | 4 ++-- .../src/main/java/org/jf/dexlib/FieldIdItem.java | 2 +- dexlib/src/main/java/org/jf/dexlib/MapItem.java | 2 +- .../src/main/java/org/jf/dexlib/MethodIdItem.java | 2 +- .../main/java/org/jf/dexlib/OdexDependencies.java | 1 - .../main/java/org/jf/dexlib/OffsettedSection.java | 4 ---- .../src/main/java/org/jf/dexlib/ProtoIdItem.java | 2 +- dexlib/src/main/java/org/jf/dexlib/Section.java | 7 +++++-- .../main/java/org/jf/dexlib/StringDataItem.java | 5 ++++- .../src/main/java/org/jf/dexlib/StringIdItem.java | 4 ++-- .../src/main/java/org/jf/dexlib/TypeIdItem.java | 2 +- .../src/main/java/org/jf/dexlib/TypeListItem.java | 2 +- .../main/java/org/jf/dexlib/Util/AccessFlags.java | 2 -- .../main/java/org/jf/dexlib/Util/ArrayUtils.java | 3 --- 75 files changed, 160 insertions(+), 152 deletions(-) diff --git a/dexlib/src/main/java/org/jf/dexlib/AnnotationDirectoryItem.java b/dexlib/src/main/java/org/jf/dexlib/AnnotationDirectoryItem.java index c1a86c97..cd436441 100644 --- a/dexlib/src/main/java/org/jf/dexlib/AnnotationDirectoryItem.java +++ b/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; diff --git a/dexlib/src/main/java/org/jf/dexlib/AnnotationItem.java b/dexlib/src/main/java/org/jf/dexlib/AnnotationItem.java index 07e82a66..f35a414b 100644 --- a/dexlib/src/main/java/org/jf/dexlib/AnnotationItem.java +++ b/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 { private int hashCode = 0; diff --git a/dexlib/src/main/java/org/jf/dexlib/AnnotationSetItem.java b/dexlib/src/main/java/org/jf/dexlib/AnnotationSetItem.java index cc5d47f0..908fd109 100644 --- a/dexlib/src/main/java/org/jf/dexlib/AnnotationSetItem.java +++ b/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; diff --git a/dexlib/src/main/java/org/jf/dexlib/AnnotationSetRefList.java b/dexlib/src/main/java/org/jf/dexlib/AnnotationSetRefList.java index ee96598c..e38ce31c 100644 --- a/dexlib/src/main/java/org/jf/dexlib/AnnotationSetRefList.java +++ b/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; diff --git a/dexlib/src/main/java/org/jf/dexlib/AnnotationVisibility.java b/dexlib/src/main/java/org/jf/dexlib/AnnotationVisibility.java index 6bd00f69..03ae96f0 100644 --- a/dexlib/src/main/java/org/jf/dexlib/AnnotationVisibility.java +++ b/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"), diff --git a/dexlib/src/main/java/org/jf/dexlib/ClassDataItem.java b/dexlib/src/main/java/org/jf/dexlib/ClassDataItem.java index 0977a4b7..c809d354 100644 --- a/dexlib/src/main/java/org/jf/dexlib/ClassDataItem.java +++ b/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 { private EncodedField[] staticFields; diff --git a/dexlib/src/main/java/org/jf/dexlib/ClassDefItem.java b/dexlib/src/main/java/org/jf/dexlib/ClassDefItem.java index bcea6858..7729715a 100644 --- a/dexlib/src/main/java/org/jf/dexlib/ClassDefItem.java +++ b/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 { private TypeIdItem classType; diff --git a/dexlib/src/main/java/org/jf/dexlib/Code/Analysis/ClassPath.java b/dexlib/src/main/java/org/jf/dexlib/Code/Analysis/ClassPath.java index ae8cb296..6d2f3bd6 100644 --- a/dexlib/src/main/java/org/jf/dexlib/Code/Analysis/ClassPath.java +++ b/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; diff --git a/dexlib/src/main/java/org/jf/dexlib/Code/Analysis/Deodexerant.java b/dexlib/src/main/java/org/jf/dexlib/Code/Analysis/Deodexerant.java index 2438f79a..43630e42 100644 --- a/dexlib/src/main/java/org/jf/dexlib/Code/Analysis/Deodexerant.java +++ b/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; /** diff --git a/dexlib/src/main/java/org/jf/dexlib/Code/Analysis/MethodAnalyzer.java b/dexlib/src/main/java/org/jf/dexlib/Code/Analysis/MethodAnalyzer.java index 15f7c9c6..62d7ca64 100644 --- a/dexlib/src/main/java/org/jf/dexlib/Code/Analysis/MethodAnalyzer.java +++ b/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.*; +import java.util.BitSet; +import java.util.EnumSet; +import java.util.List; /** * The MethodAnalyzer performs several functions. It "analyzes" the instructions and infers the register types diff --git a/dexlib/src/main/java/org/jf/dexlib/Code/Analysis/RegisterType.java b/dexlib/src/main/java/org/jf/dexlib/Code/Analysis/RegisterType.java index bd1aa380..53543e38 100644 --- a/dexlib/src/main/java/org/jf/dexlib/Code/Analysis/RegisterType.java +++ b/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 internedRegisterTypes = new HashMap(); diff --git a/dexlib/src/main/java/org/jf/dexlib/Code/Format/ArrayDataPseudoInstruction.java b/dexlib/src/main/java/org/jf/dexlib/Code/Format/ArrayDataPseudoInstruction.java index 1a236503..5de88f40 100644 --- a/dexlib/src/main/java/org/jf/dexlib/Code/Format/ArrayDataPseudoInstruction.java +++ b/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 { diff --git a/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction10t.java b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction10t.java index c777e3ab..9947a109 100644 --- a/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction10t.java +++ b/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; diff --git a/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction11n.java b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction11n.java index 26a5ac52..7fae04c3 100644 --- a/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction11n.java +++ b/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(); diff --git a/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction11x.java b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction11x.java index fe383a13..ca30c7b4 100644 --- a/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction11x.java +++ b/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(); diff --git a/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction12x.java b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction12x.java index d5201276..6d8d774d 100644 --- a/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction12x.java +++ b/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(); diff --git a/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction20t.java b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction20t.java index cbd444c6..a92e1a8b 100644 --- a/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction20t.java +++ b/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; diff --git a/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction21h.java b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction21h.java index 272cdb1c..6208a0c0 100644 --- a/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction21h.java +++ b/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(); diff --git a/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction21s.java b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction21s.java index 147c7494..ca507694 100644 --- a/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction21s.java +++ b/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(); diff --git a/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction21t.java b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction21t.java index 79249e7a..4a839d5a 100644 --- a/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction21t.java +++ b/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(); diff --git a/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction22c.java b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction22c.java index 8de1b3d8..46b2c5a3 100644 --- a/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction22c.java +++ b/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(); diff --git a/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction22cs.java b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction22cs.java index d12b71ea..9dc62fae 100644 --- a/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction22cs.java +++ b/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(); diff --git a/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction22s.java b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction22s.java index 99f672c1..434a1b20 100644 --- a/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction22s.java +++ b/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(); diff --git a/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction22t.java b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction22t.java index 8b981d75..d5b3a734 100644 --- a/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction22t.java +++ b/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(); diff --git a/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction22x.java b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction22x.java index 1a21251b..dc262897 100644 --- a/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction22x.java +++ b/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(); diff --git a/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction30t.java b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction30t.java index 2c975399..7a97903f 100644 --- a/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction30t.java +++ b/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; diff --git a/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction31c.java b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction31c.java index 73b6b5e1..83ff7c59 100644 --- a/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction31c.java +++ b/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(); diff --git a/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction31i.java b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction31i.java index 3997546a..5c08ce48 100644 --- a/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction31i.java +++ b/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(); diff --git a/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction31t.java b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction31t.java index d8bea241..52d6ce66 100644 --- a/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction31t.java +++ b/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(); diff --git a/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction32x.java b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction32x.java index 9813687e..841ab665 100644 --- a/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction32x.java +++ b/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(); diff --git a/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction35c.java b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction35c.java index c4cc27e2..1be1061f 100644 --- a/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction35c.java +++ b/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(); diff --git a/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction35ms.java b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction35ms.java index f6960ff4..13d5ccf2 100644 --- a/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction35ms.java +++ b/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 { diff --git a/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction35s.java b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction35s.java index 10bafacc..494ecccf 100644 --- a/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction35s.java +++ b/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 org.jf.dexlib.TypeIdItem; -import org.jf.dexlib.MethodIdItem; + +import static org.jf.dexlib.Code.Opcode.*; public class Instruction35s extends InstructionWithReference implements FiveRegisterInstruction { public static final Instruction.InstructionFactory Factory = new Factory(); diff --git a/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction3rc.java b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction3rc.java index 0f620236..8e29603e 100644 --- a/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction3rc.java +++ b/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(); diff --git a/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction3rms.java b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction3rms.java index 093f9f3f..7ee0f6c7 100644 --- a/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction3rms.java +++ b/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(); diff --git a/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction51l.java b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction51l.java index b3207f39..a627c7a8 100644 --- a/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction51l.java +++ b/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(); diff --git a/dexlib/src/main/java/org/jf/dexlib/Code/Format/PackedSwitchDataPseudoInstruction.java b/dexlib/src/main/java/org/jf/dexlib/Code/Format/PackedSwitchDataPseudoInstruction.java index b8095631..6e88861a 100644 --- a/dexlib/src/main/java/org/jf/dexlib/Code/Format/PackedSwitchDataPseudoInstruction.java +++ b/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.Util.AnnotatedOutput; +import org.jf.dexlib.Code.Opcode; import org.jf.dexlib.DexFile; +import org.jf.dexlib.Util.AnnotatedOutput; +import org.jf.dexlib.Util.NumberUtils; import java.util.Iterator; diff --git a/dexlib/src/main/java/org/jf/dexlib/Code/Format/SparseSwitchDataPseudoInstruction.java b/dexlib/src/main/java/org/jf/dexlib/Code/Format/SparseSwitchDataPseudoInstruction.java index d98122d2..06c295af 100644 --- a/dexlib/src/main/java/org/jf/dexlib/Code/Format/SparseSwitchDataPseudoInstruction.java +++ b/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.Util.AnnotatedOutput; +import org.jf.dexlib.Code.Opcode; import org.jf.dexlib.DexFile; +import org.jf.dexlib.Util.AnnotatedOutput; +import org.jf.dexlib.Util.NumberUtils; import java.util.Iterator; diff --git a/dexlib/src/main/java/org/jf/dexlib/Code/Instruction.java b/dexlib/src/main/java/org/jf/dexlib/Code/Instruction.java index 1db5e1a4..7bead1d8 100644 --- a/dexlib/src/main/java/org/jf/dexlib/Code/Instruction.java +++ b/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; diff --git a/dexlib/src/main/java/org/jf/dexlib/Code/InstructionIterator.java b/dexlib/src/main/java/org/jf/dexlib/Code/InstructionIterator.java index 3ae8374d..2c623cb3 100644 --- a/dexlib/src/main/java/org/jf/dexlib/Code/InstructionIterator.java +++ b/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) { diff --git a/dexlib/src/main/java/org/jf/dexlib/CodeItem.java b/dexlib/src/main/java/org/jf/dexlib/CodeItem.java index b112d5cc..aab1a8f7 100644 --- a/dexlib/src/main/java/org/jf/dexlib/CodeItem.java +++ b/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 { private int registerCount; diff --git a/dexlib/src/main/java/org/jf/dexlib/Debug/DebugInstructionIterator.java b/dexlib/src/main/java/org/jf/dexlib/Debug/DebugInstructionIterator.java index 536f26e9..b61f399d 100644 --- a/dexlib/src/main/java/org/jf/dexlib/Debug/DebugInstructionIterator.java +++ b/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 { /** diff --git a/dexlib/src/main/java/org/jf/dexlib/DebugInfoItem.java b/dexlib/src/main/java/org/jf/dexlib/DebugInfoItem.java index 4b35d8ef..81e023de 100644 --- a/dexlib/src/main/java/org/jf/dexlib/DebugInfoItem.java +++ b/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; diff --git a/dexlib/src/main/java/org/jf/dexlib/DexFile.java b/dexlib/src/main/java/org/jf/dexlib/DexFile.java index 06f697d5..a88b145d 100644 --- a/dexlib/src/main/java/org/jf/dexlib/DexFile.java +++ b/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; /** *

Main use cases

diff --git a/dexlib/src/main/java/org/jf/dexlib/EncodedArrayItem.java b/dexlib/src/main/java/org/jf/dexlib/EncodedArrayItem.java index cbc39e90..6eb917cb 100644 --- a/dexlib/src/main/java/org/jf/dexlib/EncodedArrayItem.java +++ b/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 { private int hashCode = 0; diff --git a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/AnnotationEncodedSubValue.java b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/AnnotationEncodedSubValue.java index d064e641..acd59961 100644 --- a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/AnnotationEncodedSubValue.java +++ b/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; /** diff --git a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/AnnotationEncodedValue.java b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/AnnotationEncodedValue.java index a10c9430..4e9c4e1b 100644 --- a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/AnnotationEncodedValue.java +++ b/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 { /** diff --git a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/ArrayEncodedSubValue.java b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/ArrayEncodedSubValue.java index 58689679..f79db736 100644 --- a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/ArrayEncodedSubValue.java +++ b/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; /** diff --git a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/ArrayEncodedValue.java b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/ArrayEncodedValue.java index 26699713..c9a3fc91 100644 --- a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/ArrayEncodedValue.java +++ b/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 { /** diff --git a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/ByteEncodedValue.java b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/ByteEncodedValue.java index 404dfee2..683d547e 100644 --- a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/ByteEncodedValue.java +++ b/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; diff --git a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/CharEncodedValue.java b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/CharEncodedValue.java index a92b276d..25646612 100644 --- a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/CharEncodedValue.java +++ b/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; diff --git a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/DoubleEncodedValue.java b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/DoubleEncodedValue.java index 5eb81b75..6b8bcc37 100644 --- a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/DoubleEncodedValue.java +++ b/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; diff --git a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/EncodedValue.java b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/EncodedValue.java index f1c6525d..4c00faf2 100644 --- a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/EncodedValue.java +++ b/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 { /** diff --git a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/EnumEncodedValue.java b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/EnumEncodedValue.java index c9513cfb..9d72064c 100644 --- a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/EnumEncodedValue.java +++ b/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.Util.EncodedValueUtils; +import org.jf.dexlib.FieldIdItem; 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; diff --git a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/FieldEncodedValue.java b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/FieldEncodedValue.java index 1eb3bb28..4d0de574 100644 --- a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/FieldEncodedValue.java +++ b/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; diff --git a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/FloatEncodedValue.java b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/FloatEncodedValue.java index 8b0d74a2..af514f4f 100644 --- a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/FloatEncodedValue.java +++ b/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; diff --git a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/IntEncodedValue.java b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/IntEncodedValue.java index 00d96248..7da5b021 100644 --- a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/IntEncodedValue.java +++ b/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; diff --git a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/LongEncodedValue.java b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/LongEncodedValue.java index 5635d05d..7db6ed13 100644 --- a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/LongEncodedValue.java +++ b/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; diff --git a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/MethodEncodedValue.java b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/MethodEncodedValue.java index 110c7fbc..6267ed66 100644 --- a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/MethodEncodedValue.java +++ b/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; diff --git a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/ShortEncodedValue.java b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/ShortEncodedValue.java index aef82fa3..66d80e17 100644 --- a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/ShortEncodedValue.java +++ b/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; diff --git a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/StringEncodedValue.java b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/StringEncodedValue.java index 35659540..d45c1060 100644 --- a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/StringEncodedValue.java +++ b/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; diff --git a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/TypeEncodedValue.java b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/TypeEncodedValue.java index 75d4779d..0b5dcbb4 100644 --- a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/TypeEncodedValue.java +++ b/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; diff --git a/dexlib/src/main/java/org/jf/dexlib/FieldIdItem.java b/dexlib/src/main/java/org/jf/dexlib/FieldIdItem.java index b459f3e2..a9290b1c 100644 --- a/dexlib/src/main/java/org/jf/dexlib/FieldIdItem.java +++ b/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 { private int hashCode = 0; diff --git a/dexlib/src/main/java/org/jf/dexlib/MapItem.java b/dexlib/src/main/java/org/jf/dexlib/MapItem.java index 3897c0ae..e69a33a4 100644 --- a/dexlib/src/main/java/org/jf/dexlib/MapItem.java +++ b/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 diff --git a/dexlib/src/main/java/org/jf/dexlib/MethodIdItem.java b/dexlib/src/main/java/org/jf/dexlib/MethodIdItem.java index 8a0c0f60..0c6f5210 100644 --- a/dexlib/src/main/java/org/jf/dexlib/MethodIdItem.java +++ b/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 { private int hashCode = 0; diff --git a/dexlib/src/main/java/org/jf/dexlib/OdexDependencies.java b/dexlib/src/main/java/org/jf/dexlib/OdexDependencies.java index 25c16433..581b8acc 100644 --- a/dexlib/src/main/java/org/jf/dexlib/OdexDependencies.java +++ b/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; diff --git a/dexlib/src/main/java/org/jf/dexlib/OffsettedSection.java b/dexlib/src/main/java/org/jf/dexlib/OffsettedSection.java index 38a35f04..8ebb9568 100644 --- a/dexlib/src/main/java/org/jf/dexlib/OffsettedSection.java +++ b/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 extends Section { public OffsettedSection(DexFile dexFile, ItemType itemType) { diff --git a/dexlib/src/main/java/org/jf/dexlib/ProtoIdItem.java b/dexlib/src/main/java/org/jf/dexlib/ProtoIdItem.java index f4334e43..a7b4a0a1 100644 --- a/dexlib/src/main/java/org/jf/dexlib/ProtoIdItem.java +++ b/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 { private int hashCode = 0; diff --git a/dexlib/src/main/java/org/jf/dexlib/Section.java b/dexlib/src/main/java/org/jf/dexlib/Section.java index acce00b9..0c20a719 100644 --- a/dexlib/src/main/java/org/jf/dexlib/Section.java +++ b/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 { /** diff --git a/dexlib/src/main/java/org/jf/dexlib/StringDataItem.java b/dexlib/src/main/java/org/jf/dexlib/StringDataItem.java index c2b892ad..a565d099 100644 --- a/dexlib/src/main/java/org/jf/dexlib/StringDataItem.java +++ b/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 { private int hashCode = 0; diff --git a/dexlib/src/main/java/org/jf/dexlib/StringIdItem.java b/dexlib/src/main/java/org/jf/dexlib/StringIdItem.java index 458d6322..57a5da4f 100644 --- a/dexlib/src/main/java/org/jf/dexlib/StringIdItem.java +++ b/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 { private StringDataItem stringDataItem; diff --git a/dexlib/src/main/java/org/jf/dexlib/TypeIdItem.java b/dexlib/src/main/java/org/jf/dexlib/TypeIdItem.java index 06a66d4f..a8619986 100644 --- a/dexlib/src/main/java/org/jf/dexlib/TypeIdItem.java +++ b/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 { private StringIdItem typeDescriptor; diff --git a/dexlib/src/main/java/org/jf/dexlib/TypeListItem.java b/dexlib/src/main/java/org/jf/dexlib/TypeListItem.java index 7369fa4e..a2f4c1a0 100644 --- a/dexlib/src/main/java/org/jf/dexlib/TypeListItem.java +++ b/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; diff --git a/dexlib/src/main/java/org/jf/dexlib/Util/AccessFlags.java b/dexlib/src/main/java/org/jf/dexlib/Util/AccessFlags.java index 24591463..b0e2f79e 100644 --- a/dexlib/src/main/java/org/jf/dexlib/Util/AccessFlags.java +++ b/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 { diff --git a/dexlib/src/main/java/org/jf/dexlib/Util/ArrayUtils.java b/dexlib/src/main/java/org/jf/dexlib/Util/ArrayUtils.java index a943b8da..dab08372 100644 --- a/dexlib/src/main/java/org/jf/dexlib/Util/ArrayUtils.java +++ b/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;