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@206 55b6fa8a-2a1e-11de-a435-ffa8d773f76a
This commit is contained in:
JesusFreke@JesusFreke.com 2009-06-21 20:38:03 +00:00
parent 56d16a23f6
commit 0871036088
5 changed files with 33 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
baksmali/src/main/java/org/jf/baksmali/Adaptors/AnnotationAdaptor.java
View File

@ -44,15 +44,7 @@ public class AnnotationAdaptor {
} }
public String getVisibility() { public String getVisibility() {
switch (annotationItem.getVisibility()) { return annotationItem.getVisibility().name();
case 0:
return "build";
case 1:
return "runtime";
case 2:
return "system";
}
return null;
} }
public TypeReference getAnnotationType() { public TypeReference getAnnotationType() {

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

@ -45,7 +45,7 @@ public class AnnotationDirectoryItem extends OffsettedItem<AnnotationDirectoryIt
private final FieldListField<MethodAnnotation> methodAnnotationListField; private final FieldListField<MethodAnnotation> methodAnnotationListField;
private final FieldListField<ParameterAnnotation> parameterAnnotationListField; private final FieldListField<ParameterAnnotation> parameterAnnotationListField;
public AnnotationDirectoryItem(final DexFile dexFile, int offset) { protected AnnotationDirectoryItem(final DexFile dexFile, int offset) {
super(offset); super(offset);
fields = new Field[] { fields = new Field[] {
@ -76,7 +76,7 @@ public class AnnotationDirectoryItem extends OffsettedItem<AnnotationDirectoryIt
} }
}; };
} }
public AnnotationDirectoryItem(final DexFile dexFile, public AnnotationDirectoryItem(final DexFile dexFile,
AnnotationSetItem classAnnotations, AnnotationSetItem classAnnotations,
List<FieldAnnotation> fieldAnnotations, List<FieldAnnotation> fieldAnnotations,
@ -135,7 +135,6 @@ public class AnnotationDirectoryItem extends OffsettedItem<AnnotationDirectoryIt
return Collections.unmodifiableList(parameterAnnotationList); return Collections.unmodifiableList(parameterAnnotationList);
} }
public static class FieldAnnotation extends CompositeField<FieldAnnotation> public static class FieldAnnotation extends CompositeField<FieldAnnotation>
implements Comparable<FieldAnnotation> { implements Comparable<FieldAnnotation> {
private final IndexedItemReference<FieldIdItem> fieldReferenceField; private final IndexedItemReference<FieldIdItem> fieldReferenceField;

28
dexlib/src/main/java/org/jf/dexlib/AnnotationItem.java
View File

@ -61,11 +61,35 @@ public class AnnotationItem extends OffsettedItem<AnnotationItem> {
return "annotation_item @0x" + Integer.toHexString(getOffset()); return "annotation_item @0x" + Integer.toHexString(getOffset());
} }
public byte getVisibility() { public Visibility getVisibility() {
return (byte)visibilityField.getCachedValue(); return Visibility.get((byte)visibilityField.getCachedValue());
} }
public AnnotationEncodedValueSubField getEncodedAnnotation() { public AnnotationEncodedValueSubField getEncodedAnnotation() {
return annotationField; return annotationField;
} }
public enum Visibility {
build(0x00),
runtime(0x01),
system(0x02);
public final byte value;
private Visibility(int value) {
this.value = (byte)value;
}
public static Visibility get(byte value) {
switch (value) {
case 0x00:
return build;
case 0x01:
return runtime;
case 0x02:
return system;
}
return null;
}
}
} }

2
smali/src/main/antlr3/org/jf/smali/smaliParser.g
View File

@ -126,7 +126,7 @@ tokens {
@header { @header {
package org.jf.smali; package org.jf.smali;
import org.jf.dexlib.code.Format.*; import org.jf.dexlib.Code.Format.*;
} }

6
smali/src/main/antlr3/org/jf/smali/smaliTreeWalker.g
View File

@ -40,9 +40,9 @@ import java.util.HashMap;
import org.jf.dexlib.*; import org.jf.dexlib.*;
import org.jf.dexlib.EncodedValue.*; import org.jf.dexlib.EncodedValue.*;
import org.jf.dexlib.util.*; import org.jf.dexlib.Util.*;
import org.jf.dexlib.code.*; import org.jf.dexlib.Code.*;
import org.jf.dexlib.code.Format.*; import org.jf.dexlib.Code.Format.*;
} }
@members { @members {