From 5e50f1928b957e6137e441a1c94bcc46e2a3d46f Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Tue, 3 Jul 2012 18:41:02 +0400 Subject: [PATCH] Renamed PsiClassFinderForJvm -> PsiClassFinderImpl. --- .../di/InjectorForJavaSemanticServices.java | 18 +++++++++--------- .../di/InjectorForTopDownAnalyzerForJvm.java | 14 +++++++------- ...nderForJvm.java => PsiClassFinderImpl.java} | 2 +- .../jetbrains/jet/resolve/JetResolveTest.java | 2 +- .../jet/di/AllInjectorsGenerator.java | 4 ++-- 5 files changed, 20 insertions(+), 20 deletions(-) rename compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/{PsiClassFinderForJvm.java => PsiClassFinderImpl.java} (98%) diff --git a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaSemanticServices.java b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaSemanticServices.java index 8b8de1d418d..a54e1f57214 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaSemanticServices.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaSemanticServices.java @@ -21,7 +21,7 @@ import org.jetbrains.jet.lang.resolve.java.JavaSemanticServices; import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.java.JavaBridgeConfiguration; -import org.jetbrains.jet.lang.resolve.java.PsiClassFinderForJvm; +import org.jetbrains.jet.lang.resolve.java.PsiClassFinderImpl; import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; import org.jetbrains.jet.lang.resolve.java.CompilerDependencies; import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode; @@ -41,7 +41,7 @@ public class InjectorForJavaSemanticServices { private JavaDescriptorResolver javaDescriptorResolver; private BindingTrace bindingTrace; private JavaBridgeConfiguration javaBridgeConfiguration; - private PsiClassFinderForJvm psiClassFinderForJvm; + private PsiClassFinderImpl psiClassFinder; private ModuleDescriptor moduleDescriptor; private final CompilerDependencies compilerDependencies; private CompilerSpecialMode compilerSpecialMode; @@ -58,7 +58,7 @@ public class InjectorForJavaSemanticServices { this.javaDescriptorResolver = new JavaDescriptorResolver(); this.bindingTrace = new org.jetbrains.jet.lang.resolve.BindingTraceContext(); this.javaBridgeConfiguration = new JavaBridgeConfiguration(); - this.psiClassFinderForJvm = new PsiClassFinderForJvm(); + this.psiClassFinder = new PsiClassFinderImpl(); this.moduleDescriptor = new org.jetbrains.jet.lang.descriptors.ModuleDescriptor(org.jetbrains.jet.lang.resolve.name.Name.special("")); this.compilerDependencies = compilerDependencies; this.compilerSpecialMode = compilerDependencies.getCompilerSpecialMode(); @@ -68,14 +68,14 @@ public class InjectorForJavaSemanticServices { this.namespaceFactory = new NamespaceFactoryImpl(); this.javaSemanticServices.setDescriptorResolver(javaDescriptorResolver); - this.javaSemanticServices.setPsiClassFinder(psiClassFinderForJvm); + this.javaSemanticServices.setPsiClassFinder(psiClassFinder); this.javaSemanticServices.setTrace(bindingTrace); this.javaSemanticServices.setTypeTransformer(javaTypeTransformer); this.javaDescriptorResolver.setJavaDescriptorSignatureResolver(javaDescriptorSignatureResolver); this.javaDescriptorResolver.setNamespaceFactory(namespaceFactory); this.javaDescriptorResolver.setProject(project); - this.javaDescriptorResolver.setPsiClassFinder(psiClassFinderForJvm); + this.javaDescriptorResolver.setPsiClassFinder(psiClassFinder); this.javaDescriptorResolver.setSemanticServices(javaSemanticServices); this.javaDescriptorResolver.setTrace(bindingTrace); @@ -83,7 +83,7 @@ public class InjectorForJavaSemanticServices { javaBridgeConfiguration.setMode(compilerSpecialMode); javaBridgeConfiguration.setProject(project); - this.psiClassFinderForJvm.setProject(project); + this.psiClassFinder.setProject(project); javaTypeTransformer.setJavaSemanticServices(javaSemanticServices); javaTypeTransformer.setResolver(javaDescriptorResolver); @@ -97,7 +97,7 @@ public class InjectorForJavaSemanticServices { javaBridgeConfiguration.init(); - psiClassFinderForJvm.initialize(); + psiClassFinder.initialize(); } @@ -117,8 +117,8 @@ public class InjectorForJavaSemanticServices { return this.bindingTrace; } - public PsiClassFinderForJvm getPsiClassFinderForJvm() { - return this.psiClassFinderForJvm; + public PsiClassFinderImpl getPsiClassFinder() { + return this.psiClassFinder; } public Project getProject() { diff --git a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java index 2dbaaf95b37..73c3634184f 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java @@ -31,7 +31,7 @@ import org.jetbrains.jet.lang.resolve.java.CompilerDependencies; import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode; import org.jetbrains.jet.lang.resolve.java.JavaBridgeConfiguration; import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver; -import org.jetbrains.jet.lang.resolve.java.PsiClassFinderForJvm; +import org.jetbrains.jet.lang.resolve.java.PsiClassFinderImpl; import org.jetbrains.jet.lang.resolve.NamespaceFactoryImpl; import org.jetbrains.jet.lang.resolve.DeclarationResolver; import org.jetbrains.jet.lang.resolve.AnnotationResolver; @@ -75,7 +75,7 @@ public class InjectorForTopDownAnalyzerForJvm { private CompilerSpecialMode compilerSpecialMode; private JavaBridgeConfiguration javaBridgeConfiguration; private JavaDescriptorResolver javaDescriptorResolver; - private PsiClassFinderForJvm psiClassFinderForJvm; + private PsiClassFinderImpl psiClassFinder; private NamespaceFactoryImpl namespaceFactory; private DeclarationResolver declarationResolver; private AnnotationResolver annotationResolver; @@ -116,7 +116,7 @@ public class InjectorForTopDownAnalyzerForJvm { this.compilerSpecialMode = compilerDependencies.getCompilerSpecialMode(); this.javaBridgeConfiguration = new JavaBridgeConfiguration(); this.javaDescriptorResolver = new JavaDescriptorResolver(); - this.psiClassFinderForJvm = new PsiClassFinderForJvm(); + this.psiClassFinder = new PsiClassFinderImpl(); this.namespaceFactory = new NamespaceFactoryImpl(); this.declarationResolver = new DeclarationResolver(); this.annotationResolver = new AnnotationResolver(); @@ -175,11 +175,11 @@ public class InjectorForTopDownAnalyzerForJvm { javaDescriptorResolver.setJavaDescriptorSignatureResolver(javaDescriptorSignatureResolver); javaDescriptorResolver.setNamespaceFactory(namespaceFactory); javaDescriptorResolver.setProject(project); - javaDescriptorResolver.setPsiClassFinder(psiClassFinderForJvm); + javaDescriptorResolver.setPsiClassFinder(psiClassFinder); javaDescriptorResolver.setSemanticServices(javaSemanticServices); javaDescriptorResolver.setTrace(bindingTrace); - psiClassFinderForJvm.setProject(project); + psiClassFinder.setProject(project); this.namespaceFactory.setConfiguration(javaBridgeConfiguration); this.namespaceFactory.setModuleDescriptor(moduleDescriptor); @@ -242,7 +242,7 @@ public class InjectorForTopDownAnalyzerForJvm { scriptBodyResolver.setTrace(bindingTrace); javaSemanticServices.setDescriptorResolver(javaDescriptorResolver); - javaSemanticServices.setPsiClassFinder(psiClassFinderForJvm); + javaSemanticServices.setPsiClassFinder(psiClassFinder); javaSemanticServices.setTrace(bindingTrace); javaSemanticServices.setTypeTransformer(javaTypeTransformer); @@ -254,7 +254,7 @@ public class InjectorForTopDownAnalyzerForJvm { javaBridgeConfiguration.init(); - psiClassFinderForJvm.initialize(); + psiClassFinder.initialize(); } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/PsiClassFinderForJvm.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/PsiClassFinderImpl.java similarity index 98% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/PsiClassFinderForJvm.java rename to compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/PsiClassFinderImpl.java index 7f94b76ed55..2e24ee78af4 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/PsiClassFinderForJvm.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/PsiClassFinderImpl.java @@ -34,7 +34,7 @@ import javax.inject.Inject; /** * @author Stepan Koltsov */ -public class PsiClassFinderForJvm implements PsiClassFinder { +public class PsiClassFinderImpl implements PsiClassFinder { @NotNull private Project project; diff --git a/compiler/tests/org/jetbrains/jet/resolve/JetResolveTest.java b/compiler/tests/org/jetbrains/jet/resolve/JetResolveTest.java index 24b57fa1207..bd773e56baa 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/JetResolveTest.java +++ b/compiler/tests/org/jetbrains/jet/resolve/JetResolveTest.java @@ -126,7 +126,7 @@ public class JetResolveTest extends ExtensibleResolveTestCase { Project project = getProject(); InjectorForJavaSemanticServices injector = new InjectorForJavaSemanticServices( myEnvironment.getCompilerDependencies(), project); - return injector.getPsiClassFinderForJvm().findPsiClass(new FqName(qualifiedName), PsiClassFinder.RuntimeClassesHandleMode.THROW); + return injector.getPsiClassFinder().findPsiClass(new FqName(qualifiedName), PsiClassFinder.RuntimeClassesHandleMode.THROW); } @NotNull diff --git a/injector-generator/src/org/jetbrains/jet/di/AllInjectorsGenerator.java b/injector-generator/src/org/jetbrains/jet/di/AllInjectorsGenerator.java index 991ab00f580..955eca3888e 100644 --- a/injector-generator/src/org/jetbrains/jet/di/AllInjectorsGenerator.java +++ b/injector-generator/src/org/jetbrains/jet/di/AllInjectorsGenerator.java @@ -92,7 +92,7 @@ public class AllInjectorsGenerator { generator.addField(false, CompilerSpecialMode.class, null, new GivenExpression("compilerDependencies.getCompilerSpecialMode()")); generator.addPublicField(JavaBridgeConfiguration.class); generator.addField(JavaDescriptorResolver.class); - generator.addField(PsiClassFinderForJvm.class); + generator.addField(PsiClassFinderImpl.class); generator.addPublicField(NamespaceFactoryImpl.class); generator.generate("compiler/frontend.java/src", "org.jetbrains.jet.di", "InjectorForTopDownAnalyzerForJvm"); } @@ -150,7 +150,7 @@ public class AllInjectorsGenerator { generator.addField(true, BindingTrace.class, null, new GivenExpression("new org.jetbrains.jet.lang.resolve.BindingTraceContext()")); generator.addField(JavaBridgeConfiguration.class); - generator.addPublicField(PsiClassFinderForJvm.class); + generator.addPublicField(PsiClassFinderImpl.class); generator.addField(false, ModuleDescriptor.class, null, new GivenExpression("new org.jetbrains.jet.lang.descriptors.ModuleDescriptor(org.jetbrains.jet.lang.resolve.name.Name.special(\"\"))")); generator.addParameter(CompilerDependencies.class);