From 1765843e1dd4c0ade6ecbbafe19d77349e3dfd38 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Wed, 26 Dec 2012 19:00:13 +0400 Subject: [PATCH] Rename --- ...ovider.java => KotlinJavaFileStubProvider.java} | 14 +++++++------- .../org/jetbrains/jet/asJava/KotlinLightClass.java | 2 +- .../jet/asJava/KotlinLightClassForPackage.java | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) rename compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/{KotlinLightClassProvider.java => KotlinJavaFileStubProvider.java} (93%) diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClassProvider.java b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinJavaFileStubProvider.java similarity index 93% rename from compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClassProvider.java rename to compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinJavaFileStubProvider.java index 47d4a26ee88..73ef03d02f5 100644 --- a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClassProvider.java +++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinJavaFileStubProvider.java @@ -51,15 +51,15 @@ import org.jetbrains.jet.lang.resolve.name.FqName; import java.util.Collection; import java.util.Collections; -public class KotlinLightClassProvider implements CachedValueProvider { +public class KotlinJavaFileStubProvider implements CachedValueProvider { @NotNull - public static KotlinLightClassProvider createForPackageClass( + public static KotlinJavaFileStubProvider createForPackageClass( @NotNull Project project, @NotNull final FqName packageFqName, @NotNull final Collection files ) { - return new KotlinLightClassProvider(project, packageFqName, files, new StubGenerationStrategy.NoDeclaredClasses() { + return new KotlinJavaFileStubProvider(project, packageFqName, files, new StubGenerationStrategy.NoDeclaredClasses() { @Override public void generate(GenerationState state) { NamespaceCodegen codegen = state.getFactory().forNamespace(packageFqName, files); @@ -70,7 +70,7 @@ public class KotlinLightClassProvider implements CachedValueProvider files; private final FqName packageFqName; private final Project project; private final StubGenerationStrategy stubGenerationStrategy; - private KotlinLightClassProvider( + private KotlinJavaFileStubProvider( @NotNull Project project, @NotNull FqName packageFqName, @NotNull Collection files, diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClass.java b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClass.java index 720096c07b3..53db3c7defa 100644 --- a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClass.java +++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClass.java @@ -76,7 +76,7 @@ public class KotlinLightClass extends AbstractLightClass implements JetJavaMirro PsiJavaFileStub javaFileStub = CachedValuesManager.getManager(getProject()).getCachedValue( outermostClassOrObject, JAVA_API_STUB, - KotlinLightClassProvider.createForDeclaredTopLevelClass(outermostClassOrObject), + KotlinJavaFileStubProvider.createForDeclaredTopLevelClass(outermostClassOrObject), /*trackValue = */false); PsiClass psiClass = LightClassUtil.findClass(classFqName, javaFileStub); diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClassForPackage.java b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClassForPackage.java index 45d4ca93099..4596cffb8be 100644 --- a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClassForPackage.java +++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClassForPackage.java @@ -59,7 +59,7 @@ public class KotlinLightClassForPackage extends KotlinLightClassForPackageBase i assert !files.isEmpty() : "No files for package " + packageFqName; this.files = Sets.newHashSet(files); // needed for hashCode this.hashCode = computeHashCode(); - KotlinLightClassProvider stubProvider = KotlinLightClassProvider.createForPackageClass(getProject(), packageFqName, files); + KotlinJavaFileStubProvider stubProvider = KotlinJavaFileStubProvider.createForPackageClass(getProject(), packageFqName, files); this.javaFileStub = CachedValuesManager.getManager(getProject()).createCachedValue(stubProvider, /*trackValue = */false); }