From b4b9c6c387586fcc2b324a8b00d9ec09d7341a9a Mon Sep 17 00:00:00 2001 From: Ben Gruver Date: Mon, 24 Mar 2014 22:31:17 -0700 Subject: [PATCH] Get qualifiedName from stub in when possible in SmaliClass --- .../org/jf/smalidea/psi/impl/SmaliClass.java | 29 +++++++++++-------- 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/smalidea/src/main/java/org/jf/smalidea/psi/impl/SmaliClass.java b/smalidea/src/main/java/org/jf/smalidea/psi/impl/SmaliClass.java index 5b1d5851..63f9c051 100644 --- a/smalidea/src/main/java/org/jf/smalidea/psi/impl/SmaliClass.java +++ b/smalidea/src/main/java/org/jf/smalidea/psi/impl/SmaliClass.java @@ -72,19 +72,12 @@ public class SmaliClass extends SmaliStubBasedPsiElement impleme return name.substring(lastDot+1); } - @Nullable @Override public SmaliAccessList getAccessFlagsNode() { - SmaliClassStatement classStatement = findChildByClass(SmaliClassStatement.class); - if (classStatement == null) { - return null; - } - return classStatement.getAccessFlagsNode(); - } - @Override public boolean hasTypeParameters() { - // TODO: implement generics - return false; - } - @Nullable @Override public String getQualifiedName() { + SmaliClassStub stub = getStub(); + if (stub != null) { + return stub.getQualifiedName(); + } + SmaliClassStatement classStatement = findChildByClass(SmaliClassStatement.class); if (classStatement == null) { return null; @@ -104,6 +97,18 @@ public class SmaliClass extends SmaliStubBasedPsiElement impleme return name.substring(0, lastDot); } + @Nullable @Override public SmaliAccessList getAccessFlagsNode() { + SmaliClassStatement classStatement = findChildByClass(SmaliClassStatement.class); + if (classStatement == null) { + return null; + } + return classStatement.getAccessFlagsNode(); + } + @Override public boolean hasTypeParameters() { + // TODO: implement generics + return false; + } + @Override public boolean isInterface() { return getModifierList().hasModifierProperty("interface"); }