azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move common getSignatureAnnotation() to base class

Browse Source
This commit is contained in:
Nikolay Krasko
2012-10-05 15:43:08 +04:00
parent 572173a8f8
commit e41bce013d
3 changed files with 9 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/wrapper/PsiFieldWrapper.java
-10
View File
@@ -20,7 +20,6 @@ import com.intellij.psi.PsiField;
import com.intellij.psi.PsiMember;
import com.intellij.psi.PsiType;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.resolve.java.kt.KotlinSignatureAnnotation;
/**
* @author Stepan Koltsov
@@ -42,13 +41,4 @@ public class PsiFieldWrapper extends PsiMemberWrapper {
public boolean isAbstract() {
return false;
}
private KotlinSignatureAnnotation signatureAnnotation;
@NotNull
public KotlinSignatureAnnotation getSignatureAnnotation() {
if (signatureAnnotation == null) {
signatureAnnotation = KotlinSignatureAnnotation.get(getPsiMember());
}
return signatureAnnotation;
}
}
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/wrapper/PsiMemberWrapper.java
+9
View File
@@ -19,6 +19,7 @@ package org.jetbrains.jet.lang.resolve.java.wrapper;
import com.intellij.psi.PsiMember;
import com.intellij.psi.PsiModifier;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.resolve.java.kt.KotlinSignatureAnnotation;
/**
* @author Stepan Koltsov
@@ -55,4 +56,12 @@ public abstract class PsiMemberWrapper {
return psiMember.getName();
}
private KotlinSignatureAnnotation signatureAnnotation;
@NotNull
public KotlinSignatureAnnotation getSignatureAnnotation() {
if (signatureAnnotation == null) {
signatureAnnotation = KotlinSignatureAnnotation.get(getPsiMember());
}
return signatureAnnotation;
}
}
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/wrapper/PsiMethodWrapper.java
-10
View File
@@ -24,7 +24,6 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
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.KotlinSignatureAnnotation;
import java.util.ArrayList;
import java.util.List;
@@ -74,15 +73,6 @@ public class PsiMethodWrapper extends PsiMemberWrapper {
return jetConstructor;
}
private KotlinSignatureAnnotation signatureAnnotation;
@NotNull
public KotlinSignatureAnnotation getSignatureAnnotation() {
if (signatureAnnotation == null) {
signatureAnnotation = KotlinSignatureAnnotation.get(getPsiMethod());
}
return signatureAnnotation;
}
@Override
public boolean isAbstract() {
return psiMember.hasModifierProperty(PsiModifier.ABSTRACT);