Move DexFile and DexFileReader to the dexbacked package

This commit is contained in:
Ben Gruver 2012-10-20 14:16:32 -07:00
parent 5ec83fb0f0
commit 779bf9bccb
19 changed files with 15 additions and 30 deletions

View File

@ -31,8 +31,6 @@
package org.jf.dexlib2.dexbacked; package org.jf.dexlib2.dexbacked;
import org.jf.dexlib2.DexFile;
import org.jf.dexlib2.DexFileReader;
import org.jf.dexlib2.dexbacked.util.VariableSizeList; import org.jf.dexlib2.dexbacked.util.VariableSizeList;
import org.jf.dexlib2.iface.Annotation; import org.jf.dexlib2.iface.Annotation;
import org.jf.dexlib2.iface.AnnotationElement; import org.jf.dexlib2.iface.AnnotationElement;

View File

@ -31,7 +31,6 @@
package org.jf.dexlib2.dexbacked; package org.jf.dexlib2.dexbacked;
import org.jf.dexlib2.DexFileReader;
import org.jf.dexlib2.dexbacked.value.DexBackedEncodedValue; import org.jf.dexlib2.dexbacked.value.DexBackedEncodedValue;
import org.jf.dexlib2.iface.AnnotationElement; import org.jf.dexlib2.iface.AnnotationElement;
import org.jf.dexlib2.iface.value.EncodedValue; import org.jf.dexlib2.iface.value.EncodedValue;

View File

@ -31,7 +31,6 @@
package org.jf.dexlib2.dexbacked; package org.jf.dexlib2.dexbacked;
import org.jf.dexlib2.DexFileReader;
import org.jf.dexlib2.dexbacked.util.InstructionOffsetMap; import org.jf.dexlib2.dexbacked.util.InstructionOffsetMap;
import org.jf.dexlib2.immutable.ImmutableExceptionHandler; import org.jf.dexlib2.immutable.ImmutableExceptionHandler;

View File

@ -32,8 +32,6 @@
package org.jf.dexlib2.dexbacked; package org.jf.dexlib2.dexbacked;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import org.jf.dexlib2.DexFile;
import org.jf.dexlib2.DexFileReader;
import org.jf.dexlib2.dexbacked.util.*; import org.jf.dexlib2.dexbacked.util.*;
import org.jf.dexlib2.iface.ClassDef; import org.jf.dexlib2.iface.ClassDef;
import org.jf.dexlib2.iface.Method; import org.jf.dexlib2.iface.Method;

View File

@ -31,7 +31,6 @@
package org.jf.dexlib2.dexbacked; package org.jf.dexlib2.dexbacked;
import org.jf.dexlib2.DexFileReader;
import org.jf.dexlib2.dexbacked.util.InstructionOffsetMap; import org.jf.dexlib2.dexbacked.util.InstructionOffsetMap;
import org.jf.dexlib2.immutable.ImmutableExceptionHandler; import org.jf.dexlib2.immutable.ImmutableExceptionHandler;

View File

@ -31,8 +31,6 @@
package org.jf.dexlib2.dexbacked; package org.jf.dexlib2.dexbacked;
import org.jf.dexlib2.DexFile;
import org.jf.dexlib2.DexFileReader;
import org.jf.dexlib2.dexbacked.util.AnnotationsDirectory; import org.jf.dexlib2.dexbacked.util.AnnotationsDirectory;
import org.jf.dexlib2.dexbacked.util.StaticInitialValueIterator; import org.jf.dexlib2.dexbacked.util.StaticInitialValueIterator;
import org.jf.dexlib2.iface.Field; import org.jf.dexlib2.iface.Field;

View File

@ -32,8 +32,6 @@
package org.jf.dexlib2.dexbacked; package org.jf.dexlib2.dexbacked;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import org.jf.dexlib2.DexFile;
import org.jf.dexlib2.DexFileReader;
import org.jf.dexlib2.dexbacked.util.AnnotationsDirectory; import org.jf.dexlib2.dexbacked.util.AnnotationsDirectory;
import org.jf.dexlib2.dexbacked.util.FixedSizeList; import org.jf.dexlib2.dexbacked.util.FixedSizeList;
import org.jf.dexlib2.iface.Annotation; import org.jf.dexlib2.iface.Annotation;

View File

@ -32,8 +32,6 @@
package org.jf.dexlib2.dexbacked; package org.jf.dexlib2.dexbacked;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import org.jf.dexlib2.DexFile;
import org.jf.dexlib2.DexFileReader;
import org.jf.dexlib2.dexbacked.instruction.DexBackedInstruction; import org.jf.dexlib2.dexbacked.instruction.DexBackedInstruction;
import org.jf.dexlib2.dexbacked.util.FixedSizeList; import org.jf.dexlib2.dexbacked.util.FixedSizeList;
import org.jf.dexlib2.dexbacked.util.InstructionOffsetMap; import org.jf.dexlib2.dexbacked.util.InstructionOffsetMap;

View File

