diff --git a/dexlib/src/main/java/org/jf/dexlib/ByteField.java b/dexlib/src/main/java/org/jf/dexlib/ByteField.java index bbeefeab..b7757491 100644 --- a/dexlib/src/main/java/org/jf/dexlib/ByteField.java +++ b/dexlib/src/main/java/org/jf/dexlib/ByteField.java @@ -28,8 +28,8 @@ package org.jf.dexlib; -import org.jf.dexlib.util.Input; -import org.jf.dexlib.util.Output; +import org.jf.dexlib.Util.Input; +import org.jf.dexlib.Util.Output; public class ByteField extends CachedIntegerValueField { public ByteField(String fieldName) { diff --git a/dexlib/src/main/java/org/jf/dexlib/CachedIntegerValueField.java b/dexlib/src/main/java/org/jf/dexlib/CachedIntegerValueField.java index 6e548b3d..33b44620 100644 --- a/dexlib/src/main/java/org/jf/dexlib/CachedIntegerValueField.java +++ b/dexlib/src/main/java/org/jf/dexlib/CachedIntegerValueField.java @@ -28,8 +28,8 @@ package org.jf.dexlib; -import org.jf.dexlib.util.AnnotatedOutput; -import org.jf.dexlib.util.Output; +import org.jf.dexlib.Util.AnnotatedOutput; +import org.jf.dexlib.Util.Output; public abstract class CachedIntegerValueField implements Field { diff --git a/dexlib/src/main/java/org/jf/dexlib/ClassDataItem.java b/dexlib/src/main/java/org/jf/dexlib/ClassDataItem.java index a17c6bcf..ac4bd505 100644 --- a/dexlib/src/main/java/org/jf/dexlib/ClassDataItem.java +++ b/dexlib/src/main/java/org/jf/dexlib/ClassDataItem.java @@ -28,7 +28,7 @@ package org.jf.dexlib; -import org.jf.dexlib.util.*; +import org.jf.dexlib.Util.*; import java.util.ArrayList; import java.util.Collections; diff --git a/dexlib/src/main/java/org/jf/dexlib/ClassDefItem.java b/dexlib/src/main/java/org/jf/dexlib/ClassDefItem.java index 496664a6..5cf98f2d 100644 --- a/dexlib/src/main/java/org/jf/dexlib/ClassDefItem.java +++ b/dexlib/src/main/java/org/jf/dexlib/ClassDefItem.java @@ -30,7 +30,7 @@ package org.jf.dexlib; import org.jf.dexlib.EncodedValue.EncodedValue; import org.jf.dexlib.EncodedValue.EncodedValueSubField; -import org.jf.dexlib.util.TypeUtils; +import org.jf.dexlib.Util.TypeUtils; import java.util.ArrayList; import java.util.HashMap; diff --git a/dexlib/src/main/java/org/jf/dexlib/code/Format/ArrayDataPseudoInstruction.java b/dexlib/src/main/java/org/jf/dexlib/Code/Format/ArrayDataPseudoInstruction.java similarity index 94% rename from dexlib/src/main/java/org/jf/dexlib/code/Format/ArrayDataPseudoInstruction.java rename to dexlib/src/main/java/org/jf/dexlib/Code/Format/ArrayDataPseudoInstruction.java index e117b193..3f4f0001 100644 --- a/dexlib/src/main/java/org/jf/dexlib/code/Format/ArrayDataPseudoInstruction.java +++ b/dexlib/src/main/java/org/jf/dexlib/Code/Format/ArrayDataPseudoInstruction.java @@ -26,13 +26,13 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.jf.dexlib.code.Format; +package org.jf.dexlib.Code.Format; import org.jf.dexlib.DexFile; import org.jf.dexlib.IndexedItem; -import org.jf.dexlib.code.Instruction; -import org.jf.dexlib.code.Opcode; -import org.jf.dexlib.util.Input; +import org.jf.dexlib.Code.Instruction; +import org.jf.dexlib.Code.Opcode; +import org.jf.dexlib.Util.Input; import java.util.ArrayList; import java.util.List; diff --git a/dexlib/src/main/java/org/jf/dexlib/code/Format/Format.java b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Format.java similarity index 95% rename from dexlib/src/main/java/org/jf/dexlib/code/Format/Format.java rename to dexlib/src/main/java/org/jf/dexlib/Code/Format/Format.java index ae901621..a6603567 100644 --- a/dexlib/src/main/java/org/jf/dexlib/code/Format/Format.java +++ b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Format.java @@ -26,9 +26,9 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.jf.dexlib.code.Format; +package org.jf.dexlib.Code.Format; -import org.jf.dexlib.code.Instruction; +import org.jf.dexlib.Code.Instruction; public enum Format { diff --git a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction10t.java b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction10t.java similarity index 93% rename from dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction10t.java rename to dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction10t.java index 68cb063a..cb1d2ab5 100644 --- a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction10t.java +++ b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction10t.java @@ -26,12 +26,12 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.jf.dexlib.code.Format; +package org.jf.dexlib.Code.Format; import org.jf.dexlib.DexFile; import org.jf.dexlib.IndexedItem; -import org.jf.dexlib.code.Instruction; -import org.jf.dexlib.code.Opcode; +import org.jf.dexlib.Code.Instruction; +import org.jf.dexlib.Code.Opcode; public class Instruction10t extends Instruction { diff --git a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction10x.java b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction10x.java similarity index 93% rename from dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction10x.java rename to dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction10x.java index 61430a4a..dd434346 100644 --- a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction10x.java +++ b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction10x.java @@ -26,12 +26,12 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.jf.dexlib.code.Format; +package org.jf.dexlib.Code.Format; import org.jf.dexlib.DexFile; import org.jf.dexlib.IndexedItem; -import org.jf.dexlib.code.Instruction; -import org.jf.dexlib.code.Opcode; +import org.jf.dexlib.Code.Instruction; +import org.jf.dexlib.Code.Opcode; public class Instruction10x extends Instruction { diff --git a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction11n.java b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction11n.java similarity index 92% rename from dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction11n.java rename to dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction11n.java index c983668d..e885df8f 100644 --- a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction11n.java +++ b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction11n.java @@ -26,13 +26,13 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.jf.dexlib.code.Format; +package org.jf.dexlib.Code.Format; import org.jf.dexlib.DexFile; import org.jf.dexlib.IndexedItem; -import org.jf.dexlib.code.Instruction; -import org.jf.dexlib.code.Opcode; -import org.jf.dexlib.util.NumberUtils; +import org.jf.dexlib.Code.Instruction; +import org.jf.dexlib.Code.Opcode; +import org.jf.dexlib.Util.NumberUtils; public class Instruction11n extends Instruction { diff --git a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction11x.java b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction11x.java similarity index 92% rename from dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction11x.java rename to dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction11x.java index c3eed89e..ada38e67 100644 --- a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction11x.java +++ b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction11x.java @@ -26,13 +26,13 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.jf.dexlib.code.Format; +package org.jf.dexlib.Code.Format; import org.jf.dexlib.DexFile; import org.jf.dexlib.IndexedItem; -import org.jf.dexlib.code.Instruction; -import org.jf.dexlib.code.Opcode; -import org.jf.dexlib.util.NumberUtils; +import org.jf.dexlib.Code.Instruction; +import org.jf.dexlib.Code.Opcode; +import org.jf.dexlib.Util.NumberUtils; public class Instruction11x extends Instruction { diff --git a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction12x.java b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction12x.java similarity index 92% rename from dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction12x.java rename to dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction12x.java index 728d35e5..94024b12 100644 --- a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction12x.java +++ b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction12x.java @@ -26,13 +26,13 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.jf.dexlib.code.Format; +package org.jf.dexlib.Code.Format; import org.jf.dexlib.DexFile; import org.jf.dexlib.IndexedItem; -import org.jf.dexlib.code.Instruction; -import org.jf.dexlib.code.Opcode; -import org.jf.dexlib.util.NumberUtils; +import org.jf.dexlib.Code.Instruction; +import org.jf.dexlib.Code.Opcode; +import org.jf.dexlib.Util.NumberUtils; public class Instruction12x extends Instruction { diff --git a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction20t.java b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction20t.java similarity index 92% rename from dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction20t.java rename to dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction20t.java index f62df1e9..31078958 100644 --- a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction20t.java +++ b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction20t.java @@ -26,13 +26,13 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.jf.dexlib.code.Format; +package org.jf.dexlib.Code.Format; import org.jf.dexlib.DexFile; import org.jf.dexlib.IndexedItem; -import org.jf.dexlib.code.Instruction; -import org.jf.dexlib.code.Opcode; -import org.jf.dexlib.util.NumberUtils; +import org.jf.dexlib.Code.Instruction; +import org.jf.dexlib.Code.Opcode; +import org.jf.dexlib.Util.NumberUtils; public class Instruction20t extends Instruction { diff --git a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction21c.java b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction21c.java similarity index 93% rename from dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction21c.java rename to dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction21c.java index 71fca5d0..7333aae8 100644 --- a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction21c.java +++ b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction21c.java @@ -26,14 +26,14 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.jf.dexlib.code.Format; +package org.jf.dexlib.Code.Format; import org.jf.dexlib.DexFile; import org.jf.dexlib.IndexedItem; import org.jf.dexlib.TypeIdItem; -import org.jf.dexlib.code.Instruction; -import org.jf.dexlib.code.Opcode; -import org.jf.dexlib.util.NumberUtils; +import org.jf.dexlib.Code.Instruction; +import org.jf.dexlib.Code.Opcode; +import org.jf.dexlib.Util.NumberUtils; public class Instruction21c extends Instruction { diff --git a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction21h.java b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction21h.java similarity index 92% rename from dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction21h.java rename to dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction21h.java index 04c17736..5969f0a8 100644 --- a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction21h.java +++ b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction21h.java @@ -26,13 +26,13 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.jf.dexlib.code.Format; +package org.jf.dexlib.Code.Format; import org.jf.dexlib.DexFile; import org.jf.dexlib.IndexedItem; -import org.jf.dexlib.code.Instruction; -import org.jf.dexlib.code.Opcode; -import org.jf.dexlib.util.NumberUtils; +import org.jf.dexlib.Code.Instruction; +import org.jf.dexlib.Code.Opcode; +import org.jf.dexlib.Util.NumberUtils; public class Instruction21h extends Instruction { diff --git a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction21s.java b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction21s.java similarity index 92% rename from dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction21s.java rename to dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction21s.java index 5def4c0a..fb382b91 100644 --- a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction21s.java +++ b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction21s.java @@ -26,13 +26,13 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.jf.dexlib.code.Format; +package org.jf.dexlib.Code.Format; import org.jf.dexlib.DexFile; import org.jf.dexlib.IndexedItem; -import org.jf.dexlib.code.Instruction; -import org.jf.dexlib.code.Opcode; -import org.jf.dexlib.util.NumberUtils; +import org.jf.dexlib.Code.Instruction; +import org.jf.dexlib.Code.Opcode; +import org.jf.dexlib.Util.NumberUtils; public class Instruction21s extends Instruction { diff --git a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction21t.java b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction21t.java similarity index 93% rename from dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction21t.java rename to dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction21t.java index 53c04d87..e12df804 100644 --- a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction21t.java +++ b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction21t.java @@ -26,13 +26,13 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.jf.dexlib.code.Format; +package org.jf.dexlib.Code.Format; import org.jf.dexlib.DexFile; import org.jf.dexlib.IndexedItem; -import org.jf.dexlib.code.Instruction; -import org.jf.dexlib.code.Opcode; -import org.jf.dexlib.util.NumberUtils; +import org.jf.dexlib.Code.Instruction; +import org.jf.dexlib.Code.Opcode; +import org.jf.dexlib.Util.NumberUtils; public class Instruction21t extends Instruction { diff --git a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction22b.java b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction22b.java similarity index 92% rename from dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction22b.java rename to dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction22b.java index 97103c7a..23f8c981 100644 --- a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction22b.java +++ b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction22b.java @@ -26,13 +26,13 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.jf.dexlib.code.Format; +package org.jf.dexlib.Code.Format; import org.jf.dexlib.DexFile; import org.jf.dexlib.IndexedItem; -import org.jf.dexlib.code.Instruction; -import org.jf.dexlib.code.Opcode; -import org.jf.dexlib.util.NumberUtils; +import org.jf.dexlib.Code.Instruction; +import org.jf.dexlib.Code.Opcode; +import org.jf.dexlib.Util.NumberUtils; public class Instruction22b extends Instruction { diff --git a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction22c.java b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction22c.java similarity index 92% rename from dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction22c.java rename to dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction22c.java index ed8fa3be..79dfbde0 100644 --- a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction22c.java +++ b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction22c.java @@ -26,13 +26,13 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.jf.dexlib.code.Format; +package org.jf.dexlib.Code.Format; import org.jf.dexlib.DexFile; import org.jf.dexlib.IndexedItem; -import org.jf.dexlib.code.Instruction; -import org.jf.dexlib.code.Opcode; -import org.jf.dexlib.util.NumberUtils; +import org.jf.dexlib.Code.Instruction; +import org.jf.dexlib.Code.Opcode; +import org.jf.dexlib.Util.NumberUtils; public class Instruction22c extends Instruction { diff --git a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction22s.java b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction22s.java similarity index 93% rename from dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction22s.java rename to dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction22s.java index 12231ca8..c9905df7 100644 --- a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction22s.java +++ b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction22s.java @@ -26,13 +26,13 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.jf.dexlib.code.Format; +package org.jf.dexlib.Code.Format; import org.jf.dexlib.DexFile; import org.jf.dexlib.IndexedItem; -import org.jf.dexlib.code.Instruction; -import org.jf.dexlib.code.Opcode; -import org.jf.dexlib.util.NumberUtils; +import org.jf.dexlib.Code.Instruction; +import org.jf.dexlib.Code.Opcode; +import org.jf.dexlib.Util.NumberUtils; public class Instruction22s extends Instruction { diff --git a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction22t.java b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction22t.java similarity index 93% rename from dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction22t.java rename to dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction22t.java index fde8a257..f37991af 100644 --- a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction22t.java +++ b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction22t.java @@ -26,13 +26,13 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.jf.dexlib.code.Format; +package org.jf.dexlib.Code.Format; import org.jf.dexlib.DexFile; import org.jf.dexlib.IndexedItem; -import org.jf.dexlib.code.Instruction; -import org.jf.dexlib.code.Opcode; -import org.jf.dexlib.util.NumberUtils; +import org.jf.dexlib.Code.Instruction; +import org.jf.dexlib.Code.Opcode; +import org.jf.dexlib.Util.NumberUtils; public class Instruction22t extends Instruction { diff --git a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction22x.java b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction22x.java similarity index 92% rename from dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction22x.java rename to dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction22x.java index 3f98cca7..cd044afd 100644 --- a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction22x.java +++ b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction22x.java @@ -26,13 +26,13 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.jf.dexlib.code.Format; +package org.jf.dexlib.Code.Format; import org.jf.dexlib.DexFile; import org.jf.dexlib.IndexedItem; -import org.jf.dexlib.code.Instruction; -import org.jf.dexlib.code.Opcode; -import org.jf.dexlib.util.NumberUtils; +import org.jf.dexlib.Code.Instruction; +import org.jf.dexlib.Code.Opcode; +import org.jf.dexlib.Util.NumberUtils; public class Instruction22x extends Instruction { diff --git a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction23x.java b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction23x.java similarity index 92% rename from dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction23x.java rename to dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction23x.java index 1471c71a..f1b940d8 100644 --- a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction23x.java +++ b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction23x.java @@ -26,13 +26,13 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.jf.dexlib.code.Format; +package org.jf.dexlib.Code.Format; import org.jf.dexlib.DexFile; import org.jf.dexlib.IndexedItem; -import org.jf.dexlib.code.Instruction; -import org.jf.dexlib.code.Opcode; -import org.jf.dexlib.util.NumberUtils; +import org.jf.dexlib.Code.Instruction; +import org.jf.dexlib.Code.Opcode; +import org.jf.dexlib.Util.NumberUtils; public class Instruction23x extends Instruction { diff --git a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction30t.java b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction30t.java similarity index 92% rename from dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction30t.java rename to dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction30t.java index e36fa932..0219b95c 100644 --- a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction30t.java +++ b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction30t.java @@ -26,13 +26,13 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.jf.dexlib.code.Format; +package org.jf.dexlib.Code.Format; import org.jf.dexlib.DexFile; import org.jf.dexlib.IndexedItem; -import org.jf.dexlib.code.Instruction; -import org.jf.dexlib.code.Opcode; -import org.jf.dexlib.util.NumberUtils; +import org.jf.dexlib.Code.Instruction; +import org.jf.dexlib.Code.Opcode; +import org.jf.dexlib.Util.NumberUtils; public class Instruction30t extends Instruction { diff --git a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction31c.java b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction31c.java similarity index 92% rename from dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction31c.java rename to dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction31c.java index c80e9d97..8f5f17c3 100644 --- a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction31c.java +++ b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction31c.java @@ -26,13 +26,13 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.jf.dexlib.code.Format; +package org.jf.dexlib.Code.Format; import org.jf.dexlib.DexFile; import org.jf.dexlib.IndexedItem; -import org.jf.dexlib.code.Instruction; -import org.jf.dexlib.code.Opcode; -import org.jf.dexlib.util.NumberUtils; +import org.jf.dexlib.Code.Instruction; +import org.jf.dexlib.Code.Opcode; +import org.jf.dexlib.Util.NumberUtils; public class Instruction31c extends Instruction { diff --git a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction31i.java b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction31i.java similarity index 93% rename from dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction31i.java rename to dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction31i.java index f0c187e0..6d9fa6c3 100644 --- a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction31i.java +++ b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction31i.java @@ -26,13 +26,13 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.jf.dexlib.code.Format; +package org.jf.dexlib.Code.Format; import org.jf.dexlib.DexFile; import org.jf.dexlib.IndexedItem; -import org.jf.dexlib.code.Instruction; -import org.jf.dexlib.code.Opcode; -import org.jf.dexlib.util.NumberUtils; +import org.jf.dexlib.Code.Instruction; +import org.jf.dexlib.Code.Opcode; +import org.jf.dexlib.Util.NumberUtils; public class Instruction31i extends Instruction { diff --git a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction31t.java b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction31t.java similarity index 93% rename from dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction31t.java rename to dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction31t.java index bc8fe51e..c52de6bb 100644 --- a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction31t.java +++ b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction31t.java @@ -26,13 +26,13 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.jf.dexlib.code.Format; +package org.jf.dexlib.Code.Format; import org.jf.dexlib.DexFile; import org.jf.dexlib.IndexedItem; -import org.jf.dexlib.code.Instruction; -import org.jf.dexlib.code.Opcode; -import org.jf.dexlib.util.NumberUtils; +import org.jf.dexlib.Code.Instruction; +import org.jf.dexlib.Code.Opcode; +import org.jf.dexlib.Util.NumberUtils; public class Instruction31t extends Instruction { diff --git a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction32x.java b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction32x.java similarity index 92% rename from dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction32x.java rename to dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction32x.java index f77ef9ed..0e057c99 100644 --- a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction32x.java +++ b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction32x.java @@ -26,13 +26,13 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.jf.dexlib.code.Format; +package org.jf.dexlib.Code.Format; import org.jf.dexlib.DexFile; import org.jf.dexlib.IndexedItem; -import org.jf.dexlib.code.Instruction; -import org.jf.dexlib.code.Opcode; -import org.jf.dexlib.util.NumberUtils; +import org.jf.dexlib.Code.Instruction; +import org.jf.dexlib.Code.Opcode; +import org.jf.dexlib.Util.NumberUtils; public class Instruction32x extends Instruction { diff --git a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction35c.java b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction35c.java similarity index 93% rename from dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction35c.java rename to dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction35c.java index f6828f03..9fc37ce5 100644 --- a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction35c.java +++ b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction35c.java @@ -26,16 +26,16 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.jf.dexlib.code.Format; +package org.jf.dexlib.Code.Format; import org.jf.dexlib.DexFile; import org.jf.dexlib.IndexedItem; import org.jf.dexlib.MethodIdItem; import org.jf.dexlib.TypeIdItem; -import org.jf.dexlib.code.Instruction; -import org.jf.dexlib.code.Opcode; -import static org.jf.dexlib.code.Opcode.*; -import org.jf.dexlib.util.NumberUtils; +import org.jf.dexlib.Code.Instruction; +import org.jf.dexlib.Code.Opcode; +import static org.jf.dexlib.Code.Opcode.*; +import org.jf.dexlib.Util.NumberUtils; public class Instruction35c extends Instruction { diff --git a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction3rc.java b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction3rc.java similarity index 93% rename from dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction3rc.java rename to dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction3rc.java index d28279de..6de44a1a 100644 --- a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction3rc.java +++ b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction3rc.java @@ -26,16 +26,16 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.jf.dexlib.code.Format; +package org.jf.dexlib.Code.Format; import org.jf.dexlib.DexFile; import org.jf.dexlib.IndexedItem; import org.jf.dexlib.MethodIdItem; import org.jf.dexlib.TypeIdItem; -import org.jf.dexlib.code.Instruction; -import org.jf.dexlib.code.Opcode; -import static org.jf.dexlib.code.Opcode.*; -import org.jf.dexlib.util.NumberUtils; +import org.jf.dexlib.Code.Instruction; +import org.jf.dexlib.Code.Opcode; +import static org.jf.dexlib.Code.Opcode.*; +import org.jf.dexlib.Util.NumberUtils; public class Instruction3rc extends Instruction { diff --git a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction51l.java b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction51l.java similarity index 93% rename from dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction51l.java rename to dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction51l.java index fff6de13..959126fe 100644 --- a/dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction51l.java +++ b/dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction51l.java @@ -26,13 +26,13 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.jf.dexlib.code.Format; +package org.jf.dexlib.Code.Format; import org.jf.dexlib.DexFile; import org.jf.dexlib.IndexedItem; -import org.jf.dexlib.code.Instruction; -import org.jf.dexlib.code.Opcode; -import org.jf.dexlib.util.NumberUtils; +import org.jf.dexlib.Code.Instruction; +import org.jf.dexlib.Code.Opcode; +import org.jf.dexlib.Util.NumberUtils; public class Instruction51l extends Instruction { diff --git a/dexlib/src/main/java/org/jf/dexlib/code/Format/PackedSwitchDataPseudoInstruction.java b/dexlib/src/main/java/org/jf/dexlib/Code/Format/PackedSwitchDataPseudoInstruction.java similarity index 94% rename from dexlib/src/main/java/org/jf/dexlib/code/Format/PackedSwitchDataPseudoInstruction.java rename to dexlib/src/main/java/org/jf/dexlib/Code/Format/PackedSwitchDataPseudoInstruction.java index 1dbb55ed..50864adb 100644 --- a/dexlib/src/main/java/org/jf/dexlib/code/Format/PackedSwitchDataPseudoInstruction.java +++ b/dexlib/src/main/java/org/jf/dexlib/Code/Format/PackedSwitchDataPseudoInstruction.java @@ -26,13 +26,13 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.jf.dexlib.code.Format; +package org.jf.dexlib.Code.Format; import org.jf.dexlib.DexFile; import org.jf.dexlib.IndexedItem; -import org.jf.dexlib.code.Instruction; -import org.jf.dexlib.code.Opcode; -import org.jf.dexlib.util.Input; +import org.jf.dexlib.Code.Instruction; +import org.jf.dexlib.Code.Opcode; +import org.jf.dexlib.Util.Input; public class PackedSwitchDataPseudoInstruction extends Instruction { diff --git a/dexlib/src/main/java/org/jf/dexlib/code/Format/SparseSwitchDataPseudoInstruction.java b/dexlib/src/main/java/org/jf/dexlib/Code/Format/SparseSwitchDataPseudoInstruction.java similarity index 94% rename from dexlib/src/main/java/org/jf/dexlib/code/Format/SparseSwitchDataPseudoInstruction.java rename to dexlib/src/main/java/org/jf/dexlib/Code/Format/SparseSwitchDataPseudoInstruction.java index c15a6bd7..c2bf5992 100644 --- a/dexlib/src/main/java/org/jf/dexlib/code/Format/SparseSwitchDataPseudoInstruction.java +++ b/dexlib/src/main/java/org/jf/dexlib/Code/Format/SparseSwitchDataPseudoInstruction.java @@ -26,13 +26,13 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.jf.dexlib.code.Format; +package org.jf.dexlib.Code.Format; import org.jf.dexlib.DexFile; import org.jf.dexlib.IndexedItem; -import org.jf.dexlib.code.Instruction; -import org.jf.dexlib.code.Opcode; -import org.jf.dexlib.util.Input; +import org.jf.dexlib.Code.Instruction; +import org.jf.dexlib.Code.Opcode; +import org.jf.dexlib.Util.Input; public class SparseSwitchDataPseudoInstruction extends Instruction { diff --git a/dexlib/src/main/java/org/jf/dexlib/code/Instruction.java b/dexlib/src/main/java/org/jf/dexlib/Code/Instruction.java similarity index 96% rename from dexlib/src/main/java/org/jf/dexlib/code/Instruction.java rename to dexlib/src/main/java/org/jf/dexlib/Code/Instruction.java index 8dbe7978..4a63a2d9 100644 --- a/dexlib/src/main/java/org/jf/dexlib/code/Instruction.java +++ b/dexlib/src/main/java/org/jf/dexlib/Code/Instruction.java @@ -26,11 +26,11 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.jf.dexlib.code; +package org.jf.dexlib.Code; import org.jf.dexlib.*; -import org.jf.dexlib.util.NumberUtils; -import org.jf.dexlib.code.Format.Format; +import org.jf.dexlib.Util.NumberUtils; +import org.jf.dexlib.Code.Format.Format; public abstract class Instruction { private DexFile dexFile; diff --git a/dexlib/src/main/java/org/jf/dexlib/code/InstructionField.java b/dexlib/src/main/java/org/jf/dexlib/Code/InstructionField.java similarity index 94% rename from dexlib/src/main/java/org/jf/dexlib/code/InstructionField.java rename to dexlib/src/main/java/org/jf/dexlib/Code/InstructionField.java index c2b2de18..42f6995c 100644 --- a/dexlib/src/main/java/org/jf/dexlib/code/InstructionField.java +++ b/dexlib/src/main/java/org/jf/dexlib/Code/InstructionField.java @@ -26,16 +26,16 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.jf.dexlib.code; +package org.jf.dexlib.Code; import org.jf.dexlib.DexFile; import org.jf.dexlib.Field; import org.jf.dexlib.IndexedItem; -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.util.AnnotatedOutput; -import org.jf.dexlib.util.Input; +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.Util.AnnotatedOutput; +import org.jf.dexlib.Util.Input; public class InstructionField implements Field { private Instruction instruction; diff --git a/dexlib/src/main/java/org/jf/dexlib/code/Opcode.java b/dexlib/src/main/java/org/jf/dexlib/Code/Opcode.java similarity index 98% rename from dexlib/src/main/java/org/jf/dexlib/code/Opcode.java rename to dexlib/src/main/java/org/jf/dexlib/Code/Opcode.java index 291bc9a4..a6dc2efb 100644 --- a/dexlib/src/main/java/org/jf/dexlib/code/Opcode.java +++ b/dexlib/src/main/java/org/jf/dexlib/Code/Opcode.java @@ -26,9 +26,9 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.jf.dexlib.code; +package org.jf.dexlib.Code; -import org.jf.dexlib.code.Format.Format; +import org.jf.dexlib.Code.Format.Format; import java.util.ArrayList; import java.util.HashMap; diff --git a/dexlib/src/main/java/org/jf/dexlib/code/ReferenceType.java b/dexlib/src/main/java/org/jf/dexlib/Code/ReferenceType.java similarity index 96% rename from dexlib/src/main/java/org/jf/dexlib/code/ReferenceType.java rename to dexlib/src/main/java/org/jf/dexlib/Code/ReferenceType.java index 0615e54f..fa714743 100644 --- a/dexlib/src/main/java/org/jf/dexlib/code/ReferenceType.java +++ b/dexlib/src/main/java/org/jf/dexlib/Code/ReferenceType.java @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.jf.dexlib.code; +package org.jf.dexlib.Code; import org.jf.dexlib.*; diff --git a/dexlib/src/main/java/org/jf/dexlib/CodeItem.java b/dexlib/src/main/java/org/jf/dexlib/CodeItem.java index a9ca13fe..82d907e0 100644 --- a/dexlib/src/main/java/org/jf/dexlib/CodeItem.java +++ b/dexlib/src/main/java/org/jf/dexlib/CodeItem.java @@ -28,10 +28,10 @@ package org.jf.dexlib; -import org.jf.dexlib.code.InstructionField; -import org.jf.dexlib.code.Opcode; -import org.jf.dexlib.util.AnnotatedOutput; -import org.jf.dexlib.util.Input; +import org.jf.dexlib.Code.InstructionField; +import org.jf.dexlib.Code.Opcode; +import org.jf.dexlib.Util.AnnotatedOutput; +import org.jf.dexlib.Util.Input; import java.util.ArrayList; import java.util.HashMap; diff --git a/dexlib/src/main/java/org/jf/dexlib/CompositeField.java b/dexlib/src/main/java/org/jf/dexlib/CompositeField.java index f3e41857..bc79b776 100644 --- a/dexlib/src/main/java/org/jf/dexlib/CompositeField.java +++ b/dexlib/src/main/java/org/jf/dexlib/CompositeField.java @@ -28,8 +28,8 @@ package org.jf.dexlib; -import org.jf.dexlib.util.AnnotatedOutput; -import org.jf.dexlib.util.Input; +import org.jf.dexlib.Util.AnnotatedOutput; +import org.jf.dexlib.Util.Input; public abstract class CompositeField> implements Field { diff --git a/dexlib/src/main/java/org/jf/dexlib/debug/AdvanceLine.java b/dexlib/src/main/java/org/jf/dexlib/Debug/AdvanceLine.java similarity index 96% rename from dexlib/src/main/java/org/jf/dexlib/debug/AdvanceLine.java rename to dexlib/src/main/java/org/jf/dexlib/Debug/AdvanceLine.java index a4aa4500..4f976973 100644 --- a/dexlib/src/main/java/org/jf/dexlib/debug/AdvanceLine.java +++ b/dexlib/src/main/java/org/jf/dexlib/Debug/AdvanceLine.java @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.jf.dexlib.debug; +package org.jf.dexlib.Debug; import org.jf.dexlib.ByteField; import org.jf.dexlib.CompositeField; diff --git a/dexlib/src/main/java/org/jf/dexlib/debug/AdvancePC.java b/dexlib/src/main/java/org/jf/dexlib/Debug/AdvancePC.java similarity index 96% rename from dexlib/src/main/java/org/jf/dexlib/debug/AdvancePC.java rename to dexlib/src/main/java/org/jf/dexlib/Debug/AdvancePC.java index d341f368..03255c94 100644 --- a/dexlib/src/main/java/org/jf/dexlib/debug/AdvancePC.java +++ b/dexlib/src/main/java/org/jf/dexlib/Debug/AdvancePC.java @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.jf.dexlib.debug; +package org.jf.dexlib.Debug; import org.jf.dexlib.ByteField; import org.jf.dexlib.CompositeField; diff --git a/dexlib/src/main/java/org/jf/dexlib/debug/DebugInstruction.java b/dexlib/src/main/java/org/jf/dexlib/Debug/DebugInstruction.java similarity index 96% rename from dexlib/src/main/java/org/jf/dexlib/debug/DebugInstruction.java rename to dexlib/src/main/java/org/jf/dexlib/Debug/DebugInstruction.java index 7f957de9..db4a1436 100644 --- a/dexlib/src/main/java/org/jf/dexlib/debug/DebugInstruction.java +++ b/dexlib/src/main/java/org/jf/dexlib/Debug/DebugInstruction.java @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.jf.dexlib.debug; +package org.jf.dexlib.Debug; import org.jf.dexlib.Field; diff --git a/dexlib/src/main/java/org/jf/dexlib/debug/DebugInstructionFactory.java b/dexlib/src/main/java/org/jf/dexlib/Debug/DebugInstructionFactory.java similarity index 95% rename from dexlib/src/main/java/org/jf/dexlib/debug/DebugInstructionFactory.java rename to dexlib/src/main/java/org/jf/dexlib/Debug/DebugInstructionFactory.java index bb72709a..f01a7127 100644 --- a/dexlib/src/main/java/org/jf/dexlib/debug/DebugInstructionFactory.java +++ b/dexlib/src/main/java/org/jf/dexlib/Debug/DebugInstructionFactory.java @@ -26,10 +26,10 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.jf.dexlib.debug; +package org.jf.dexlib.Debug; import org.jf.dexlib.DexFile; -import org.jf.dexlib.util.Input; +import org.jf.dexlib.Util.Input; public abstract class DebugInstructionFactory { public static DebugInstruction readDebugInstruction(DexFile dexFile, Input in) { diff --git a/dexlib/src/main/java/org/jf/dexlib/debug/EndLocal.java b/dexlib/src/main/java/org/jf/dexlib/Debug/EndLocal.java similarity index 96% rename from dexlib/src/main/java/org/jf/dexlib/debug/EndLocal.java rename to dexlib/src/main/java/org/jf/dexlib/Debug/EndLocal.java index 7aba5ab4..6810f9e1 100644 --- a/dexlib/src/main/java/org/jf/dexlib/debug/EndLocal.java +++ b/dexlib/src/main/java/org/jf/dexlib/Debug/EndLocal.java @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.jf.dexlib.debug; +package org.jf.dexlib.Debug; import org.jf.dexlib.ByteField; import org.jf.dexlib.CompositeField; diff --git a/dexlib/src/main/java/org/jf/dexlib/debug/EndSequence.java b/dexlib/src/main/java/org/jf/dexlib/Debug/EndSequence.java similarity index 96% rename from dexlib/src/main/java/org/jf/dexlib/debug/EndSequence.java rename to dexlib/src/main/java/org/jf/dexlib/Debug/EndSequence.java index 52e70bec..5fc8ea3e 100644 --- a/dexlib/src/main/java/org/jf/dexlib/debug/EndSequence.java +++ b/dexlib/src/main/java/org/jf/dexlib/Debug/EndSequence.java @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.jf.dexlib.debug; +package org.jf.dexlib.Debug; import org.jf.dexlib.ByteField; import org.jf.dexlib.CompositeField; diff --git a/dexlib/src/main/java/org/jf/dexlib/debug/RestartLocal.java b/dexlib/src/main/java/org/jf/dexlib/Debug/RestartLocal.java similarity index 96% rename from dexlib/src/main/java/org/jf/dexlib/debug/RestartLocal.java rename to dexlib/src/main/java/org/jf/dexlib/Debug/RestartLocal.java index 0218b4b0..0500e832 100644 --- a/dexlib/src/main/java/org/jf/dexlib/debug/RestartLocal.java +++ b/dexlib/src/main/java/org/jf/dexlib/Debug/RestartLocal.java @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.jf.dexlib.debug; +package org.jf.dexlib.Debug; import org.jf.dexlib.*; diff --git a/dexlib/src/main/java/org/jf/dexlib/debug/SetEpilogueBegin.java b/dexlib/src/main/java/org/jf/dexlib/Debug/SetEpilogueBegin.java similarity index 96% rename from dexlib/src/main/java/org/jf/dexlib/debug/SetEpilogueBegin.java rename to dexlib/src/main/java/org/jf/dexlib/Debug/SetEpilogueBegin.java index 3fd5b775..cbdc0331 100644 --- a/dexlib/src/main/java/org/jf/dexlib/debug/SetEpilogueBegin.java +++ b/dexlib/src/main/java/org/jf/dexlib/Debug/SetEpilogueBegin.java @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.jf.dexlib.debug; +package org.jf.dexlib.Debug; import org.jf.dexlib.ByteField; import org.jf.dexlib.CompositeField; diff --git a/dexlib/src/main/java/org/jf/dexlib/debug/SetFile.java b/dexlib/src/main/java/org/jf/dexlib/Debug/SetFile.java similarity index 96% rename from dexlib/src/main/java/org/jf/dexlib/debug/SetFile.java rename to dexlib/src/main/java/org/jf/dexlib/Debug/SetFile.java index e1e727c1..7e5dd845 100644 --- a/dexlib/src/main/java/org/jf/dexlib/debug/SetFile.java +++ b/dexlib/src/main/java/org/jf/dexlib/Debug/SetFile.java @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.jf.dexlib.debug; +package org.jf.dexlib.Debug; import org.jf.dexlib.*; diff --git a/dexlib/src/main/java/org/jf/dexlib/debug/SetPrologueEnd.java b/dexlib/src/main/java/org/jf/dexlib/Debug/SetPrologueEnd.java similarity index 96% rename from dexlib/src/main/java/org/jf/dexlib/debug/SetPrologueEnd.java rename to dexlib/src/main/java/org/jf/dexlib/Debug/SetPrologueEnd.java index 7766ae6c..8ac5caca 100644 --- a/dexlib/src/main/java/org/jf/dexlib/debug/SetPrologueEnd.java +++ b/dexlib/src/main/java/org/jf/dexlib/Debug/SetPrologueEnd.java @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.jf.dexlib.debug; +package org.jf.dexlib.Debug; import org.jf.dexlib.ByteField; import org.jf.dexlib.CompositeField; diff --git a/dexlib/src/main/java/org/jf/dexlib/debug/SpecialOpcode.java b/dexlib/src/main/java/org/jf/dexlib/Debug/SpecialOpcode.java similarity index 96% rename from dexlib/src/main/java/org/jf/dexlib/debug/SpecialOpcode.java rename to dexlib/src/main/java/org/jf/dexlib/Debug/SpecialOpcode.java index 70bf9d6f..6b716574 100644 --- a/dexlib/src/main/java/org/jf/dexlib/debug/SpecialOpcode.java +++ b/dexlib/src/main/java/org/jf/dexlib/Debug/SpecialOpcode.java @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.jf.dexlib.debug; +package org.jf.dexlib.Debug; import org.jf.dexlib.ByteField; import org.jf.dexlib.CompositeField; diff --git a/dexlib/src/main/java/org/jf/dexlib/debug/StartLocal.java b/dexlib/src/main/java/org/jf/dexlib/Debug/StartLocal.java similarity index 96% rename from dexlib/src/main/java/org/jf/dexlib/debug/StartLocal.java rename to dexlib/src/main/java/org/jf/dexlib/Debug/StartLocal.java index e3d09e84..024d3ac3 100644 --- a/dexlib/src/main/java/org/jf/dexlib/debug/StartLocal.java +++ b/dexlib/src/main/java/org/jf/dexlib/Debug/StartLocal.java @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.jf.dexlib.debug; +package org.jf.dexlib.Debug; import org.jf.dexlib.*; diff --git a/dexlib/src/main/java/org/jf/dexlib/debug/StartLocalExtended.java b/dexlib/src/main/java/org/jf/dexlib/Debug/StartLocalExtended.java similarity index 96% rename from dexlib/src/main/java/org/jf/dexlib/debug/StartLocalExtended.java rename to dexlib/src/main/java/org/jf/dexlib/Debug/StartLocalExtended.java index f7ecc153..0e58b125 100644 --- a/dexlib/src/main/java/org/jf/dexlib/debug/StartLocalExtended.java +++ b/dexlib/src/main/java/org/jf/dexlib/Debug/StartLocalExtended.java @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.jf.dexlib.debug; +package org.jf.dexlib.Debug; import org.jf.dexlib.*; diff --git a/dexlib/src/main/java/org/jf/dexlib/DebugInfoItem.java b/dexlib/src/main/java/org/jf/dexlib/DebugInfoItem.java index f70ef053..07fa5014 100644 --- a/dexlib/src/main/java/org/jf/dexlib/DebugInfoItem.java +++ b/dexlib/src/main/java/org/jf/dexlib/DebugInfoItem.java @@ -28,11 +28,11 @@ package org.jf.dexlib; -import org.jf.dexlib.debug.DebugInstruction; -import org.jf.dexlib.debug.DebugInstructionFactory; -import org.jf.dexlib.debug.EndSequence; -import org.jf.dexlib.util.AnnotatedOutput; -import org.jf.dexlib.util.Input; +import org.jf.dexlib.Debug.DebugInstruction; +import org.jf.dexlib.Debug.DebugInstructionFactory; +import org.jf.dexlib.Debug.EndSequence; +import org.jf.dexlib.Util.AnnotatedOutput; +import org.jf.dexlib.Util.Input; import java.util.ArrayList; import java.util.List; diff --git a/dexlib/src/main/java/org/jf/dexlib/DexFile.java b/dexlib/src/main/java/org/jf/dexlib/DexFile.java index 7c3504e2..d50069f6 100644 --- a/dexlib/src/main/java/org/jf/dexlib/DexFile.java +++ b/dexlib/src/main/java/org/jf/dexlib/DexFile.java @@ -28,10 +28,10 @@ package org.jf.dexlib; -import org.jf.dexlib.util.AnnotatedOutput; -import org.jf.dexlib.util.ByteArrayInput; -import org.jf.dexlib.util.FileUtils; -import org.jf.dexlib.util.Input; +import org.jf.dexlib.Util.AnnotatedOutput; +import org.jf.dexlib.Util.ByteArrayInput; +import org.jf.dexlib.Util.FileUtils; +import org.jf.dexlib.Util.Input; import java.io.File; import java.security.DigestException; @@ -197,15 +197,12 @@ public class DexFile offset = HeaderItemSection.place(offset); for (IndexedSection indexedSection: indexedSections) { - indexedSection.unplace(); offset = indexedSection.place(offset); } dataOffset = offset; for (OffsettedSection offsettedSection: offsettedSections) { - offsettedSection.unplace(); - offset = offsettedSection.place(offset); } diff --git a/dexlib/src/main/java/org/jf/dexlib/EncodedArrayItem.java b/dexlib/src/main/java/org/jf/dexlib/EncodedArrayItem.java index 2a3c899a..9f819c34 100644 --- a/dexlib/src/main/java/org/jf/dexlib/EncodedArrayItem.java +++ b/dexlib/src/main/java/org/jf/dexlib/EncodedArrayItem.java @@ -30,8 +30,6 @@ package org.jf.dexlib; import org.jf.dexlib.EncodedValue.ArrayEncodedValueSubField; import org.jf.dexlib.EncodedValue.EncodedValue; -import org.jf.dexlib.util.AnnotatedOutput; -import org.jf.dexlib.util.Input; import java.util.ArrayList; diff --git a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/BoolEncodedValueSubField.java b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/BoolEncodedValueSubField.java index e488c9e6..c845c555 100644 --- a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/BoolEncodedValueSubField.java +++ b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/BoolEncodedValueSubField.java @@ -28,8 +28,8 @@ package org.jf.dexlib.EncodedValue; -import org.jf.dexlib.util.AnnotatedOutput; -import org.jf.dexlib.util.Input; +import org.jf.dexlib.Util.AnnotatedOutput; +import org.jf.dexlib.Util.Input; public class BoolEncodedValueSubField extends SimpleEncodedValueSubField diff --git a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/ByteEncodedValueSubField.java b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/ByteEncodedValueSubField.java index abc853ba..9b7adf4c 100644 --- a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/ByteEncodedValueSubField.java +++ b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/ByteEncodedValueSubField.java @@ -28,8 +28,8 @@ package org.jf.dexlib.EncodedValue; -import org.jf.dexlib.util.AnnotatedOutput; -import org.jf.dexlib.util.Input; +import org.jf.dexlib.Util.AnnotatedOutput; +import org.jf.dexlib.Util.Input; public class ByteEncodedValueSubField extends SimpleEncodedValueSubField diff --git a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/CharEncodedValueSubField.java b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/CharEncodedValueSubField.java index b39dc58d..2c309855 100644 --- a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/CharEncodedValueSubField.java +++ b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/CharEncodedValueSubField.java @@ -28,9 +28,9 @@ package org.jf.dexlib.EncodedValue; -import org.jf.dexlib.util.AnnotatedOutput; -import org.jf.dexlib.util.EncodedValueUtils; -import org.jf.dexlib.util.Input; +import org.jf.dexlib.Util.AnnotatedOutput; +import org.jf.dexlib.Util.EncodedValueUtils; +import org.jf.dexlib.Util.Input; public class CharEncodedValueSubField extends SimpleEncodedValueSubField diff --git a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/DoubleEncodedValueSubField.java b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/DoubleEncodedValueSubField.java index 6c4b62b5..44f83204 100644 --- a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/DoubleEncodedValueSubField.java +++ b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/DoubleEncodedValueSubField.java @@ -28,9 +28,9 @@ package org.jf.dexlib.EncodedValue; -import org.jf.dexlib.util.AnnotatedOutput; -import org.jf.dexlib.util.EncodedValueUtils; -import org.jf.dexlib.util.Input; +import org.jf.dexlib.Util.AnnotatedOutput; +import org.jf.dexlib.Util.EncodedValueUtils; +import org.jf.dexlib.Util.Input; public class DoubleEncodedValueSubField extends SimpleEncodedValueSubField diff --git a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/EncodedIndexedItemReference.java b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/EncodedIndexedItemReference.java index 8a6facaa..98e9cf27 100644 --- a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/EncodedIndexedItemReference.java +++ b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/EncodedIndexedItemReference.java @@ -29,9 +29,9 @@ package org.jf.dexlib.EncodedValue; import org.jf.dexlib.*; -import org.jf.dexlib.util.AnnotatedOutput; -import org.jf.dexlib.util.EncodedValueUtils; -import org.jf.dexlib.util.Input; +import org.jf.dexlib.Util.AnnotatedOutput; +import org.jf.dexlib.Util.EncodedValueUtils; +import org.jf.dexlib.Util.Input; public class EncodedIndexedItemReference> implements EncodedValueSubField> { diff --git a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/EncodedValue.java b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/EncodedValue.java index be337117..badde4e3 100644 --- a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/EncodedValue.java +++ b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/EncodedValue.java @@ -31,8 +31,8 @@ package org.jf.dexlib.EncodedValue; import org.jf.dexlib.CompositeField; import org.jf.dexlib.DexFile; import org.jf.dexlib.Field; -import org.jf.dexlib.util.AnnotatedOutput; -import org.jf.dexlib.util.Input; +import org.jf.dexlib.Util.AnnotatedOutput; +import org.jf.dexlib.Util.Input; public class EncodedValue extends CompositeField { private class ValueTypeArgField implements Field { diff --git a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/FloatEncodedValueSubField.java b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/FloatEncodedValueSubField.java index 0a0f1ccf..f9f7e6b7 100644 --- a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/FloatEncodedValueSubField.java +++ b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/FloatEncodedValueSubField.java @@ -28,9 +28,9 @@ package org.jf.dexlib.EncodedValue; -import org.jf.dexlib.util.AnnotatedOutput; -import org.jf.dexlib.util.EncodedValueUtils; -import org.jf.dexlib.util.Input; +import org.jf.dexlib.Util.AnnotatedOutput; +import org.jf.dexlib.Util.EncodedValueUtils; +import org.jf.dexlib.Util.Input; public class FloatEncodedValueSubField extends SimpleEncodedValueSubField diff --git a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/IntEncodedValueSubField.java b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/IntEncodedValueSubField.java index f903b8ec..c974c2c4 100644 --- a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/IntEncodedValueSubField.java +++ b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/IntEncodedValueSubField.java @@ -28,9 +28,9 @@ package org.jf.dexlib.EncodedValue; -import org.jf.dexlib.util.AnnotatedOutput; -import org.jf.dexlib.util.EncodedValueUtils; -import org.jf.dexlib.util.Input; +import org.jf.dexlib.Util.AnnotatedOutput; +import org.jf.dexlib.Util.EncodedValueUtils; +import org.jf.dexlib.Util.Input; public class IntEncodedValueSubField extends SimpleEncodedValueSubField diff --git a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/LongEncodedValueSubField.java b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/LongEncodedValueSubField.java index 8bea5bd7..6292517d 100644 --- a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/LongEncodedValueSubField.java +++ b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/LongEncodedValueSubField.java @@ -28,9 +28,9 @@ package org.jf.dexlib.EncodedValue; -import org.jf.dexlib.util.AnnotatedOutput; -import org.jf.dexlib.util.EncodedValueUtils; -import org.jf.dexlib.util.Input; +import org.jf.dexlib.Util.AnnotatedOutput; +import org.jf.dexlib.Util.EncodedValueUtils; +import org.jf.dexlib.Util.Input; public class LongEncodedValueSubField extends SimpleEncodedValueSubField diff --git a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/NullEncodedValueSubField.java b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/NullEncodedValueSubField.java index 0311b21f..559dad72 100644 --- a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/NullEncodedValueSubField.java +++ b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/NullEncodedValueSubField.java @@ -28,8 +28,8 @@ package org.jf.dexlib.EncodedValue; -import org.jf.dexlib.util.AnnotatedOutput; -import org.jf.dexlib.util.Input; +import org.jf.dexlib.Util.AnnotatedOutput; +import org.jf.dexlib.Util.Input; public class NullEncodedValueSubField extends SimpleEncodedValueSubField diff --git a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/ShortEncodedValueSubField.java b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/ShortEncodedValueSubField.java index 8fa6dc37..464604c9 100644 --- a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/ShortEncodedValueSubField.java +++ b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/ShortEncodedValueSubField.java @@ -28,9 +28,9 @@ package org.jf.dexlib.EncodedValue; -import org.jf.dexlib.util.AnnotatedOutput; -import org.jf.dexlib.util.EncodedValueUtils; -import org.jf.dexlib.util.Input; +import org.jf.dexlib.Util.AnnotatedOutput; +import org.jf.dexlib.Util.EncodedValueUtils; +import org.jf.dexlib.Util.Input; public class ShortEncodedValueSubField extends SimpleEncodedValueSubField diff --git a/dexlib/src/main/java/org/jf/dexlib/Field.java b/dexlib/src/main/java/org/jf/dexlib/Field.java index 8ebc1fd4..abfa04c9 100644 --- a/dexlib/src/main/java/org/jf/dexlib/Field.java +++ b/dexlib/src/main/java/org/jf/dexlib/Field.java @@ -28,8 +28,8 @@ package org.jf.dexlib; -import org.jf.dexlib.util.AnnotatedOutput; -import org.jf.dexlib.util.Input; +import org.jf.dexlib.Util.AnnotatedOutput; +import org.jf.dexlib.Util.Input; public interface Field { public void writeTo(AnnotatedOutput out); diff --git a/dexlib/src/main/java/org/jf/dexlib/FieldListField.java b/dexlib/src/main/java/org/jf/dexlib/FieldListField.java index c63945f9..c93cd400 100644 --- a/dexlib/src/main/java/org/jf/dexlib/FieldListField.java +++ b/dexlib/src/main/java/org/jf/dexlib/FieldListField.java @@ -28,8 +28,8 @@ package org.jf.dexlib; -import org.jf.dexlib.util.AnnotatedOutput; -import org.jf.dexlib.util.Input; +import org.jf.dexlib.Util.AnnotatedOutput; +import org.jf.dexlib.Util.Input; import java.util.ArrayList; diff --git a/dexlib/src/main/java/org/jf/dexlib/FixedSizeByteArrayField.java b/dexlib/src/main/java/org/jf/dexlib/FixedSizeByteArrayField.java index e5a4fa76..ccb4cf90 100644 --- a/dexlib/src/main/java/org/jf/dexlib/FixedSizeByteArrayField.java +++ b/dexlib/src/main/java/org/jf/dexlib/FixedSizeByteArrayField.java @@ -28,8 +28,8 @@ package org.jf.dexlib; -import org.jf.dexlib.util.AnnotatedOutput; -import org.jf.dexlib.util.Input; +import org.jf.dexlib.Util.AnnotatedOutput; +import org.jf.dexlib.Util.Input; public class FixedSizeByteArrayField implements Field { protected byte[] value; diff --git a/dexlib/src/main/java/org/jf/dexlib/HeaderItem.java b/dexlib/src/main/java/org/jf/dexlib/HeaderItem.java index a59a233a..67c852d8 100644 --- a/dexlib/src/main/java/org/jf/dexlib/HeaderItem.java +++ b/dexlib/src/main/java/org/jf/dexlib/HeaderItem.java @@ -28,7 +28,7 @@ package org.jf.dexlib; -import org.jf.dexlib.util.AnnotatedOutput; +import org.jf.dexlib.Util.AnnotatedOutput; import java.io.UnsupportedEncodingException; diff --git a/dexlib/src/main/java/org/jf/dexlib/IndexedSection.java b/dexlib/src/main/java/org/jf/dexlib/IndexedSection.java index 2d3bd1b7..db6cffdf 100644 --- a/dexlib/src/main/java/org/jf/dexlib/IndexedSection.java +++ b/dexlib/src/main/java/org/jf/dexlib/IndexedSection.java @@ -28,7 +28,7 @@ package org.jf.dexlib; -import org.jf.dexlib.util.Input; +import org.jf.dexlib.Util.Input; import java.util.Collections; diff --git a/dexlib/src/main/java/org/jf/dexlib/IntegerField.java b/dexlib/src/main/java/org/jf/dexlib/IntegerField.java index a2c9940e..ba4ac2f2 100644 --- a/dexlib/src/main/java/org/jf/dexlib/IntegerField.java +++ b/dexlib/src/main/java/org/jf/dexlib/IntegerField.java @@ -28,8 +28,8 @@ package org.jf.dexlib; -import org.jf.dexlib.util.Input; -import org.jf.dexlib.util.Output; +import org.jf.dexlib.Util.Input; +import org.jf.dexlib.Util.Output; public class IntegerField extends CachedIntegerValueField { public IntegerField(String fieldName) { diff --git a/dexlib/src/main/java/org/jf/dexlib/Item.java b/dexlib/src/main/java/org/jf/dexlib/Item.java index f0dd12b8..efb3f4f8 100644 --- a/dexlib/src/main/java/org/jf/dexlib/Item.java +++ b/dexlib/src/main/java/org/jf/dexlib/Item.java @@ -28,8 +28,8 @@ package org.jf.dexlib; -import org.jf.dexlib.util.AnnotatedOutput; -import org.jf.dexlib.util.Input; +import org.jf.dexlib.Util.AnnotatedOutput; +import org.jf.dexlib.Util.Input; public abstract class Item { protected int offset = -1; @@ -44,10 +44,6 @@ public abstract class Item { return offset > -1; } - public void unplace() { - offset = -1; - } - public int place(int index, int offset) { offset = alignOffset(offset); diff --git a/dexlib/src/main/java/org/jf/dexlib/ItemReference.java b/dexlib/src/main/java/org/jf/dexlib/ItemReference.java index e677bdd7..ea06db43 100644 --- a/dexlib/src/main/java/org/jf/dexlib/ItemReference.java +++ b/dexlib/src/main/java/org/jf/dexlib/ItemReference.java @@ -28,8 +28,8 @@ package org.jf.dexlib; -import org.jf.dexlib.util.AnnotatedOutput; -import org.jf.dexlib.util.Input; +import org.jf.dexlib.Util.AnnotatedOutput; +import org.jf.dexlib.Util.Input; public abstract class ItemReference, S extends ItemReference> implements Field { private T item = null; diff --git a/dexlib/src/main/java/org/jf/dexlib/Leb128Field.java b/dexlib/src/main/java/org/jf/dexlib/Leb128Field.java index 2ba58342..59e2c670 100644 --- a/dexlib/src/main/java/org/jf/dexlib/Leb128Field.java +++ b/dexlib/src/main/java/org/jf/dexlib/Leb128Field.java @@ -28,9 +28,9 @@ package org.jf.dexlib; -import org.jf.dexlib.util.Input; -import org.jf.dexlib.util.Leb128Utils; -import org.jf.dexlib.util.Output; +import org.jf.dexlib.Util.Input; +import org.jf.dexlib.Util.Leb128Utils; +import org.jf.dexlib.Util.Output; public class Leb128Field extends CachedIntegerValueField { public Leb128Field(String fieldName) { diff --git a/dexlib/src/main/java/org/jf/dexlib/Leb128p1Field.java b/dexlib/src/main/java/org/jf/dexlib/Leb128p1Field.java index b79f0b34..963c9878 100644 --- a/dexlib/src/main/java/org/jf/dexlib/Leb128p1Field.java +++ b/dexlib/src/main/java/org/jf/dexlib/Leb128p1Field.java @@ -28,9 +28,9 @@ package org.jf.dexlib; -import org.jf.dexlib.util.Input; -import org.jf.dexlib.util.Leb128Utils; -import org.jf.dexlib.util.Output; +import org.jf.dexlib.Util.Input; +import org.jf.dexlib.Util.Leb128Utils; +import org.jf.dexlib.Util.Output; public class Leb128p1Field extends CachedIntegerValueField { public Leb128p1Field(String fieldName) { diff --git a/dexlib/src/main/java/org/jf/dexlib/ListSizeField.java b/dexlib/src/main/java/org/jf/dexlib/ListSizeField.java index 4d1515bd..36e91b39 100644 --- a/dexlib/src/main/java/org/jf/dexlib/ListSizeField.java +++ b/dexlib/src/main/java/org/jf/dexlib/ListSizeField.java @@ -28,8 +28,8 @@ package org.jf.dexlib; -import org.jf.dexlib.util.AnnotatedOutput; -import org.jf.dexlib.util.Input; +import org.jf.dexlib.Util.AnnotatedOutput; +import org.jf.dexlib.Util.Input; import java.util.ArrayList; diff --git a/dexlib/src/main/java/org/jf/dexlib/MapItem.java b/dexlib/src/main/java/org/jf/dexlib/MapItem.java index e3729250..5ba7663d 100644 --- a/dexlib/src/main/java/org/jf/dexlib/MapItem.java +++ b/dexlib/src/main/java/org/jf/dexlib/MapItem.java @@ -28,9 +28,6 @@ package org.jf.dexlib; -import org.jf.dexlib.util.AnnotatedOutput; -import org.jf.dexlib.util.Input; - import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; diff --git a/dexlib/src/main/java/org/jf/dexlib/MethodIdItem.java b/dexlib/src/main/java/org/jf/dexlib/MethodIdItem.java index dbf32bf5..f51022eb 100644 --- a/dexlib/src/main/java/org/jf/dexlib/MethodIdItem.java +++ b/dexlib/src/main/java/org/jf/dexlib/MethodIdItem.java @@ -68,10 +68,8 @@ public class MethodIdItem extends IndexedItem { public String getMethodString() { if (cachedMethodString == null) { String parentClass = classTypeReferenceField.getReference().getTypeDescriptor(); - //strip the leading L and trailing ; - parentClass = parentClass.substring(1, parentClass.length() - 1); - cachedMethodString = parentClass + methodNameReferenceField.getReference().getStringValue() + + cachedMethodString = parentClass + "->" + methodNameReferenceField.getReference().getStringValue() + prototypeReferenceField.getReference().getPrototypeString(); } return cachedMethodString; diff --git a/dexlib/src/main/java/org/jf/dexlib/NullTerminatedByteArrayField.java b/dexlib/src/main/java/org/jf/dexlib/NullTerminatedByteArrayField.java index 34994f97..d5397690 100644 --- a/dexlib/src/main/java/org/jf/dexlib/NullTerminatedByteArrayField.java +++ b/dexlib/src/main/java/org/jf/dexlib/NullTerminatedByteArrayField.java @@ -28,9 +28,8 @@ package org.jf.dexlib; -import org.jf.dexlib.util.AnnotatedOutput; -import org.jf.dexlib.util.ByteArray; -import org.jf.dexlib.util.Input; +import org.jf.dexlib.Util.AnnotatedOutput; +import org.jf.dexlib.Util.Input; public class NullTerminatedByteArrayField implements Field { protected byte[] value; diff --git a/dexlib/src/main/java/org/jf/dexlib/OffsettedSection.java b/dexlib/src/main/java/org/jf/dexlib/OffsettedSection.java index 74ce1971..aaa7bbd8 100644 --- a/dexlib/src/main/java/org/jf/dexlib/OffsettedSection.java +++ b/dexlib/src/main/java/org/jf/dexlib/OffsettedSection.java @@ -28,7 +28,7 @@ package org.jf.dexlib; -import org.jf.dexlib.util.Input; +import org.jf.dexlib.Util.Input; import java.util.HashMap; import java.util.Collections; diff --git a/dexlib/src/main/java/org/jf/dexlib/Section.java b/dexlib/src/main/java/org/jf/dexlib/Section.java index 45fb050c..e2fbbf19 100644 --- a/dexlib/src/main/java/org/jf/dexlib/Section.java +++ b/dexlib/src/main/java/org/jf/dexlib/Section.java @@ -28,8 +28,8 @@ package org.jf.dexlib; -import org.jf.dexlib.util.AnnotatedOutput; -import org.jf.dexlib.util.Input; +import org.jf.dexlib.Util.AnnotatedOutput; +import org.jf.dexlib.Util.Input; import java.util.ArrayList; import java.util.HashMap; @@ -74,12 +74,6 @@ public abstract class Section { return offset; } - public void unplace() { - for (Item item: items) { - item.unplace(); - } - } - public void writeTo(AnnotatedOutput out) { for (int i = 0; i < size(); i++) { T item = items.get(i); diff --git a/dexlib/src/main/java/org/jf/dexlib/SectionHeaderInfo.java b/dexlib/src/main/java/org/jf/dexlib/SectionHeaderInfo.java index d98582ef..3417f91e 100644 --- a/dexlib/src/main/java/org/jf/dexlib/SectionHeaderInfo.java +++ b/dexlib/src/main/java/org/jf/dexlib/SectionHeaderInfo.java @@ -28,7 +28,7 @@ package org.jf.dexlib; -import org.jf.dexlib.util.AnnotatedOutput; +import org.jf.dexlib.Util.AnnotatedOutput; public abstract class SectionHeaderInfo extends CompositeField { private final String sectionName; diff --git a/dexlib/src/main/java/org/jf/dexlib/ShortIntegerField.java b/dexlib/src/main/java/org/jf/dexlib/ShortIntegerField.java index 2f30730d..775a1f9b 100644 --- a/dexlib/src/main/java/org/jf/dexlib/ShortIntegerField.java +++ b/dexlib/src/main/java/org/jf/dexlib/ShortIntegerField.java @@ -28,8 +28,8 @@ package org.jf.dexlib; -import org.jf.dexlib.util.Input; -import org.jf.dexlib.util.Output; +import org.jf.dexlib.Util.Input; +import org.jf.dexlib.Util.Output; public class ShortIntegerField extends CachedIntegerValueField { public ShortIntegerField(String fieldName) { diff --git a/dexlib/src/main/java/org/jf/dexlib/SignedLeb128Field.java b/dexlib/src/main/java/org/jf/dexlib/SignedLeb128Field.java index c6ce0b71..825088ad 100644 --- a/dexlib/src/main/java/org/jf/dexlib/SignedLeb128Field.java +++ b/dexlib/src/main/java/org/jf/dexlib/SignedLeb128Field.java @@ -28,9 +28,9 @@ package org.jf.dexlib; -import org.jf.dexlib.util.Input; -import org.jf.dexlib.util.Leb128Utils; -import org.jf.dexlib.util.Output; +import org.jf.dexlib.Util.Input; +import org.jf.dexlib.Util.Leb128Utils; +import org.jf.dexlib.Util.Output; public class SignedLeb128Field extends CachedIntegerValueField { public SignedLeb128Field(String fieldName) { diff --git a/dexlib/src/main/java/org/jf/dexlib/StringDataItem.java b/dexlib/src/main/java/org/jf/dexlib/StringDataItem.java index d8dac650..a060d728 100644 --- a/dexlib/src/main/java/org/jf/dexlib/StringDataItem.java +++ b/dexlib/src/main/java/org/jf/dexlib/StringDataItem.java @@ -28,8 +28,8 @@ package org.jf.dexlib; -import org.jf.dexlib.util.ByteArray; -import org.jf.dexlib.util.Utf8Utils; +import org.jf.dexlib.Util.ByteArray; +import org.jf.dexlib.Util.Utf8Utils; public class StringDataItem extends OffsettedItem implements Comparable { private String value = null; diff --git a/dexlib/src/main/java/org/jf/dexlib/util/AccessFlags.java b/dexlib/src/main/java/org/jf/dexlib/Util/AccessFlags.java similarity index 96% rename from dexlib/src/main/java/org/jf/dexlib/util/AccessFlags.java rename to dexlib/src/main/java/org/jf/dexlib/Util/AccessFlags.java index 260d9f75..3efdea9f 100644 --- a/dexlib/src/main/java/org/jf/dexlib/util/AccessFlags.java +++ b/dexlib/src/main/java/org/jf/dexlib/Util/AccessFlags.java @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.jf.dexlib.util; +package org.jf.dexlib.Util; import java.util.ArrayList; import java.util.HashMap; diff --git a/dexlib/src/main/java/org/jf/dexlib/util/AnnotatedOutput.java b/dexlib/src/main/java/org/jf/dexlib/Util/AnnotatedOutput.java similarity index 99% rename from dexlib/src/main/java/org/jf/dexlib/util/AnnotatedOutput.java rename to dexlib/src/main/java/org/jf/dexlib/Util/AnnotatedOutput.java index 32735a9e..41254d56 100644 --- a/dexlib/src/main/java/org/jf/dexlib/util/AnnotatedOutput.java +++ b/dexlib/src/main/java/org/jf/dexlib/Util/AnnotatedOutput.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jf.dexlib.util; +package org.jf.dexlib.Util; /** * Interface for a binary output destination that may be augmented diff --git a/dexlib/src/main/java/org/jf/dexlib/util/ByteArray.java b/dexlib/src/main/java/org/jf/dexlib/Util/ByteArray.java similarity index 99% rename from dexlib/src/main/java/org/jf/dexlib/util/ByteArray.java rename to dexlib/src/main/java/org/jf/dexlib/Util/ByteArray.java index 3b2bd7b6..84192d88 100644 --- a/dexlib/src/main/java/org/jf/dexlib/util/ByteArray.java +++ b/dexlib/src/main/java/org/jf/dexlib/Util/ByteArray.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jf.dexlib.util; +package org.jf.dexlib.Util; import java.io.DataInputStream; import java.io.IOException; diff --git a/dexlib/src/main/java/org/jf/dexlib/util/ByteArrayAnnotatedOutput.java b/dexlib/src/main/java/org/jf/dexlib/Util/ByteArrayAnnotatedOutput.java similarity index 99% rename from dexlib/src/main/java/org/jf/dexlib/util/ByteArrayAnnotatedOutput.java rename to dexlib/src/main/java/org/jf/dexlib/Util/ByteArrayAnnotatedOutput.java index cee9f50b..9824f4db 100644 --- a/dexlib/src/main/java/org/jf/dexlib/util/ByteArrayAnnotatedOutput.java +++ b/dexlib/src/main/java/org/jf/dexlib/Util/ByteArrayAnnotatedOutput.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jf.dexlib.util; +package org.jf.dexlib.Util; import java.io.IOException; import java.io.Writer; diff --git a/dexlib/src/main/java/org/jf/dexlib/util/ByteArrayInput.java b/dexlib/src/main/java/org/jf/dexlib/Util/ByteArrayInput.java similarity index 90% rename from dexlib/src/main/java/org/jf/dexlib/util/ByteArrayInput.java rename to dexlib/src/main/java/org/jf/dexlib/Util/ByteArrayInput.java index 852eba47..7206e3e2 100644 --- a/dexlib/src/main/java/org/jf/dexlib/util/ByteArrayInput.java +++ b/dexlib/src/main/java/org/jf/dexlib/Util/ByteArrayInput.java @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.jf.dexlib.util; +package org.jf.dexlib.Util; /** * Implementation of {@link Input} which reads the data from a @@ -142,20 +142,14 @@ public class ByteArrayInput cursor = end; - /** - * TODO: is there a faster/better way to do this? - */ - return (long)((data[readAt] & 0xff) + - ((data[readAt + 1] & 0xff) << 8) + - ((data[readAt + 2] & 0xff) << 16) + - ((data[readAt + 3] & 0xff) << 24)) - - + - - ((long)((data[readAt + 4] & 0xff)+ - ((data[readAt + 5] & 0xff) << 8) + - ((data[readAt + 6] & 0xff) << 16) + - ((data[readAt + 7] & 0xff) << 24)) << 32); + return (data[readAt] & 0xffL) | + ((data[readAt + 1] & 0xffL) << 8) | + ((data[readAt + 2] & 0xffL) << 16) | + ((data[readAt + 3] & 0xffL) << 24) | + ((data[readAt + 4] & 0xffL) << 32) | + ((data[readAt + 5] & 0xffL) << 40) | + ((data[readAt + 6] & 0xffL) << 48) | + ((data[readAt + 7] & 0xffL) << 58); } /** {@inheritDoc} */ diff --git a/dexlib/src/main/java/org/jf/dexlib/util/ByteArrayOutput.java b/dexlib/src/main/java/org/jf/dexlib/Util/ByteArrayOutput.java similarity index 99% rename from dexlib/src/main/java/org/jf/dexlib/util/ByteArrayOutput.java rename to dexlib/src/main/java/org/jf/dexlib/Util/ByteArrayOutput.java index ffaceb02..577b2a74 100644 --- a/dexlib/src/main/java/org/jf/dexlib/util/ByteArrayOutput.java +++ b/dexlib/src/main/java/org/jf/dexlib/Util/ByteArrayOutput.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jf.dexlib.util; +package org.jf.dexlib.Util; import java.util.ArrayList; diff --git a/dexlib/src/main/java/org/jf/dexlib/util/DebugInfoBuilder.java b/dexlib/src/main/java/org/jf/dexlib/Util/DebugInfoBuilder.java similarity index 96% rename from dexlib/src/main/java/org/jf/dexlib/util/DebugInfoBuilder.java rename to dexlib/src/main/java/org/jf/dexlib/Util/DebugInfoBuilder.java index 4d15fb59..4a9142aa 100644 --- a/dexlib/src/main/java/org/jf/dexlib/util/DebugInfoBuilder.java +++ b/dexlib/src/main/java/org/jf/dexlib/Util/DebugInfoBuilder.java @@ -26,13 +26,13 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.jf.dexlib.util; +package org.jf.dexlib.Util; import org.jf.dexlib.DebugInfoItem; import org.jf.dexlib.DexFile; import org.jf.dexlib.StringIdItem; import org.jf.dexlib.TypeIdItem; -import org.jf.dexlib.debug.*; +import org.jf.dexlib.Debug.*; import java.util.ArrayList; import java.util.List; diff --git a/dexlib/src/main/java/org/jf/dexlib/util/DebugInfoDecoder.java b/dexlib/src/main/java/org/jf/dexlib/Util/DebugInfoDecoder.java similarity index 99% rename from dexlib/src/main/java/org/jf/dexlib/util/DebugInfoDecoder.java rename to dexlib/src/main/java/org/jf/dexlib/Util/DebugInfoDecoder.java index aad56a99..4a33aabf 100644 --- a/dexlib/src/main/java/org/jf/dexlib/util/DebugInfoDecoder.java +++ b/dexlib/src/main/java/org/jf/dexlib/Util/DebugInfoDecoder.java @@ -26,12 +26,12 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.jf.dexlib.util; +package org.jf.dexlib.Util; import org.jf.dexlib.StringIdItem; import org.jf.dexlib.TypeIdItem; import org.jf.dexlib.DebugInfoItem; -import org.jf.dexlib.debug.*; +import org.jf.dexlib.Debug.*; public class DebugInfoDecoder { private final DebugInfoItem debugItem; diff --git a/dexlib/src/main/java/org/jf/dexlib/util/EncodedValueUtils.java b/dexlib/src/main/java/org/jf/dexlib/Util/EncodedValueUtils.java similarity index 96% rename from dexlib/src/main/java/org/jf/dexlib/util/EncodedValueUtils.java rename to dexlib/src/main/java/org/jf/dexlib/Util/EncodedValueUtils.java index a455b1db..5d0f3d2d 100644 --- a/dexlib/src/main/java/org/jf/dexlib/util/EncodedValueUtils.java +++ b/dexlib/src/main/java/org/jf/dexlib/Util/EncodedValueUtils.java @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.jf.dexlib.util; +package org.jf.dexlib.Util; public class EncodedValueUtils { public static byte getRequiredBytesForSignedIntegralValue(long value) { diff --git a/dexlib/src/main/java/org/jf/dexlib/util/ExceptionWithContext.java b/dexlib/src/main/java/org/jf/dexlib/Util/ExceptionWithContext.java similarity index 99% rename from dexlib/src/main/java/org/jf/dexlib/util/ExceptionWithContext.java rename to dexlib/src/main/java/org/jf/dexlib/Util/ExceptionWithContext.java index 05495a9c..fcca7fcb 100644 --- a/dexlib/src/main/java/org/jf/dexlib/util/ExceptionWithContext.java +++ b/dexlib/src/main/java/org/jf/dexlib/Util/ExceptionWithContext.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jf.dexlib.util; +package org.jf.dexlib.Util; import java.io.PrintStream; import java.io.PrintWriter; diff --git a/dexlib/src/main/java/org/jf/dexlib/util/FileUtils.java b/dexlib/src/main/java/org/jf/dexlib/Util/FileUtils.java similarity index 98% rename from dexlib/src/main/java/org/jf/dexlib/util/FileUtils.java rename to dexlib/src/main/java/org/jf/dexlib/Util/FileUtils.java index e4bd968b..2da3baec 100644 --- a/dexlib/src/main/java/org/jf/dexlib/util/FileUtils.java +++ b/dexlib/src/main/java/org/jf/dexlib/Util/FileUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jf.dexlib.util; +package org.jf.dexlib.Util; import java.io.File; import java.io.FileInputStream; diff --git a/dexlib/src/main/java/org/jf/dexlib/util/Hex.java b/dexlib/src/main/java/org/jf/dexlib/Util/Hex.java similarity index 99% rename from dexlib/src/main/java/org/jf/dexlib/util/Hex.java rename to dexlib/src/main/java/org/jf/dexlib/Util/Hex.java index 6ff373f1..60561654 100644 --- a/dexlib/src/main/java/org/jf/dexlib/util/Hex.java +++ b/dexlib/src/main/java/org/jf/dexlib/Util/Hex.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jf.dexlib.util; +package org.jf.dexlib.Util; /** * Utilities for formatting numbers as hexadecimal. diff --git a/dexlib/src/main/java/org/jf/dexlib/util/IndentingWriter.java b/dexlib/src/main/java/org/jf/dexlib/Util/IndentingWriter.java similarity index 99% rename from dexlib/src/main/java/org/jf/dexlib/util/IndentingWriter.java rename to dexlib/src/main/java/org/jf/dexlib/Util/IndentingWriter.java index 06485f89..e2be59f9 100644 --- a/dexlib/src/main/java/org/jf/dexlib/util/IndentingWriter.java +++ b/dexlib/src/main/java/org/jf/dexlib/Util/IndentingWriter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jf.dexlib.util; +package org.jf.dexlib.Util; import java.io.FilterWriter; import java.io.IOException; diff --git a/dexlib/src/main/java/org/jf/dexlib/util/Input.java b/dexlib/src/main/java/org/jf/dexlib/Util/Input.java similarity index 96% rename from dexlib/src/main/java/org/jf/dexlib/util/Input.java rename to dexlib/src/main/java/org/jf/dexlib/Util/Input.java index 1988c6a5..1ac4f7bb 100644 --- a/dexlib/src/main/java/org/jf/dexlib/util/Input.java +++ b/dexlib/src/main/java/org/jf/dexlib/Util/Input.java @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.jf.dexlib.util; +package org.jf.dexlib.Util; /** * Interface for a source for binary input. This is similar to diff --git a/dexlib/src/main/java/org/jf/dexlib/util/Leb128Utils.java b/dexlib/src/main/java/org/jf/dexlib/Util/Leb128Utils.java similarity index 98% rename from dexlib/src/main/java/org/jf/dexlib/util/Leb128Utils.java rename to dexlib/src/main/java/org/jf/dexlib/Util/Leb128Utils.java index 5ed5045e..9ed9d367 100644 --- a/dexlib/src/main/java/org/jf/dexlib/util/Leb128Utils.java +++ b/dexlib/src/main/java/org/jf/dexlib/Util/Leb128Utils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jf.dexlib.util; +package org.jf.dexlib.Util; /** * LEB128 (little-endian base 128) utilities. diff --git a/dexlib/src/main/java/org/jf/dexlib/util/NumberUtils.java b/dexlib/src/main/java/org/jf/dexlib/Util/NumberUtils.java similarity index 99% rename from dexlib/src/main/java/org/jf/dexlib/util/NumberUtils.java rename to dexlib/src/main/java/org/jf/dexlib/Util/NumberUtils.java index 39963c0c..11155136 100644 --- a/dexlib/src/main/java/org/jf/dexlib/util/NumberUtils.java +++ b/dexlib/src/main/java/org/jf/dexlib/Util/NumberUtils.java @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.jf.dexlib.util; +package org.jf.dexlib.Util; public class NumberUtils { diff --git a/dexlib/src/main/java/org/jf/dexlib/util/Output.java b/dexlib/src/main/java/org/jf/dexlib/Util/Output.java similarity index 99% rename from dexlib/src/main/java/org/jf/dexlib/util/Output.java rename to dexlib/src/main/java/org/jf/dexlib/Util/Output.java index 869fbfee..44959876 100644 --- a/dexlib/src/main/java/org/jf/dexlib/util/Output.java +++ b/dexlib/src/main/java/org/jf/dexlib/Util/Output.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jf.dexlib.util; +package org.jf.dexlib.Util; /** * Interface for a sink for binary output. This is similar to diff --git a/dexlib/src/main/java/org/jf/dexlib/util/Pair.java b/dexlib/src/main/java/org/jf/dexlib/Util/Pair.java similarity index 96% rename from dexlib/src/main/java/org/jf/dexlib/util/Pair.java rename to dexlib/src/main/java/org/jf/dexlib/Util/Pair.java index 8816f68f..2eb09616 100644 --- a/dexlib/src/main/java/org/jf/dexlib/util/Pair.java +++ b/dexlib/src/main/java/org/jf/dexlib/Util/Pair.java @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.jf.dexlib.util; +package org.jf.dexlib.Util; public class Pair { public final A first; diff --git a/dexlib/src/main/java/org/jf/dexlib/util/TryListBuilder.java b/dexlib/src/main/java/org/jf/dexlib/Util/TryListBuilder.java similarity index 97% rename from dexlib/src/main/java/org/jf/dexlib/util/TryListBuilder.java rename to dexlib/src/main/java/org/jf/dexlib/Util/TryListBuilder.java index 94df69a1..d65913cf 100644 --- a/dexlib/src/main/java/org/jf/dexlib/util/TryListBuilder.java +++ b/dexlib/src/main/java/org/jf/dexlib/Util/TryListBuilder.java @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.jf.dexlib.util; +package org.jf.dexlib.Util; import org.jf.dexlib.CodeItem; import org.jf.dexlib.DexFile; diff --git a/dexlib/src/main/java/org/jf/dexlib/util/TwoColumnOutput.java b/dexlib/src/main/java/org/jf/dexlib/Util/TwoColumnOutput.java similarity index 99% rename from dexlib/src/main/java/org/jf/dexlib/util/TwoColumnOutput.java rename to dexlib/src/main/java/org/jf/dexlib/Util/TwoColumnOutput.java index 9fc0a6bf..fde4bca1 100644 --- a/dexlib/src/main/java/org/jf/dexlib/util/TwoColumnOutput.java +++ b/dexlib/src/main/java/org/jf/dexlib/Util/TwoColumnOutput.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jf.dexlib.util; +package org.jf.dexlib.Util; import java.io.*; diff --git a/dexlib/src/main/java/org/jf/dexlib/util/TypeUtils.java b/dexlib/src/main/java/org/jf/dexlib/Util/TypeUtils.java similarity index 96% rename from dexlib/src/main/java/org/jf/dexlib/util/TypeUtils.java rename to dexlib/src/main/java/org/jf/dexlib/Util/TypeUtils.java index 536b3131..a01f8364 100644 --- a/dexlib/src/main/java/org/jf/dexlib/util/TypeUtils.java +++ b/dexlib/src/main/java/org/jf/dexlib/Util/TypeUtils.java @@ -26,7 +26,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.jf.dexlib.util; +package org.jf.dexlib.Util; import org.jf.dexlib.DexFile; import org.jf.dexlib.EncodedValue.*; diff --git a/dexlib/src/main/java/org/jf/dexlib/util/Utf8Utils.java b/dexlib/src/main/java/org/jf/dexlib/Util/Utf8Utils.java similarity index 99% rename from dexlib/src/main/java/org/jf/dexlib/util/Utf8Utils.java rename to dexlib/src/main/java/org/jf/dexlib/Util/Utf8Utils.java index 35db9838..dfd073d8 100644 --- a/dexlib/src/main/java/org/jf/dexlib/util/Utf8Utils.java +++ b/dexlib/src/main/java/org/jf/dexlib/Util/Utf8Utils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jf.dexlib.util; +package org.jf.dexlib.Util; /** * Constants of type CONSTANT_Utf8_info.