From fbea4e751fa6f1748ded4379a4b64601cb53ba7b Mon Sep 17 00:00:00 2001 From: "JesusFreke@JesusFreke.com" Date: Fri, 16 Apr 2010 07:26:08 +0000 Subject: [PATCH] Cleaned up imports git-svn-id: https://smali.googlecode.com/svn/trunk@709 55b6fa8a-2a1e-11de-a435-ffa8d773f76a --- .../org/jf/baksmali/Adaptors/AnnotationFormatter.java | 2 +- .../java/org/jf/baksmali/Adaptors/ClassDefinition.java | 6 +++--- .../EncodedValue/ArrayEncodedValueAdaptor.java | 2 +- .../java/org/jf/baksmali/Adaptors/FieldDefinition.java | 2 +- .../Adaptors/Format/InstructionMethodItem.java | 3 ++- .../Adaptors/Format/InstructionMethodItemFactory.java | 5 ++++- .../Format/OffsetInstructionFormatMethodItem.java | 10 +++++----- .../Adaptors/Format/PackedSwitchMethodItem.java | 4 ++-- .../Adaptors/Format/SparseSwitchMethodItem.java | 2 +- .../org/jf/baksmali/Adaptors/MethodDefinition.java | 7 ++++--- .../Adaptors/PreInstructionRegisterInfoMethodItem.java | 2 +- .../org/jf/baksmali/Adaptors/RegisterFormatter.java | 2 +- baksmali/src/main/java/org/jf/baksmali/baksmali.java | 2 +- baksmali/src/main/java/org/jf/baksmali/dump.java | 5 +++-- baksmali/src/main/java/org/jf/baksmali/main.java | 5 +++-- 15 files changed, 33 insertions(+), 26 deletions(-) diff --git a/baksmali/src/main/java/org/jf/baksmali/Adaptors/AnnotationFormatter.java b/baksmali/src/main/java/org/jf/baksmali/Adaptors/AnnotationFormatter.java index fea40978..bdb6f803 100644 --- a/baksmali/src/main/java/org/jf/baksmali/Adaptors/AnnotationFormatter.java +++ b/baksmali/src/main/java/org/jf/baksmali/Adaptors/AnnotationFormatter.java @@ -28,9 +28,9 @@ package org.jf.baksmali.Adaptors; +import org.jf.baksmali.Adaptors.EncodedValue.AnnotationEncodedValueAdaptor; import org.jf.baksmali.IndentingWriter; import org.jf.dexlib.AnnotationItem; -import org.jf.baksmali.Adaptors.EncodedValue.AnnotationEncodedValueAdaptor; import org.jf.dexlib.AnnotationSetItem; import java.io.IOException; diff --git a/baksmali/src/main/java/org/jf/baksmali/Adaptors/ClassDefinition.java b/baksmali/src/main/java/org/jf/baksmali/Adaptors/ClassDefinition.java index 5f8e9f10..15607688 100644 --- a/baksmali/src/main/java/org/jf/baksmali/Adaptors/ClassDefinition.java +++ b/baksmali/src/main/java/org/jf/baksmali/Adaptors/ClassDefinition.java @@ -29,11 +29,11 @@ package org.jf.baksmali.Adaptors; import org.jf.baksmali.IndentingWriter; -import org.jf.dexlib.Code.Analysis.ValidationException; -import org.jf.dexlib.EncodedValue.EncodedValue; import org.jf.dexlib.*; -import org.jf.dexlib.Code.Instruction; +import org.jf.dexlib.Code.Analysis.ValidationException; import org.jf.dexlib.Code.Format.Instruction21c; +import org.jf.dexlib.Code.Instruction; +import org.jf.dexlib.EncodedValue.EncodedValue; import org.jf.dexlib.Util.AccessFlags; import org.jf.dexlib.Util.SparseArray; diff --git a/baksmali/src/main/java/org/jf/baksmali/Adaptors/EncodedValue/ArrayEncodedValueAdaptor.java b/baksmali/src/main/java/org/jf/baksmali/Adaptors/EncodedValue/ArrayEncodedValueAdaptor.java index 521f4137..633a332e 100644 --- a/baksmali/src/main/java/org/jf/baksmali/Adaptors/EncodedValue/ArrayEncodedValueAdaptor.java +++ b/baksmali/src/main/java/org/jf/baksmali/Adaptors/EncodedValue/ArrayEncodedValueAdaptor.java @@ -29,8 +29,8 @@ package org.jf.baksmali.Adaptors.EncodedValue; import org.jf.baksmali.IndentingWriter; -import org.jf.dexlib.EncodedValue.EncodedValue; import org.jf.dexlib.EncodedValue.ArrayEncodedValue; +import org.jf.dexlib.EncodedValue.EncodedValue; import java.io.IOException; diff --git a/baksmali/src/main/java/org/jf/baksmali/Adaptors/FieldDefinition.java b/baksmali/src/main/java/org/jf/baksmali/Adaptors/FieldDefinition.java index efbbbfe9..e47becca 100644 --- a/baksmali/src/main/java/org/jf/baksmali/Adaptors/FieldDefinition.java +++ b/baksmali/src/main/java/org/jf/baksmali/Adaptors/FieldDefinition.java @@ -30,10 +30,10 @@ package org.jf.baksmali.Adaptors; import org.jf.baksmali.Adaptors.EncodedValue.EncodedValueAdaptor; import org.jf.baksmali.IndentingWriter; +import org.jf.dexlib.AnnotationSetItem; import org.jf.dexlib.ClassDataItem; import org.jf.dexlib.EncodedValue.EncodedValue; import org.jf.dexlib.EncodedValue.NullEncodedValue; -import org.jf.dexlib.AnnotationSetItem; import org.jf.dexlib.Util.AccessFlags; import java.io.IOException; diff --git a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/InstructionMethodItem.java b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/InstructionMethodItem.java index b1bbf88d..055722b9 100644 --- a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/InstructionMethodItem.java +++ b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/InstructionMethodItem.java @@ -33,8 +33,9 @@ import org.jf.baksmali.Adaptors.ReferenceFormatter; import org.jf.baksmali.Adaptors.RegisterFormatter; import org.jf.baksmali.IndentingWriter; import org.jf.baksmali.Renderers.LongRenderer; -import org.jf.dexlib.*; import org.jf.dexlib.Code.*; +import org.jf.dexlib.CodeItem; +import org.jf.dexlib.Item; import java.io.IOException; diff --git a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/InstructionMethodItemFactory.java b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/InstructionMethodItemFactory.java index 14a4f7ba..ecc3c11d 100644 --- a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/InstructionMethodItemFactory.java +++ b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/InstructionMethodItemFactory.java @@ -29,7 +29,10 @@ package org.jf.baksmali.Adaptors.Format; import org.jf.baksmali.Adaptors.MethodDefinition; -import org.jf.dexlib.Code.Format.*; +import org.jf.dexlib.Code.Format.ArrayDataPseudoInstruction; +import org.jf.dexlib.Code.Format.PackedSwitchDataPseudoInstruction; +import org.jf.dexlib.Code.Format.SparseSwitchDataPseudoInstruction; +import org.jf.dexlib.Code.Format.UnresolvedNullReference; import org.jf.dexlib.Code.Instruction; import org.jf.dexlib.Code.OffsetInstruction; import org.jf.dexlib.CodeItem; diff --git a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/OffsetInstructionFormatMethodItem.java b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/OffsetInstructionFormatMethodItem.java index be545838..6a871eb3 100644 --- a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/OffsetInstructionFormatMethodItem.java +++ b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/OffsetInstructionFormatMethodItem.java @@ -28,13 +28,13 @@ package org.jf.baksmali.Adaptors.Format; -import org.jf.baksmali.IndentingWriter; -import org.jf.dexlib.Code.Opcode; -import org.jf.dexlib.CodeItem; -import org.jf.dexlib.Code.Instruction; -import org.jf.dexlib.Code.OffsetInstruction; import org.jf.baksmali.Adaptors.LabelMethodItem; import org.jf.baksmali.Adaptors.MethodDefinition; +import org.jf.baksmali.IndentingWriter; +import org.jf.dexlib.Code.Instruction; +import org.jf.dexlib.Code.OffsetInstruction; +import org.jf.dexlib.Code.Opcode; +import org.jf.dexlib.CodeItem; import java.io.IOException; diff --git a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/PackedSwitchMethodItem.java b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/PackedSwitchMethodItem.java index 5deee1e4..0165afc1 100644 --- a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/PackedSwitchMethodItem.java +++ b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/PackedSwitchMethodItem.java @@ -28,12 +28,12 @@ package org.jf.baksmali.Adaptors.Format; +import org.jf.baksmali.Adaptors.LabelMethodItem; +import org.jf.baksmali.Adaptors.MethodDefinition; import org.jf.baksmali.IndentingWriter; import org.jf.baksmali.Renderers.IntegerRenderer; import org.jf.dexlib.Code.Format.PackedSwitchDataPseudoInstruction; import org.jf.dexlib.CodeItem; -import org.jf.baksmali.Adaptors.LabelMethodItem; -import org.jf.baksmali.Adaptors.MethodDefinition; import java.io.IOException; import java.util.ArrayList; diff --git a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/SparseSwitchMethodItem.java b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/SparseSwitchMethodItem.java index 73af8cb0..7cd66d91 100644 --- a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/SparseSwitchMethodItem.java +++ b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/SparseSwitchMethodItem.java @@ -28,12 +28,12 @@ package org.jf.baksmali.Adaptors.Format; +import org.jf.baksmali.Adaptors.LabelMethodItem; import org.jf.baksmali.Adaptors.MethodDefinition; import org.jf.baksmali.IndentingWriter; import org.jf.baksmali.Renderers.IntegerRenderer; import org.jf.dexlib.Code.Format.SparseSwitchDataPseudoInstruction; import org.jf.dexlib.CodeItem; -import org.jf.baksmali.Adaptors.LabelMethodItem; import java.io.IOException; import java.util.ArrayList; diff --git a/baksmali/src/main/java/org/jf/baksmali/Adaptors/MethodDefinition.java b/baksmali/src/main/java/org/jf/baksmali/Adaptors/MethodDefinition.java index 5e2a23c6..10e063a2 100644 --- a/baksmali/src/main/java/org/jf/baksmali/Adaptors/MethodDefinition.java +++ b/baksmali/src/main/java/org/jf/baksmali/Adaptors/MethodDefinition.java @@ -28,16 +28,17 @@ package org.jf.baksmali.Adaptors; -import org.jf.baksmali.Adaptors.Format.*; +import org.jf.baksmali.Adaptors.Format.InstructionMethodItemFactory; import org.jf.baksmali.IndentingWriter; -import org.jf.baksmali.Renderers.IntegerRenderer; import org.jf.baksmali.baksmali; import org.jf.dexlib.*; -import org.jf.dexlib.Code.*; import org.jf.dexlib.Code.Analysis.AnalyzedInstruction; import org.jf.dexlib.Code.Analysis.MethodAnalyzer; import org.jf.dexlib.Code.Analysis.ValidationException; import org.jf.dexlib.Code.Format.Format; +import org.jf.dexlib.Code.Instruction; +import org.jf.dexlib.Code.OffsetInstruction; +import org.jf.dexlib.Code.Opcode; import org.jf.dexlib.Debug.DebugInstructionIterator; import org.jf.dexlib.Util.AccessFlags; import org.jf.dexlib.Util.ExceptionWithContext; diff --git a/baksmali/src/main/java/org/jf/baksmali/Adaptors/PreInstructionRegisterInfoMethodItem.java b/baksmali/src/main/java/org/jf/baksmali/Adaptors/PreInstructionRegisterInfoMethodItem.java index eb5eebfe..dda46a01 100644 --- a/baksmali/src/main/java/org/jf/baksmali/Adaptors/PreInstructionRegisterInfoMethodItem.java +++ b/baksmali/src/main/java/org/jf/baksmali/Adaptors/PreInstructionRegisterInfoMethodItem.java @@ -32,10 +32,10 @@ import org.jf.baksmali.IndentingWriter; import org.jf.baksmali.baksmali; import org.jf.baksmali.main; import org.jf.dexlib.ClassDataItem; -import org.jf.dexlib.Code.*; import org.jf.dexlib.Code.Analysis.AnalyzedInstruction; import org.jf.dexlib.Code.Analysis.MethodAnalyzer; import org.jf.dexlib.Code.Analysis.RegisterType; +import org.jf.dexlib.Code.*; import org.jf.dexlib.Util.AccessFlags; import java.io.IOException; diff --git a/baksmali/src/main/java/org/jf/baksmali/Adaptors/RegisterFormatter.java b/baksmali/src/main/java/org/jf/baksmali/Adaptors/RegisterFormatter.java index 816efcfd..c1d88cc1 100644 --- a/baksmali/src/main/java/org/jf/baksmali/Adaptors/RegisterFormatter.java +++ b/baksmali/src/main/java/org/jf/baksmali/Adaptors/RegisterFormatter.java @@ -29,9 +29,9 @@ package org.jf.baksmali.Adaptors; import org.jf.baksmali.IndentingWriter; +import org.jf.baksmali.baksmali; import org.jf.dexlib.CodeItem; import org.jf.dexlib.Util.AccessFlags; -import org.jf.baksmali.baksmali; import java.io.IOException; diff --git a/baksmali/src/main/java/org/jf/baksmali/baksmali.java b/baksmali/src/main/java/org/jf/baksmali/baksmali.java index 0dca42c3..682881f3 100644 --- a/baksmali/src/main/java/org/jf/baksmali/baksmali.java +++ b/baksmali/src/main/java/org/jf/baksmali/baksmali.java @@ -29,9 +29,9 @@ package org.jf.baksmali; import org.jf.baksmali.Adaptors.ClassDefinition; +import org.jf.dexlib.ClassDefItem; import org.jf.dexlib.Code.Analysis.ClassPath; import org.jf.dexlib.DexFile; -import org.jf.dexlib.ClassDefItem; import java.io.*; import java.util.regex.Matcher; diff --git a/baksmali/src/main/java/org/jf/baksmali/dump.java b/baksmali/src/main/java/org/jf/baksmali/dump.java index 29e5f497..f428642e 100644 --- a/baksmali/src/main/java/org/jf/baksmali/dump.java +++ b/baksmali/src/main/java/org/jf/baksmali/dump.java @@ -30,9 +30,10 @@ package org.jf.baksmali; import org.jf.dexlib.DexFile; import org.jf.dexlib.Util.ByteArrayAnnotatedOutput; -import org.apache.commons.cli.*; -import java.io.*; +import java.io.FileOutputStream; +import java.io.FileWriter; +import java.io.IOException; public class dump { public static void dump(DexFile dexFile, String dumpFileName, String outputDexFileName, boolean sort) diff --git a/baksmali/src/main/java/org/jf/baksmali/main.java b/baksmali/src/main/java/org/jf/baksmali/main.java index 66abb1fd..d72c4523 100644 --- a/baksmali/src/main/java/org/jf/baksmali/main.java +++ b/baksmali/src/main/java/org/jf/baksmali/main.java @@ -30,11 +30,12 @@ package org.jf.baksmali; import org.apache.commons.cli.*; import org.jf.dexlib.DexFile; -import org.jf.util.*; +import org.jf.util.ConsoleUtil; +import org.jf.util.smaliHelpFormatter; import java.io.File; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; import java.util.ArrayList; import java.util.List; import java.util.Properties;