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 f8c65b7b2c5..133efcc21ab 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaSemanticServices.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaSemanticServices.java @@ -46,7 +46,7 @@ public class InjectorForJavaSemanticServices { private CompilerSpecialMode compilerSpecialMode; private final Project project; private JavaTypeTransformer javaTypeTransformer; - private NamespaceFactoryImpl namespaceFactoryImpl; + private NamespaceFactoryImpl namespaceFactory; public InjectorForJavaSemanticServices( @NotNull CompilerDependencies compilerDependencies, @@ -62,14 +62,14 @@ public class InjectorForJavaSemanticServices { this.compilerSpecialMode = compilerDependencies.getCompilerSpecialMode(); this.project = project; this.javaTypeTransformer = new JavaTypeTransformer(); - this.namespaceFactoryImpl = new NamespaceFactoryImpl(); + this.namespaceFactory = new NamespaceFactoryImpl(); this.javaSemanticServices.setDescriptorResolver(javaDescriptorResolver); this.javaSemanticServices.setPsiClassFinder(psiClassFinderForJvm); this.javaSemanticServices.setTrace(bindingTrace); this.javaSemanticServices.setTypeTransformer(javaTypeTransformer); - this.javaDescriptorResolver.setNamespaceFactory(namespaceFactoryImpl); + this.javaDescriptorResolver.setNamespaceFactory(namespaceFactory); this.javaDescriptorResolver.setProject(project); this.javaDescriptorResolver.setPsiClassFinder(psiClassFinderForJvm); this.javaDescriptorResolver.setSemanticServices(javaSemanticServices); @@ -85,9 +85,9 @@ public class InjectorForJavaSemanticServices { javaTypeTransformer.setJavaSemanticServices(javaSemanticServices); javaTypeTransformer.setResolver(javaDescriptorResolver); - namespaceFactoryImpl.setConfiguration(javaBridgeConfiguration); - namespaceFactoryImpl.setModuleDescriptor(moduleDescriptor); - namespaceFactoryImpl.setTrace(bindingTrace); + namespaceFactory.setConfiguration(javaBridgeConfiguration); + namespaceFactory.setModuleDescriptor(moduleDescriptor); + namespaceFactory.setTrace(bindingTrace); javaBridgeConfiguration.init(); 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 1dcf35b6fad..14f1e1187b5 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java @@ -83,7 +83,7 @@ public class InjectorForTopDownAnalyzerForJvm { private OverloadingConflictResolver overloadingConflictResolver; private ImportsResolver importsResolver; private DelegationResolver delegationResolver; - private NamespaceFactoryImpl namespaceFactoryImpl; + private NamespaceFactoryImpl namespaceFactory; private OverloadResolver overloadResolver; private OverrideResolver overrideResolver; private TypeHierarchyResolver typeHierarchyResolver; @@ -122,7 +122,7 @@ public class InjectorForTopDownAnalyzerForJvm { this.overloadingConflictResolver = new OverloadingConflictResolver(); this.importsResolver = new ImportsResolver(); this.delegationResolver = new DelegationResolver(); - this.namespaceFactoryImpl = new NamespaceFactoryImpl(); + this.namespaceFactory = new NamespaceFactoryImpl(); this.overloadResolver = new OverloadResolver(); this.overrideResolver = new OverrideResolver(); this.typeHierarchyResolver = new TypeHierarchyResolver(); @@ -138,7 +138,7 @@ public class InjectorForTopDownAnalyzerForJvm { this.topDownAnalyzer.setDelegationResolver(delegationResolver); this.topDownAnalyzer.setDependencyClassByQualifiedNameResolver(javaDescriptorResolver); this.topDownAnalyzer.setModuleDescriptor(moduleDescriptor); - this.topDownAnalyzer.setNamespaceFactory(namespaceFactoryImpl); + this.topDownAnalyzer.setNamespaceFactory(namespaceFactory); this.topDownAnalyzer.setOverloadResolver(overloadResolver); this.topDownAnalyzer.setOverrideResolver(overrideResolver); this.topDownAnalyzer.setTopDownAnalysisParameters(topDownAnalysisParameters); @@ -167,7 +167,7 @@ public class InjectorForTopDownAnalyzerForJvm { this.javaBridgeConfiguration.setMode(compilerSpecialMode); this.javaBridgeConfiguration.setProject(project); - javaDescriptorResolver.setNamespaceFactory(namespaceFactoryImpl); + javaDescriptorResolver.setNamespaceFactory(namespaceFactory); javaDescriptorResolver.setProject(project); javaDescriptorResolver.setPsiClassFinder(psiClassFinderForJvm); javaDescriptorResolver.setSemanticServices(javaSemanticServices); @@ -207,9 +207,9 @@ public class InjectorForTopDownAnalyzerForJvm { delegationResolver.setContext(topDownAnalysisContext); delegationResolver.setTrace(bindingTrace); - namespaceFactoryImpl.setConfiguration(javaBridgeConfiguration); - namespaceFactoryImpl.setModuleDescriptor(moduleDescriptor); - namespaceFactoryImpl.setTrace(bindingTrace); + namespaceFactory.setConfiguration(javaBridgeConfiguration); + namespaceFactory.setModuleDescriptor(moduleDescriptor); + namespaceFactory.setTrace(bindingTrace); overloadResolver.setContext(topDownAnalysisContext); overloadResolver.setTrace(bindingTrace); @@ -221,7 +221,7 @@ public class InjectorForTopDownAnalyzerForJvm { typeHierarchyResolver.setContext(topDownAnalysisContext); typeHierarchyResolver.setDescriptorResolver(descriptorResolver); typeHierarchyResolver.setImportsResolver(importsResolver); - typeHierarchyResolver.setNamespaceFactory(namespaceFactoryImpl); + typeHierarchyResolver.setNamespaceFactory(namespaceFactory); typeHierarchyResolver.setScriptResolver(scriptResolver); typeHierarchyResolver.setTrace(bindingTrace); @@ -229,7 +229,7 @@ public class InjectorForTopDownAnalyzerForJvm { scriptResolver.setDependencyClassByQualifiedNameResolver(javaDescriptorResolver); scriptResolver.setExpressionTypingServices(expressionTypingServices); scriptResolver.setModuleDescriptor(moduleDescriptor); - scriptResolver.setNamespaceFactory(namespaceFactoryImpl); + scriptResolver.setNamespaceFactory(namespaceFactory); scriptResolver.setTopDownAnalysisParameters(topDownAnalysisParameters); scriptResolver.setTrace(bindingTrace); diff --git a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java index 9b44a25a7ef..6210243c3be 100644 --- a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java +++ b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java @@ -65,7 +65,7 @@ public class InjectorForTopDownAnalyzerBasic { private final BindingTrace bindingTrace; private final ModuleDescriptor moduleDescriptor; private final ModuleConfiguration moduleConfiguration; - private DependencyClassByQualifiedNameResolverDummyImpl dependencyClassByQualifiedNameResolverDummyImpl; + private DependencyClassByQualifiedNameResolverDummyImpl dependencyClassByQualifiedNameResolverDummy; private DeclarationResolver declarationResolver; private AnnotationResolver annotationResolver; private CallResolver callResolver; @@ -75,7 +75,7 @@ public class InjectorForTopDownAnalyzerBasic { private OverloadingConflictResolver overloadingConflictResolver; private ImportsResolver importsResolver; private DelegationResolver delegationResolver; - private NamespaceFactoryImpl namespaceFactoryImpl; + private NamespaceFactoryImpl namespaceFactory; private OverloadResolver overloadResolver; private OverrideResolver overrideResolver; private TypeHierarchyResolver typeHierarchyResolver; @@ -99,7 +99,7 @@ public class InjectorForTopDownAnalyzerBasic { this.bindingTrace = bindingTrace; this.moduleDescriptor = moduleDescriptor; this.moduleConfiguration = moduleConfiguration; - this.dependencyClassByQualifiedNameResolverDummyImpl = new DependencyClassByQualifiedNameResolverDummyImpl(); + this.dependencyClassByQualifiedNameResolverDummy = new DependencyClassByQualifiedNameResolverDummyImpl(); this.declarationResolver = new DeclarationResolver(); this.annotationResolver = new AnnotationResolver(); this.callResolver = new CallResolver(); @@ -109,7 +109,7 @@ public class InjectorForTopDownAnalyzerBasic { this.overloadingConflictResolver = new OverloadingConflictResolver(); this.importsResolver = new ImportsResolver(); this.delegationResolver = new DelegationResolver(); - this.namespaceFactoryImpl = new NamespaceFactoryImpl(); + this.namespaceFactory = new NamespaceFactoryImpl(); this.overloadResolver = new OverloadResolver(); this.overrideResolver = new OverrideResolver(); this.typeHierarchyResolver = new TypeHierarchyResolver(); @@ -121,9 +121,9 @@ public class InjectorForTopDownAnalyzerBasic { this.topDownAnalyzer.setDeclarationResolver(declarationResolver); this.topDownAnalyzer.setDeclarationsChecker(declarationsChecker); this.topDownAnalyzer.setDelegationResolver(delegationResolver); - this.topDownAnalyzer.setDependencyClassByQualifiedNameResolver(dependencyClassByQualifiedNameResolverDummyImpl); + this.topDownAnalyzer.setDependencyClassByQualifiedNameResolver(dependencyClassByQualifiedNameResolverDummy); this.topDownAnalyzer.setModuleDescriptor(moduleDescriptor); - this.topDownAnalyzer.setNamespaceFactory(namespaceFactoryImpl); + this.topDownAnalyzer.setNamespaceFactory(namespaceFactory); this.topDownAnalyzer.setOverloadResolver(overloadResolver); this.topDownAnalyzer.setOverrideResolver(overrideResolver); this.topDownAnalyzer.setTopDownAnalysisParameters(topDownAnalysisParameters); @@ -179,9 +179,9 @@ public class InjectorForTopDownAnalyzerBasic { delegationResolver.setContext(topDownAnalysisContext); delegationResolver.setTrace(bindingTrace); - namespaceFactoryImpl.setConfiguration(moduleConfiguration); - namespaceFactoryImpl.setModuleDescriptor(moduleDescriptor); - namespaceFactoryImpl.setTrace(bindingTrace); + namespaceFactory.setConfiguration(moduleConfiguration); + namespaceFactory.setModuleDescriptor(moduleDescriptor); + namespaceFactory.setTrace(bindingTrace); overloadResolver.setContext(topDownAnalysisContext); overloadResolver.setTrace(bindingTrace); @@ -193,15 +193,15 @@ public class InjectorForTopDownAnalyzerBasic { typeHierarchyResolver.setContext(topDownAnalysisContext); typeHierarchyResolver.setDescriptorResolver(descriptorResolver); typeHierarchyResolver.setImportsResolver(importsResolver); - typeHierarchyResolver.setNamespaceFactory(namespaceFactoryImpl); + typeHierarchyResolver.setNamespaceFactory(namespaceFactory); typeHierarchyResolver.setScriptResolver(scriptResolver); typeHierarchyResolver.setTrace(bindingTrace); scriptResolver.setContext(topDownAnalysisContext); - scriptResolver.setDependencyClassByQualifiedNameResolver(dependencyClassByQualifiedNameResolverDummyImpl); + scriptResolver.setDependencyClassByQualifiedNameResolver(dependencyClassByQualifiedNameResolverDummy); scriptResolver.setExpressionTypingServices(expressionTypingServices); scriptResolver.setModuleDescriptor(moduleDescriptor); - scriptResolver.setNamespaceFactory(namespaceFactoryImpl); + scriptResolver.setNamespaceFactory(namespaceFactory); scriptResolver.setTopDownAnalysisParameters(topDownAnalysisParameters); scriptResolver.setTrace(bindingTrace); diff --git a/injector-generator/src/org/jetbrains/jet/di/DependencyInjectorGenerator.java b/injector-generator/src/org/jetbrains/jet/di/DependencyInjectorGenerator.java index 5f697df5f79..dadf7cb3671 100644 --- a/injector-generator/src/org/jetbrains/jet/di/DependencyInjectorGenerator.java +++ b/injector-generator/src/org/jetbrains/jet/di/DependencyInjectorGenerator.java @@ -489,7 +489,7 @@ public class DependencyInjectorGenerator { private String var(@NotNull DiType type) { StringBuilder sb = new StringBuilder(); - sb.append(StringUtil.decapitalize(type.getClazz().getSimpleName())); + sb.append(StringUtil.decapitalize(type.getClazz().getSimpleName().replaceFirst("Impl$", ""))); if (type.getTypeParameters().size() > 0) { sb.append("Of"); } diff --git a/js/js.translator/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java b/js/js.translator/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java index 4990679dfcd..1c75b4cbf07 100644 --- a/js/js.translator/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java +++ b/js/js.translator/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java @@ -65,7 +65,7 @@ public class InjectorForTopDownAnalyzerForJs { private final BindingTrace bindingTrace; private final ModuleDescriptor moduleDescriptor; private final ModuleConfiguration moduleConfiguration; - private DependencyClassByQualifiedNameResolverDummyImpl dependencyClassByQualifiedNameResolverDummyImpl; + private DependencyClassByQualifiedNameResolverDummyImpl dependencyClassByQualifiedNameResolverDummy; private DeclarationResolver declarationResolver; private AnnotationResolver annotationResolver; private CallResolver callResolver; @@ -75,7 +75,7 @@ public class InjectorForTopDownAnalyzerForJs { private OverloadingConflictResolver overloadingConflictResolver; private ImportsResolver importsResolver; private DelegationResolver delegationResolver; - private NamespaceFactoryImpl namespaceFactoryImpl; + private NamespaceFactoryImpl namespaceFactory; private OverloadResolver overloadResolver; private OverrideResolver overrideResolver; private TypeHierarchyResolver typeHierarchyResolver; @@ -99,7 +99,7 @@ public class InjectorForTopDownAnalyzerForJs { this.bindingTrace = bindingTrace; this.moduleDescriptor = moduleDescriptor; this.moduleConfiguration = moduleConfiguration; - this.dependencyClassByQualifiedNameResolverDummyImpl = new DependencyClassByQualifiedNameResolverDummyImpl(); + this.dependencyClassByQualifiedNameResolverDummy = new DependencyClassByQualifiedNameResolverDummyImpl(); this.declarationResolver = new DeclarationResolver(); this.annotationResolver = new AnnotationResolver(); this.callResolver = new CallResolver(); @@ -109,7 +109,7 @@ public class InjectorForTopDownAnalyzerForJs { this.overloadingConflictResolver = new OverloadingConflictResolver(); this.importsResolver = new ImportsResolver(); this.delegationResolver = new DelegationResolver(); - this.namespaceFactoryImpl = new NamespaceFactoryImpl(); + this.namespaceFactory = new NamespaceFactoryImpl(); this.overloadResolver = new OverloadResolver(); this.overrideResolver = new OverrideResolver(); this.typeHierarchyResolver = new TypeHierarchyResolver(); @@ -121,9 +121,9 @@ public class InjectorForTopDownAnalyzerForJs { this.topDownAnalyzer.setDeclarationResolver(declarationResolver); this.topDownAnalyzer.setDeclarationsChecker(declarationsChecker); this.topDownAnalyzer.setDelegationResolver(delegationResolver); - this.topDownAnalyzer.setDependencyClassByQualifiedNameResolver(dependencyClassByQualifiedNameResolverDummyImpl); + this.topDownAnalyzer.setDependencyClassByQualifiedNameResolver(dependencyClassByQualifiedNameResolverDummy); this.topDownAnalyzer.setModuleDescriptor(moduleDescriptor); - this.topDownAnalyzer.setNamespaceFactory(namespaceFactoryImpl); + this.topDownAnalyzer.setNamespaceFactory(namespaceFactory); this.topDownAnalyzer.setOverloadResolver(overloadResolver); this.topDownAnalyzer.setOverrideResolver(overrideResolver); this.topDownAnalyzer.setTopDownAnalysisParameters(topDownAnalysisParameters); @@ -179,9 +179,9 @@ public class InjectorForTopDownAnalyzerForJs { delegationResolver.setContext(topDownAnalysisContext); delegationResolver.setTrace(bindingTrace); - namespaceFactoryImpl.setConfiguration(moduleConfiguration); - namespaceFactoryImpl.setModuleDescriptor(moduleDescriptor); - namespaceFactoryImpl.setTrace(bindingTrace); + namespaceFactory.setConfiguration(moduleConfiguration); + namespaceFactory.setModuleDescriptor(moduleDescriptor); + namespaceFactory.setTrace(bindingTrace); overloadResolver.setContext(topDownAnalysisContext); overloadResolver.setTrace(bindingTrace); @@ -193,15 +193,15 @@ public class InjectorForTopDownAnalyzerForJs { typeHierarchyResolver.setContext(topDownAnalysisContext); typeHierarchyResolver.setDescriptorResolver(descriptorResolver); typeHierarchyResolver.setImportsResolver(importsResolver); - typeHierarchyResolver.setNamespaceFactory(namespaceFactoryImpl); + typeHierarchyResolver.setNamespaceFactory(namespaceFactory); typeHierarchyResolver.setScriptResolver(scriptResolver); typeHierarchyResolver.setTrace(bindingTrace); scriptResolver.setContext(topDownAnalysisContext); - scriptResolver.setDependencyClassByQualifiedNameResolver(dependencyClassByQualifiedNameResolverDummyImpl); + scriptResolver.setDependencyClassByQualifiedNameResolver(dependencyClassByQualifiedNameResolverDummy); scriptResolver.setExpressionTypingServices(expressionTypingServices); scriptResolver.setModuleDescriptor(moduleDescriptor); - scriptResolver.setNamespaceFactory(namespaceFactoryImpl); + scriptResolver.setNamespaceFactory(namespaceFactory); scriptResolver.setTopDownAnalysisParameters(topDownAnalysisParameters); scriptResolver.setTrace(bindingTrace);