diff --git a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaDescriptorResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaDescriptorResolver.java index 2477b496883..ffcd6fac624 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaDescriptorResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaDescriptorResolver.java @@ -26,16 +26,16 @@ import org.jetbrains.jet.lang.resolve.java.JavaSemanticServices; import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver; import org.jetbrains.jet.lang.resolve.java.PsiClassFinderImpl; import org.jetbrains.jet.lang.resolve.java.JavaTypeTransformer; -import org.jetbrains.jet.lang.resolve.java.resolver.ClassResolver; +import org.jetbrains.jet.lang.resolve.java.resolver.JavaClassResolver; import org.jetbrains.jet.lang.resolve.java.resolver.JavaAnnotationResolver; -import org.jetbrains.jet.lang.resolve.java.resolver.CompileTimeConstResolver; -import org.jetbrains.jet.lang.resolve.java.resolver.NamespaceResolver; +import org.jetbrains.jet.lang.resolve.java.resolver.JavaCompileTimeConstResolver; +import org.jetbrains.jet.lang.resolve.java.resolver.JavaNamespaceResolver; import org.jetbrains.jet.lang.resolve.java.JavaDescriptorSignatureResolver; -import org.jetbrains.jet.lang.resolve.java.resolver.ConstructorResolver; -import org.jetbrains.jet.lang.resolve.java.resolver.ValueParameterResolver; -import org.jetbrains.jet.lang.resolve.java.resolver.FunctionResolver; -import org.jetbrains.jet.lang.resolve.java.resolver.InnerClassResolver; -import org.jetbrains.jet.lang.resolve.java.resolver.PropertiesResolver; +import org.jetbrains.jet.lang.resolve.java.resolver.JavaConstructorResolver; +import org.jetbrains.jet.lang.resolve.java.resolver.JavaValueParameterResolver; +import org.jetbrains.jet.lang.resolve.java.resolver.JavaFunctionResolver; +import org.jetbrains.jet.lang.resolve.java.resolver.JavaInnerClassResolver; +import org.jetbrains.jet.lang.resolve.java.resolver.JavaPropertiesResolver; import org.jetbrains.annotations.NotNull; import javax.annotation.PreDestroy; @@ -51,16 +51,16 @@ public class InjectorForJavaDescriptorResolver { private JavaDescriptorResolver javaDescriptorResolver; private PsiClassFinderImpl psiClassFinder; private JavaTypeTransformer javaTypeTransformer; - private ClassResolver classResolver; + private JavaClassResolver javaClassResolver; private JavaAnnotationResolver javaAnnotationResolver; - private CompileTimeConstResolver compileTimeConstResolver; - private NamespaceResolver namespaceResolver; + private JavaCompileTimeConstResolver javaCompileTimeConstResolver; + private JavaNamespaceResolver javaNamespaceResolver; private JavaDescriptorSignatureResolver javaDescriptorSignatureResolver; - private ConstructorResolver constructorResolver; - private ValueParameterResolver valueParameterResolver; - private FunctionResolver functionResolver; - private InnerClassResolver innerClassResolver; - private PropertiesResolver propertiesResolver; + private JavaConstructorResolver javaConstructorResolver; + private JavaValueParameterResolver javaValueParameterResolver; + private JavaFunctionResolver javaFunctionResolver; + private JavaInnerClassResolver javaInnerClassResolver; + private JavaPropertiesResolver javaPropertiesResolver; public InjectorForJavaDescriptorResolver( @NotNull Project project, @@ -77,16 +77,16 @@ public class InjectorForJavaDescriptorResolver { this.javaDescriptorResolver = new JavaDescriptorResolver(); this.psiClassFinder = new PsiClassFinderImpl(); this.javaTypeTransformer = new JavaTypeTransformer(); - this.classResolver = new ClassResolver(); + this.javaClassResolver = new JavaClassResolver(); this.javaAnnotationResolver = new JavaAnnotationResolver(); - this.compileTimeConstResolver = new CompileTimeConstResolver(); - this.namespaceResolver = new NamespaceResolver(); + this.javaCompileTimeConstResolver = new JavaCompileTimeConstResolver(); + this.javaNamespaceResolver = new JavaNamespaceResolver(); this.javaDescriptorSignatureResolver = new JavaDescriptorSignatureResolver(); - this.constructorResolver = new ConstructorResolver(); - this.valueParameterResolver = new ValueParameterResolver(); - this.functionResolver = new FunctionResolver(); - this.innerClassResolver = new InnerClassResolver(); - this.propertiesResolver = new PropertiesResolver(); + this.javaConstructorResolver = new JavaConstructorResolver(); + this.javaValueParameterResolver = new JavaValueParameterResolver(); + this.javaFunctionResolver = new JavaFunctionResolver(); + this.javaInnerClassResolver = new JavaInnerClassResolver(); + this.javaPropertiesResolver = new JavaPropertiesResolver(); javaBridgeConfiguration.setBuiltinsScopeExtensionMode(builtinsScopeExtensionMode); javaBridgeConfiguration.setJavaSemanticServices(javaSemanticServices); @@ -97,13 +97,13 @@ public class InjectorForJavaDescriptorResolver { this.javaSemanticServices.setTrace(bindingTrace); this.javaSemanticServices.setTypeTransformer(javaTypeTransformer); - this.javaDescriptorResolver.setClassResolver(classResolver); - this.javaDescriptorResolver.setConstructorResolver(constructorResolver); - this.javaDescriptorResolver.setFunctionResolver(functionResolver); - this.javaDescriptorResolver.setInnerClassResolver(innerClassResolver); - this.javaDescriptorResolver.setNamespaceResolver(namespaceResolver); + this.javaDescriptorResolver.setClassResolver(javaClassResolver); + this.javaDescriptorResolver.setConstructorResolver(javaConstructorResolver); + this.javaDescriptorResolver.setFunctionResolver(javaFunctionResolver); + this.javaDescriptorResolver.setInnerClassResolver(javaInnerClassResolver); + this.javaDescriptorResolver.setNamespaceResolver(javaNamespaceResolver); this.javaDescriptorResolver.setProject(project); - this.javaDescriptorResolver.setPropertiesResolver(propertiesResolver); + this.javaDescriptorResolver.setPropertiesResolver(javaPropertiesResolver); this.javaDescriptorResolver.setSemanticServices(javaSemanticServices); this.javaDescriptorResolver.setTrace(bindingTrace); @@ -112,46 +112,46 @@ public class InjectorForJavaDescriptorResolver { javaTypeTransformer.setJavaSemanticServices(javaSemanticServices); javaTypeTransformer.setResolver(javaDescriptorResolver); - classResolver.setAnnotationResolver(javaAnnotationResolver); - classResolver.setJavaDescriptorResolver(javaDescriptorResolver); - classResolver.setNamespaceResolver(namespaceResolver); - classResolver.setPsiClassFinder(psiClassFinder); - classResolver.setSemanticServices(javaSemanticServices); - classResolver.setSignatureResolver(javaDescriptorSignatureResolver); - classResolver.setTrace(bindingTrace); - classResolver.setTypeTransformer(javaTypeTransformer); + javaClassResolver.setAnnotationResolver(javaAnnotationResolver); + javaClassResolver.setJavaDescriptorResolver(javaDescriptorResolver); + javaClassResolver.setNamespaceResolver(javaNamespaceResolver); + javaClassResolver.setPsiClassFinder(psiClassFinder); + javaClassResolver.setSemanticServices(javaSemanticServices); + javaClassResolver.setSignatureResolver(javaDescriptorSignatureResolver); + javaClassResolver.setTrace(bindingTrace); + javaClassResolver.setTypeTransformer(javaTypeTransformer); - javaAnnotationResolver.setClassResolver(classResolver); - javaAnnotationResolver.setCompileTimeConstResolver(compileTimeConstResolver); + javaAnnotationResolver.setClassResolver(javaClassResolver); + javaAnnotationResolver.setCompileTimeConstResolver(javaCompileTimeConstResolver); - compileTimeConstResolver.setAnnotationResolver(javaAnnotationResolver); - compileTimeConstResolver.setClassResolver(classResolver); + javaCompileTimeConstResolver.setAnnotationResolver(javaAnnotationResolver); + javaCompileTimeConstResolver.setClassResolver(javaClassResolver); - namespaceResolver.setJavaSemanticServices(javaSemanticServices); - namespaceResolver.setPsiClassFinder(psiClassFinder); - namespaceResolver.setTrace(bindingTrace); + javaNamespaceResolver.setJavaSemanticServices(javaSemanticServices); + javaNamespaceResolver.setPsiClassFinder(psiClassFinder); + javaNamespaceResolver.setTrace(bindingTrace); javaDescriptorSignatureResolver.setJavaSemanticServices(javaSemanticServices); - constructorResolver.setTrace(bindingTrace); - constructorResolver.setTypeTransformer(javaTypeTransformer); - constructorResolver.setValueParameterResolver(valueParameterResolver); + javaConstructorResolver.setTrace(bindingTrace); + javaConstructorResolver.setTypeTransformer(javaTypeTransformer); + javaConstructorResolver.setValueParameterResolver(javaValueParameterResolver); - valueParameterResolver.setTypeTransformer(javaTypeTransformer); + javaValueParameterResolver.setTypeTransformer(javaTypeTransformer); - functionResolver.setAnnotationResolver(javaAnnotationResolver); - functionResolver.setParameterResolver(valueParameterResolver); - functionResolver.setSignatureResolver(javaDescriptorSignatureResolver); - functionResolver.setTrace(bindingTrace); - functionResolver.setTypeTransformer(javaTypeTransformer); + javaFunctionResolver.setAnnotationResolver(javaAnnotationResolver); + javaFunctionResolver.setParameterResolver(javaValueParameterResolver); + javaFunctionResolver.setSignatureResolver(javaDescriptorSignatureResolver); + javaFunctionResolver.setTrace(bindingTrace); + javaFunctionResolver.setTypeTransformer(javaTypeTransformer); - innerClassResolver.setClassResolver(classResolver); + javaInnerClassResolver.setClassResolver(javaClassResolver); - propertiesResolver.setAnnotationResolver(javaAnnotationResolver); - propertiesResolver.setClassResolver(classResolver); - propertiesResolver.setJavaDescriptorSignatureResolver(javaDescriptorSignatureResolver); - propertiesResolver.setSemanticServices(javaSemanticServices); - propertiesResolver.setTrace(bindingTrace); + javaPropertiesResolver.setAnnotationResolver(javaAnnotationResolver); + javaPropertiesResolver.setClassResolver(javaClassResolver); + javaPropertiesResolver.setJavaDescriptorSignatureResolver(javaDescriptorSignatureResolver); + javaPropertiesResolver.setSemanticServices(javaSemanticServices); + javaPropertiesResolver.setTrace(bindingTrace); javaBridgeConfiguration.init(); 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 2c94233860f..d54404d6e57 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaSemanticServices.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaSemanticServices.java @@ -26,16 +26,16 @@ import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; import org.jetbrains.jet.lang.BuiltinsScopeExtensionMode; import com.intellij.openapi.project.Project; import org.jetbrains.jet.lang.resolve.java.JavaTypeTransformer; -import org.jetbrains.jet.lang.resolve.java.resolver.ClassResolver; +import org.jetbrains.jet.lang.resolve.java.resolver.JavaClassResolver; import org.jetbrains.jet.lang.resolve.java.resolver.JavaAnnotationResolver; -import org.jetbrains.jet.lang.resolve.java.resolver.CompileTimeConstResolver; -import org.jetbrains.jet.lang.resolve.java.resolver.NamespaceResolver; +import org.jetbrains.jet.lang.resolve.java.resolver.JavaCompileTimeConstResolver; +import org.jetbrains.jet.lang.resolve.java.resolver.JavaNamespaceResolver; import org.jetbrains.jet.lang.resolve.java.JavaDescriptorSignatureResolver; -import org.jetbrains.jet.lang.resolve.java.resolver.ConstructorResolver; -import org.jetbrains.jet.lang.resolve.java.resolver.ValueParameterResolver; -import org.jetbrains.jet.lang.resolve.java.resolver.FunctionResolver; -import org.jetbrains.jet.lang.resolve.java.resolver.InnerClassResolver; -import org.jetbrains.jet.lang.resolve.java.resolver.PropertiesResolver; +import org.jetbrains.jet.lang.resolve.java.resolver.JavaConstructorResolver; +import org.jetbrains.jet.lang.resolve.java.resolver.JavaValueParameterResolver; +import org.jetbrains.jet.lang.resolve.java.resolver.JavaFunctionResolver; +import org.jetbrains.jet.lang.resolve.java.resolver.JavaInnerClassResolver; +import org.jetbrains.jet.lang.resolve.java.resolver.JavaPropertiesResolver; import org.jetbrains.annotations.NotNull; import javax.annotation.PreDestroy; @@ -51,16 +51,16 @@ public class InjectorForJavaSemanticServices { private final BuiltinsScopeExtensionMode builtinsScopeExtensionMode; private final Project project; private JavaTypeTransformer javaTypeTransformer; - private ClassResolver classResolver; + private JavaClassResolver javaClassResolver; private JavaAnnotationResolver javaAnnotationResolver; - private CompileTimeConstResolver compileTimeConstResolver; - private NamespaceResolver namespaceResolver; + private JavaCompileTimeConstResolver javaCompileTimeConstResolver; + private JavaNamespaceResolver javaNamespaceResolver; private JavaDescriptorSignatureResolver javaDescriptorSignatureResolver; - private ConstructorResolver constructorResolver; - private ValueParameterResolver valueParameterResolver; - private FunctionResolver functionResolver; - private InnerClassResolver innerClassResolver; - private PropertiesResolver propertiesResolver; + private JavaConstructorResolver javaConstructorResolver; + private JavaValueParameterResolver javaValueParameterResolver; + private JavaFunctionResolver javaFunctionResolver; + private JavaInnerClassResolver javaInnerClassResolver; + private JavaPropertiesResolver javaPropertiesResolver; public InjectorForJavaSemanticServices( @NotNull BuiltinsScopeExtensionMode builtinsScopeExtensionMode, @@ -75,29 +75,29 @@ public class InjectorForJavaSemanticServices { this.builtinsScopeExtensionMode = builtinsScopeExtensionMode; this.project = project; this.javaTypeTransformer = new JavaTypeTransformer(); - this.classResolver = new ClassResolver(); + this.javaClassResolver = new JavaClassResolver(); this.javaAnnotationResolver = new JavaAnnotationResolver(); - this.compileTimeConstResolver = new CompileTimeConstResolver(); - this.namespaceResolver = new NamespaceResolver(); + this.javaCompileTimeConstResolver = new JavaCompileTimeConstResolver(); + this.javaNamespaceResolver = new JavaNamespaceResolver(); this.javaDescriptorSignatureResolver = new JavaDescriptorSignatureResolver(); - this.constructorResolver = new ConstructorResolver(); - this.valueParameterResolver = new ValueParameterResolver(); - this.functionResolver = new FunctionResolver(); - this.innerClassResolver = new InnerClassResolver(); - this.propertiesResolver = new PropertiesResolver(); + this.javaConstructorResolver = new JavaConstructorResolver(); + this.javaValueParameterResolver = new JavaValueParameterResolver(); + this.javaFunctionResolver = new JavaFunctionResolver(); + this.javaInnerClassResolver = new JavaInnerClassResolver(); + this.javaPropertiesResolver = new JavaPropertiesResolver(); this.javaSemanticServices.setDescriptorResolver(javaDescriptorResolver); this.javaSemanticServices.setPsiClassFinder(psiClassFinder); this.javaSemanticServices.setTrace(bindingTrace); this.javaSemanticServices.setTypeTransformer(javaTypeTransformer); - this.javaDescriptorResolver.setClassResolver(classResolver); - this.javaDescriptorResolver.setConstructorResolver(constructorResolver); - this.javaDescriptorResolver.setFunctionResolver(functionResolver); - this.javaDescriptorResolver.setInnerClassResolver(innerClassResolver); - this.javaDescriptorResolver.setNamespaceResolver(namespaceResolver); + this.javaDescriptorResolver.setClassResolver(javaClassResolver); + this.javaDescriptorResolver.setConstructorResolver(javaConstructorResolver); + this.javaDescriptorResolver.setFunctionResolver(javaFunctionResolver); + this.javaDescriptorResolver.setInnerClassResolver(javaInnerClassResolver); + this.javaDescriptorResolver.setNamespaceResolver(javaNamespaceResolver); this.javaDescriptorResolver.setProject(project); - this.javaDescriptorResolver.setPropertiesResolver(propertiesResolver); + this.javaDescriptorResolver.setPropertiesResolver(javaPropertiesResolver); this.javaDescriptorResolver.setSemanticServices(javaSemanticServices); this.javaDescriptorResolver.setTrace(bindingTrace); @@ -110,46 +110,46 @@ public class InjectorForJavaSemanticServices { javaTypeTransformer.setJavaSemanticServices(javaSemanticServices); javaTypeTransformer.setResolver(javaDescriptorResolver); - classResolver.setAnnotationResolver(javaAnnotationResolver); - classResolver.setJavaDescriptorResolver(javaDescriptorResolver); - classResolver.setNamespaceResolver(namespaceResolver); - classResolver.setPsiClassFinder(psiClassFinder); - classResolver.setSemanticServices(javaSemanticServices); - classResolver.setSignatureResolver(javaDescriptorSignatureResolver); - classResolver.setTrace(bindingTrace); - classResolver.setTypeTransformer(javaTypeTransformer); + javaClassResolver.setAnnotationResolver(javaAnnotationResolver); + javaClassResolver.setJavaDescriptorResolver(javaDescriptorResolver); + javaClassResolver.setNamespaceResolver(javaNamespaceResolver); + javaClassResolver.setPsiClassFinder(psiClassFinder); + javaClassResolver.setSemanticServices(javaSemanticServices); + javaClassResolver.setSignatureResolver(javaDescriptorSignatureResolver); + javaClassResolver.setTrace(bindingTrace); + javaClassResolver.setTypeTransformer(javaTypeTransformer); - javaAnnotationResolver.setClassResolver(classResolver); - javaAnnotationResolver.setCompileTimeConstResolver(compileTimeConstResolver); + javaAnnotationResolver.setClassResolver(javaClassResolver); + javaAnnotationResolver.setCompileTimeConstResolver(javaCompileTimeConstResolver); - compileTimeConstResolver.setAnnotationResolver(javaAnnotationResolver); - compileTimeConstResolver.setClassResolver(classResolver); + javaCompileTimeConstResolver.setAnnotationResolver(javaAnnotationResolver); + javaCompileTimeConstResolver.setClassResolver(javaClassResolver); - namespaceResolver.setJavaSemanticServices(javaSemanticServices); - namespaceResolver.setPsiClassFinder(psiClassFinder); - namespaceResolver.setTrace(bindingTrace); + javaNamespaceResolver.setJavaSemanticServices(javaSemanticServices); + javaNamespaceResolver.setPsiClassFinder(psiClassFinder); + javaNamespaceResolver.setTrace(bindingTrace); javaDescriptorSignatureResolver.setJavaSemanticServices(javaSemanticServices); - constructorResolver.setTrace(bindingTrace); - constructorResolver.setTypeTransformer(javaTypeTransformer); - constructorResolver.setValueParameterResolver(valueParameterResolver); + javaConstructorResolver.setTrace(bindingTrace); + javaConstructorResolver.setTypeTransformer(javaTypeTransformer); + javaConstructorResolver.setValueParameterResolver(javaValueParameterResolver); - valueParameterResolver.setTypeTransformer(javaTypeTransformer); + javaValueParameterResolver.setTypeTransformer(javaTypeTransformer); - functionResolver.setAnnotationResolver(javaAnnotationResolver); - functionResolver.setParameterResolver(valueParameterResolver); - functionResolver.setSignatureResolver(javaDescriptorSignatureResolver); - functionResolver.setTrace(bindingTrace); - functionResolver.setTypeTransformer(javaTypeTransformer); + javaFunctionResolver.setAnnotationResolver(javaAnnotationResolver); + javaFunctionResolver.setParameterResolver(javaValueParameterResolver); + javaFunctionResolver.setSignatureResolver(javaDescriptorSignatureResolver); + javaFunctionResolver.setTrace(bindingTrace); + javaFunctionResolver.setTypeTransformer(javaTypeTransformer); - innerClassResolver.setClassResolver(classResolver); + javaInnerClassResolver.setClassResolver(javaClassResolver); - propertiesResolver.setAnnotationResolver(javaAnnotationResolver); - propertiesResolver.setClassResolver(classResolver); - propertiesResolver.setJavaDescriptorSignatureResolver(javaDescriptorSignatureResolver); - propertiesResolver.setSemanticServices(javaSemanticServices); - propertiesResolver.setTrace(bindingTrace); + javaPropertiesResolver.setAnnotationResolver(javaAnnotationResolver); + javaPropertiesResolver.setClassResolver(javaClassResolver); + javaPropertiesResolver.setJavaDescriptorSignatureResolver(javaDescriptorSignatureResolver); + javaPropertiesResolver.setSemanticServices(javaSemanticServices); + javaPropertiesResolver.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 bd75dfa2c8e..8c174b0b5b5 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java @@ -48,16 +48,16 @@ import org.jetbrains.jet.lang.resolve.TypeHierarchyResolver; import org.jetbrains.jet.lang.resolve.ScriptBodyResolver; import org.jetbrains.jet.lang.resolve.java.JavaSemanticServices; import org.jetbrains.jet.lang.resolve.java.JavaTypeTransformer; -import org.jetbrains.jet.lang.resolve.java.resolver.ClassResolver; +import org.jetbrains.jet.lang.resolve.java.resolver.JavaClassResolver; import org.jetbrains.jet.lang.resolve.java.resolver.JavaAnnotationResolver; -import org.jetbrains.jet.lang.resolve.java.resolver.CompileTimeConstResolver; -import org.jetbrains.jet.lang.resolve.java.resolver.NamespaceResolver; +import org.jetbrains.jet.lang.resolve.java.resolver.JavaCompileTimeConstResolver; +import org.jetbrains.jet.lang.resolve.java.resolver.JavaNamespaceResolver; import org.jetbrains.jet.lang.resolve.java.JavaDescriptorSignatureResolver; -import org.jetbrains.jet.lang.resolve.java.resolver.ConstructorResolver; -import org.jetbrains.jet.lang.resolve.java.resolver.ValueParameterResolver; -import org.jetbrains.jet.lang.resolve.java.resolver.FunctionResolver; -import org.jetbrains.jet.lang.resolve.java.resolver.InnerClassResolver; -import org.jetbrains.jet.lang.resolve.java.resolver.PropertiesResolver; +import org.jetbrains.jet.lang.resolve.java.resolver.JavaConstructorResolver; +import org.jetbrains.jet.lang.resolve.java.resolver.JavaValueParameterResolver; +import org.jetbrains.jet.lang.resolve.java.resolver.JavaFunctionResolver; +import org.jetbrains.jet.lang.resolve.java.resolver.JavaInnerClassResolver; +import org.jetbrains.jet.lang.resolve.java.resolver.JavaPropertiesResolver; import org.jetbrains.annotations.NotNull; import javax.annotation.PreDestroy; @@ -94,16 +94,16 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly private ScriptBodyResolver scriptBodyResolver; private JavaSemanticServices javaSemanticServices; private JavaTypeTransformer javaTypeTransformer; - private ClassResolver classResolver; + private JavaClassResolver javaClassResolver; private JavaAnnotationResolver javaAnnotationResolver; - private CompileTimeConstResolver compileTimeConstResolver; - private NamespaceResolver namespaceResolver; + private JavaCompileTimeConstResolver javaCompileTimeConstResolver; + private JavaNamespaceResolver javaNamespaceResolver; private JavaDescriptorSignatureResolver javaDescriptorSignatureResolver; - private ConstructorResolver constructorResolver; - private ValueParameterResolver valueParameterResolver; - private FunctionResolver functionResolver; - private InnerClassResolver innerClassResolver; - private PropertiesResolver propertiesResolver; + private JavaConstructorResolver javaConstructorResolver; + private JavaValueParameterResolver javaValueParameterResolver; + private JavaFunctionResolver javaFunctionResolver; + private JavaInnerClassResolver javaInnerClassResolver; + private JavaPropertiesResolver javaPropertiesResolver; public InjectorForTopDownAnalyzerForJvm( @NotNull Project project, @@ -142,16 +142,16 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly this.scriptBodyResolver = new ScriptBodyResolver(); this.javaSemanticServices = new JavaSemanticServices(); this.javaTypeTransformer = new JavaTypeTransformer(); - this.classResolver = new ClassResolver(); + this.javaClassResolver = new JavaClassResolver(); this.javaAnnotationResolver = new JavaAnnotationResolver(); - this.compileTimeConstResolver = new CompileTimeConstResolver(); - this.namespaceResolver = new NamespaceResolver(); + this.javaCompileTimeConstResolver = new JavaCompileTimeConstResolver(); + this.javaNamespaceResolver = new JavaNamespaceResolver(); this.javaDescriptorSignatureResolver = new JavaDescriptorSignatureResolver(); - this.constructorResolver = new ConstructorResolver(); - this.valueParameterResolver = new ValueParameterResolver(); - this.functionResolver = new FunctionResolver(); - this.innerClassResolver = new InnerClassResolver(); - this.propertiesResolver = new PropertiesResolver(); + this.javaConstructorResolver = new JavaConstructorResolver(); + this.javaValueParameterResolver = new JavaValueParameterResolver(); + this.javaFunctionResolver = new JavaFunctionResolver(); + this.javaInnerClassResolver = new JavaInnerClassResolver(); + this.javaPropertiesResolver = new JavaPropertiesResolver(); this.topDownAnalyzer.setBodyResolver(bodyResolver); this.topDownAnalyzer.setContext(topDownAnalysisContext); @@ -189,13 +189,13 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly this.moduleConfiguration.setJavaSemanticServices(javaSemanticServices); this.moduleConfiguration.setProject(project); - javaDescriptorResolver.setClassResolver(classResolver); - javaDescriptorResolver.setConstructorResolver(constructorResolver); - javaDescriptorResolver.setFunctionResolver(functionResolver); - javaDescriptorResolver.setInnerClassResolver(innerClassResolver); - javaDescriptorResolver.setNamespaceResolver(namespaceResolver); + javaDescriptorResolver.setClassResolver(javaClassResolver); + javaDescriptorResolver.setConstructorResolver(javaConstructorResolver); + javaDescriptorResolver.setFunctionResolver(javaFunctionResolver); + javaDescriptorResolver.setInnerClassResolver(javaInnerClassResolver); + javaDescriptorResolver.setNamespaceResolver(javaNamespaceResolver); javaDescriptorResolver.setProject(project); - javaDescriptorResolver.setPropertiesResolver(propertiesResolver); + javaDescriptorResolver.setPropertiesResolver(javaPropertiesResolver); javaDescriptorResolver.setSemanticServices(javaSemanticServices); javaDescriptorResolver.setTrace(bindingTrace); @@ -267,46 +267,46 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly javaTypeTransformer.setJavaSemanticServices(javaSemanticServices); javaTypeTransformer.setResolver(javaDescriptorResolver); - classResolver.setAnnotationResolver(javaAnnotationResolver); - classResolver.setJavaDescriptorResolver(javaDescriptorResolver); - classResolver.setNamespaceResolver(namespaceResolver); - classResolver.setPsiClassFinder(psiClassFinder); - classResolver.setSemanticServices(javaSemanticServices); - classResolver.setSignatureResolver(javaDescriptorSignatureResolver); - classResolver.setTrace(bindingTrace); - classResolver.setTypeTransformer(javaTypeTransformer); + javaClassResolver.setAnnotationResolver(javaAnnotationResolver); + javaClassResolver.setJavaDescriptorResolver(javaDescriptorResolver); + javaClassResolver.setNamespaceResolver(javaNamespaceResolver); + javaClassResolver.setPsiClassFinder(psiClassFinder); + javaClassResolver.setSemanticServices(javaSemanticServices); + javaClassResolver.setSignatureResolver(javaDescriptorSignatureResolver); + javaClassResolver.setTrace(bindingTrace); + javaClassResolver.setTypeTransformer(javaTypeTransformer); - javaAnnotationResolver.setClassResolver(classResolver); - javaAnnotationResolver.setCompileTimeConstResolver(compileTimeConstResolver); + javaAnnotationResolver.setClassResolver(javaClassResolver); + javaAnnotationResolver.setCompileTimeConstResolver(javaCompileTimeConstResolver); - compileTimeConstResolver.setAnnotationResolver(javaAnnotationResolver); - compileTimeConstResolver.setClassResolver(classResolver); + javaCompileTimeConstResolver.setAnnotationResolver(javaAnnotationResolver); + javaCompileTimeConstResolver.setClassResolver(javaClassResolver); - namespaceResolver.setJavaSemanticServices(javaSemanticServices); - namespaceResolver.setPsiClassFinder(psiClassFinder); - namespaceResolver.setTrace(bindingTrace); + javaNamespaceResolver.setJavaSemanticServices(javaSemanticServices); + javaNamespaceResolver.setPsiClassFinder(psiClassFinder); + javaNamespaceResolver.setTrace(bindingTrace); javaDescriptorSignatureResolver.setJavaSemanticServices(javaSemanticServices); - constructorResolver.setTrace(bindingTrace); - constructorResolver.setTypeTransformer(javaTypeTransformer); - constructorResolver.setValueParameterResolver(valueParameterResolver); + javaConstructorResolver.setTrace(bindingTrace); + javaConstructorResolver.setTypeTransformer(javaTypeTransformer); + javaConstructorResolver.setValueParameterResolver(javaValueParameterResolver); - valueParameterResolver.setTypeTransformer(javaTypeTransformer); + javaValueParameterResolver.setTypeTransformer(javaTypeTransformer); - functionResolver.setAnnotationResolver(javaAnnotationResolver); - functionResolver.setParameterResolver(valueParameterResolver); - functionResolver.setSignatureResolver(javaDescriptorSignatureResolver); - functionResolver.setTrace(bindingTrace); - functionResolver.setTypeTransformer(javaTypeTransformer); + javaFunctionResolver.setAnnotationResolver(javaAnnotationResolver); + javaFunctionResolver.setParameterResolver(javaValueParameterResolver); + javaFunctionResolver.setSignatureResolver(javaDescriptorSignatureResolver); + javaFunctionResolver.setTrace(bindingTrace); + javaFunctionResolver.setTypeTransformer(javaTypeTransformer); - innerClassResolver.setClassResolver(classResolver); + javaInnerClassResolver.setClassResolver(javaClassResolver); - propertiesResolver.setAnnotationResolver(javaAnnotationResolver); - propertiesResolver.setClassResolver(classResolver); - propertiesResolver.setJavaDescriptorSignatureResolver(javaDescriptorSignatureResolver); - propertiesResolver.setSemanticServices(javaSemanticServices); - propertiesResolver.setTrace(bindingTrace); + javaPropertiesResolver.setAnnotationResolver(javaAnnotationResolver); + javaPropertiesResolver.setClassResolver(javaClassResolver); + javaPropertiesResolver.setJavaDescriptorSignatureResolver(javaDescriptorSignatureResolver); + javaPropertiesResolver.setSemanticServices(javaSemanticServices); + javaPropertiesResolver.setTrace(bindingTrace); moduleConfiguration.init(); diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java index 241cf2acd80..fba5477d6f1 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java @@ -64,12 +64,12 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes protected Project project; protected JavaSemanticServices semanticServices; private BindingTrace trace; - private PropertiesResolver propertiesResolver; - private ClassResolver classResolver; - private ConstructorResolver constructorResolver; - private FunctionResolver functionResolver; - private NamespaceResolver namespaceResolver; - private InnerClassResolver innerClassResolver; + private JavaPropertiesResolver propertiesResolver; + private JavaClassResolver classResolver; + private JavaConstructorResolver constructorResolver; + private JavaFunctionResolver functionResolver; + private JavaNamespaceResolver namespaceResolver; + private JavaInnerClassResolver innerClassResolver; @Inject public void setProject(Project project) { @@ -87,32 +87,32 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes } @Inject - public void setFunctionResolver(FunctionResolver functionResolver) { + public void setFunctionResolver(JavaFunctionResolver functionResolver) { this.functionResolver = functionResolver; } @Inject - public void setClassResolver(ClassResolver classResolver) { + public void setClassResolver(JavaClassResolver classResolver) { this.classResolver = classResolver; } @Inject - public void setNamespaceResolver(NamespaceResolver namespaceResolver) { + public void setNamespaceResolver(JavaNamespaceResolver namespaceResolver) { this.namespaceResolver = namespaceResolver; } @Inject - public void setPropertiesResolver(PropertiesResolver propertiesResolver) { + public void setPropertiesResolver(JavaPropertiesResolver propertiesResolver) { this.propertiesResolver = propertiesResolver; } @Inject - public void setConstructorResolver(ConstructorResolver constructorResolver) { + public void setConstructorResolver(JavaConstructorResolver constructorResolver) { this.constructorResolver = constructorResolver; } @Inject - public void setInnerClassResolver(InnerClassResolver innerClassResolver) { + public void setInnerClassResolver(JavaInnerClassResolver innerClassResolver) { this.innerClassResolver = innerClassResolver; } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaAnnotationResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaAnnotationResolver.java index 9775615272e..3e8f986620b 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaAnnotationResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaAnnotationResolver.java @@ -37,19 +37,19 @@ import java.util.Arrays; import java.util.List; public final class JavaAnnotationResolver { - private ClassResolver classResolver; - private CompileTimeConstResolver compileTimeConstResolver; + private JavaClassResolver classResolver; + private JavaCompileTimeConstResolver compileTimeConstResolver; public JavaAnnotationResolver() { } @Inject - public void setClassResolver(ClassResolver classResolver) { + public void setClassResolver(JavaClassResolver classResolver) { this.classResolver = classResolver; } @Inject - public void setCompileTimeConstResolver(CompileTimeConstResolver compileTimeConstResolver) { + public void setCompileTimeConstResolver(JavaCompileTimeConstResolver compileTimeConstResolver) { this.compileTimeConstResolver = compileTimeConstResolver; } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/ClassResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java similarity index 99% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/ClassResolver.java rename to compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java index 0ed111a9355..591458313c7 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/ClassResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java @@ -60,7 +60,7 @@ import static org.jetbrains.jet.lang.resolve.DescriptorResolver.createEnumClassO import static org.jetbrains.jet.lang.resolve.DescriptorResolver.createEnumClassObjectValuesMethod; import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getClassObjectName; -public final class ClassResolver { +public final class JavaClassResolver { // NOTE: this complexity is introduced because class descriptors do not always have valid fqnames (class objects) private final Map classDescriptorCache = @@ -86,10 +86,10 @@ public final class ClassResolver { private JavaSemanticServices semanticServices; private JavaAnnotationResolver annotationResolver; private PsiClassFinder psiClassFinder; - private NamespaceResolver namespaceResolver; + private JavaNamespaceResolver namespaceResolver; private JavaTypeTransformer typeTransformer; - public ClassResolver() { + public JavaClassResolver() { } @Inject @@ -123,7 +123,7 @@ public final class ClassResolver { } @Inject - public void setNamespaceResolver(NamespaceResolver namespaceResolver) { + public void setNamespaceResolver(JavaNamespaceResolver namespaceResolver) { this.namespaceResolver = namespaceResolver; } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/CompileTimeConstResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaCompileTimeConstResolver.java similarity index 97% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/CompileTimeConstResolver.java rename to compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaCompileTimeConstResolver.java index 83e6f891b15..db63bbdd8b4 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/CompileTimeConstResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaCompileTimeConstResolver.java @@ -39,11 +39,11 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -public final class CompileTimeConstResolver { +public final class JavaCompileTimeConstResolver { private JavaAnnotationResolver annotationResolver; - private ClassResolver classResolver; + private JavaClassResolver classResolver; - public CompileTimeConstResolver() { + public JavaCompileTimeConstResolver() { } @Inject @@ -52,7 +52,7 @@ public final class CompileTimeConstResolver { } @Inject - public void setClassResolver(ClassResolver classResolver) { + public void setClassResolver(JavaClassResolver classResolver) { this.classResolver = classResolver; } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/ConstructorResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaConstructorResolver.java similarity index 97% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/ConstructorResolver.java rename to compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaConstructorResolver.java index c187ff97287..017ea939ddd 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/ConstructorResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaConstructorResolver.java @@ -38,12 +38,12 @@ import java.util.Collection; import java.util.Collections; import java.util.List; -public final class ConstructorResolver { +public final class JavaConstructorResolver { private BindingTrace trace; private JavaTypeTransformer typeTransformer; - private ValueParameterResolver valueParameterResolver; + private JavaValueParameterResolver valueParameterResolver; - public ConstructorResolver() { + public JavaConstructorResolver() { } @Inject @@ -57,7 +57,7 @@ public final class ConstructorResolver { } @Inject - public void setValueParameterResolver(ValueParameterResolver valueParameterResolver) { + public void setValueParameterResolver(JavaValueParameterResolver valueParameterResolver) { this.valueParameterResolver = valueParameterResolver; } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/FunctionResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaFunctionResolver.java similarity index 97% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/FunctionResolver.java rename to compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaFunctionResolver.java index f526328bbe2..a7733daeca1 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/FunctionResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaFunctionResolver.java @@ -39,15 +39,15 @@ import org.jetbrains.jet.lang.types.lang.JetStandardLibrary; import javax.inject.Inject; import java.util.*; -public final class FunctionResolver { +public final class JavaFunctionResolver { private JavaTypeTransformer typeTransformer; private BindingTrace trace; private JavaDescriptorSignatureResolver signatureResolver; - private ValueParameterResolver parameterResolver; + private JavaValueParameterResolver parameterResolver; private JavaAnnotationResolver annotationResolver; - public FunctionResolver() { + public JavaFunctionResolver() { } @Inject @@ -66,7 +66,7 @@ public final class FunctionResolver { } @Inject - public void setParameterResolver(ValueParameterResolver parameterResolver) { + public void setParameterResolver(JavaValueParameterResolver parameterResolver) { this.parameterResolver = parameterResolver; } @@ -119,7 +119,7 @@ public final class FunctionResolver { List methodTypeParameters = signatureResolver.resolveMethodTypeParameters(method, - functionDescriptorImpl); + functionDescriptorImpl); TypeVariableResolver methodTypeVariableResolver = TypeVariableResolvers.typeVariableResolverFromTypeParameters(methodTypeParameters, functionDescriptorImpl, diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/InnerClassResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaInnerClassResolver.java similarity index 94% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/InnerClassResolver.java rename to compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaInnerClassResolver.java index a63bddc8662..80342d509e4 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/InnerClassResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaInnerClassResolver.java @@ -31,15 +31,15 @@ import javax.inject.Inject; import java.util.ArrayList; import java.util.List; -public final class InnerClassResolver { +public final class JavaInnerClassResolver { - private ClassResolver classResolver; + private JavaClassResolver classResolver; - public InnerClassResolver() { + public JavaInnerClassResolver() { } @Inject - public void setClassResolver(ClassResolver classResolver) { + public void setClassResolver(JavaClassResolver classResolver) { this.classResolver = classResolver; } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/NamespaceResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaNamespaceResolver.java similarity index 98% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/NamespaceResolver.java rename to compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaNamespaceResolver.java index d6e1fc4875a..0da28f19ad3 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/NamespaceResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaNamespaceResolver.java @@ -38,7 +38,7 @@ import javax.inject.Inject; import java.util.Collections; import java.util.Map; -public final class NamespaceResolver { +public final class JavaNamespaceResolver { @NotNull public static final ModuleDescriptor FAKE_ROOT_MODULE = new ModuleDescriptor(JavaDescriptorResolver.JAVA_ROOT); @@ -48,7 +48,7 @@ public final class NamespaceResolver { private BindingTrace trace; private JavaSemanticServices javaSemanticServices; - public NamespaceResolver() { + public JavaNamespaceResolver() { } @Inject diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/PropertiesResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPropertiesResolver.java similarity index 99% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/PropertiesResolver.java rename to compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPropertiesResolver.java index fba3a8aeb83..9528610b1cf 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/PropertiesResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPropertiesResolver.java @@ -43,15 +43,15 @@ import org.jetbrains.jet.lang.types.TypeUtils; import javax.inject.Inject; import java.util.*; -public final class PropertiesResolver { +public final class JavaPropertiesResolver { private JavaSemanticServices semanticServices; private JavaDescriptorSignatureResolver javaDescriptorSignatureResolver; private BindingTrace trace; private JavaAnnotationResolver annotationResolver; - private ClassResolver classResolver; + private JavaClassResolver classResolver; - public PropertiesResolver() { + public JavaPropertiesResolver() { } @Inject @@ -75,7 +75,7 @@ public final class PropertiesResolver { } @Inject - public void setClassResolver(ClassResolver classResolver) { + public void setClassResolver(JavaClassResolver classResolver) { this.classResolver = classResolver; } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/ValueParameterResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaValueParameterResolver.java similarity index 98% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/ValueParameterResolver.java rename to compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaValueParameterResolver.java index 1c3c0c4194c..ddf8c026cb1 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/ValueParameterResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaValueParameterResolver.java @@ -39,11 +39,11 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -public final class ValueParameterResolver { +public final class JavaValueParameterResolver { private JavaTypeTransformer typeTransformer; - public ValueParameterResolver() { + public JavaValueParameterResolver() { } @NotNull