diff --git a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedAnnotation.java b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedAnnotation.java index e5eaa559..11a5a271 100644 --- a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedAnnotation.java +++ b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedAnnotation.java @@ -31,8 +31,6 @@ 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.iface.Annotation; import org.jf.dexlib2.iface.AnnotationElement; diff --git a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedAnnotationElement.java b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedAnnotationElement.java index 6fe98188..06db0c0f 100644 --- a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedAnnotationElement.java +++ b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedAnnotationElement.java @@ -31,7 +31,6 @@ package org.jf.dexlib2.dexbacked; -import org.jf.dexlib2.DexFileReader; import org.jf.dexlib2.dexbacked.value.DexBackedEncodedValue; import org.jf.dexlib2.iface.AnnotationElement; import org.jf.dexlib2.iface.value.EncodedValue; diff --git a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedCatchAllExceptionHandler.java b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedCatchAllExceptionHandler.java index a472c27f..630e2b4c 100644 --- a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedCatchAllExceptionHandler.java +++ b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedCatchAllExceptionHandler.java @@ -31,7 +31,6 @@ package org.jf.dexlib2.dexbacked; -import org.jf.dexlib2.DexFileReader; import org.jf.dexlib2.dexbacked.util.InstructionOffsetMap; import org.jf.dexlib2.immutable.ImmutableExceptionHandler; diff --git a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedClassDef.java b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedClassDef.java index 28018747..27d11209 100644 --- a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedClassDef.java +++ b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedClassDef.java @@ -32,8 +32,6 @@ package org.jf.dexlib2.dexbacked; 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.iface.ClassDef; import org.jf.dexlib2.iface.Method; diff --git a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedExceptionHandler.java b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedExceptionHandler.java index 67ad855b..b9685da9 100644 --- a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedExceptionHandler.java +++ b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedExceptionHandler.java @@ -31,7 +31,6 @@ package org.jf.dexlib2.dexbacked; -import org.jf.dexlib2.DexFileReader; import org.jf.dexlib2.dexbacked.util.InstructionOffsetMap; import org.jf.dexlib2.immutable.ImmutableExceptionHandler; diff --git a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedField.java b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedField.java index 0682bae1..e33eb9ff 100644 --- a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedField.java +++ b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedField.java @@ -31,8 +31,6 @@ 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.StaticInitialValueIterator; import org.jf.dexlib2.iface.Field; diff --git a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedMethod.java b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedMethod.java index 712d143b..970cbbe5 100644 --- a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedMethod.java +++ b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedMethod.java @@ -32,8 +32,6 @@ package org.jf.dexlib2.dexbacked; 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.FixedSizeList; import org.jf.dexlib2.iface.Annotation; diff --git a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedMethodImplementation.java b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedMethodImplementation.java index 0180a556..b46f733f 100644 --- a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedMethodImplementation.java +++ b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedMethodImplementation.java @@ -32,8 +32,6 @@ package org.jf.dexlib2.dexbacked; 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.util.FixedSizeList; import org.jf.dexlib2.dexbacked.util.InstructionOffsetMap; diff --git a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedTryBlock.java b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedTryBlock.java index 96e7a2ce..1f01041b 100644 --- a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedTryBlock.java +++ b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedTryBlock.java @@ -31,8 +31,6 @@ 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.iface.ExceptionHandler; import org.jf.dexlib2.iface.TryBlock; diff --git a/dexlib2/src/main/java/org/jf/dexlib2/DexFile.java b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexFile.java similarity index 98% rename from dexlib2/src/main/java/org/jf/dexlib2/DexFile.java rename to dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexFile.java index f83e4478..3a8d58f8 100644 --- a/dexlib2/src/main/java/org/jf/dexlib2/DexFile.java +++ b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexFile.java @@ -29,7 +29,7 @@ * 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; diff --git a/dexlib2/src/main/java/org/jf/dexlib2/DexFileReader.java b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexFileReader.java similarity index 99% rename from dexlib2/src/main/java/org/jf/dexlib2/DexFileReader.java rename to dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexFileReader.java index ae6df975..ca44eb77 100644 --- a/dexlib2/src/main/java/org/jf/dexlib2/DexFileReader.java +++ b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexFileReader.java @@ -29,7 +29,7 @@ * 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; diff --git a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/instruction/DexBackedInstruction.java b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/instruction/DexBackedInstruction.java index 88107b07..964beeb7 100644 --- a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/instruction/DexBackedInstruction.java +++ b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/instruction/DexBackedInstruction.java @@ -31,7 +31,7 @@ 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.iface.instruction.Instruction; import org.jf.dexlib2.iface.instruction.formats.*; diff --git a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/util/AnnotationsDirectory.java b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/util/AnnotationsDirectory.java index 5cb9f54b..137713e8 100644 --- a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/util/AnnotationsDirectory.java +++ b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/util/AnnotationsDirectory.java @@ -32,7 +32,7 @@ package org.jf.dexlib2.dexbacked.util; import com.google.common.collect.ImmutableList; -import org.jf.dexlib2.DexFile; +import org.jf.dexlib2.dexbacked.DexFile; import org.jf.dexlib2.dexbacked.DexBackedAnnotation; import javax.annotation.Nonnull; diff --git a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/util/StaticInitialValueIterator.java b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/util/StaticInitialValueIterator.java index 0f19e69a..bcedb4b0 100644 --- a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/util/StaticInitialValueIterator.java +++ b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/util/StaticInitialValueIterator.java @@ -31,8 +31,8 @@ package org.jf.dexlib2.dexbacked.util; -import org.jf.dexlib2.DexFile; -import org.jf.dexlib2.DexFileReader; +import org.jf.dexlib2.dexbacked.DexFile; +import org.jf.dexlib2.dexbacked.DexFileReader; import org.jf.dexlib2.dexbacked.value.DexBackedEncodedValue; import org.jf.dexlib2.iface.value.EncodedValue; diff --git a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/util/VariableSizeList.java b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/util/VariableSizeList.java index fb95ee31..6d0bb93f 100644 --- a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/util/VariableSizeList.java +++ b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/util/VariableSizeList.java @@ -31,8 +31,8 @@ package org.jf.dexlib2.dexbacked.util; -import org.jf.dexlib2.DexFile; -import org.jf.dexlib2.DexFileReader; +import org.jf.dexlib2.dexbacked.DexFile; +import org.jf.dexlib2.dexbacked.DexFileReader; import org.jf.util.AbstractListIterator; import javax.annotation.Nonnull; diff --git a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/util/VariableSizeListWithContext.java b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/util/VariableSizeListWithContext.java index 6729f15a..5e8ae2ce 100644 --- a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/util/VariableSizeListWithContext.java +++ b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/util/VariableSizeListWithContext.java @@ -31,8 +31,8 @@ package org.jf.dexlib2.dexbacked.util; -import org.jf.dexlib2.DexFile; -import org.jf.dexlib2.DexFileReader; +import org.jf.dexlib2.dexbacked.DexFile; +import org.jf.dexlib2.dexbacked.DexFileReader; import org.jf.util.AbstractListIterator; import javax.annotation.Nonnull; diff --git a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/value/DexBackedAnnotationEncodedValue.java b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/value/DexBackedAnnotationEncodedValue.java index 0a1de17c..0f92501e 100644 --- a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/value/DexBackedAnnotationEncodedValue.java +++ b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/value/DexBackedAnnotationEncodedValue.java @@ -31,8 +31,8 @@ package org.jf.dexlib2.dexbacked.value; -import org.jf.dexlib2.DexFile; -import org.jf.dexlib2.DexFileReader; +import org.jf.dexlib2.dexbacked.DexFile; +import org.jf.dexlib2.dexbacked.DexFileReader; import org.jf.dexlib2.ValueType; import org.jf.dexlib2.dexbacked.DexBackedAnnotationElement; import org.jf.dexlib2.dexbacked.util.VariableSizeList; diff --git a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/value/DexBackedArrayEncodedValue.java b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/value/DexBackedArrayEncodedValue.java index 0c1bc14a..58a6baad 100644 --- a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/value/DexBackedArrayEncodedValue.java +++ b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/value/DexBackedArrayEncodedValue.java @@ -31,8 +31,8 @@ package org.jf.dexlib2.dexbacked.value; -import org.jf.dexlib2.DexFile; -import org.jf.dexlib2.DexFileReader; +import org.jf.dexlib2.dexbacked.DexFile; +import org.jf.dexlib2.dexbacked.DexFileReader; import org.jf.dexlib2.ValueType; import org.jf.dexlib2.dexbacked.util.VariableSizeList; import org.jf.dexlib2.iface.value.ArrayEncodedValue; diff --git a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/value/DexBackedEncodedValue.java b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/value/DexBackedEncodedValue.java index 3448e450..dc08ee92 100644 --- a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/value/DexBackedEncodedValue.java +++ b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/value/DexBackedEncodedValue.java @@ -31,7 +31,7 @@ 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.iface.value.EncodedValue; import org.jf.dexlib2.immutable.value.*;