Misc cleanup/refactoring

git-svn-id: https://smali.googlecode.com/svn/trunk@204 55b6fa8a-2a1e-11de-a435-ffa8d773f76a
This commit is contained in:
JesusFreke@JesusFreke.com 2009-06-21 20:07:36 +00:00
parent cb83d271e5
commit bf4ca730cc
37 changed files with 43 additions and 43 deletions

View File

@ -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.*;

View File

@ -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;

View File

@ -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;

View File

@ -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<Instruction10t> {
public Instruction10tMethodItem(int offset, Instruction10t instruction) {

View File

@ -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<Instruction10x> {
public Instruction10xMethodItem(int offset, Instruction10x instruction) {

View File

@ -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<Instruction11n> {
public Instruction11nMethodItem(int offset, Instruction11n instruction) {

View File

@ -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<Instruction11x> {
public Instruction11xMethodItem(int offset, Instruction11x instruction) {

View File

@ -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<Instruction12x> {
public Instruction12xMethodItem(int offset, Instruction12x instruction) {

View File

@ -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<Instruction20t> {
public Instruction20tMethodItem(int offset, Instruction20t instruction) {

View File

@ -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<Instruction21c> {
public Instruction21cMethodItem(int offset, Instruction21c instruction) {

View File

@ -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<Instruction21h> {
public Instruction21hMethodItem(int offset, Instruction21h instruction) {

View File

@ -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<Instruction21s> {
public Instruction21sMethodItem(int offset, Instruction21s instruction) {

View File

@ -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<Instruction21t> {
public Instruction21tMethodItem(int offset, Instruction21t instruction) {

View File

@ -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<Instruction22b> {
public Instruction22bMethodItem(int offset, Instruction22b instruction) {

View File

@ -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<Instruction22c> {
public Instruction22cMethodItem(int offset, Instruction22c instruction) {

View File

@ -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<Instruction22s> {
public Instruction22sMethodItem(int offset, Instruction22s instruction) {

View File

@ -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<Instruction22t> {
public Instruction22tMethodItem(int offset, Instruction22t instruction) {

View File

@ -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<Instruction22x> {
public Instruction22xMethodItem(int offset, Instruction22x instruction) {

View File

@ -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<Instruction23x> {
public Instruction23xMethodItem(int offset, Instruction23x instruction) {

View File

@ -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<Instruction30t> {
public Instruction30tMethodItem(int offset, Instruction30t instruction) {

View File

@ -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<Instruction31c> {
public Instruction31cMethodItem(int offset, Instruction31c instruction) {

View File

@ -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<Instruction31i> {
public Instruction31iMethodItem(int offset, Instruction31i instruction) {

View File

@ -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<Instruction31t> {
public Instruction31tMethodItem(int offset, Instruction31t instruction) {

View File

@ -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<Instruction32x> {
public Instruction32xMethodItem(int offset, Instruction32x instruction) {

View File

@ -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<Instruction35c> {
public Instruction35cMethodItem(int offset, Instruction35c instruction) {

View File

@ -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<Instruction3rc> {
public Instruction3rcMethodItem(int offset, Instruction3rc instruction) {

View File

@ -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<Instruction51l> {
public Instruction51lMethodItem(int offset, Instruction51l instruction) {

View File

@ -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<T extends Instruction> extends MethodItem {
protected T instruction;

View File

@ -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<PackedSwitchDataPseudoInstruction> {
private int baseAddress;

View File

@ -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<SparseSwitchDataPseudoInstruction> {
private int baseAddress;

View File

@ -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;

View File

@ -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.*;

View File

@ -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<StringIdItem> {
public StringReference(StringIdItem item) {

View File

@ -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) {

View File

@ -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;

View File

@ -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;

View File

@ -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;