Move common getSignatureAnnotation() to base class
This commit is contained in:
-10
@@ -20,7 +20,6 @@ import com.intellij.psi.PsiField;
|
|||||||
import com.intellij.psi.PsiMember;
|
import com.intellij.psi.PsiMember;
|
||||||
import com.intellij.psi.PsiType;
|
import com.intellij.psi.PsiType;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.jet.lang.resolve.java.kt.KotlinSignatureAnnotation;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Stepan Koltsov
|
* @author Stepan Koltsov
|
||||||
@@ -42,13 +41,4 @@ public class PsiFieldWrapper extends PsiMemberWrapper {
|
|||||||
public boolean isAbstract() {
|
public boolean isAbstract() {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
private KotlinSignatureAnnotation signatureAnnotation;
|
|
||||||
@NotNull
|
|
||||||
public KotlinSignatureAnnotation getSignatureAnnotation() {
|
|
||||||
if (signatureAnnotation == null) {
|
|
||||||
signatureAnnotation = KotlinSignatureAnnotation.get(getPsiMember());
|
|
||||||
}
|
|
||||||
return signatureAnnotation;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
+9
@@ -19,6 +19,7 @@ package org.jetbrains.jet.lang.resolve.java.wrapper;
|
|||||||
import com.intellij.psi.PsiMember;
|
import com.intellij.psi.PsiMember;
|
||||||
import com.intellij.psi.PsiModifier;
|
import com.intellij.psi.PsiModifier;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
import org.jetbrains.jet.lang.resolve.java.kt.KotlinSignatureAnnotation;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Stepan Koltsov
|
* @author Stepan Koltsov
|
||||||
@@ -55,4 +56,12 @@ public abstract class PsiMemberWrapper {
|
|||||||
return psiMember.getName();
|
return psiMember.getName();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private KotlinSignatureAnnotation signatureAnnotation;
|
||||||
|
@NotNull
|
||||||
|
public KotlinSignatureAnnotation getSignatureAnnotation() {
|
||||||
|
if (signatureAnnotation == null) {
|
||||||
|
signatureAnnotation = KotlinSignatureAnnotation.get(getPsiMember());
|
||||||
|
}
|
||||||
|
return signatureAnnotation;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
-10
@@ -24,7 +24,6 @@ import org.jetbrains.annotations.NotNull;
|
|||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
import org.jetbrains.jet.lang.resolve.java.kt.JetConstructorAnnotation;
|
import org.jetbrains.jet.lang.resolve.java.kt.JetConstructorAnnotation;
|
||||||
import org.jetbrains.jet.lang.resolve.java.kt.JetMethodAnnotation;
|
import org.jetbrains.jet.lang.resolve.java.kt.JetMethodAnnotation;
|
||||||
import org.jetbrains.jet.lang.resolve.java.kt.KotlinSignatureAnnotation;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@@ -74,15 +73,6 @@ public class PsiMethodWrapper extends PsiMemberWrapper {
|
|||||||
return jetConstructor;
|
return jetConstructor;
|
||||||
}
|
}
|
||||||
|
|
||||||
private KotlinSignatureAnnotation signatureAnnotation;
|
|
||||||
@NotNull
|
|
||||||
public KotlinSignatureAnnotation getSignatureAnnotation() {
|
|
||||||
if (signatureAnnotation == null) {
|
|
||||||
signatureAnnotation = KotlinSignatureAnnotation.get(getPsiMethod());
|
|
||||||
}
|
|
||||||
return signatureAnnotation;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isAbstract() {
|
public boolean isAbstract() {
|
||||||
return psiMember.hasModifierProperty(PsiModifier.ABSTRACT);
|
return psiMember.hasModifierProperty(PsiModifier.ABSTRACT);
|
||||||
|
|||||||
Reference in New Issue
Block a user