ReVanced/smali
1
0
Fork 0
mirror of https://github.com/revanced/smali.git synced 2025-05-04 08:34:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Misc cleanup/refactoring

Browse Source 
git-svn-id: https://smali.googlecode.com/svn/trunk@203 55b6fa8a-2a1e-11de-a435-ffa8d773f76a
This commit is contained in:
JesusFreke@JesusFreke.com 2009-06-21 20:06:46 +00:00
parent f730ada982
commit cb83d271e5
107 changed files with 254 additions and 281 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dexlib/src/main/java/org/jf/dexlib/ByteField.java
View File

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

4
dexlib/src/main/java/org/jf/dexlib/CachedIntegerValueField.java
View File

@ -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<T extends CachedIntegerValueField>
implements Field<T> {

2
dexlib/src/main/java/org/jf/dexlib/ClassDataItem.java
View File

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

2
dexlib/src/main/java/org/jf/dexlib/ClassDefItem.java
View File

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

8
dexlib/src/main/java/org/jf/dexlib/code/Format/ArrayDataPseudoInstruction.java → dexlib/src/main/java/org/jf/dexlib/Code/Format/ArrayDataPseudoInstruction.java
View File

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

4
dexlib/src/main/java/org/jf/dexlib/code/Format/Format.java → dexlib/src/main/java/org/jf/dexlib/Code/Format/Format.java
View File

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

6
dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction10t.java → dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction10t.java
View File

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

6
dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction10x.java → dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction10x.java
View File

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

8
dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction11n.java → dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction11n.java
View File

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

8
dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction11x.java → dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction11x.java
View File

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

8
dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction12x.java → dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction12x.java
View File

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

8
dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction20t.java → dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction20t.java
View File

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

8
dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction21c.java → dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction21c.java
View File

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

8
dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction21h.java → dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction21h.java
View File

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

8
dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction21s.java → dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction21s.java
View File

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

8
dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction21t.java → dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction21t.java
View File

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

8
dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction22b.java → dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction22b.java
View File

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

8
dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction22c.java → dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction22c.java
View File

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

8
dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction22s.java → dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction22s.java
View File

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

8
dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction22t.java → dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction22t.java
View File

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

8
dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction22x.java → dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction22x.java
View File

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

8
dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction23x.java → dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction23x.java
View File

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

8
dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction30t.java → dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction30t.java
View File

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

8
dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction31c.java → dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction31c.java
View File

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

8
dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction31i.java → dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction31i.java
View File

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

8
dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction31t.java → dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction31t.java
View File

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

8
dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction32x.java → dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction32x.java
View File

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

10
dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction35c.java → dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction35c.java
View File

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

10
dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction3rc.java → dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction3rc.java
View File

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

8
dexlib/src/main/java/org/jf/dexlib/code/Format/Instruction51l.java → dexlib/src/main/java/org/jf/dexlib/Code/Format/Instruction51l.java
View File

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

8
dexlib/src/main/java/org/jf/dexlib/code/Format/PackedSwitchDataPseudoInstruction.java → dexlib/src/main/java/org/jf/dexlib/Code/Format/PackedSwitchDataPseudoInstruction.java
View File

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

8
dexlib/src/main/java/org/jf/dexlib/code/Format/SparseSwitchDataPseudoInstruction.java → dexlib/src/main/java/org/jf/dexlib/Code/Format/SparseSwitchDataPseudoInstruction.java
View File

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

6
dexlib/src/main/java/org/jf/dexlib/code/Instruction.java → dexlib/src/main/java/org/jf/dexlib/Code/Instruction.java
View File

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

12
dexlib/src/main/java/org/jf/dexlib/code/InstructionField.java → dexlib/src/main/java/org/jf/dexlib/Code/InstructionField.java
View File

@ -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<InstructionField> {
private Instruction instruction;

4
dexlib/src/main/java/org/jf/dexlib/code/Opcode.java → dexlib/src/main/java/org/jf/dexlib/Code/Opcode.java
View File

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

2
dexlib/src/main/java/org/jf/dexlib/code/ReferenceType.java → dexlib/src/main/java/org/jf/dexlib/Code/ReferenceType.java
View File

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

8
dexlib/src/main/java/org/jf/dexlib/CodeItem.java
View File

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

4
dexlib/src/main/java/org/jf/dexlib/CompositeField.java
View File

@ -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<T extends CompositeField<T>> implements Field<T> {

2
dexlib/src/main/java/org/jf/dexlib/debug/AdvanceLine.java → dexlib/src/main/java/org/jf/dexlib/Debug/AdvanceLine.java
View File

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

2
dexlib/src/main/java/org/jf/dexlib/debug/AdvancePC.java → dexlib/src/main/java/org/jf/dexlib/Debug/AdvancePC.java
View File

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

2
dexlib/src/main/java/org/jf/dexlib/debug/DebugInstruction.java → dexlib/src/main/java/org/jf/dexlib/Debug/DebugInstruction.java
View File

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

4
dexlib/src/main/java/org/jf/dexlib/debug/DebugInstructionFactory.java → dexlib/src/main/java/org/jf/dexlib/Debug/DebugInstructionFactory.java
View File

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

2
dexlib/src/main/java/org/jf/dexlib/debug/EndLocal.java → dexlib/src/main/java/org/jf/dexlib/Debug/EndLocal.java
View File

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

2
dexlib/src/main/java/org/jf/dexlib/debug/EndSequence.java → dexlib/src/main/java/org/jf/dexlib/Debug/EndSequence.java
View File

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

2
dexlib/src/main/java/org/jf/dexlib/debug/RestartLocal.java → dexlib/src/main/java/org/jf/dexlib/Debug/RestartLocal.java
View File

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

2
dexlib/src/main/java/org/jf/dexlib/debug/SetEpilogueBegin.java → dexlib/src/main/java/org/jf/dexlib/Debug/SetEpilogueBegin.java
View File

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

2
dexlib/src/main/java/org/jf/dexlib/debug/SetFile.java → dexlib/src/main/java/org/jf/dexlib/Debug/SetFile.java
View File

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

2
dexlib/src/main/java/org/jf/dexlib/debug/SetPrologueEnd.java → dexlib/src/main/java/org/jf/dexlib/Debug/SetPrologueEnd.java
View File

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

2
dexlib/src/main/java/org/jf/dexlib/debug/SpecialOpcode.java → dexlib/src/main/java/org/jf/dexlib/Debug/SpecialOpcode.java
View File

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

2
dexlib/src/main/java/org/jf/dexlib/debug/StartLocal.java → dexlib/src/main/java/org/jf/dexlib/Debug/StartLocal.java
View File

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

2
dexlib/src/main/java/org/jf/dexlib/debug/StartLocalExtended.java → dexlib/src/main/java/org/jf/dexlib/Debug/StartLocalExtended.java
View File

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

10
dexlib/src/main/java/org/jf/dexlib/DebugInfoItem.java
View File

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

11
dexlib/src/main/java/org/jf/dexlib/DexFile.java
View File

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

2
dexlib/src/main/java/org/jf/dexlib/EncodedArrayItem.java
View File

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

4
dexlib/src/main/java/org/jf/dexlib/EncodedValue/BoolEncodedValueSubField.java
View File

@ -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<Boolean, BoolEncodedValueSubField>

4
dexlib/src/main/java/org/jf/dexlib/EncodedValue/ByteEncodedValueSubField.java
View File

@ -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<Byte, ByteEncodedValueSubField>

6
dexlib/src/main/java/org/jf/dexlib/EncodedValue/CharEncodedValueSubField.java
View File

@ -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<Character, CharEncodedValueSubField>

6
dexlib/src/main/java/org/jf/dexlib/EncodedValue/DoubleEncodedValueSubField.java
View File

@ -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<Double, DoubleEncodedValueSubField>

6
dexlib/src/main/java/org/jf/dexlib/EncodedValue/EncodedIndexedItemReference.java
View File

@ -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<T extends IndexedItem<T>>
implements EncodedValueSubField<EncodedIndexedItemReference<T>> {

4
dexlib/src/main/java/org/jf/dexlib/EncodedValue/EncodedValue.java
View File

@ -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<EncodedValue> {
private class ValueTypeArgField implements Field<ValueTypeArgField> {

6
dexlib/src/main/java/org/jf/dexlib/EncodedValue/FloatEncodedValueSubField.java
View File

@ -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<Float, FloatEncodedValueSubField>

6
dexlib/src/main/java/org/jf/dexlib/EncodedValue/IntEncodedValueSubField.java
View File

@ -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<Integer, IntEncodedValueSubField>

6
dexlib/src/main/java/org/jf/dexlib/EncodedValue/LongEncodedValueSubField.java
View File

@ -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<Long, LongEncodedValueSubField>

4
dexlib/src/main/java/org/jf/dexlib/EncodedValue/NullEncodedValueSubField.java
View File

@ -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<Object, NullEncodedValueSubField>

6
dexlib/src/main/java/org/jf/dexlib/EncodedValue/ShortEncodedValueSubField.java
View File

@ -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<Short, ShortEncodedValueSubField>

4
dexlib/src/main/java/org/jf/dexlib/Field.java
View File

@ -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<T extends Field> {
public void writeTo(AnnotatedOutput out);

4
dexlib/src/main/java/org/jf/dexlib/FieldListField.java
View File

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

4
dexlib/src/main/java/org/jf/dexlib/FixedSizeByteArrayField.java
View File

@ -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<FixedSizeByteArrayField> {
protected byte[] value;

2
dexlib/src/main/java/org/jf/dexlib/HeaderItem.java
View File

@ -28,7 +28,7 @@
package org.jf.dexlib;
import org.jf.dexlib.util.AnnotatedOutput;
import org.jf.dexlib.Util.AnnotatedOutput;
import java.io.UnsupportedEncodingException;

2
dexlib/src/main/java/org/jf/dexlib/IndexedSection.java
View File

@ -28,7 +28,7 @@
package org.jf.dexlib;
import org.jf.dexlib.util.Input;
import org.jf.dexlib.Util.Input;
import java.util.Collections;

4
dexlib/src/main/java/org/jf/dexlib/IntegerField.java
View File

@ -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<IntegerField> {
public IntegerField(String fieldName) {

8
dexlib/src/main/java/org/jf/dexlib/Item.java
View File

@ -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<T extends Item> {
protected int offset = -1;
@ -44,10 +44,6 @@ public abstract class Item<T extends Item> {
return offset > -1;
}
public void unplace() {
offset = -1;
}
public int place(int index, int offset) {
offset = alignOffset(offset);

4
dexlib/src/main/java/org/jf/dexlib/ItemReference.java
View File

@ -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<T extends Item<T>, S extends ItemReference<T,S>> implements Field<S> {
private T item = null;

6
dexlib/src/main/java/org/jf/dexlib/Leb128Field.java
View File

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

6
dexlib/src/main/java/org/jf/dexlib/Leb128p1Field.java
View File

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

4
dexlib/src/main/java/org/jf/dexlib/ListSizeField.java
View File

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

3
dexlib/src/main/java/org/jf/dexlib/MapItem.java
View File

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

4
dexlib/src/main/java/org/jf/dexlib/MethodIdItem.java
View File

@ -68,10 +68,8 @@ public class MethodIdItem extends IndexedItem<MethodIdItem> {
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;

5
dexlib/src/main/java/org/jf/dexlib/NullTerminatedByteArrayField.java
View File

@ -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<NullTerminatedByteArrayField> {
protected byte[] value;

2
dexlib/src/main/java/org/jf/dexlib/OffsettedSection.java
View File

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

10
dexlib/src/main/java/org/jf/dexlib/Section.java
View File

@ -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<T extends Item> {
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);

2
dexlib/src/main/java/org/jf/dexlib/SectionHeaderInfo.java
View File

@ -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<SectionHeaderInfo> {
private final String sectionName;

4
dexlib/src/main/java/org/jf/dexlib/ShortIntegerField.java
View File

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

6
dexlib/src/main/java/org/jf/dexlib/SignedLeb128Field.java
View File

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

4
dexlib/src/main/java/org/jf/dexlib/StringDataItem.java
View File

@ -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<StringDataItem> implements Comparable<StringDataItem> {
private String value = null;

2
dexlib/src/main/java/org/jf/dexlib/util/AccessFlags.java → dexlib/src/main/java/org/jf/dexlib/Util/AccessFlags.java
View File

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

2
dexlib/src/main/java/org/jf/dexlib/util/AnnotatedOutput.java → dexlib/src/main/java/org/jf/dexlib/Util/AnnotatedOutput.java
View File

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

2
dexlib/src/main/java/org/jf/dexlib/util/ByteArray.java → dexlib/src/main/java/org/jf/dexlib/Util/ByteArray.java
View File

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

2
dexlib/src/main/java/org/jf/dexlib/util/ByteArrayAnnotatedOutput.java → dexlib/src/main/java/org/jf/dexlib/Util/ByteArrayAnnotatedOutput.java
View File

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

24
dexlib/src/main/java/org/jf/dexlib/util/ByteArrayInput.java → dexlib/src/main/java/org/jf/dexlib/Util/ByteArrayInput.java
View File

@ -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} */

2
dexlib/src/main/java/org/jf/dexlib/util/ByteArrayOutput.java → dexlib/src/main/java/org/jf/dexlib/Util/ByteArrayOutput.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jf.dexlib.util;
package org.jf.dexlib.Util;
import java.util.ArrayList;

4
dexlib/src/main/java/org/jf/dexlib/util/DebugInfoBuilder.java → dexlib/src/main/java/org/jf/dexlib/Util/DebugInfoBuilder.java
View File

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

4
dexlib/src/main/java/org/jf/dexlib/util/DebugInfoDecoder.java → dexlib/src/main/java/org/jf/dexlib/Util/DebugInfoDecoder.java
View File

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

2
dexlib/src/main/java/org/jf/dexlib/util/EncodedValueUtils.java → dexlib/src/main/java/org/jf/dexlib/Util/EncodedValueUtils.java
View File

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

2
dexlib/src/main/java/org/jf/dexlib/util/ExceptionWithContext.java → dexlib/src/main/java/org/jf/dexlib/Util/ExceptionWithContext.java
View File

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

2
dexlib/src/main/java/org/jf/dexlib/util/FileUtils.java → dexlib/src/main/java/org/jf/dexlib/Util/FileUtils.java
View File

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

2
dexlib/src/main/java/org/jf/dexlib/util/Hex.java → dexlib/src/main/java/org/jf/dexlib/Util/Hex.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jf.dexlib.util;
package org.jf.dexlib.Util;
/**
* Utilities for formatting numbers as hexadecimal.

2
dexlib/src/main/java/org/jf/dexlib/util/IndentingWriter.java → dexlib/src/main/java/org/jf/dexlib/Util/IndentingWriter.java
View File

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

2
dexlib/src/main/java/org/jf/dexlib/util/Input.java → dexlib/src/main/java/org/jf/dexlib/Util/Input.java
View File

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

2
dexlib/src/main/java/org/jf/dexlib/util/Leb128Utils.java → dexlib/src/main/java/org/jf/dexlib/Util/Leb128Utils.java
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jf.dexlib.util;
package org.jf.dexlib.Util;
/**
* LEB128 (little-endian base 128) utilities.

Some files were not shown because too many files have changed in this diff Show More