From 9fbecf515e0541e611200a08ba5ea90308d3a2c8 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Mon, 5 Nov 2012 14:13:13 +0400 Subject: [PATCH] Move NamedMembers and MembersCache to provider package --- .../src/org/jetbrains/jet/lang/resolve/java/TypeSource.java | 2 +- .../java/provider/ClassPsiDeclarationProviderImpl.java | 1 - .../provider/KotlinNamespacePsiDeclarationProvider.java | 1 - .../jet/lang/resolve/java/{ => provider}/MembersCache.java | 5 ++++- .../jet/lang/resolve/java/{ => provider}/NamedMembers.java | 2 +- .../java/provider/PackagePsiDeclarationProviderImpl.java | 1 - .../lang/resolve/java/provider/PsiDeclarationProvider.java | 1 - .../resolve/java/provider/PsiDeclarationProviderBase.java | 1 - .../lang/resolve/java/resolver/JavaFunctionResolver.java | 1 + .../lang/resolve/java/resolver/JavaPropertyResolver.java | 1 + .../jet/lang/resolve/java/scope/JavaBaseScope.java | 6 +----- 11 files changed, 9 insertions(+), 13 deletions(-) rename compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/{ => provider}/MembersCache.java (98%) rename compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/{ => provider}/NamedMembers.java (97%) diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/TypeSource.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/TypeSource.java index 08fb69227bf..e3015607004 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/TypeSource.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/TypeSource.java @@ -32,7 +32,7 @@ public class TypeSource { @NotNull private final PsiModifierListOwner psiNotNullOwner; - TypeSource(@NotNull String typeString, @NotNull PsiType psiType, @NotNull PsiModifierListOwner psiNotNullOwner) { + public TypeSource(@NotNull String typeString, @NotNull PsiType psiType, @NotNull PsiModifierListOwner psiNotNullOwner) { this.typeString = typeString; this.psiType = psiType; this.psiNotNullOwner = psiNotNullOwner; 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 610f29825cc..9f7777daed3 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 @@ -4,7 +4,6 @@ import com.intellij.psi.PsiClass; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.resolve.java.DescriptorResolverUtils; -import org.jetbrains.jet.lang.resolve.java.MembersCache; import static org.jetbrains.jet.lang.resolve.java.provider.Origin.JAVA; import static org.jetbrains.jet.lang.resolve.java.provider.Origin.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 77264b52a22..49e8cfd8202 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 @@ -19,7 +19,6 @@ package org.jetbrains.jet.lang.resolve.java.provider; import com.intellij.psi.PsiClass; import com.intellij.psi.PsiPackage; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.resolve.java.MembersCache; import static org.jetbrains.jet.lang.resolve.java.provider.Origin.KOTLIN; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/MembersCache.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/MembersCache.java similarity index 98% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/MembersCache.java rename to compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/MembersCache.java index ebf5540c515..57d7c152e5a 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/MembersCache.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/MembersCache.java @@ -14,11 +14,14 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java; +package org.jetbrains.jet.lang.resolve.java.provider; import com.intellij.psi.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.jet.lang.resolve.java.JvmAbi; +import org.jetbrains.jet.lang.resolve.java.JvmStdlibNames; +import org.jetbrains.jet.lang.resolve.java.TypeSource; import org.jetbrains.jet.lang.resolve.java.kt.JetClassAnnotation; import org.jetbrains.jet.lang.resolve.java.prop.PropertyNameUtils; import org.jetbrains.jet.lang.resolve.java.prop.PropertyParseResult; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/NamedMembers.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/NamedMembers.java similarity index 97% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/NamedMembers.java rename to compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/NamedMembers.java index f8baac00100..2aaa988fad1 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/NamedMembers.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/NamedMembers.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java; +package org.jetbrains.jet.lang.resolve.java.provider; import com.google.common.collect.Lists; import org.jetbrains.annotations.NotNull; 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 cbae95ab424..00aca000a49 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 @@ -18,7 +18,6 @@ package org.jetbrains.jet.lang.resolve.java.provider; import com.intellij.psi.PsiPackage; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.resolve.java.MembersCache; import static org.jetbrains.jet.lang.resolve.java.provider.Origin.JAVA; import static org.jetbrains.jet.lang.resolve.java.provider.Origin.KOTLIN; 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 4ffe68fce0e..5fe28485f7a 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 @@ -17,7 +17,6 @@ package org.jetbrains.jet.lang.resolve.java.provider; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.resolve.java.MembersCache; public interface PsiDeclarationProvider { diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/PsiDeclarationProviderBase.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/PsiDeclarationProviderBase.java index 37d3273cb7f..f6f50902c67 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/PsiDeclarationProviderBase.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/PsiDeclarationProviderBase.java @@ -17,7 +17,6 @@ package org.jetbrains.jet.lang.resolve.java.provider; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.resolve.java.MembersCache; public abstract class PsiDeclarationProviderBase implements PsiDeclarationProvider { private MembersCache membersCache = null; 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 63ad352a34c..a70815e964f 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 @@ -29,6 +29,7 @@ import org.jetbrains.jet.lang.resolve.java.*; import org.jetbrains.jet.lang.resolve.java.kotlinSignature.AlternativeMethodSignatureData; import org.jetbrains.jet.lang.resolve.java.kt.DescriptorKindUtils; import org.jetbrains.jet.lang.resolve.java.provider.ClassPsiDeclarationProvider; +import org.jetbrains.jet.lang.resolve.java.provider.NamedMembers; import org.jetbrains.jet.lang.resolve.java.provider.PsiDeclarationProvider; import org.jetbrains.jet.lang.resolve.java.wrapper.PsiMethodWrapper; import org.jetbrains.jet.lang.resolve.name.Name; 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 9cdf282b22e..0a325eb2f0b 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 @@ -31,6 +31,7 @@ import org.jetbrains.jet.lang.resolve.java.kotlinSignature.AlternativeFieldSigna import org.jetbrains.jet.lang.resolve.java.kt.DescriptorKindUtils; import org.jetbrains.jet.lang.resolve.java.kt.JetMethodAnnotation; import org.jetbrains.jet.lang.resolve.java.provider.ClassPsiDeclarationProvider; +import org.jetbrains.jet.lang.resolve.java.provider.NamedMembers; import org.jetbrains.jet.lang.resolve.java.provider.PsiDeclarationProvider; import org.jetbrains.jet.lang.resolve.java.wrapper.PropertyPsiData; import org.jetbrains.jet.lang.resolve.java.wrapper.PropertyPsiDataElement; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaBaseScope.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaBaseScope.java index 9f21b0cccb4..305ce9a58d4 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaBaseScope.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaBaseScope.java @@ -26,12 +26,8 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.java.JavaSemanticServices; -import org.jetbrains.jet.lang.resolve.java.NamedMembers; import org.jetbrains.jet.lang.resolve.java.descriptor.JavaNamespaceDescriptor; -import org.jetbrains.jet.lang.resolve.java.provider.ClassPsiDeclarationProvider; -import org.jetbrains.jet.lang.resolve.java.provider.ClassPsiDeclarationProviderImpl; -import org.jetbrains.jet.lang.resolve.java.provider.PackagePsiDeclarationProvider; -import org.jetbrains.jet.lang.resolve.java.provider.PsiDeclarationProvider; +import org.jetbrains.jet.lang.resolve.java.provider.*; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.resolve.scopes.JetScopeImpl;