From e9bf09d2401549d44c675b7c83c64ae52baa956b Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Wed, 7 Nov 2012 15:37:53 +0400 Subject: [PATCH] Rename class: Origin -> DeclarationOrigin --- .../ClassPsiDeclarationProviderImpl.java | 16 ++++++++-------- .../{Origin.java => DeclarationOrigin.java} | 2 +- .../KotlinNamespacePsiDeclarationProvider.java | 6 +++--- .../PackagePsiDeclarationProviderImpl.java | 8 ++++---- .../java/provider/PsiDeclarationProvider.java | 2 +- .../java/resolver/JavaFunctionResolver.java | 8 ++++---- .../java/resolver/JavaPropertyResolver.java | 6 +++--- .../java/resolver/JavaSupertypeResolver.java | 4 ++-- 8 files changed, 26 insertions(+), 26 deletions(-) rename compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/{Origin.java => DeclarationOrigin.java} (95%) diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/ClassPsiDeclarationProviderImpl.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/ClassPsiDeclarationProviderImpl.java index 9f7777daed3..3e18ef50af0 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/ClassPsiDeclarationProviderImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/ClassPsiDeclarationProviderImpl.java @@ -5,8 +5,8 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.resolve.java.DescriptorResolverUtils; -import static org.jetbrains.jet.lang.resolve.java.provider.Origin.JAVA; -import static org.jetbrains.jet.lang.resolve.java.provider.Origin.KOTLIN; +import static org.jetbrains.jet.lang.resolve.java.provider.DeclarationOrigin.JAVA; +import static org.jetbrains.jet.lang.resolve.java.provider.DeclarationOrigin.KOTLIN; public class ClassPsiDeclarationProviderImpl extends PsiDeclarationProviderBase implements ClassPsiDeclarationProvider { @@ -14,20 +14,20 @@ public class ClassPsiDeclarationProviderImpl extends PsiDeclarationProviderBase private final PsiClass psiClass; private final boolean staticMembers; @NotNull - protected final Origin origin; + protected final DeclarationOrigin declarationOrigin; protected ClassPsiDeclarationProviderImpl( @NotNull PsiClass psiClass, boolean staticMembers ) { this.staticMembers = staticMembers; this.psiClass = psiClass; - this.origin = determineOrigin(psiClass); + this.declarationOrigin = determineOrigin(psiClass); } @Override @NotNull protected MembersCache buildMembersCache() { - return MembersCache.buildMembersByNameCache(new MembersCache(), psiClass, null, staticMembers, getOrigin() == KOTLIN); + return MembersCache.buildMembersByNameCache(new MembersCache(), psiClass, null, staticMembers, getDeclarationOrigin() == KOTLIN); } @Override @@ -38,12 +38,12 @@ public class ClassPsiDeclarationProviderImpl extends PsiDeclarationProviderBase @Override @NotNull - public Origin getOrigin() { - return origin; + public DeclarationOrigin getDeclarationOrigin() { + return declarationOrigin; } @NotNull - private static Origin determineOrigin(@Nullable PsiClass psiClass) { + private static DeclarationOrigin determineOrigin(@Nullable PsiClass psiClass) { return ((psiClass != null) && DescriptorResolverUtils.isKotlinClass(psiClass)) ? KOTLIN : JAVA; } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/Origin.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/DeclarationOrigin.java similarity index 95% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/Origin.java rename to compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/DeclarationOrigin.java index 629eb514173..0a87640a7e0 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/Origin.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/DeclarationOrigin.java @@ -16,7 +16,7 @@ package org.jetbrains.jet.lang.resolve.java.provider; -public enum Origin { +public enum DeclarationOrigin { JAVA, KOTLIN } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/KotlinNamespacePsiDeclarationProvider.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/KotlinNamespacePsiDeclarationProvider.java index 49e8cfd8202..e80fbbc73d9 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/KotlinNamespacePsiDeclarationProvider.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/KotlinNamespacePsiDeclarationProvider.java @@ -20,7 +20,7 @@ import com.intellij.psi.PsiClass; import com.intellij.psi.PsiPackage; import org.jetbrains.annotations.NotNull; -import static org.jetbrains.jet.lang.resolve.java.provider.Origin.KOTLIN; +import static org.jetbrains.jet.lang.resolve.java.provider.DeclarationOrigin.KOTLIN; public final class KotlinNamespacePsiDeclarationProvider extends ClassPsiDeclarationProviderImpl implements PackagePsiDeclarationProvider { @@ -45,13 +45,13 @@ public final class KotlinNamespacePsiDeclarationProvider extends ClassPsiDeclara @Override protected MembersCache buildMembersCache() { MembersCache cacheWithMembers = super.buildMembersCache(); - MembersCache.buildMembersByNameCache(cacheWithMembers, null, packagePsiDeclarationProvider.getPsiPackage(), true, getOrigin() == KOTLIN); + MembersCache.buildMembersByNameCache(cacheWithMembers, null, packagePsiDeclarationProvider.getPsiPackage(), true, getDeclarationOrigin() == KOTLIN); return cacheWithMembers; } @NotNull @Override - public Origin getOrigin() { + public DeclarationOrigin getDeclarationOrigin() { return KOTLIN; } } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/PackagePsiDeclarationProviderImpl.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/PackagePsiDeclarationProviderImpl.java index 00aca000a49..d3902f583f7 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/PackagePsiDeclarationProviderImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/PackagePsiDeclarationProviderImpl.java @@ -19,8 +19,8 @@ package org.jetbrains.jet.lang.resolve.java.provider; import com.intellij.psi.PsiPackage; import org.jetbrains.annotations.NotNull; -import static org.jetbrains.jet.lang.resolve.java.provider.Origin.JAVA; -import static org.jetbrains.jet.lang.resolve.java.provider.Origin.KOTLIN; +import static org.jetbrains.jet.lang.resolve.java.provider.DeclarationOrigin.JAVA; +import static org.jetbrains.jet.lang.resolve.java.provider.DeclarationOrigin.KOTLIN; public final class PackagePsiDeclarationProviderImpl extends PsiDeclarationProviderBase implements PackagePsiDeclarationProvider { @@ -42,12 +42,12 @@ public final class PackagePsiDeclarationProviderImpl extends PsiDeclarationProvi @NotNull @Override protected MembersCache buildMembersCache() { - return MembersCache.buildMembersByNameCache(new MembersCache(), null, getPsiPackage(), true, getOrigin() == KOTLIN); + return MembersCache.buildMembersByNameCache(new MembersCache(), null, getPsiPackage(), true, getDeclarationOrigin() == KOTLIN); } @NotNull @Override - public Origin getOrigin() { + public DeclarationOrigin getDeclarationOrigin() { return JAVA; } } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/PsiDeclarationProvider.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/PsiDeclarationProvider.java index 5fe28485f7a..9d428bb8c9f 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/PsiDeclarationProvider.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/PsiDeclarationProvider.java @@ -24,5 +24,5 @@ public interface PsiDeclarationProvider { MembersCache getMembersCache(); @NotNull - Origin getOrigin(); + DeclarationOrigin getDeclarationOrigin(); } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaFunctionResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaFunctionResolver.java index a70815e964f..871c3856ca1 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaFunctionResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaFunctionResolver.java @@ -44,8 +44,8 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import static org.jetbrains.jet.lang.resolve.java.provider.Origin.JAVA; -import static org.jetbrains.jet.lang.resolve.java.provider.Origin.KOTLIN; +import static org.jetbrains.jet.lang.resolve.java.provider.DeclarationOrigin.JAVA; +import static org.jetbrains.jet.lang.resolve.java.provider.DeclarationOrigin.KOTLIN; public final class JavaFunctionResolver { @@ -100,7 +100,7 @@ public final class JavaFunctionResolver { final PsiMethod psiMethod = method.getPsiMethod(); final PsiClass containingClass = psiMethod.getContainingClass(); - if (scopeData.getOrigin() == KOTLIN) { + if (scopeData.getDeclarationOrigin() == KOTLIN) { // TODO: unless maybe class explicitly extends Object assert containingClass != null; String ownerClassName = containingClass.getQualifiedName(); @@ -163,7 +163,7 @@ public final class JavaFunctionResolver { BindingContextUtils.recordFunctionDeclarationToDescriptor(trace, psiMethod, functionDescriptorImpl); } - if (scopeData.getOrigin() == JAVA) { + if (scopeData.getDeclarationOrigin() == JAVA) { trace.record(BindingContext.IS_DECLARED_IN_JAVA, functionDescriptorImpl); } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPropertyResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPropertyResolver.java index 0a325eb2f0b..646d41ee69e 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPropertyResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPropertyResolver.java @@ -46,7 +46,7 @@ import org.jetbrains.jet.lang.types.TypeUtils; import javax.inject.Inject; import java.util.*; -import static org.jetbrains.jet.lang.resolve.java.provider.Origin.JAVA; +import static org.jetbrains.jet.lang.resolve.java.provider.DeclarationOrigin.JAVA; public final class JavaPropertyResolver { @@ -245,7 +245,7 @@ public final class JavaPropertyResolver { recordObjectDeclarationClassIfNeeded(psiData, realOwner, propertyDescriptor, propertyType); - if (scopeData.getOrigin() == JAVA) { + if (scopeData.getDeclarationOrigin() == JAVA) { trace.record(BindingContext.IS_DECLARED_IN_JAVA, propertyDescriptor); } return propertyDescriptor; @@ -423,7 +423,7 @@ public final class JavaPropertyResolver { } private static boolean isPropertyFinal(PsiDeclarationProvider scopeData, PropertyPsiData psiData) { - if (scopeData.getOrigin() == JAVA) { + if (scopeData.getDeclarationOrigin() == JAVA) { return true; } return psiData.isFinal(); diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaSupertypeResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaSupertypeResolver.java index e3159a333bd..7540e49ba2d 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaSupertypeResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaSupertypeResolver.java @@ -43,7 +43,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import static org.jetbrains.jet.lang.resolve.java.provider.Origin.KOTLIN; +import static org.jetbrains.jet.lang.resolve.java.provider.DeclarationOrigin.KOTLIN; public final class JavaSupertypeResolver { @@ -144,7 +144,7 @@ public final class JavaSupertypeResolver { @NotNull ClassDescriptor classDescriptor, @NotNull List result ) { - if (classData.getOrigin() == KOTLIN + if (classData.getDeclarationOrigin() == KOTLIN || DescriptorResolverUtils.OBJECT_FQ_NAME.equalsTo(psiClass.getQualifiedName()) // TODO: annotations || classDescriptor.getKind() == ClassKind.ANNOTATION_CLASS) {