azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename

Browse Source
This commit is contained in:
Andrey Breslav
2012-12-26 19:00:13 +04:00
parent 9ada4a8082
commit 1765843e1d
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClassProvider.java → compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinJavaFileStubProvider.java
+7 -7
View File
@@ -51,15 +51,15 @@ import org.jetbrains.jet.lang.resolve.name.FqName;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
public class KotlinLightClassProvider implements CachedValueProvider<PsiJavaFileStub> { public class KotlinJavaFileStubProvider implements CachedValueProvider<PsiJavaFileStub> {
@NotNull @NotNull
public static KotlinLightClassProvider createForPackageClass( public static KotlinJavaFileStubProvider createForPackageClass(
@NotNull Project project, @NotNull Project project,
@NotNull final FqName packageFqName, @NotNull final FqName packageFqName,
@NotNull final Collection<JetFile> files @NotNull final Collection<JetFile> files
) { ) {
return new KotlinLightClassProvider(project, packageFqName, files, new StubGenerationStrategy.NoDeclaredClasses() { return new KotlinJavaFileStubProvider(project, packageFqName, files, new StubGenerationStrategy.NoDeclaredClasses() {
@Override @Override
public void generate(GenerationState state) { public void generate(GenerationState state) {
NamespaceCodegen codegen = state.getFactory().forNamespace(packageFqName, files); NamespaceCodegen codegen = state.getFactory().forNamespace(packageFqName, files);
@@ -70,7 +70,7 @@ public class KotlinLightClassProvider implements CachedValueProvider<PsiJavaFile
} }
@NotNull @NotNull
public static KotlinLightClassProvider createForDeclaredTopLevelClass( public static KotlinJavaFileStubProvider createForDeclaredTopLevelClass(
@NotNull final JetClassOrObject classOrObject @NotNull final JetClassOrObject classOrObject
) { ) {
JetFile file = (JetFile) classOrObject.getContainingFile(); JetFile file = (JetFile) classOrObject.getContainingFile();
@@ -78,7 +78,7 @@ public class KotlinLightClassProvider implements CachedValueProvider<PsiJavaFile
final FqName packageFqName = JetPsiUtil.getFQName(file); final FqName packageFqName = JetPsiUtil.getFQName(file);
return new KotlinLightClassProvider(classOrObject.getProject(), packageFqName, Collections.singletonList(file), new StubGenerationStrategy.WithDeclaredClasses() { return new KotlinJavaFileStubProvider(classOrObject.getProject(), packageFqName, Collections.singletonList(file), new StubGenerationStrategy.WithDeclaredClasses() {
@Override @Override
public void generate(GenerationState state) { public void generate(GenerationState state) {
@@ -93,14 +93,14 @@ public class KotlinLightClassProvider implements CachedValueProvider<PsiJavaFile
}); });
} }
private static final Logger LOG = Logger.getInstance(KotlinLightClassProvider.class); private static final Logger LOG = Logger.getInstance(KotlinJavaFileStubProvider.class);
private final Collection<JetFile> files; private final Collection<JetFile> files;
private final FqName packageFqName; private final FqName packageFqName;
private final Project project; private final Project project;
private final StubGenerationStrategy stubGenerationStrategy; private final StubGenerationStrategy stubGenerationStrategy;
private KotlinLightClassProvider( private KotlinJavaFileStubProvider(
@NotNull Project project, @NotNull Project project,
@NotNull FqName packageFqName, @NotNull FqName packageFqName,
@NotNull Collection<JetFile> files, @NotNull Collection<JetFile> files,
compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClass.java
+1 -1
View File
@@ -76,7 +76,7 @@ public class KotlinLightClass extends AbstractLightClass implements JetJavaMirro
PsiJavaFileStub javaFileStub = CachedValuesManager.getManager(getProject()).getCachedValue( PsiJavaFileStub javaFileStub = CachedValuesManager.getManager(getProject()).getCachedValue(
outermostClassOrObject, outermostClassOrObject,
JAVA_API_STUB, JAVA_API_STUB,
KotlinLightClassProvider.createForDeclaredTopLevelClass(outermostClassOrObject), KotlinJavaFileStubProvider.createForDeclaredTopLevelClass(outermostClassOrObject),
/*trackValue = */false); /*trackValue = */false);
PsiClass psiClass = LightClassUtil.findClass(classFqName, javaFileStub); PsiClass psiClass = LightClassUtil.findClass(classFqName, javaFileStub);
compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClassForPackage.java
+1 -1
View File
@@ -59,7 +59,7 @@ public class KotlinLightClassForPackage extends KotlinLightClassForPackageBase i
assert !files.isEmpty() : "No files for package " + packageFqName; assert !files.isEmpty() : "No files for package " + packageFqName;
this.files = Sets.newHashSet(files); // needed for hashCode this.files = Sets.newHashSet(files); // needed for hashCode
this.hashCode = computeHashCode(); 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); this.javaFileStub = CachedValuesManager.getManager(getProject()).createCachedValue(stubProvider, /*trackValue = */false);
} }