@ -31,8 +31,6 @@
package org.jf.dexlib2.dexbacked; package org.jf.dexlib2.dexbacked;
import org.jf.dexlib2.DexFile;
import org.jf.dexlib2.DexFileReader;
import org.jf.dexlib2.dexbacked.util.InstructionOffsetMap; import org.jf.dexlib2.dexbacked.util.InstructionOffsetMap;
import org.jf.dexlib2.iface.ExceptionHandler; import org.jf.dexlib2.iface.ExceptionHandler;
import org.jf.dexlib2.iface.TryBlock; import org.jf.dexlib2.iface.TryBlock;

View File

@ -29,7 +29,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
package org.jf.dexlib2; package org.jf.dexlib2.dexbacked;
import javax.annotation.Nullable; import javax.annotation.Nullable;

View File

@ -29,7 +29,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
package org.jf.dexlib2; package org.jf.dexlib2.dexbacked;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;

View File

@ -31,7 +31,7 @@
package org.jf.dexlib2.dexbacked.instruction; package org.jf.dexlib2.dexbacked.instruction;
import org.jf.dexlib2.DexFileReader; import org.jf.dexlib2.dexbacked.DexFileReader;
import org.jf.dexlib2.Opcode; import org.jf.dexlib2.Opcode;
import org.jf.dexlib2.iface.instruction.Instruction; import org.jf.dexlib2.iface.instruction.Instruction;
import org.jf.dexlib2.iface.instruction.formats.*; import org.jf.dexlib2.iface.instruction.formats.*;

View File

@ -32,7 +32,7 @@
package org.jf.dexlib2.dexbacked.util; package org.jf.dexlib2.dexbacked.util;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import org.jf.dexlib2.DexFile; import org.jf.dexlib2.dexbacked.DexFile;
import org.jf.dexlib2.dexbacked.DexBackedAnnotation; import org.jf.dexlib2.dexbacked.DexBackedAnnotation;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;

View File

@ -31,8 +31,8 @@
package org.jf.dexlib2.dexbacked.util; package org.jf.dexlib2.dexbacked.util;
import org.jf.dexlib2.DexFile; import org.jf.dexlib2.dexbacked.DexFile;
import org.jf.dexlib2.DexFileReader; import org.jf.dexlib2.dexbacked.DexFileReader;
import org.jf.dexlib2.dexbacked.value.DexBackedEncodedValue; import org.jf.dexlib2.dexbacked.value.DexBackedEncodedValue;
import org.jf.dexlib2.iface.value.EncodedValue; import org.jf.dexlib2.iface.value.EncodedValue;

View File

@ -31,8 +31,8 @@
package org.jf.dexlib2.dexbacked.util; package org.jf.dexlib2.dexbacked.util;
import org.jf.dexlib2.DexFile; import org.jf.dexlib2.dexbacked.DexFile;
import org.jf.dexlib2.DexFileReader; import org.jf.dexlib2.dexbacked.DexFileReader;
import org.jf.util.AbstractListIterator; import org.jf.util.AbstractListIterator;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;

View File

@ -31,8 +31,8 @@
package org.jf.dexlib2.dexbacked.util; package org.jf.dexlib2.dexbacked.util;
import org.jf.dexlib2.DexFile; import org.jf.dexlib2.dexbacked.DexFile;
import org.jf.dexlib2.DexFileReader; import org.jf.dexlib2.dexbacked.DexFileReader;
import org.jf.util.AbstractListIterator; import org.jf.util.AbstractListIterator;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;

View File

@ -31,8 +31,8 @@
package org.jf.dexlib2.dexbacked.value; package org.jf.dexlib2.dexbacked.value;
import org.jf.dexlib2.DexFile; import org.jf.dexlib2.dexbacked.DexFile;
import org.jf.dexlib2.DexFileReader; import org.jf.dexlib2.dexbacked.DexFileReader;
import org.jf.dexlib2.ValueType; import org.jf.dexlib2.ValueType;
import org.jf.dexlib2.dexbacked.DexBackedAnnotationElement; import org.jf.dexlib2.dexbacked.DexBackedAnnotationElement;
import org.jf.dexlib2.dexbacked.util.VariableSizeList; import org.jf.dexlib2.dexbacked.util.VariableSizeList;

View File

@ -31,8 +31,8 @@
package org.jf.dexlib2.dexbacked.value; package org.jf.dexlib2.dexbacked.value;
import org.jf.dexlib2.DexFile; import org.jf.dexlib2.dexbacked.DexFile;
import org.jf.dexlib2.DexFileReader; import org.jf.dexlib2.dexbacked.DexFileReader;
import org.jf.dexlib2.ValueType; import org.jf.dexlib2.ValueType;
import org.jf.dexlib2.dexbacked.util.VariableSizeList; import org.jf.dexlib2.dexbacked.util.VariableSizeList;
import org.jf.dexlib2.iface.value.ArrayEncodedValue; import org.jf.dexlib2.iface.value.ArrayEncodedValue;

View File

@ -31,7 +31,7 @@
package org.jf.dexlib2.dexbacked.value; package org.jf.dexlib2.dexbacked.value;
import org.jf.dexlib2.DexFileReader; import org.jf.dexlib2.dexbacked.DexFileReader;
import org.jf.dexlib2.ValueType; import org.jf.dexlib2.ValueType;
import org.jf.dexlib2.iface.value.EncodedValue; import org.jf.dexlib2.iface.value.EncodedValue;
import org.jf.dexlib2.immutable.value.*; import org.jf.dexlib2.immutable.value.*;