From eef86b4191bc038f11aa40aff7dcfcc1db671d05 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Thu, 29 Aug 2013 23:13:07 +0400 Subject: [PATCH] Get rid of getPsi() methods in JavaElement/JavaType hierarchy --- .../structure/impl/JavaAnnotationArgumentImpl.java | 5 +++-- .../JavaAnnotationAsAnnotationArgumentImpl.java | 9 ++------- .../impl/JavaArrayAnnotationArgumentImpl.java | 9 ++------- .../resolve/java/structure/impl/JavaClassImpl.java | 2 +- .../java/structure/impl/JavaClassifierImpl.java | 4 ++-- .../resolve/java/structure/impl/JavaFieldImpl.java | 8 +------- .../java/structure/impl/JavaMemberImpl.java | 4 ++-- .../java/structure/impl/JavaMethodImpl.java | 8 +------- .../impl/JavaReferenceAnnotationArgumentImpl.java | 9 ++------- .../resolve/java/structure/impl/JavaTypeImpl.java | 14 +++++++------- .../java/structure/impl/JavaTypeParameterImpl.java | 8 +------- 11 files changed, 24 insertions(+), 56 deletions(-) diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaAnnotationArgumentImpl.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaAnnotationArgumentImpl.java index f601c77f785..a70658a0c9f 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaAnnotationArgumentImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaAnnotationArgumentImpl.java @@ -22,10 +22,11 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.resolve.java.structure.JavaAnnotationArgument; import org.jetbrains.jet.lang.resolve.name.Name; -public abstract class JavaAnnotationArgumentImpl extends JavaElementImpl implements JavaAnnotationArgument { +public abstract class JavaAnnotationArgumentImpl extends JavaElementImpl + implements JavaAnnotationArgument { private final Name name; - protected JavaAnnotationArgumentImpl(@NotNull PsiAnnotationMemberValue psiAnnotationMemberValue, @Nullable Name name) { + protected JavaAnnotationArgumentImpl(@NotNull Psi psiAnnotationMemberValue, @Nullable Name name) { super(psiAnnotationMemberValue); this.name = name; } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaAnnotationAsAnnotationArgumentImpl.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaAnnotationAsAnnotationArgumentImpl.java index 658d8a97d51..0f82cdebab7 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaAnnotationAsAnnotationArgumentImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaAnnotationAsAnnotationArgumentImpl.java @@ -23,17 +23,12 @@ import org.jetbrains.jet.lang.resolve.java.structure.JavaAnnotation; import org.jetbrains.jet.lang.resolve.java.structure.JavaAnnotationAsAnnotationArgument; import org.jetbrains.jet.lang.resolve.name.Name; -public class JavaAnnotationAsAnnotationArgumentImpl extends JavaAnnotationArgumentImpl implements JavaAnnotationAsAnnotationArgument { +public class JavaAnnotationAsAnnotationArgumentImpl extends JavaAnnotationArgumentImpl + implements JavaAnnotationAsAnnotationArgument { protected JavaAnnotationAsAnnotationArgumentImpl(@NotNull PsiAnnotation psiAnnotation, @Nullable Name name) { super(psiAnnotation, name); } - @NotNull - @Override - public PsiAnnotation getPsi() { - return (PsiAnnotation) super.getPsi(); - } - @Override @NotNull public JavaAnnotation getAnnotation() { diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaArrayAnnotationArgumentImpl.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaArrayAnnotationArgumentImpl.java index 2b20d69ba35..d0bc15da2b0 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaArrayAnnotationArgumentImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaArrayAnnotationArgumentImpl.java @@ -27,17 +27,12 @@ import java.util.Collection; import static org.jetbrains.jet.lang.resolve.java.structure.impl.JavaElementCollectionFromPsiArrayUtil.namelessAnnotationArguments; -public class JavaArrayAnnotationArgumentImpl extends JavaAnnotationArgumentImpl implements JavaArrayAnnotationArgument { +public class JavaArrayAnnotationArgumentImpl extends JavaAnnotationArgumentImpl + implements JavaArrayAnnotationArgument { protected JavaArrayAnnotationArgumentImpl(@NotNull PsiArrayInitializerMemberValue psiArrayInitializerMemberValue, @Nullable Name name) { super(psiArrayInitializerMemberValue, name); } - @NotNull - @Override - public PsiArrayInitializerMemberValue getPsi() { - return (PsiArrayInitializerMemberValue) super.getPsi(); - } - @Override @NotNull public Collection getElements() { diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaClassImpl.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaClassImpl.java index 62bdef9606e..f40bb6dd2a2 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaClassImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaClassImpl.java @@ -33,7 +33,7 @@ import java.util.Collection; import static org.jetbrains.jet.lang.resolve.java.structure.impl.JavaElementCollectionFromPsiArrayUtil.*; -public class JavaClassImpl extends JavaClassifierImpl implements JavaClass, JavaAnnotationOwnerImpl, JavaModifierListOwnerImpl { +public class JavaClassImpl extends JavaClassifierImpl implements JavaClass, JavaAnnotationOwnerImpl, JavaModifierListOwnerImpl { public JavaClassImpl(@NotNull PsiClass psiClass) { super(psiClass); assert !(psiClass instanceof PsiTypeParameter) diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaClassifierImpl.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaClassifierImpl.java index e1ea5789ad5..29444069602 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaClassifierImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaClassifierImpl.java @@ -21,8 +21,8 @@ import com.intellij.psi.PsiTypeParameter; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.resolve.java.structure.JavaClassifier; -public abstract class JavaClassifierImpl extends JavaElementImpl implements JavaClassifier { - protected JavaClassifierImpl(@NotNull PsiClass psiClass) { +public abstract class JavaClassifierImpl extends JavaElementImpl implements JavaClassifier { + protected JavaClassifierImpl(@NotNull Psi psiClass) { super(psiClass); } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaFieldImpl.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaFieldImpl.java index e5cce3fde46..b67a9730748 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaFieldImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaFieldImpl.java @@ -22,17 +22,11 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.resolve.java.structure.JavaField; import org.jetbrains.jet.lang.resolve.java.structure.JavaType; -public class JavaFieldImpl extends JavaMemberImpl implements JavaField { +public class JavaFieldImpl extends JavaMemberImpl implements JavaField { public JavaFieldImpl(@NotNull PsiField psiField) { super(psiField); } - @NotNull - @Override - public PsiField getPsi() { - return (PsiField) super.getPsi(); - } - @Override public boolean isEnumEntry() { return getPsi() instanceof PsiEnumConstant; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaMemberImpl.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaMemberImpl.java index 9aa5bc3bbc7..b85ac294844 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaMemberImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaMemberImpl.java @@ -29,9 +29,9 @@ import org.jetbrains.jet.lang.resolve.name.Name; import java.util.Collection; -public abstract class JavaMemberImpl extends JavaElementImpl +public abstract class JavaMemberImpl extends JavaElementImpl implements JavaMember, JavaAnnotationOwnerImpl, JavaModifierListOwnerImpl { - protected JavaMemberImpl(@NotNull PsiMember psiMember) { + protected JavaMemberImpl(@NotNull Psi psiMember) { super(psiMember); } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaMethodImpl.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaMethodImpl.java index 62134a2f6c3..fd308e76480 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaMethodImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaMethodImpl.java @@ -32,17 +32,11 @@ import java.util.Collection; import static org.jetbrains.jet.lang.resolve.java.structure.impl.JavaElementCollectionFromPsiArrayUtil.typeParameters; import static org.jetbrains.jet.lang.resolve.java.structure.impl.JavaElementCollectionFromPsiArrayUtil.valueParameters; -public class JavaMethodImpl extends JavaMemberImpl implements JavaMethod { +public class JavaMethodImpl extends JavaMemberImpl implements JavaMethod { public JavaMethodImpl(@NotNull PsiMethod psiMethod) { super(psiMethod); } - @NotNull - @Override - public PsiMethod getPsi() { - return (PsiMethod) super.getPsi(); - } - @NotNull @Override public Name getName() { diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaReferenceAnnotationArgumentImpl.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaReferenceAnnotationArgumentImpl.java index 699ef706e8b..154c8f7b4d6 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaReferenceAnnotationArgumentImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaReferenceAnnotationArgumentImpl.java @@ -26,17 +26,12 @@ import org.jetbrains.jet.lang.resolve.java.structure.JavaElement; import org.jetbrains.jet.lang.resolve.java.structure.JavaReferenceAnnotationArgument; import org.jetbrains.jet.lang.resolve.name.Name; -public class JavaReferenceAnnotationArgumentImpl extends JavaAnnotationArgumentImpl implements JavaReferenceAnnotationArgument { +public class JavaReferenceAnnotationArgumentImpl extends JavaAnnotationArgumentImpl + implements JavaReferenceAnnotationArgument { protected JavaReferenceAnnotationArgumentImpl(@NotNull PsiReferenceExpression psiReferenceExpression, @Nullable Name name) { super(psiReferenceExpression, name); } - @NotNull - @Override - public PsiReferenceExpression getPsi() { - return (PsiReferenceExpression) super.getPsi(); - } - @Override @Nullable public JavaElement resolve() { diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaTypeImpl.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaTypeImpl.java index 82623b853e1..7aedf56671c 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaTypeImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaTypeImpl.java @@ -34,35 +34,35 @@ public abstract class JavaTypeImpl implements JavaType { } @NotNull - public static JavaType create(@NotNull PsiType psiType) { - return psiType.accept(new PsiTypeVisitor() { + public static JavaTypeImpl create(@NotNull PsiType psiType) { + return psiType.accept(new PsiTypeVisitor>() { @Nullable @Override - public JavaType visitType(PsiType type) { + public JavaTypeImpl visitType(PsiType type) { throw new UnsupportedOperationException("Unsupported PsiType: " + type); } @Nullable @Override - public JavaType visitPrimitiveType(PsiPrimitiveType primitiveType) { + public JavaTypeImpl visitPrimitiveType(PsiPrimitiveType primitiveType) { return new JavaPrimitiveTypeImpl(primitiveType); } @Nullable @Override - public JavaType visitArrayType(PsiArrayType arrayType) { + public JavaTypeImpl visitArrayType(PsiArrayType arrayType) { return new JavaArrayTypeImpl(arrayType); } @Nullable @Override - public JavaType visitClassType(PsiClassType classType) { + public JavaTypeImpl visitClassType(PsiClassType classType) { return new JavaClassifierTypeImpl(classType); } @Nullable @Override - public JavaType visitWildcardType(PsiWildcardType wildcardType) { + public JavaTypeImpl visitWildcardType(PsiWildcardType wildcardType) { return new JavaWildcardTypeImpl(wildcardType); } }); diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaTypeParameterImpl.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaTypeParameterImpl.java index 825f96c31a3..7fba8122328 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaTypeParameterImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaTypeParameterImpl.java @@ -26,17 +26,11 @@ import java.util.Collection; import static org.jetbrains.jet.lang.resolve.java.structure.impl.JavaElementCollectionFromPsiArrayUtil.classifierTypes; -public class JavaTypeParameterImpl extends JavaClassifierImpl implements JavaTypeParameter { +public class JavaTypeParameterImpl extends JavaClassifierImpl implements JavaTypeParameter { public JavaTypeParameterImpl(@NotNull PsiTypeParameter psiTypeParameter) { super(psiTypeParameter); } - @NotNull - @Override - public PsiTypeParameter getPsi() { - return (PsiTypeParameter) super.getPsi(); - } - @Override public int getIndex() { return getPsi().getIndex();