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

Renamed PsiClassFinderForJvm -> PsiClassFinderImpl.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-07-03 18:41:02 +04:00
parent d8f74db060
commit 5e50f1928b
5 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaSemanticServices.java
+9 -9
View File
@@ -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.java.JavaDescriptorResolver;
import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.BindingTrace;
import org.jetbrains.jet.lang.resolve.java.JavaBridgeConfiguration; 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.descriptors.ModuleDescriptor;
import org.jetbrains.jet.lang.resolve.java.CompilerDependencies; import org.jetbrains.jet.lang.resolve.java.CompilerDependencies;
import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode; import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode;
@@ -41,7 +41,7 @@ public class InjectorForJavaSemanticServices {
private JavaDescriptorResolver javaDescriptorResolver; private JavaDescriptorResolver javaDescriptorResolver;
private BindingTrace bindingTrace; private BindingTrace bindingTrace;
private JavaBridgeConfiguration javaBridgeConfiguration; private JavaBridgeConfiguration javaBridgeConfiguration;
private PsiClassFinderForJvm psiClassFinderForJvm; private PsiClassFinderImpl psiClassFinder;
private ModuleDescriptor moduleDescriptor; private ModuleDescriptor moduleDescriptor;
private final CompilerDependencies compilerDependencies; private final CompilerDependencies compilerDependencies;
private CompilerSpecialMode compilerSpecialMode; private CompilerSpecialMode compilerSpecialMode;
@@ -58,7 +58,7 @@ public class InjectorForJavaSemanticServices {
this.javaDescriptorResolver = new JavaDescriptorResolver(); this.javaDescriptorResolver = new JavaDescriptorResolver();
this.bindingTrace = new org.jetbrains.jet.lang.resolve.BindingTraceContext(); this.bindingTrace = new org.jetbrains.jet.lang.resolve.BindingTraceContext();
this.javaBridgeConfiguration = new JavaBridgeConfiguration(); 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("<dummy>")); this.moduleDescriptor = new org.jetbrains.jet.lang.descriptors.ModuleDescriptor(org.jetbrains.jet.lang.resolve.name.Name.special("<dummy>"));
this.compilerDependencies = compilerDependencies; this.compilerDependencies = compilerDependencies;
this.compilerSpecialMode = compilerDependencies.getCompilerSpecialMode(); this.compilerSpecialMode = compilerDependencies.getCompilerSpecialMode();
@@ -68,14 +68,14 @@ public class InjectorForJavaSemanticServices {
this.namespaceFactory = new NamespaceFactoryImpl(); this.namespaceFactory = new NamespaceFactoryImpl();
this.javaSemanticServices.setDescriptorResolver(javaDescriptorResolver); this.javaSemanticServices.setDescriptorResolver(javaDescriptorResolver);
this.javaSemanticServices.setPsiClassFinder(psiClassFinderForJvm); this.javaSemanticServices.setPsiClassFinder(psiClassFinder);
this.javaSemanticServices.setTrace(bindingTrace); this.javaSemanticServices.setTrace(bindingTrace);
this.javaSemanticServices.setTypeTransformer(javaTypeTransformer); this.javaSemanticServices.setTypeTransformer(javaTypeTransformer);
this.javaDescriptorResolver.setJavaDescriptorSignatureResolver(javaDescriptorSignatureResolver); this.javaDescriptorResolver.setJavaDescriptorSignatureResolver(javaDescriptorSignatureResolver);
this.javaDescriptorResolver.setNamespaceFactory(namespaceFactory); this.javaDescriptorResolver.setNamespaceFactory(namespaceFactory);
this.javaDescriptorResolver.setProject(project); this.javaDescriptorResolver.setProject(project);
this.javaDescriptorResolver.setPsiClassFinder(psiClassFinderForJvm); this.javaDescriptorResolver.setPsiClassFinder(psiClassFinder);
this.javaDescriptorResolver.setSemanticServices(javaSemanticServices); this.javaDescriptorResolver.setSemanticServices(javaSemanticServices);
this.javaDescriptorResolver.setTrace(bindingTrace); this.javaDescriptorResolver.setTrace(bindingTrace);
@@ -83,7 +83,7 @@ public class InjectorForJavaSemanticServices {
javaBridgeConfiguration.setMode(compilerSpecialMode); javaBridgeConfiguration.setMode(compilerSpecialMode);
javaBridgeConfiguration.setProject(project); javaBridgeConfiguration.setProject(project);
this.psiClassFinderForJvm.setProject(project); this.psiClassFinder.setProject(project);
javaTypeTransformer.setJavaSemanticServices(javaSemanticServices); javaTypeTransformer.setJavaSemanticServices(javaSemanticServices);
javaTypeTransformer.setResolver(javaDescriptorResolver); javaTypeTransformer.setResolver(javaDescriptorResolver);
@@ -97,7 +97,7 @@ public class InjectorForJavaSemanticServices {
javaBridgeConfiguration.init(); javaBridgeConfiguration.init();
psiClassFinderForJvm.initialize(); psiClassFinder.initialize();
} }
@@ -117,8 +117,8 @@ public class InjectorForJavaSemanticServices {
return this.bindingTrace; return this.bindingTrace;
} }
public PsiClassFinderForJvm getPsiClassFinderForJvm() { public PsiClassFinderImpl getPsiClassFinder() {
return this.psiClassFinderForJvm; return this.psiClassFinder;
} }
public Project getProject() { public Project getProject() {
compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java
+7 -7
View File
@@ -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.CompilerSpecialMode;
import org.jetbrains.jet.lang.resolve.java.JavaBridgeConfiguration; import org.jetbrains.jet.lang.resolve.java.JavaBridgeConfiguration;
import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver; 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.NamespaceFactoryImpl;
import org.jetbrains.jet.lang.resolve.DeclarationResolver; import org.jetbrains.jet.lang.resolve.DeclarationResolver;
import org.jetbrains.jet.lang.resolve.AnnotationResolver; import org.jetbrains.jet.lang.resolve.AnnotationResolver;
@@ -75,7 +75,7 @@ public class InjectorForTopDownAnalyzerForJvm {
private CompilerSpecialMode compilerSpecialMode; private CompilerSpecialMode compilerSpecialMode;
private JavaBridgeConfiguration javaBridgeConfiguration; private JavaBridgeConfiguration javaBridgeConfiguration;
private JavaDescriptorResolver javaDescriptorResolver; private JavaDescriptorResolver javaDescriptorResolver;
private PsiClassFinderForJvm psiClassFinderForJvm; private PsiClassFinderImpl psiClassFinder;
private NamespaceFactoryImpl namespaceFactory; private NamespaceFactoryImpl namespaceFactory;
private DeclarationResolver declarationResolver; private DeclarationResolver declarationResolver;
private AnnotationResolver annotationResolver; private AnnotationResolver annotationResolver;
@@ -116,7 +116,7 @@ public class InjectorForTopDownAnalyzerForJvm {
this.compilerSpecialMode = compilerDependencies.getCompilerSpecialMode(); this.compilerSpecialMode = compilerDependencies.getCompilerSpecialMode();
this.javaBridgeConfiguration = new JavaBridgeConfiguration(); this.javaBridgeConfiguration = new JavaBridgeConfiguration();
this.javaDescriptorResolver = new JavaDescriptorResolver(); this.javaDescriptorResolver = new JavaDescriptorResolver();
this.psiClassFinderForJvm = new PsiClassFinderForJvm(); this.psiClassFinder = new PsiClassFinderImpl();
this.namespaceFactory = new NamespaceFactoryImpl(); this.namespaceFactory = new NamespaceFactoryImpl();
this.declarationResolver = new DeclarationResolver(); this.declarationResolver = new DeclarationResolver();
this.annotationResolver = new AnnotationResolver(); this.annotationResolver = new AnnotationResolver();
@@ -175,11 +175,11 @@ public class InjectorForTopDownAnalyzerForJvm {
javaDescriptorResolver.setJavaDescriptorSignatureResolver(javaDescriptorSignatureResolver); javaDescriptorResolver.setJavaDescriptorSignatureResolver(javaDescriptorSignatureResolver);
javaDescriptorResolver.setNamespaceFactory(namespaceFactory); javaDescriptorResolver.setNamespaceFactory(namespaceFactory);
javaDescriptorResolver.setProject(project); javaDescriptorResolver.setProject(project);
javaDescriptorResolver.setPsiClassFinder(psiClassFinderForJvm); javaDescriptorResolver.setPsiClassFinder(psiClassFinder);
javaDescriptorResolver.setSemanticServices(javaSemanticServices); javaDescriptorResolver.setSemanticServices(javaSemanticServices);
javaDescriptorResolver.setTrace(bindingTrace); javaDescriptorResolver.setTrace(bindingTrace);
psiClassFinderForJvm.setProject(project); psiClassFinder.setProject(project);
this.namespaceFactory.setConfiguration(javaBridgeConfiguration); this.namespaceFactory.setConfiguration(javaBridgeConfiguration);
this.namespaceFactory.setModuleDescriptor(moduleDescriptor); this.namespaceFactory.setModuleDescriptor(moduleDescriptor);
@@ -242,7 +242,7 @@ public class InjectorForTopDownAnalyzerForJvm {
scriptBodyResolver.setTrace(bindingTrace); scriptBodyResolver.setTrace(bindingTrace);
javaSemanticServices.setDescriptorResolver(javaDescriptorResolver); javaSemanticServices.setDescriptorResolver(javaDescriptorResolver);
javaSemanticServices.setPsiClassFinder(psiClassFinderForJvm); javaSemanticServices.setPsiClassFinder(psiClassFinder);
javaSemanticServices.setTrace(bindingTrace); javaSemanticServices.setTrace(bindingTrace);
javaSemanticServices.setTypeTransformer(javaTypeTransformer); javaSemanticServices.setTypeTransformer(javaTypeTransformer);
@@ -254,7 +254,7 @@ public class InjectorForTopDownAnalyzerForJvm {
javaBridgeConfiguration.init(); javaBridgeConfiguration.init();
psiClassFinderForJvm.initialize(); psiClassFinder.initialize();
} }
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/PsiClassFinderForJvm.java → compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/PsiClassFinderImpl.java
+1 -1
View File
@@ -34,7 +34,7 @@ import javax.inject.Inject;
/** /**
* @author Stepan Koltsov * @author Stepan Koltsov
*/ */
public class PsiClassFinderForJvm implements PsiClassFinder { public class PsiClassFinderImpl implements PsiClassFinder {
@NotNull @NotNull
private Project project; private Project project;
compiler/tests/org/jetbrains/jet/resolve/JetResolveTest.java
+1 -1
View File
@@ -126,7 +126,7 @@ public class JetResolveTest extends ExtensibleResolveTestCase {
Project project = getProject(); Project project = getProject();
InjectorForJavaSemanticServices injector = new InjectorForJavaSemanticServices( InjectorForJavaSemanticServices injector = new InjectorForJavaSemanticServices(
myEnvironment.getCompilerDependencies(), project); myEnvironment.getCompilerDependencies(), project);
return injector.getPsiClassFinderForJvm().findPsiClass(new FqName(qualifiedName), PsiClassFinder.RuntimeClassesHandleMode.THROW); return injector.getPsiClassFinder().findPsiClass(new FqName(qualifiedName), PsiClassFinder.RuntimeClassesHandleMode.THROW);
} }
@NotNull @NotNull
injector-generator/src/org/jetbrains/jet/di/AllInjectorsGenerator.java
+2 -2
View File
@@ -92,7 +92,7 @@ public class AllInjectorsGenerator {
generator.addField(false, CompilerSpecialMode.class, null, new GivenExpression("compilerDependencies.getCompilerSpecialMode()")); generator.addField(false, CompilerSpecialMode.class, null, new GivenExpression("compilerDependencies.getCompilerSpecialMode()"));
generator.addPublicField(JavaBridgeConfiguration.class); generator.addPublicField(JavaBridgeConfiguration.class);
generator.addField(JavaDescriptorResolver.class); generator.addField(JavaDescriptorResolver.class);
generator.addField(PsiClassFinderForJvm.class); generator.addField(PsiClassFinderImpl.class);
generator.addPublicField(NamespaceFactoryImpl.class); generator.addPublicField(NamespaceFactoryImpl.class);
generator.generate("compiler/frontend.java/src", "org.jetbrains.jet.di", "InjectorForTopDownAnalyzerForJvm"); generator.generate("compiler/frontend.java/src", "org.jetbrains.jet.di", "InjectorForTopDownAnalyzerForJvm");
} }
@@ -150,7 +150,7 @@ public class AllInjectorsGenerator {
generator.addField(true, BindingTrace.class, null, generator.addField(true, BindingTrace.class, null,
new GivenExpression("new org.jetbrains.jet.lang.resolve.BindingTraceContext()")); new GivenExpression("new org.jetbrains.jet.lang.resolve.BindingTraceContext()"));
generator.addField(JavaBridgeConfiguration.class); generator.addField(JavaBridgeConfiguration.class);
generator.addPublicField(PsiClassFinderForJvm.class); generator.addPublicField(PsiClassFinderImpl.class);
generator.addField(false, ModuleDescriptor.class, null, generator.addField(false, ModuleDescriptor.class, null,
new GivenExpression("new org.jetbrains.jet.lang.descriptors.ModuleDescriptor(org.jetbrains.jet.lang.resolve.name.Name.special(\"<dummy>\"))")); new GivenExpression("new org.jetbrains.jet.lang.descriptors.ModuleDescriptor(org.jetbrains.jet.lang.resolve.name.Name.special(\"<dummy>\"))"));
generator.addParameter(CompilerDependencies.class); generator.addParameter(CompilerDependencies.class);