From bf4ca730cc857f76ee703e9efa73ad3e408c6c37 Mon Sep 17 00:00:00 2001 From: "JesusFreke@JesusFreke.com" Date: Sun, 21 Jun 2009 20:07:36 +0000 Subject: [PATCH] Misc cleanup/refactoring git-svn-id: https://smali.googlecode.com/svn/trunk@204 55b6fa8a-2a1e-11de-a435-ffa8d773f76a --- .../org/jf/baksmali/Adaptors/ClassDefinition.java | 2 +- .../org/jf/baksmali/Adaptors/FieldDefinition.java | 2 +- .../Adaptors/Format/ArrayDataMethodItem.java | 2 +- .../Adaptors/Format/Instruction10tMethodItem.java | 2 +- .../Adaptors/Format/Instruction10xMethodItem.java | 2 +- .../Adaptors/Format/Instruction11nMethodItem.java | 2 +- .../Adaptors/Format/Instruction11xMethodItem.java | 2 +- .../Adaptors/Format/Instruction12xMethodItem.java | 2 +- .../Adaptors/Format/Instruction20tMethodItem.java | 2 +- .../Adaptors/Format/Instruction21cMethodItem.java | 2 +- .../Adaptors/Format/Instruction21hMethodItem.java | 2 +- .../Adaptors/Format/Instruction21sMethodItem.java | 2 +- .../Adaptors/Format/Instruction21tMethodItem.java | 2 +- .../Adaptors/Format/Instruction22bMethodItem.java | 2 +- .../Adaptors/Format/Instruction22cMethodItem.java | 2 +- .../Adaptors/Format/Instruction22sMethodItem.java | 2 +- .../Adaptors/Format/Instruction22tMethodItem.java | 2 +- .../Adaptors/Format/Instruction22xMethodItem.java | 2 +- .../Adaptors/Format/Instruction23xMethodItem.java | 2 +- .../Adaptors/Format/Instruction30tMethodItem.java | 2 +- .../Adaptors/Format/Instruction31cMethodItem.java | 2 +- .../Adaptors/Format/Instruction31iMethodItem.java | 2 +- .../Adaptors/Format/Instruction31tMethodItem.java | 2 +- .../Adaptors/Format/Instruction32xMethodItem.java | 2 +- .../Adaptors/Format/Instruction35cMethodItem.java | 2 +- .../Adaptors/Format/Instruction3rcMethodItem.java | 2 +- .../Adaptors/Format/Instruction51lMethodItem.java | 2 +- .../Adaptors/Format/InstructionFormatMethodItem.java | 2 +- .../Adaptors/Format/PackedSwitchMethodItem.java | 2 +- .../Adaptors/Format/SparseSwitchMethodItem.java | 2 +- .../jf/baksmali/Adaptors/LocalDebugMethodItem.java | 2 +- .../org/jf/baksmali/Adaptors/MethodDefinition.java | 12 ++++++------ .../baksmali/Adaptors/Reference/StringReference.java | 2 +- .../java/org/jf/baksmali/Renderers/CharRenderer.java | 2 +- baksmali/src/main/java/org/jf/baksmali/dump.java | 2 +- dexlib/src/test/java/TryListBuilderTest.java | 4 ++-- smali/src/main/java/org/jf/smali/smali.java | 2 +- 37 files changed, 43 insertions(+), 43 deletions(-) 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 6cf81fe6..f5ae880c 100644 --- a/baksmali/src/main/java/org/jf/baksmali/Adaptors/ClassDefinition.java +++ b/baksmali/src/main/java/org/jf/baksmali/Adaptors/ClassDefinition.java @@ -30,7 +30,7 @@ package org.jf.baksmali.Adaptors; import org.jf.dexlib.EncodedValue.EncodedValue; import org.jf.dexlib.*; -import org.jf.dexlib.util.AccessFlags; +import org.jf.dexlib.Util.AccessFlags; import java.util.*; 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 ae3e4f05..9469a107 100644 --- a/baksmali/src/main/java/org/jf/baksmali/Adaptors/FieldDefinition.java +++ b/baksmali/src/main/java/org/jf/baksmali/Adaptors/FieldDefinition.java @@ -34,7 +34,7 @@ import org.jf.dexlib.EncodedValue.EncodedValue; import org.jf.dexlib.FieldIdItem; import org.jf.dexlib.AnnotationSetItem; import org.jf.dexlib.AnnotationItem; -import org.jf.dexlib.util.AccessFlags; +import org.jf.dexlib.Util.AccessFlags; import java.util.ArrayList; import java.util.List; diff --git a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/ArrayDataMethodItem.java b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/ArrayDataMethodItem.java index 1027dcaa..f79be1f6 100644 --- a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/ArrayDataMethodItem.java +++ b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/ArrayDataMethodItem.java @@ -28,7 +28,7 @@ package org.jf.baksmali.Adaptors.Format; -import org.jf.dexlib.code.Format.ArrayDataPseudoInstruction; +import org.jf.dexlib.Code.Format.ArrayDataPseudoInstruction; import java.util.ArrayList; import java.util.List; diff --git a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction10tMethodItem.java b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction10tMethodItem.java index 2d5b260f..2da08cf1 100644 --- a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction10tMethodItem.java +++ b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction10tMethodItem.java @@ -28,7 +28,7 @@ package org.jf.baksmali.Adaptors.Format; -import org.jf.dexlib.code.Format.Instruction10t; +import org.jf.dexlib.Code.Format.Instruction10t; public class Instruction10tMethodItem extends InstructionFormatMethodItem { public Instruction10tMethodItem(int offset, Instruction10t instruction) { diff --git a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction10xMethodItem.java b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction10xMethodItem.java index 184b6833..2cd34f40 100644 --- a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction10xMethodItem.java +++ b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction10xMethodItem.java @@ -28,7 +28,7 @@ package org.jf.baksmali.Adaptors.Format; -import org.jf.dexlib.code.Format.Instruction10x; +import org.jf.dexlib.Code.Format.Instruction10x; public class Instruction10xMethodItem extends InstructionFormatMethodItem { public Instruction10xMethodItem(int offset, Instruction10x instruction) { diff --git a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction11nMethodItem.java b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction11nMethodItem.java index b6293d32..935cde02 100644 --- a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction11nMethodItem.java +++ b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction11nMethodItem.java @@ -28,7 +28,7 @@ package org.jf.baksmali.Adaptors.Format; -import org.jf.dexlib.code.Format.Instruction11n; +import org.jf.dexlib.Code.Format.Instruction11n; public class Instruction11nMethodItem extends InstructionFormatMethodItem { public Instruction11nMethodItem(int offset, Instruction11n instruction) { diff --git a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction11xMethodItem.java b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction11xMethodItem.java index b33db77d..83d35e6b 100644 --- a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction11xMethodItem.java +++ b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction11xMethodItem.java @@ -28,7 +28,7 @@ package org.jf.baksmali.Adaptors.Format; -import org.jf.dexlib.code.Format.Instruction11x; +import org.jf.dexlib.Code.Format.Instruction11x; public class Instruction11xMethodItem extends InstructionFormatMethodItem { public Instruction11xMethodItem(int offset, Instruction11x instruction) { diff --git a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction12xMethodItem.java b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction12xMethodItem.java index 63a31218..caf9b149 100644 --- a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction12xMethodItem.java +++ b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction12xMethodItem.java @@ -28,7 +28,7 @@ package org.jf.baksmali.Adaptors.Format; -import org.jf.dexlib.code.Format.Instruction12x; +import org.jf.dexlib.Code.Format.Instruction12x; public class Instruction12xMethodItem extends InstructionFormatMethodItem { public Instruction12xMethodItem(int offset, Instruction12x instruction) { diff --git a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction20tMethodItem.java b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction20tMethodItem.java index ccc3e7b0..3ce50a69 100644 --- a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction20tMethodItem.java +++ b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction20tMethodItem.java @@ -28,7 +28,7 @@ package org.jf.baksmali.Adaptors.Format; -import org.jf.dexlib.code.Format.Instruction20t; +import org.jf.dexlib.Code.Format.Instruction20t; public class Instruction20tMethodItem extends InstructionFormatMethodItem { public Instruction20tMethodItem(int offset, Instruction20t instruction) { diff --git a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction21cMethodItem.java b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction21cMethodItem.java index 2cfefd28..f86c9c71 100644 --- a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction21cMethodItem.java +++ b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction21cMethodItem.java @@ -28,7 +28,7 @@ package org.jf.baksmali.Adaptors.Format; -import org.jf.dexlib.code.Format.Instruction21c; +import org.jf.dexlib.Code.Format.Instruction21c; public class Instruction21cMethodItem extends InstructionFormatMethodItem { public Instruction21cMethodItem(int offset, Instruction21c instruction) { diff --git a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction21hMethodItem.java b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction21hMethodItem.java index f30d4b95..ef30c324 100644 --- a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction21hMethodItem.java +++ b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction21hMethodItem.java @@ -28,7 +28,7 @@ package org.jf.baksmali.Adaptors.Format; -import org.jf.dexlib.code.Format.Instruction21h; +import org.jf.dexlib.Code.Format.Instruction21h; public class Instruction21hMethodItem extends InstructionFormatMethodItem { public Instruction21hMethodItem(int offset, Instruction21h instruction) { diff --git a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction21sMethodItem.java b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction21sMethodItem.java index 177d1929..9eeba7c6 100644 --- a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction21sMethodItem.java +++ b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction21sMethodItem.java @@ -28,7 +28,7 @@ package org.jf.baksmali.Adaptors.Format; -import org.jf.dexlib.code.Format.Instruction21s; +import org.jf.dexlib.Code.Format.Instruction21s; public class Instruction21sMethodItem extends InstructionFormatMethodItem { public Instruction21sMethodItem(int offset, Instruction21s instruction) { diff --git a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction21tMethodItem.java b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction21tMethodItem.java index 9d437d77..26672561 100644 --- a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction21tMethodItem.java +++ b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction21tMethodItem.java @@ -28,7 +28,7 @@ package org.jf.baksmali.Adaptors.Format; -import org.jf.dexlib.code.Format.Instruction21t; +import org.jf.dexlib.Code.Format.Instruction21t; public class Instruction21tMethodItem extends InstructionFormatMethodItem { public Instruction21tMethodItem(int offset, Instruction21t instruction) { diff --git a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction22bMethodItem.java b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction22bMethodItem.java index a69a5ee3..3399f41a 100644 --- a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction22bMethodItem.java +++ b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction22bMethodItem.java @@ -28,7 +28,7 @@ package org.jf.baksmali.Adaptors.Format; -import org.jf.dexlib.code.Format.Instruction22b; +import org.jf.dexlib.Code.Format.Instruction22b; public class Instruction22bMethodItem extends InstructionFormatMethodItem { public Instruction22bMethodItem(int offset, Instruction22b instruction) { diff --git a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction22cMethodItem.java b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction22cMethodItem.java index e55630cf..2fd79faf 100644 --- a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction22cMethodItem.java +++ b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction22cMethodItem.java @@ -28,7 +28,7 @@ package org.jf.baksmali.Adaptors.Format; -import org.jf.dexlib.code.Format.Instruction22c; +import org.jf.dexlib.Code.Format.Instruction22c; public class Instruction22cMethodItem extends InstructionFormatMethodItem { public Instruction22cMethodItem(int offset, Instruction22c instruction) { diff --git a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction22sMethodItem.java b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction22sMethodItem.java index ec366339..8638736f 100644 --- a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction22sMethodItem.java +++ b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction22sMethodItem.java @@ -28,7 +28,7 @@ package org.jf.baksmali.Adaptors.Format; -import org.jf.dexlib.code.Format.Instruction22s; +import org.jf.dexlib.Code.Format.Instruction22s; public class Instruction22sMethodItem extends InstructionFormatMethodItem { public Instruction22sMethodItem(int offset, Instruction22s instruction) { diff --git a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction22tMethodItem.java b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction22tMethodItem.java index 8bc89db0..3f57987c 100644 --- a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction22tMethodItem.java +++ b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction22tMethodItem.java @@ -28,7 +28,7 @@ package org.jf.baksmali.Adaptors.Format; -import org.jf.dexlib.code.Format.Instruction22t; +import org.jf.dexlib.Code.Format.Instruction22t; public class Instruction22tMethodItem extends InstructionFormatMethodItem { public Instruction22tMethodItem(int offset, Instruction22t instruction) { diff --git a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction22xMethodItem.java b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction22xMethodItem.java index 5c3719bb..6f48c568 100644 --- a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction22xMethodItem.java +++ b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction22xMethodItem.java @@ -28,7 +28,7 @@ package org.jf.baksmali.Adaptors.Format; -import org.jf.dexlib.code.Format.Instruction22x; +import org.jf.dexlib.Code.Format.Instruction22x; public class Instruction22xMethodItem extends InstructionFormatMethodItem { public Instruction22xMethodItem(int offset, Instruction22x instruction) { diff --git a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction23xMethodItem.java b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction23xMethodItem.java index b9cd8715..a4d9ab1e 100644 --- a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction23xMethodItem.java +++ b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction23xMethodItem.java @@ -28,7 +28,7 @@ package org.jf.baksmali.Adaptors.Format; -import org.jf.dexlib.code.Format.Instruction23x; +import org.jf.dexlib.Code.Format.Instruction23x; public class Instruction23xMethodItem extends InstructionFormatMethodItem { public Instruction23xMethodItem(int offset, Instruction23x instruction) { diff --git a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction30tMethodItem.java b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction30tMethodItem.java index 1fb9f0de..76f08555 100644 --- a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction30tMethodItem.java +++ b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction30tMethodItem.java @@ -28,7 +28,7 @@ package org.jf.baksmali.Adaptors.Format; -import org.jf.dexlib.code.Format.Instruction30t; +import org.jf.dexlib.Code.Format.Instruction30t; public class Instruction30tMethodItem extends InstructionFormatMethodItem { public Instruction30tMethodItem(int offset, Instruction30t instruction) { diff --git a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction31cMethodItem.java b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction31cMethodItem.java index 122f731e..28890886 100644 --- a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction31cMethodItem.java +++ b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction31cMethodItem.java @@ -28,7 +28,7 @@ package org.jf.baksmali.Adaptors.Format; -import org.jf.dexlib.code.Format.Instruction31c; +import org.jf.dexlib.Code.Format.Instruction31c; public class Instruction31cMethodItem extends InstructionFormatMethodItem { public Instruction31cMethodItem(int offset, Instruction31c instruction) { diff --git a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction31iMethodItem.java b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction31iMethodItem.java index fa9266fe..b7d93e82 100644 --- a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction31iMethodItem.java +++ b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction31iMethodItem.java @@ -28,7 +28,7 @@ package org.jf.baksmali.Adaptors.Format; -import org.jf.dexlib.code.Format.Instruction31i; +import org.jf.dexlib.Code.Format.Instruction31i; public class Instruction31iMethodItem extends InstructionFormatMethodItem { public Instruction31iMethodItem(int offset, Instruction31i instruction) { diff --git a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction31tMethodItem.java b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction31tMethodItem.java index f8af97c2..fa51e0f5 100644 --- a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction31tMethodItem.java +++ b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction31tMethodItem.java @@ -28,7 +28,7 @@ package org.jf.baksmali.Adaptors.Format; -import org.jf.dexlib.code.Format.Instruction31t; +import org.jf.dexlib.Code.Format.Instruction31t; public class Instruction31tMethodItem extends InstructionFormatMethodItem { public Instruction31tMethodItem(int offset, Instruction31t instruction) { diff --git a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction32xMethodItem.java b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction32xMethodItem.java index 708fba95..8f1a767f 100644 --- a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction32xMethodItem.java +++ b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction32xMethodItem.java @@ -28,7 +28,7 @@ package org.jf.baksmali.Adaptors.Format; -import org.jf.dexlib.code.Format.Instruction32x; +import org.jf.dexlib.Code.Format.Instruction32x; public class Instruction32xMethodItem extends InstructionFormatMethodItem { public Instruction32xMethodItem(int offset, Instruction32x instruction) { diff --git a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction35cMethodItem.java b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction35cMethodItem.java index 5d596014..458e639b 100644 --- a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction35cMethodItem.java +++ b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction35cMethodItem.java @@ -28,7 +28,7 @@ package org.jf.baksmali.Adaptors.Format; -import org.jf.dexlib.code.Format.Instruction35c; +import org.jf.dexlib.Code.Format.Instruction35c; public class Instruction35cMethodItem extends InstructionFormatMethodItem { public Instruction35cMethodItem(int offset, Instruction35c instruction) { diff --git a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction3rcMethodItem.java b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction3rcMethodItem.java index 01737f5d..00fdc8da 100644 --- a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction3rcMethodItem.java +++ b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction3rcMethodItem.java @@ -28,7 +28,7 @@ package org.jf.baksmali.Adaptors.Format; -import org.jf.dexlib.code.Format.Instruction3rc; +import org.jf.dexlib.Code.Format.Instruction3rc; public class Instruction3rcMethodItem extends InstructionFormatMethodItem { public Instruction3rcMethodItem(int offset, Instruction3rc instruction) { diff --git a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction51lMethodItem.java b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction51lMethodItem.java index 3d1167e6..297fa1fa 100644 --- a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction51lMethodItem.java +++ b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/Instruction51lMethodItem.java @@ -28,7 +28,7 @@ package org.jf.baksmali.Adaptors.Format; -import org.jf.dexlib.code.Format.Instruction51l; +import org.jf.dexlib.Code.Format.Instruction51l; public class Instruction51lMethodItem extends InstructionFormatMethodItem { public Instruction51lMethodItem(int offset, Instruction51l instruction) { diff --git a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/InstructionFormatMethodItem.java b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/InstructionFormatMethodItem.java index 4ed53bf1..a2212260 100644 --- a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/InstructionFormatMethodItem.java +++ b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Format/InstructionFormatMethodItem.java @@ -30,7 +30,7 @@ package org.jf.baksmali.Adaptors.Format; import org.jf.baksmali.Adaptors.MethodItem; import org.jf.baksmali.Adaptors.Reference.Reference; -import org.jf.dexlib.code.Instruction; +import org.jf.dexlib.Code.Instruction; public abstract class InstructionFormatMethodItem extends MethodItem { protected T instruction; 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 22dc5880..02a2b852 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,7 +28,7 @@ package org.jf.baksmali.Adaptors.Format; -import org.jf.dexlib.code.Format.PackedSwitchDataPseudoInstruction; +import org.jf.dexlib.Code.Format.PackedSwitchDataPseudoInstruction; public class PackedSwitchMethodItem extends InstructionFormatMethodItem { private int baseAddress; 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 275b9a26..33e53318 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,7 +28,7 @@ package org.jf.baksmali.Adaptors.Format; -import org.jf.dexlib.code.Format.SparseSwitchDataPseudoInstruction; +import org.jf.dexlib.Code.Format.SparseSwitchDataPseudoInstruction; public class SparseSwitchMethodItem extends InstructionFormatMethodItem { private int baseAddress; diff --git a/baksmali/src/main/java/org/jf/baksmali/Adaptors/LocalDebugMethodItem.java b/baksmali/src/main/java/org/jf/baksmali/Adaptors/LocalDebugMethodItem.java index d78d9637..7df5d27e 100644 --- a/baksmali/src/main/java/org/jf/baksmali/Adaptors/LocalDebugMethodItem.java +++ b/baksmali/src/main/java/org/jf/baksmali/Adaptors/LocalDebugMethodItem.java @@ -28,7 +28,7 @@ package org.jf.baksmali.Adaptors; -import org.jf.dexlib.util.DebugInfoDecoder; +import org.jf.dexlib.Util.DebugInfoDecoder; public class LocalDebugMethodItem extends DebugMethodItem { private DebugInfoDecoder.Local local; 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 df36783b..cb955253 100644 --- a/baksmali/src/main/java/org/jf/baksmali/Adaptors/MethodDefinition.java +++ b/baksmali/src/main/java/org/jf/baksmali/Adaptors/MethodDefinition.java @@ -30,12 +30,12 @@ package org.jf.baksmali.Adaptors; import org.jf.baksmali.Adaptors.Format.*; import org.jf.dexlib.*; -import org.jf.dexlib.code.Format.*; -import org.jf.dexlib.code.Instruction; -import org.jf.dexlib.code.InstructionField; -import org.jf.dexlib.code.Opcode; -import org.jf.dexlib.util.AccessFlags; -import org.jf.dexlib.util.DebugInfoDecoder; +import org.jf.dexlib.Code.Format.*; +import org.jf.dexlib.Code.Instruction; +import org.jf.dexlib.Code.InstructionField; +import org.jf.dexlib.Code.Opcode; +import org.jf.dexlib.Util.AccessFlags; +import org.jf.dexlib.Util.DebugInfoDecoder; import java.util.*; diff --git a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Reference/StringReference.java b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Reference/StringReference.java index e5495c8f..81c25010 100644 --- a/baksmali/src/main/java/org/jf/baksmali/Adaptors/Reference/StringReference.java +++ b/baksmali/src/main/java/org/jf/baksmali/Adaptors/Reference/StringReference.java @@ -29,7 +29,7 @@ package org.jf.baksmali.Adaptors.Reference; import org.jf.dexlib.StringIdItem; -import org.jf.dexlib.util.Utf8Utils; +import org.jf.dexlib.Util.Utf8Utils; public class StringReference extends Reference { public StringReference(StringIdItem item) { diff --git a/baksmali/src/main/java/org/jf/baksmali/Renderers/CharRenderer.java b/baksmali/src/main/java/org/jf/baksmali/Renderers/CharRenderer.java index 367e5f65..d6a6a5e7 100644 --- a/baksmali/src/main/java/org/jf/baksmali/Renderers/CharRenderer.java +++ b/baksmali/src/main/java/org/jf/baksmali/Renderers/CharRenderer.java @@ -29,7 +29,7 @@ package org.jf.baksmali.Renderers; import org.antlr.stringtemplate.AttributeRenderer; -import org.jf.dexlib.util.Utf8Utils; +import org.jf.dexlib.Util.Utf8Utils; public class CharRenderer implements AttributeRenderer { public String toString(Object o) { diff --git a/baksmali/src/main/java/org/jf/baksmali/dump.java b/baksmali/src/main/java/org/jf/baksmali/dump.java index 635930f8..450659d2 100644 --- a/baksmali/src/main/java/org/jf/baksmali/dump.java +++ b/baksmali/src/main/java/org/jf/baksmali/dump.java @@ -29,7 +29,7 @@ package org.jf.baksmali; import org.jf.dexlib.DexFile; -import org.jf.dexlib.util.ByteArrayAnnotatedOutput; +import org.jf.dexlib.Util.ByteArrayAnnotatedOutput; import java.io.File; import java.io.FileWriter; diff --git a/dexlib/src/test/java/TryListBuilderTest.java b/dexlib/src/test/java/TryListBuilderTest.java index d172dee0..988e446e 100644 --- a/dexlib/src/test/java/TryListBuilderTest.java +++ b/dexlib/src/test/java/TryListBuilderTest.java @@ -30,8 +30,8 @@ import org.jf.dexlib.CodeItem; import org.jf.dexlib.DexFile; import org.jf.dexlib.TypeIdItem; -import org.jf.dexlib.util.Pair; -import org.jf.dexlib.util.TryListBuilder; +import org.jf.dexlib.Util.Pair; +import org.jf.dexlib.Util.TryListBuilder; import org.junit.Assert; import org.junit.Test; diff --git a/smali/src/main/java/org/jf/smali/smali.java b/smali/src/main/java/org/jf/smali/smali.java index 8867c473..8df14865 100644 --- a/smali/src/main/java/org/jf/smali/smali.java +++ b/smali/src/main/java/org/jf/smali/smali.java @@ -33,7 +33,7 @@ import org.antlr.runtime.CommonTokenStream; import org.antlr.runtime.tree.CommonTree; import org.antlr.runtime.tree.CommonTreeNodeStream; import org.jf.dexlib.DexFile; -import org.jf.dexlib.util.ByteArrayAnnotatedOutput; +import org.jf.dexlib.Util.ByteArrayAnnotatedOutput; import java.io.*; import java.util.LinkedHashSet;