From 912d3426a4aef410516c9de38bf5020b0811541e Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 19 Aug 2013 16:40:52 +0400 Subject: [PATCH] Extract interface out of JavaClassifier --- .../resolve/java/structure/JavaClass.java | 2 +- .../java/structure/JavaClassifier.java | 21 +-------- .../java/structure/JavaClassifierImpl.java | 43 +++++++++++++++++++ .../java/structure/JavaClassifierType.java | 2 +- .../java/structure/JavaTypeParameter.java | 2 +- 5 files changed, 48 insertions(+), 22 deletions(-) create mode 100644 compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaClassifierImpl.java diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaClass.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaClass.java index 2159b3f953a..d57bc1585f0 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaClass.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaClass.java @@ -31,7 +31,7 @@ import java.util.Collection; import static org.jetbrains.jet.lang.resolve.java.structure.JavaElementCollectionFromPsiArrayUtil.*; -public class JavaClass extends JavaClassifier +public class JavaClass extends JavaClassifierImpl implements JavaNamedElement, JavaTypeParameterListOwner, JavaModifierListOwner, JavaAnnotationOwner { public enum OriginKind { COMPILED, diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaClassifier.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaClassifier.java index 187e9c2a5c6..9c286e5f3b9 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaClassifier.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaClassifier.java @@ -17,27 +17,10 @@ package org.jetbrains.jet.lang.resolve.java.structure; import com.intellij.psi.PsiClass; -import com.intellij.psi.PsiTypeParameter; import org.jetbrains.annotations.NotNull; -public abstract class JavaClassifier extends JavaElementImpl { - protected JavaClassifier(@NotNull PsiClass psiClass) { - super(psiClass); - } - +public interface JavaClassifier extends JavaElement { @NotNull @Override - public PsiClass getPsi() { - return (PsiClass) super.getPsi(); - } - - @NotNull - public static JavaClassifier create(@NotNull PsiClass psiClass) { - if (psiClass instanceof PsiTypeParameter) { - return new JavaTypeParameter((PsiTypeParameter) psiClass); - } - else { - return new JavaClass(psiClass); - } - } + PsiClass getPsi(); } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaClassifierImpl.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaClassifierImpl.java new file mode 100644 index 00000000000..415b1ae9501 --- /dev/null +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaClassifierImpl.java @@ -0,0 +1,43 @@ +/* + * Copyright 2010-2013 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jetbrains.jet.lang.resolve.java.structure; + +import com.intellij.psi.PsiClass; +import com.intellij.psi.PsiTypeParameter; +import org.jetbrains.annotations.NotNull; + +public abstract class JavaClassifierImpl extends JavaElementImpl implements JavaClassifier { + protected JavaClassifierImpl(@NotNull PsiClass psiClass) { + super(psiClass); + } + + @NotNull + @Override + public PsiClass getPsi() { + return (PsiClass) super.getPsi(); + } + + @NotNull + /* package */ static JavaClassifier create(@NotNull PsiClass psiClass) { + if (psiClass instanceof PsiTypeParameter) { + return new JavaTypeParameter((PsiTypeParameter) psiClass); + } + else { + return new JavaClass(psiClass); + } + } +} diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaClassifierType.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaClassifierType.java index 19115fbd2b3..db5dd79ea25 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaClassifierType.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaClassifierType.java @@ -69,7 +69,7 @@ public class JavaClassifierType extends JavaType { PsiClassType.ClassResolveResult result = getPsi().resolveGenerics(); PsiClass psiClass = result.getElement(); resolutionResult = new ResolutionResult( - psiClass == null ? null : JavaClassifier.create(psiClass), + psiClass == null ? null : JavaClassifierImpl.create(psiClass), new JavaTypeSubstitutor(result.getSubstitutor()) ); } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaTypeParameter.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaTypeParameter.java index 84364ef2c2c..9cb82312069 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaTypeParameter.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaTypeParameter.java @@ -28,7 +28,7 @@ import java.util.Collection; import static org.jetbrains.jet.lang.resolve.java.structure.JavaElementCollectionFromPsiArrayUtil.classifierTypes; -public class JavaTypeParameter extends JavaClassifier implements JavaNamedElement { +public class JavaTypeParameter extends JavaClassifierImpl implements JavaNamedElement { public JavaTypeParameter(@NotNull PsiTypeParameter psiTypeParameter) { super(psiTypeParameter); }