Add an isStatic() helper for SmaliMethod

This commit is contained in:
Ben Gruver 2015-02-14 19:54:08 -08:00
parent d733304122
commit 16dde79e58
2 changed files with 6 additions and 3 deletions

View File

@ -174,9 +174,8 @@ public class SmaliMethod extends SmaliStubBasedPsiElement<SmaliMethodStub>
}
public int getParameterRegisterCount() {
SmaliModifierList modifierList = getModifierList();
int parameterRegisterCount = getMethodPrototype().getParameterList().getParameterRegisterCount();
if (!modifierList.hasModifierProperty("static")) {
if (!isStatic()) {
parameterRegisterCount++;
}
return parameterRegisterCount;
@ -190,6 +189,10 @@ public class SmaliMethod extends SmaliStubBasedPsiElement<SmaliMethodStub>
return hasModifierProperty("constructor") && !hasModifierProperty("static");
}
public boolean isStatic() {
return hasModifierProperty("static");
}
@Override public boolean isVarArgs() {
return hasModifierProperty("varargs");
}

View File

@ -169,7 +169,7 @@ public class SmaliMethodParameter extends SmaliStubBasedPsiElement<SmaliMethodPa
// TODO: it might be a good idea to cache this, or at least do it non-recursively
PsiElement prevSibling = getPrevSibling();
if (prevSibling == null) {
return getParentMethod().hasModifierProperty("static") ? 0 : 1;
return getParentMethod().isStatic() ? 0 : 1;
}
assert prevSibling instanceof SmaliMethodParameter;
SmaliMethodParameter prevParam = (SmaliMethodParameter)prevSibling;