From 940aba04ff1043e6a54c2b1c64dab1ad2051f10a Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Mon, 5 Nov 2012 14:10:55 +0400 Subject: [PATCH] Rename package: data -> provider --- .../jet/lang/resolve/java/JavaDescriptorResolver.java | 4 ++-- .../java/descriptor/ClassDescriptorFromJvmBytecode.java | 2 +- .../{data => provider}/ClassPsiDeclarationProvider.java | 2 +- .../ClassPsiDeclarationProviderImpl.java | 6 +++--- .../KotlinNamespacePsiDeclarationProvider.java | 4 ++-- .../jet/lang/resolve/java/{data => provider}/Origin.java | 2 +- .../{data => provider}/PackagePsiDeclarationProvider.java | 2 +- .../PackagePsiDeclarationProviderImpl.java | 6 +++--- .../java/{data => provider}/PsiDeclarationProvider.java | 2 +- .../{data => provider}/PsiDeclarationProviderBase.java | 2 +- .../{data => provider}/PsiDeclarationProviderFactory.java | 2 +- .../resolve/java/resolver/JavaClassObjectResolver.java | 4 ++-- .../jet/lang/resolve/java/resolver/JavaClassResolver.java | 4 ++-- .../resolve/java/resolver/JavaConstructorResolver.java | 2 +- .../lang/resolve/java/resolver/JavaFunctionResolver.java | 8 ++++---- .../lang/resolve/java/resolver/JavaNamespaceResolver.java | 4 ++-- .../lang/resolve/java/resolver/JavaPropertyResolver.java | 6 +++--- .../lang/resolve/java/resolver/JavaSupertypeResolver.java | 4 ++-- .../jet/lang/resolve/java/scope/JavaBaseScope.java | 8 ++++---- .../lang/resolve/java/scope/JavaClassMembersScope.java | 2 +- .../jet/lang/resolve/java/scope/JavaPackageScope.java | 6 +++--- 21 files changed, 41 insertions(+), 41 deletions(-) rename compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/{data => provider}/ClassPsiDeclarationProvider.java (94%) rename compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/{data => provider}/ClassPsiDeclarationProviderImpl.java (87%) rename compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/{data => provider}/KotlinNamespacePsiDeclarationProvider.java (93%) rename compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/{data => provider}/Origin.java (92%) rename compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/{data => provider}/PackagePsiDeclarationProvider.java (93%) rename compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/{data => provider}/PackagePsiDeclarationProviderImpl.java (88%) rename compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/{data => provider}/PsiDeclarationProvider.java (93%) rename compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/{data => provider}/PsiDeclarationProviderBase.java (95%) rename compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/{data => provider}/PsiDeclarationProviderFactory.java (98%) diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java index 268b5c6d1c7..279806f131f 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java @@ -21,9 +21,9 @@ import org.jetbrains.annotations.NotNull; 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.data.ClassPsiDeclarationProvider; -import org.jetbrains.jet.lang.resolve.java.data.PsiDeclarationProvider; import org.jetbrains.jet.lang.resolve.java.descriptor.ClassDescriptorFromJvmBytecode; +import org.jetbrains.jet.lang.resolve.java.provider.ClassPsiDeclarationProvider; +import org.jetbrains.jet.lang.resolve.java.provider.PsiDeclarationProvider; import org.jetbrains.jet.lang.resolve.java.resolver.*; import org.jetbrains.jet.lang.resolve.java.scope.JavaPackageScope; import org.jetbrains.jet.lang.resolve.name.FqName; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/ClassDescriptorFromJvmBytecode.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/ClassDescriptorFromJvmBytecode.java index dfda984f620..e5bea1875d4 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/ClassDescriptorFromJvmBytecode.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/ClassDescriptorFromJvmBytecode.java @@ -22,7 +22,7 @@ import org.jetbrains.jet.lang.descriptors.ConstructorDescriptor; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.descriptors.MutableClassDescriptorLite; import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver; -import org.jetbrains.jet.lang.resolve.java.data.ClassPsiDeclarationProvider; +import org.jetbrains.jet.lang.resolve.java.provider.ClassPsiDeclarationProvider; import org.jetbrains.jet.lang.resolve.lazy.LazyClassDescriptor; import java.util.Collection; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/data/ClassPsiDeclarationProvider.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/ClassPsiDeclarationProvider.java similarity index 94% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/data/ClassPsiDeclarationProvider.java rename to compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/ClassPsiDeclarationProvider.java index 5751cdd7839..22ed129d597 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/data/ClassPsiDeclarationProvider.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/ClassPsiDeclarationProvider.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.data; +package org.jetbrains.jet.lang.resolve.java.provider; import com.intellij.psi.PsiClass; import org.jetbrains.annotations.NotNull; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/data/ClassPsiDeclarationProviderImpl.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/ClassPsiDeclarationProviderImpl.java similarity index 87% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/data/ClassPsiDeclarationProviderImpl.java rename to compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/ClassPsiDeclarationProviderImpl.java index 2c3c91d60ec..610f29825cc 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/data/ClassPsiDeclarationProviderImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/ClassPsiDeclarationProviderImpl.java @@ -1,4 +1,4 @@ -package org.jetbrains.jet.lang.resolve.java.data; +package org.jetbrains.jet.lang.resolve.java.provider; import com.intellij.psi.PsiClass; import org.jetbrains.annotations.NotNull; @@ -6,8 +6,8 @@ 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.data.Origin.JAVA; -import static org.jetbrains.jet.lang.resolve.java.data.Origin.KOTLIN; +import static org.jetbrains.jet.lang.resolve.java.provider.Origin.JAVA; +import static org.jetbrains.jet.lang.resolve.java.provider.Origin.KOTLIN; public class ClassPsiDeclarationProviderImpl extends PsiDeclarationProviderBase implements ClassPsiDeclarationProvider { diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/data/KotlinNamespacePsiDeclarationProvider.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/KotlinNamespacePsiDeclarationProvider.java similarity index 93% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/data/KotlinNamespacePsiDeclarationProvider.java rename to compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/KotlinNamespacePsiDeclarationProvider.java index 59b503cce5f..77264b52a22 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/data/KotlinNamespacePsiDeclarationProvider.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/KotlinNamespacePsiDeclarationProvider.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.data; +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.data.Origin.KOTLIN; +import static org.jetbrains.jet.lang.resolve.java.provider.Origin.KOTLIN; public final class KotlinNamespacePsiDeclarationProvider extends ClassPsiDeclarationProviderImpl implements PackagePsiDeclarationProvider { diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/data/Origin.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/Origin.java similarity index 92% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/data/Origin.java rename to compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/Origin.java index f4ef038cda4..629eb514173 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/data/Origin.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/Origin.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.data; +package org.jetbrains.jet.lang.resolve.java.provider; public enum Origin { JAVA, diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/data/PackagePsiDeclarationProvider.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/PackagePsiDeclarationProvider.java similarity index 93% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/data/PackagePsiDeclarationProvider.java rename to compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/PackagePsiDeclarationProvider.java index 42bb48416d5..818fae07ee7 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/data/PackagePsiDeclarationProvider.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/PackagePsiDeclarationProvider.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.data; +package org.jetbrains.jet.lang.resolve.java.provider; import com.intellij.psi.PsiPackage; import org.jetbrains.annotations.NotNull; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/data/PackagePsiDeclarationProviderImpl.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/PackagePsiDeclarationProviderImpl.java similarity index 88% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/data/PackagePsiDeclarationProviderImpl.java rename to compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/PackagePsiDeclarationProviderImpl.java index 70c3f01ba60..cbae95ab424 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/data/PackagePsiDeclarationProviderImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/PackagePsiDeclarationProviderImpl.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.data; +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.data.Origin.JAVA; -import static org.jetbrains.jet.lang.resolve.java.data.Origin.KOTLIN; +import static org.jetbrains.jet.lang.resolve.java.provider.Origin.JAVA; +import static org.jetbrains.jet.lang.resolve.java.provider.Origin.KOTLIN; public final class PackagePsiDeclarationProviderImpl extends PsiDeclarationProviderBase implements PackagePsiDeclarationProvider { diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/data/PsiDeclarationProvider.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/PsiDeclarationProvider.java similarity index 93% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/data/PsiDeclarationProvider.java rename to compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/PsiDeclarationProvider.java index 68dbae284f7..4ffe68fce0e 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/data/PsiDeclarationProvider.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/PsiDeclarationProvider.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.data; +package org.jetbrains.jet.lang.resolve.java.provider; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.resolve.java.MembersCache; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/data/PsiDeclarationProviderBase.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/PsiDeclarationProviderBase.java similarity index 95% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/data/PsiDeclarationProviderBase.java rename to compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/PsiDeclarationProviderBase.java index 4da665f5e8f..37d3273cb7f 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/data/PsiDeclarationProviderBase.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/PsiDeclarationProviderBase.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.data; +package org.jetbrains.jet.lang.resolve.java.provider; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.resolve.java.MembersCache; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/data/PsiDeclarationProviderFactory.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/PsiDeclarationProviderFactory.java similarity index 98% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/data/PsiDeclarationProviderFactory.java rename to compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/PsiDeclarationProviderFactory.java index 4a3c137439d..34a3c01ad45 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/data/PsiDeclarationProviderFactory.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/provider/PsiDeclarationProviderFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.data; +package org.jetbrains.jet.lang.resolve.java.provider; import com.intellij.psi.PsiClass; import com.intellij.psi.PsiPackage; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassObjectResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassObjectResolver.java index d85d42503c1..b0aacc73f77 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassObjectResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassObjectResolver.java @@ -28,9 +28,9 @@ import org.jetbrains.jet.lang.resolve.java.DescriptorResolverUtils; import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver; import org.jetbrains.jet.lang.resolve.java.JavaSemanticServices; import org.jetbrains.jet.lang.resolve.java.JvmAbi; -import org.jetbrains.jet.lang.resolve.java.data.ClassPsiDeclarationProvider; -import org.jetbrains.jet.lang.resolve.java.data.PsiDeclarationProviderFactory; import org.jetbrains.jet.lang.resolve.java.descriptor.ClassDescriptorFromJvmBytecode; +import org.jetbrains.jet.lang.resolve.java.provider.ClassPsiDeclarationProvider; +import org.jetbrains.jet.lang.resolve.java.provider.PsiDeclarationProviderFactory; import org.jetbrains.jet.lang.resolve.java.scope.JavaClassMembersScope; import org.jetbrains.jet.lang.resolve.java.wrapper.PsiClassWrapper; import org.jetbrains.jet.lang.resolve.name.FqName; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java index daa84b9c3b7..2bfc0f40126 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java @@ -30,10 +30,10 @@ import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.java.*; -import org.jetbrains.jet.lang.resolve.java.data.ClassPsiDeclarationProvider; -import org.jetbrains.jet.lang.resolve.java.data.PsiDeclarationProviderFactory; import org.jetbrains.jet.lang.resolve.java.descriptor.ClassDescriptorFromJvmBytecode; import org.jetbrains.jet.lang.resolve.java.kt.JetClassAnnotation; +import org.jetbrains.jet.lang.resolve.java.provider.ClassPsiDeclarationProvider; +import org.jetbrains.jet.lang.resolve.java.provider.PsiDeclarationProviderFactory; import org.jetbrains.jet.lang.resolve.java.scope.JavaClassMembersScope; import org.jetbrains.jet.lang.resolve.java.wrapper.PsiClassWrapper; import org.jetbrains.jet.lang.resolve.name.FqName; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaConstructorResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaConstructorResolver.java index 43f63228f56..d5c474b7065 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaConstructorResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaConstructorResolver.java @@ -26,9 +26,9 @@ import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.DescriptorResolver; import org.jetbrains.jet.lang.resolve.java.*; -import org.jetbrains.jet.lang.resolve.java.data.ClassPsiDeclarationProvider; import org.jetbrains.jet.lang.resolve.java.descriptor.ClassDescriptorFromJvmBytecode; import org.jetbrains.jet.lang.resolve.java.kotlinSignature.AlternativeMethodSignatureData; +import org.jetbrains.jet.lang.resolve.java.provider.ClassPsiDeclarationProvider; import org.jetbrains.jet.lang.resolve.java.wrapper.PsiMethodWrapper; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.types.JetType; 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 bf5f0c966e3..63ad352a34c 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 @@ -26,10 +26,10 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.resolve.*; import org.jetbrains.jet.lang.resolve.java.*; -import org.jetbrains.jet.lang.resolve.java.data.ClassPsiDeclarationProvider; -import org.jetbrains.jet.lang.resolve.java.data.PsiDeclarationProvider; 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.PsiDeclarationProvider; import org.jetbrains.jet.lang.resolve.java.wrapper.PsiMethodWrapper; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.types.JetType; @@ -43,8 +43,8 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import static org.jetbrains.jet.lang.resolve.java.data.Origin.JAVA; -import static org.jetbrains.jet.lang.resolve.java.data.Origin.KOTLIN; +import static org.jetbrains.jet.lang.resolve.java.provider.Origin.JAVA; +import static org.jetbrains.jet.lang.resolve.java.provider.Origin.KOTLIN; public final class JavaFunctionResolver { diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaNamespaceResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaNamespaceResolver.java index 25293de35ac..cd134d729d3 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaNamespaceResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaNamespaceResolver.java @@ -30,9 +30,9 @@ import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.java.*; -import org.jetbrains.jet.lang.resolve.java.data.PsiDeclarationProvider; -import org.jetbrains.jet.lang.resolve.java.data.PsiDeclarationProviderFactory; import org.jetbrains.jet.lang.resolve.java.descriptor.JavaNamespaceDescriptor; +import org.jetbrains.jet.lang.resolve.java.provider.PsiDeclarationProvider; +import org.jetbrains.jet.lang.resolve.java.provider.PsiDeclarationProviderFactory; import org.jetbrains.jet.lang.resolve.java.scope.JavaPackageScope; import org.jetbrains.jet.lang.resolve.name.FqName; 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 68dd0794f31..9cdf282b22e 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 @@ -27,11 +27,11 @@ import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.OverrideResolver; import org.jetbrains.jet.lang.resolve.java.*; -import org.jetbrains.jet.lang.resolve.java.data.ClassPsiDeclarationProvider; -import org.jetbrains.jet.lang.resolve.java.data.PsiDeclarationProvider; import org.jetbrains.jet.lang.resolve.java.kotlinSignature.AlternativeFieldSignatureData; 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.PsiDeclarationProvider; import org.jetbrains.jet.lang.resolve.java.wrapper.PropertyPsiData; import org.jetbrains.jet.lang.resolve.java.wrapper.PropertyPsiDataElement; import org.jetbrains.jet.lang.resolve.java.wrapper.PsiFieldWrapper; @@ -45,7 +45,7 @@ import org.jetbrains.jet.lang.types.TypeUtils; import javax.inject.Inject; import java.util.*; -import static org.jetbrains.jet.lang.resolve.java.data.Origin.JAVA; +import static org.jetbrains.jet.lang.resolve.java.provider.Origin.JAVA; public final class JavaPropertyResolver { 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 e347240f334..e3159a333bd 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 @@ -27,7 +27,7 @@ import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.java.*; -import org.jetbrains.jet.lang.resolve.java.data.ClassPsiDeclarationProvider; +import org.jetbrains.jet.lang.resolve.java.provider.ClassPsiDeclarationProvider; import org.jetbrains.jet.lang.resolve.java.wrapper.PsiClassWrapper; import org.jetbrains.jet.lang.types.ErrorUtils; import org.jetbrains.jet.lang.types.JetType; @@ -43,7 +43,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import static org.jetbrains.jet.lang.resolve.java.data.Origin.KOTLIN; +import static org.jetbrains.jet.lang.resolve.java.provider.Origin.KOTLIN; public final class JavaSupertypeResolver { 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 6334a959107..9f21b0cccb4 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 @@ -27,11 +27,11 @@ 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.data.ClassPsiDeclarationProvider; -import org.jetbrains.jet.lang.resolve.java.data.ClassPsiDeclarationProviderImpl; -import org.jetbrains.jet.lang.resolve.java.data.PackagePsiDeclarationProvider; -import org.jetbrains.jet.lang.resolve.java.data.PsiDeclarationProvider; 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.name.Name; import org.jetbrains.jet.lang.resolve.scopes.JetScopeImpl; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaClassMembersScope.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaClassMembersScope.java index 1cd83489137..917ba7afee8 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaClassMembersScope.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaClassMembersScope.java @@ -26,7 +26,7 @@ import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.resolve.java.DescriptorSearchRule; import org.jetbrains.jet.lang.resolve.java.JavaSemanticServices; -import org.jetbrains.jet.lang.resolve.java.data.ClassPsiDeclarationProvider; +import org.jetbrains.jet.lang.resolve.java.provider.ClassPsiDeclarationProvider; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.LabelName; import org.jetbrains.jet.lang.resolve.name.Name; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaPackageScope.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaPackageScope.java index cade9a6f3da..2eb2420895f 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaPackageScope.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/scope/JavaPackageScope.java @@ -24,9 +24,9 @@ import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor; import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor; import org.jetbrains.jet.lang.resolve.java.DescriptorSearchRule; import org.jetbrains.jet.lang.resolve.java.JavaSemanticServices; -import org.jetbrains.jet.lang.resolve.java.data.ClassPsiDeclarationProvider; -import org.jetbrains.jet.lang.resolve.java.data.PackagePsiDeclarationProvider; -import org.jetbrains.jet.lang.resolve.java.data.PsiDeclarationProvider; +import org.jetbrains.jet.lang.resolve.java.provider.ClassPsiDeclarationProvider; +import org.jetbrains.jet.lang.resolve.java.provider.PackagePsiDeclarationProvider; +import org.jetbrains.jet.lang.resolve.java.provider.PsiDeclarationProvider; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.Name;