From 16dde79e587da4ea840293e196a02101b1aafc22 Mon Sep 17 00:00:00 2001
From: Ben Gruver <bgruv@google.com>
Date: Sat, 14 Feb 2015 19:54:08 -0800
Subject: [PATCH] Add an isStatic() helper for SmaliMethod

---
 .../main/java/org/jf/smalidea/psi/impl/SmaliMethod.java    | 7 +++++--
 .../org/jf/smalidea/psi/impl/SmaliMethodParameter.java     | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/smalidea/src/main/java/org/jf/smalidea/psi/impl/SmaliMethod.java b/smalidea/src/main/java/org/jf/smalidea/psi/impl/SmaliMethod.java
index acbb3b8e..bdb58188 100644
--- a/smalidea/src/main/java/org/jf/smalidea/psi/impl/SmaliMethod.java
+++ b/smalidea/src/main/java/org/jf/smalidea/psi/impl/SmaliMethod.java
@@ -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");
     }
diff --git a/smalidea/src/main/java/org/jf/smalidea/psi/impl/SmaliMethodParameter.java b/smalidea/src/main/java/org/jf/smalidea/psi/impl/SmaliMethodParameter.java
index 2060a6e0..f6fe4932 100644
--- a/smalidea/src/main/java/org/jf/smalidea/psi/impl/SmaliMethodParameter.java
+++ b/smalidea/src/main/java/org/jf/smalidea/psi/impl/SmaliMethodParameter.java
@@ -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;