From 67248b19c77aa4fe6a3d77b9ccf15e65cc9f956c Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Fri, 19 Oct 2012 18:17:23 +0400 Subject: [PATCH] Rename JavaPropertiesResolver -> JavaPropertyResolver --- .../di/InjectorForJavaDescriptorResolver.java | 40 ++++++------------- .../di/InjectorForJavaSemanticServices.java | 40 ++++++------------- .../resolve/java/JavaDescriptorResolver.java | 4 +- ...esolver.java => JavaPropertyResolver.java} | 4 +- 4 files changed, 30 insertions(+), 58 deletions(-) rename compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/{JavaPropertiesResolver.java => JavaPropertyResolver.java} (99%) 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 1afc82d5581..5c7fa3316af 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaDescriptorResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaDescriptorResolver.java @@ -18,26 +18,12 @@ package org.jetbrains.jet.di; import com.intellij.openapi.project.Project; -import org.jetbrains.jet.lang.resolve.BindingTrace; -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; -import org.jetbrains.jet.lang.resolve.java.JavaBridgeConfiguration; -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.JavaClassResolver; -import org.jetbrains.jet.lang.resolve.java.resolver.JavaAnnotationResolver; -import org.jetbrains.jet.lang.resolve.java.resolver.JavaCompileTimeConstResolver; -import org.jetbrains.jet.lang.resolve.java.resolver.JavaClassObjectResolver; -import org.jetbrains.jet.lang.resolve.java.resolver.JavaSupertypesResolver; -import org.jetbrains.jet.lang.resolve.java.resolver.JavaNamespaceResolver; -import org.jetbrains.jet.lang.resolve.java.resolver.JavaSignatureResolver; -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 org.jetbrains.jet.lang.descriptors.ModuleDescriptor; +import org.jetbrains.jet.lang.resolve.BindingTrace; +import org.jetbrains.jet.lang.resolve.java.*; +import org.jetbrains.jet.lang.resolve.java.resolver.*; + import javax.annotation.PreDestroy; /* This file is generated by org.jetbrains.jet.di.AllInjectorsGenerator. DO NOT EDIT! */ @@ -62,7 +48,7 @@ public class InjectorForJavaDescriptorResolver { private JavaValueParameterResolver javaValueParameterResolver; private JavaFunctionResolver javaFunctionResolver; private JavaInnerClassResolver javaInnerClassResolver; - private JavaPropertiesResolver javaPropertiesResolver; + private JavaPropertyResolver javaPropertyResolver; public InjectorForJavaDescriptorResolver( @NotNull Project project, @@ -88,7 +74,7 @@ public class InjectorForJavaDescriptorResolver { this.javaValueParameterResolver = new JavaValueParameterResolver(); this.javaFunctionResolver = new JavaFunctionResolver(); this.javaInnerClassResolver = new JavaInnerClassResolver(); - this.javaPropertiesResolver = new JavaPropertiesResolver(); + this.javaPropertyResolver = new JavaPropertyResolver(); javaBridgeConfiguration.setJavaSemanticServices(javaSemanticServices); javaBridgeConfiguration.setProject(project); @@ -103,7 +89,7 @@ public class InjectorForJavaDescriptorResolver { this.javaDescriptorResolver.setFunctionResolver(javaFunctionResolver); this.javaDescriptorResolver.setInnerClassResolver(javaInnerClassResolver); this.javaDescriptorResolver.setNamespaceResolver(javaNamespaceResolver); - this.javaDescriptorResolver.setPropertiesResolver(javaPropertiesResolver); + this.javaDescriptorResolver.setPropertiesResolver(javaPropertyResolver); this.psiClassFinder.setProject(project); @@ -156,11 +142,11 @@ public class InjectorForJavaDescriptorResolver { javaInnerClassResolver.setClassResolver(javaClassResolver); - javaPropertiesResolver.setAnnotationResolver(javaAnnotationResolver); - javaPropertiesResolver.setClassResolver(javaClassResolver); - javaPropertiesResolver.setJavaSignatureResolver(javaSignatureResolver); - javaPropertiesResolver.setSemanticServices(javaSemanticServices); - javaPropertiesResolver.setTrace(bindingTrace); + javaPropertyResolver.setAnnotationResolver(javaAnnotationResolver); + javaPropertyResolver.setClassResolver(javaClassResolver); + javaPropertyResolver.setJavaSignatureResolver(javaSignatureResolver); + javaPropertyResolver.setSemanticServices(javaSemanticServices); + javaPropertyResolver.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 86e50b8e64d..768c6466252 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaSemanticServices.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaSemanticServices.java @@ -17,27 +17,13 @@ package org.jetbrains.jet.di; -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.PsiClassFinderImpl; -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; import com.intellij.openapi.project.Project; -import org.jetbrains.jet.lang.resolve.java.JavaTypeTransformer; -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.JavaCompileTimeConstResolver; -import org.jetbrains.jet.lang.resolve.java.resolver.JavaClassObjectResolver; -import org.jetbrains.jet.lang.resolve.java.resolver.JavaSupertypesResolver; -import org.jetbrains.jet.lang.resolve.java.resolver.JavaNamespaceResolver; -import org.jetbrains.jet.lang.resolve.java.resolver.JavaSignatureResolver; -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 org.jetbrains.jet.lang.descriptors.ModuleDescriptor; +import org.jetbrains.jet.lang.resolve.BindingTrace; +import org.jetbrains.jet.lang.resolve.java.*; +import org.jetbrains.jet.lang.resolve.java.resolver.*; + import javax.annotation.PreDestroy; /* This file is generated by org.jetbrains.jet.di.AllInjectorsGenerator. DO NOT EDIT! */ @@ -62,7 +48,7 @@ public class InjectorForJavaSemanticServices { private JavaValueParameterResolver javaValueParameterResolver; private JavaFunctionResolver javaFunctionResolver; private JavaInnerClassResolver javaInnerClassResolver; - private JavaPropertiesResolver javaPropertiesResolver; + private JavaPropertyResolver javaPropertyResolver; public InjectorForJavaSemanticServices( @NotNull Project project @@ -86,7 +72,7 @@ public class InjectorForJavaSemanticServices { this.javaValueParameterResolver = new JavaValueParameterResolver(); this.javaFunctionResolver = new JavaFunctionResolver(); this.javaInnerClassResolver = new JavaInnerClassResolver(); - this.javaPropertiesResolver = new JavaPropertiesResolver(); + this.javaPropertyResolver = new JavaPropertyResolver(); this.javaSemanticServices.setDescriptorResolver(javaDescriptorResolver); this.javaSemanticServices.setPsiClassFinder(psiClassFinder); @@ -98,7 +84,7 @@ public class InjectorForJavaSemanticServices { this.javaDescriptorResolver.setFunctionResolver(javaFunctionResolver); this.javaDescriptorResolver.setInnerClassResolver(javaInnerClassResolver); this.javaDescriptorResolver.setNamespaceResolver(javaNamespaceResolver); - this.javaDescriptorResolver.setPropertiesResolver(javaPropertiesResolver); + this.javaDescriptorResolver.setPropertiesResolver(javaPropertyResolver); javaBridgeConfiguration.setJavaSemanticServices(javaSemanticServices); javaBridgeConfiguration.setProject(project); @@ -154,11 +140,11 @@ public class InjectorForJavaSemanticServices { javaInnerClassResolver.setClassResolver(javaClassResolver); - javaPropertiesResolver.setAnnotationResolver(javaAnnotationResolver); - javaPropertiesResolver.setClassResolver(javaClassResolver); - javaPropertiesResolver.setJavaSignatureResolver(javaSignatureResolver); - javaPropertiesResolver.setSemanticServices(javaSemanticServices); - javaPropertiesResolver.setTrace(bindingTrace); + javaPropertyResolver.setAnnotationResolver(javaAnnotationResolver); + javaPropertyResolver.setClassResolver(javaClassResolver); + javaPropertyResolver.setJavaSignatureResolver(javaSignatureResolver); + javaPropertyResolver.setSemanticServices(javaSemanticServices); + javaPropertyResolver.setTrace(bindingTrace); javaBridgeConfiguration.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 6aeb78f65fd..7ce9b02a25f 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 @@ -59,7 +59,7 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes } }; - private JavaPropertiesResolver propertiesResolver; + private JavaPropertyResolver propertiesResolver; private JavaClassResolver classResolver; private JavaConstructorResolver constructorResolver; private JavaFunctionResolver functionResolver; @@ -82,7 +82,7 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes } @Inject - public void setPropertiesResolver(JavaPropertiesResolver propertiesResolver) { + public void setPropertiesResolver(JavaPropertyResolver propertiesResolver) { this.propertiesResolver = propertiesResolver; } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPropertiesResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPropertyResolver.java similarity index 99% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPropertiesResolver.java rename to compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPropertyResolver.java index 3f930d99ab7..da966454fb5 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPropertiesResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPropertyResolver.java @@ -43,7 +43,7 @@ import org.jetbrains.jet.lang.types.TypeUtils; import javax.inject.Inject; import java.util.*; -public final class JavaPropertiesResolver { +public final class JavaPropertyResolver { private JavaSemanticServices semanticServices; private JavaSignatureResolver javaSignatureResolver; @@ -51,7 +51,7 @@ public final class JavaPropertiesResolver { private JavaAnnotationResolver annotationResolver; private JavaClassResolver classResolver; - public JavaPropertiesResolver() { + public JavaPropertyResolver() { } @Inject