ReVanced/smali
1
0
Fork 0
mirror of https://github.com/revanced/smali.git synced 2025-05-16 22:17:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Adding @Nonnull's and removing unnecessary null checks.

Browse Source
This commit is contained in:
Izzat Bahadirov 2013-04-29 15:58:35 -04:00
parent e3b5efd7d8
commit 2206c7638b
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dexlib2/src/main/java/org/jf/dexlib2/analysis/ClassProto.java
View File

@ -82,6 +82,7 @@ public class ClassProto implements TypeProto {
return classDef; return classDef;
} }
@Nonnull
Method[] getVtable() { Method[] getVtable() {
if (vtable == null) { if (vtable == null) {
vtable = loadVtable(); vtable = loadVtable();
@ -89,6 +90,7 @@ public class ClassProto implements TypeProto {
return vtable; return vtable;
} }
@Nonnull
SparseArray<FieldReference> getInstanceFields() { SparseArray<FieldReference> getInstanceFields() {
if (instanceFields == null) { if (instanceFields == null) {
instanceFields = loadFields(); instanceFields = loadFields();
@ -275,7 +277,7 @@ public class ClassProto implements TypeProto {
@Override @Override
@Nullable @Nullable
public FieldReference getFieldByOffset(int fieldOffset) { public FieldReference getFieldByOffset(int fieldOffset) {
if (getInstanceFields() == null) { if (getInstanceFields().size() == 0) {
return null; return null;
} }
return getInstanceFields().get(fieldOffset); return getInstanceFields().get(fieldOffset);
@ -284,14 +286,13 @@ public class ClassProto implements TypeProto {
@Override @Override
@Nullable @Nullable
public MethodReference getMethodByVtableIndex(int vtableIndex) { public MethodReference getMethodByVtableIndex(int vtableIndex) {
if (getVtable() == null if (vtableIndex < 0 || vtableIndex >= getVtable().length) {
|| vtableIndex < 0
|| vtableIndex >= getVtable().length) {
return null; return null;
} }
return getVtable()[vtableIndex]; return getVtable()[vtableIndex];
} }
@Nonnull
private SparseArray<FieldReference> loadFields() { private SparseArray<FieldReference> loadFields() {
//This is a bit of an "involved" operation. We need to follow the same algorithm that dalvik uses to //This is a bit of an "involved" operation. We need to follow the same algorithm that dalvik uses to
//arrange fields, so that we end up with the same field offsets (which is needed for deodexing). //arrange fields, so that we end up with the same field offsets (which is needed for deodexing).
@ -477,7 +478,7 @@ public class ClassProto implements TypeProto {
private int getNextFieldOffset() { private int getNextFieldOffset() {
SparseArray<FieldReference> instanceFields = getInstanceFields(); SparseArray<FieldReference> instanceFields = getInstanceFields();
if (instanceFields == null || instanceFields.size() == 0) { if (instanceFields.size() == 0) {
return 8; return 8;
} }
@ -495,6 +496,7 @@ public class ClassProto implements TypeProto {
} }
//TODO: check the case when we have a package private method that overrides an interface method //TODO: check the case when we have a package private method that overrides an interface method
@Nonnull
private Method[] loadVtable() { private Method[] loadVtable() {
//TODO: it might be useful to keep track of which class's implementation is used for each virtual method. In other words, associate the implementing class type with each vtable entry //TODO: it might be useful to keep track of which class's implementation is used for each virtual method. In other words, associate the implementing class type with each vtable entry
List<Method> virtualMethodList = Lists.newLinkedList(); List<Method> virtualMethodList = Lists.newLinkedList();
@ -526,7 +528,7 @@ public class ClassProto implements TypeProto {
return vtable; return vtable;
} }
private void addToVtable(Iterable<? extends Method> localMethods, List<Method> vtable) { private void addToVtable(@Nonnull Iterable<? extends Method> localMethods, @Nonnull List<Method> vtable) {
for (Method virtualMethod: localMethods) { for (Method virtualMethod: localMethods) {
boolean found = false; boolean found = false;
for (int i=0; i<vtable.size(); i++) { for (int i=0; i<vtable.size(); i++) {