diff options
Diffstat (limited to 'dx/src/com/android/dx/cf')
20 files changed, 35 insertions, 34 deletions
diff --git a/dx/src/com/android/dx/cf/code/BaseMachine.java b/dx/src/com/android/dx/cf/code/BaseMachine.java index c56dd3e72..7bff2ff2f 100644 --- a/dx/src/com/android/dx/cf/code/BaseMachine.java +++ b/dx/src/com/android/dx/cf/code/BaseMachine.java @@ -16,8 +16,8 @@ package com.android.dx.cf.code; -import com.android.dx.rop.code.RegisterSpec; import com.android.dx.rop.code.LocalItem; +import com.android.dx.rop.code.RegisterSpec; import com.android.dx.rop.cst.Constant; import com.android.dx.rop.type.Prototype; import com.android.dx.rop.type.StdTypeList; diff --git a/dx/src/com/android/dx/cf/code/BasicBlocker.java b/dx/src/com/android/dx/cf/code/BasicBlocker.java index 56d399111..8fb9560f8 100644 --- a/dx/src/com/android/dx/cf/code/BasicBlocker.java +++ b/dx/src/com/android/dx/cf/code/BasicBlocker.java @@ -18,8 +18,8 @@ package com.android.dx.cf.code; import com.android.dx.rop.cst.Constant; import com.android.dx.rop.cst.CstMemberRef; -import com.android.dx.rop.cst.CstType; import com.android.dx.rop.cst.CstString; +import com.android.dx.rop.cst.CstType; import com.android.dx.rop.type.Type; import com.android.dx.util.Bits; import com.android.dx.util.IntList; diff --git a/dx/src/com/android/dx/cf/code/ByteBlockList.java b/dx/src/com/android/dx/cf/code/ByteBlockList.java index 412dfc3f7..5370c951f 100644 --- a/dx/src/com/android/dx/cf/code/ByteBlockList.java +++ b/dx/src/com/android/dx/cf/code/ByteBlockList.java @@ -16,7 +16,6 @@ package com.android.dx.cf.code; -import com.android.dx.util.FixedSizeList; import com.android.dx.util.Hex; import com.android.dx.util.LabeledList; diff --git a/dx/src/com/android/dx/cf/code/ExecutionStack.java b/dx/src/com/android/dx/cf/code/ExecutionStack.java index 51f633447..696abc80a 100644 --- a/dx/src/com/android/dx/cf/code/ExecutionStack.java +++ b/dx/src/com/android/dx/cf/code/ExecutionStack.java @@ -16,9 +16,9 @@ package com.android.dx.cf.code; +import com.android.dex.util.ExceptionWithContext; import com.android.dx.rop.type.Type; import com.android.dx.rop.type.TypeBearer; -import com.android.dx.util.ExceptionWithContext; import com.android.dx.util.Hex; import com.android.dx.util.MutabilityControl; diff --git a/dx/src/com/android/dx/cf/code/Frame.java b/dx/src/com/android/dx/cf/code/Frame.java index 002a4fbc1..cb32b92d9 100644 --- a/dx/src/com/android/dx/cf/code/Frame.java +++ b/dx/src/com/android/dx/cf/code/Frame.java @@ -16,10 +16,10 @@ package com.android.dx.cf.code; +import com.android.dex.util.ExceptionWithContext; import com.android.dx.rop.cst.CstType; import com.android.dx.rop.type.StdTypeList; import com.android.dx.rop.type.Type; -import com.android.dx.util.ExceptionWithContext; import com.android.dx.util.IntList; /** diff --git a/dx/src/com/android/dx/cf/code/LocalVariableList.java b/dx/src/com/android/dx/cf/code/LocalVariableList.java index 2962698e5..4a0bae10c 100644 --- a/dx/src/com/android/dx/cf/code/LocalVariableList.java +++ b/dx/src/com/android/dx/cf/code/LocalVariableList.java @@ -16,9 +16,9 @@ package com.android.dx.cf.code; +import com.android.dx.rop.code.LocalItem; import com.android.dx.rop.cst.CstString; import com.android.dx.rop.type.Type; -import com.android.dx.rop.code.LocalItem; import com.android.dx.util.FixedSizeList; /** diff --git a/dx/src/com/android/dx/cf/code/LocalsArray.java b/dx/src/com/android/dx/cf/code/LocalsArray.java index 75af04752..07ca96da6 100644 --- a/dx/src/com/android/dx/cf/code/LocalsArray.java +++ b/dx/src/com/android/dx/cf/code/LocalsArray.java @@ -16,11 +16,10 @@ package com.android.dx.cf.code; +import com.android.dex.util.ExceptionWithContext; import com.android.dx.rop.code.RegisterSpec; import com.android.dx.rop.type.Type; import com.android.dx.rop.type.TypeBearer; -import com.android.dx.util.ExceptionWithContext; -import com.android.dx.util.Hex; import com.android.dx.util.MutabilityControl; import com.android.dx.util.ToHuman; diff --git a/dx/src/com/android/dx/cf/code/LocalsArraySet.java b/dx/src/com/android/dx/cf/code/LocalsArraySet.java index 5d0305508..c4b7da9f3 100644 --- a/dx/src/com/android/dx/cf/code/LocalsArraySet.java +++ b/dx/src/com/android/dx/cf/code/LocalsArraySet.java @@ -16,13 +16,11 @@ package com.android.dx.cf.code; +import com.android.dex.util.ExceptionWithContext; import com.android.dx.rop.code.RegisterSpec; import com.android.dx.rop.type.Type; import com.android.dx.rop.type.TypeBearer; -import com.android.dx.util.ExceptionWithContext; import com.android.dx.util.Hex; -import com.android.dx.util.MutabilityControl; - import java.util.ArrayList; /** diff --git a/dx/src/com/android/dx/cf/code/Machine.java b/dx/src/com/android/dx/cf/code/Machine.java index a81feaff3..a1905059f 100644 --- a/dx/src/com/android/dx/cf/code/Machine.java +++ b/dx/src/com/android/dx/cf/code/Machine.java @@ -16,10 +16,10 @@ package com.android.dx.cf.code; +import com.android.dx.rop.code.LocalItem; import com.android.dx.rop.cst.Constant; import com.android.dx.rop.type.Prototype; import com.android.dx.rop.type.Type; -import com.android.dx.rop.code.LocalItem; import java.util.ArrayList; /** diff --git a/dx/src/com/android/dx/cf/code/OneLocalsArray.java b/dx/src/com/android/dx/cf/code/OneLocalsArray.java index cafd177d3..0286a706f 100644 --- a/dx/src/com/android/dx/cf/code/OneLocalsArray.java +++ b/dx/src/com/android/dx/cf/code/OneLocalsArray.java @@ -16,12 +16,11 @@ package com.android.dx.cf.code; +import com.android.dex.util.ExceptionWithContext; import com.android.dx.rop.code.RegisterSpec; import com.android.dx.rop.type.Type; import com.android.dx.rop.type.TypeBearer; -import com.android.dx.util.ExceptionWithContext; import com.android.dx.util.Hex; -import com.android.dx.util.MutabilityControl; /** * Representation of an array of local variables, with Java semantics. diff --git a/dx/src/com/android/dx/cf/code/Ropper.java b/dx/src/com/android/dx/cf/code/Ropper.java index 715cfd8e9..c318b4c72 100644 --- a/dx/src/com/android/dx/cf/code/Ropper.java +++ b/dx/src/com/android/dx/cf/code/Ropper.java @@ -16,7 +16,22 @@ package com.android.dx.cf.code; -import com.android.dx.rop.code.*; +import com.android.dx.rop.code.AccessFlags; +import com.android.dx.rop.code.BasicBlock; +import com.android.dx.rop.code.BasicBlockList; +import com.android.dx.rop.code.Insn; +import com.android.dx.rop.code.InsnList; +import com.android.dx.rop.code.PlainCstInsn; +import com.android.dx.rop.code.PlainInsn; +import com.android.dx.rop.code.RegisterSpec; +import com.android.dx.rop.code.RegisterSpecList; +import com.android.dx.rop.code.Rop; +import com.android.dx.rop.code.RopMethod; +import com.android.dx.rop.code.Rops; +import com.android.dx.rop.code.SourcePosition; +import com.android.dx.rop.code.ThrowingCstInsn; +import com.android.dx.rop.code.ThrowingInsn; +import com.android.dx.rop.code.TranslationAdvice; import com.android.dx.rop.cst.CstInteger; import com.android.dx.rop.cst.CstType; import com.android.dx.rop.type.Prototype; @@ -26,7 +41,6 @@ import com.android.dx.rop.type.TypeList; import com.android.dx.util.Bits; import com.android.dx.util.Hex; import com.android.dx.util.IntList; - import java.util.ArrayList; import java.util.BitSet; import java.util.HashMap; diff --git a/dx/src/com/android/dx/cf/code/RopperMachine.java b/dx/src/com/android/dx/cf/code/RopperMachine.java index f45bc1f42..f1b8db412 100644 --- a/dx/src/com/android/dx/cf/code/RopperMachine.java +++ b/dx/src/com/android/dx/cf/code/RopperMachine.java @@ -41,7 +41,6 @@ import com.android.dx.rop.type.Type; import com.android.dx.rop.type.TypeBearer; import com.android.dx.rop.type.TypeList; import com.android.dx.util.IntList; - import java.util.ArrayList; /** diff --git a/dx/src/com/android/dx/cf/code/SimException.java b/dx/src/com/android/dx/cf/code/SimException.java index 220f2818a..7cbab04c7 100644 --- a/dx/src/com/android/dx/cf/code/SimException.java +++ b/dx/src/com/android/dx/cf/code/SimException.java @@ -16,7 +16,7 @@ package com.android.dx.cf.code; -import com.android.dx.util.ExceptionWithContext; +import com.android.dex.util.ExceptionWithContext; /** * Exception from simulation. diff --git a/dx/src/com/android/dx/cf/code/Simulator.java b/dx/src/com/android/dx/cf/code/Simulator.java index c09783167..35e62281b 100644 --- a/dx/src/com/android/dx/cf/code/Simulator.java +++ b/dx/src/com/android/dx/cf/code/Simulator.java @@ -16,6 +16,7 @@ package com.android.dx.cf.code; +import com.android.dx.rop.code.LocalItem; import com.android.dx.rop.cst.Constant; import com.android.dx.rop.cst.CstFieldRef; import com.android.dx.rop.cst.CstInteger; @@ -24,9 +25,7 @@ import com.android.dx.rop.cst.CstMethodRef; import com.android.dx.rop.cst.CstType; import com.android.dx.rop.type.Prototype; import com.android.dx.rop.type.Type; -import com.android.dx.rop.code.LocalItem; import com.android.dx.util.Hex; - import java.util.ArrayList; /** diff --git a/dx/src/com/android/dx/cf/direct/AnnotationParser.java b/dx/src/com/android/dx/cf/direct/AnnotationParser.java index fdbc99047..f76669445 100644 --- a/dx/src/com/android/dx/cf/direct/AnnotationParser.java +++ b/dx/src/com/android/dx/cf/direct/AnnotationParser.java @@ -42,7 +42,6 @@ import com.android.dx.rop.cst.CstType; import com.android.dx.rop.type.Type; import com.android.dx.util.ByteArray; import com.android.dx.util.Hex; - import java.io.IOException; /** diff --git a/dx/src/com/android/dx/cf/direct/ClassPathOpener.java b/dx/src/com/android/dx/cf/direct/ClassPathOpener.java index 7621bf7c7..e2e2cfbe9 100644 --- a/dx/src/com/android/dx/cf/direct/ClassPathOpener.java +++ b/dx/src/com/android/dx/cf/direct/ClassPathOpener.java @@ -16,18 +16,17 @@ package com.android.dx.cf.direct; -import com.android.dx.util.FileUtils; - +import com.android.dex.util.FileUtils; +import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; -import java.io.ByteArrayOutputStream; import java.io.InputStream; -import java.util.zip.ZipFile; -import java.util.zip.ZipEntry; -import java.util.Arrays; -import java.util.Comparator; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; +import java.util.Comparator; +import java.util.zip.ZipEntry; +import java.util.zip.ZipFile; /** * Opens all the class files found in a class path element. Path elements diff --git a/dx/src/com/android/dx/cf/direct/CodeObserver.java b/dx/src/com/android/dx/cf/direct/CodeObserver.java index efcc80ba9..4262cf82c 100644 --- a/dx/src/com/android/dx/cf/direct/CodeObserver.java +++ b/dx/src/com/android/dx/cf/direct/CodeObserver.java @@ -30,9 +30,6 @@ import com.android.dx.rop.cst.CstType; import com.android.dx.rop.type.Type; import com.android.dx.util.ByteArray; import com.android.dx.util.Hex; -import com.android.dx.util.IntList; - -import java.util.List; import java.util.ArrayList; /** diff --git a/dx/src/com/android/dx/cf/direct/DirectClassFile.java b/dx/src/com/android/dx/cf/direct/DirectClassFile.java index 4f1c85de7..a7bb073a6 100644 --- a/dx/src/com/android/dx/cf/direct/DirectClassFile.java +++ b/dx/src/com/android/dx/cf/direct/DirectClassFile.java @@ -28,8 +28,8 @@ import com.android.dx.cf.iface.ParseObserver; import com.android.dx.cf.iface.StdAttributeList; import com.android.dx.rop.code.AccessFlags; import com.android.dx.rop.cst.ConstantPool; -import com.android.dx.rop.cst.CstType; import com.android.dx.rop.cst.CstString; +import com.android.dx.rop.cst.CstType; import com.android.dx.rop.cst.StdConstantPool; import com.android.dx.rop.type.StdTypeList; import com.android.dx.rop.type.Type; diff --git a/dx/src/com/android/dx/cf/direct/StdAttributeFactory.java b/dx/src/com/android/dx/cf/direct/StdAttributeFactory.java index ae04a1397..992809a0a 100644 --- a/dx/src/com/android/dx/cf/direct/StdAttributeFactory.java +++ b/dx/src/com/android/dx/cf/direct/StdAttributeFactory.java @@ -55,7 +55,6 @@ import com.android.dx.rop.cst.TypedConstant; import com.android.dx.rop.type.TypeList; import com.android.dx.util.ByteArray; import com.android.dx.util.Hex; - import java.io.IOException; /** diff --git a/dx/src/com/android/dx/cf/iface/ParseException.java b/dx/src/com/android/dx/cf/iface/ParseException.java index 18a9d0e24..6ed6d3bbf 100644 --- a/dx/src/com/android/dx/cf/iface/ParseException.java +++ b/dx/src/com/android/dx/cf/iface/ParseException.java @@ -16,7 +16,7 @@ package com.android.dx.cf.iface; -import com.android.dx.util.ExceptionWithContext; +import com.android.dex.util.ExceptionWithContext; /** * Exception from parsing. |