From f09185f80efca666c19c313e191783390e7b5e3b Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Fri, 19 Oct 2012 18:20:19 +0400 Subject: [PATCH] Rename: JavaSupertypesResolver -> JavaSupertypeResolver --- .../di/InjectorForJavaDescriptorResolver.java | 40 ++++++++++++------ .../di/InjectorForJavaSemanticServices.java | 42 ++++++++++++------- .../resolver/JavaClassObjectResolver.java | 9 ++-- .../java/resolver/JavaClassResolver.java | 4 +- ...solver.java => JavaSupertypeResolver.java} | 2 +- 5 files changed, 64 insertions(+), 33 deletions(-) rename compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/{JavaSupertypesResolver.java => JavaSupertypeResolver.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 5c7fa3316af..141885c62db 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaDescriptorResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaDescriptorResolver.java @@ -18,12 +18,26 @@ package org.jetbrains.jet.di; import com.intellij.openapi.project.Project; -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 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.JavaSupertypeResolver; +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.JavaPropertyResolver; +import org.jetbrains.annotations.NotNull; import javax.annotation.PreDestroy; /* This file is generated by org.jetbrains.jet.di.AllInjectorsGenerator. DO NOT EDIT! */ @@ -41,7 +55,7 @@ public class InjectorForJavaDescriptorResolver { private JavaAnnotationResolver javaAnnotationResolver; private JavaCompileTimeConstResolver javaCompileTimeConstResolver; private JavaClassObjectResolver javaClassObjectResolver; - private JavaSupertypesResolver javaSupertypesResolver; + private JavaSupertypeResolver javaSupertypeResolver; private JavaNamespaceResolver javaNamespaceResolver; private JavaSignatureResolver javaSignatureResolver; private JavaConstructorResolver javaConstructorResolver; @@ -67,7 +81,7 @@ public class InjectorForJavaDescriptorResolver { this.javaAnnotationResolver = new JavaAnnotationResolver(); this.javaCompileTimeConstResolver = new JavaCompileTimeConstResolver(); this.javaClassObjectResolver = new JavaClassObjectResolver(); - this.javaSupertypesResolver = new JavaSupertypesResolver(); + this.javaSupertypeResolver = new JavaSupertypeResolver(); this.javaNamespaceResolver = new JavaNamespaceResolver(); this.javaSignatureResolver = new JavaSignatureResolver(); this.javaConstructorResolver = new JavaConstructorResolver(); @@ -103,7 +117,7 @@ public class InjectorForJavaDescriptorResolver { javaClassResolver.setPsiClassFinder(psiClassFinder); javaClassResolver.setSemanticServices(javaSemanticServices); javaClassResolver.setSignatureResolver(javaSignatureResolver); - javaClassResolver.setSupertypesResolver(javaSupertypesResolver); + javaClassResolver.setSupertypesResolver(javaSupertypeResolver); javaClassResolver.setTrace(bindingTrace); javaAnnotationResolver.setClassResolver(javaClassResolver); @@ -114,13 +128,13 @@ public class InjectorForJavaDescriptorResolver { javaClassObjectResolver.setJavaDescriptorResolver(javaDescriptorResolver); javaClassObjectResolver.setSemanticServices(javaSemanticServices); - javaClassObjectResolver.setSupertypesResolver(javaSupertypesResolver); + javaClassObjectResolver.setSupertypesResolver(javaSupertypeResolver); javaClassObjectResolver.setTrace(bindingTrace); - javaSupertypesResolver.setClassResolver(javaClassResolver); - javaSupertypesResolver.setSemanticServices(javaSemanticServices); - javaSupertypesResolver.setTrace(bindingTrace); - javaSupertypesResolver.setTypeTransformer(javaTypeTransformer); + javaSupertypeResolver.setClassResolver(javaClassResolver); + javaSupertypeResolver.setSemanticServices(javaSemanticServices); + javaSupertypeResolver.setTrace(bindingTrace); + javaSupertypeResolver.setTypeTransformer(javaTypeTransformer); javaNamespaceResolver.setJavaSemanticServices(javaSemanticServices); javaNamespaceResolver.setPsiClassFinder(psiClassFinder); 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 768c6466252..1deddf71af0 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaSemanticServices.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaSemanticServices.java @@ -17,13 +17,27 @@ package org.jetbrains.jet.di; -import com.intellij.openapi.project.Project; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; +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.*; -import org.jetbrains.jet.lang.resolve.java.resolver.*; - +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.JavaSupertypeResolver; +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.JavaPropertyResolver; +import org.jetbrains.annotations.NotNull; import javax.annotation.PreDestroy; /* This file is generated by org.jetbrains.jet.di.AllInjectorsGenerator. DO NOT EDIT! */ @@ -41,7 +55,7 @@ public class InjectorForJavaSemanticServices { private JavaAnnotationResolver javaAnnotationResolver; private JavaCompileTimeConstResolver javaCompileTimeConstResolver; private JavaClassObjectResolver javaClassObjectResolver; - private JavaSupertypesResolver javaSupertypesResolver; + private JavaSupertypeResolver javaSupertypeResolver; private JavaNamespaceResolver javaNamespaceResolver; private JavaSignatureResolver javaSignatureResolver; private JavaConstructorResolver javaConstructorResolver; @@ -65,7 +79,7 @@ public class InjectorForJavaSemanticServices { this.javaAnnotationResolver = new JavaAnnotationResolver(); this.javaCompileTimeConstResolver = new JavaCompileTimeConstResolver(); this.javaClassObjectResolver = new JavaClassObjectResolver(); - this.javaSupertypesResolver = new JavaSupertypesResolver(); + this.javaSupertypeResolver = new JavaSupertypeResolver(); this.javaNamespaceResolver = new JavaNamespaceResolver(); this.javaSignatureResolver = new JavaSignatureResolver(); this.javaConstructorResolver = new JavaConstructorResolver(); @@ -101,7 +115,7 @@ public class InjectorForJavaSemanticServices { javaClassResolver.setPsiClassFinder(psiClassFinder); javaClassResolver.setSemanticServices(javaSemanticServices); javaClassResolver.setSignatureResolver(javaSignatureResolver); - javaClassResolver.setSupertypesResolver(javaSupertypesResolver); + javaClassResolver.setSupertypesResolver(javaSupertypeResolver); javaClassResolver.setTrace(bindingTrace); javaAnnotationResolver.setClassResolver(javaClassResolver); @@ -112,13 +126,13 @@ public class InjectorForJavaSemanticServices { javaClassObjectResolver.setJavaDescriptorResolver(javaDescriptorResolver); javaClassObjectResolver.setSemanticServices(javaSemanticServices); - javaClassObjectResolver.setSupertypesResolver(javaSupertypesResolver); + javaClassObjectResolver.setSupertypesResolver(javaSupertypeResolver); javaClassObjectResolver.setTrace(bindingTrace); - javaSupertypesResolver.setClassResolver(javaClassResolver); - javaSupertypesResolver.setSemanticServices(javaSemanticServices); - javaSupertypesResolver.setTrace(bindingTrace); - javaSupertypesResolver.setTypeTransformer(javaTypeTransformer); + javaSupertypeResolver.setClassResolver(javaClassResolver); + javaSupertypeResolver.setSemanticServices(javaSemanticServices); + javaSupertypeResolver.setTrace(bindingTrace); + javaSupertypeResolver.setTypeTransformer(javaTypeTransformer); javaNamespaceResolver.setJavaSemanticServices(javaSemanticServices); javaNamespaceResolver.setPsiClassFinder(psiClassFinder); diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassObjectResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassObjectResolver.java index 196b78d6cb5..080f5b223f1 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassObjectResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassObjectResolver.java @@ -19,7 +19,10 @@ package org.jetbrains.jet.lang.resolve.java.resolver; import com.intellij.psi.PsiClass; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.jet.lang.descriptors.ClassDescriptor; +import org.jetbrains.jet.lang.descriptors.ClassKind; +import org.jetbrains.jet.lang.descriptors.Modality; +import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.java.DescriptorResolverUtils; import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver; @@ -51,10 +54,10 @@ public final class JavaClassObjectResolver { private JavaDescriptorResolver javaDescriptorResolver; private BindingTrace trace; private JavaSemanticServices semanticServices; - private JavaSupertypesResolver supertypesResolver; + private JavaSupertypeResolver supertypesResolver; @Inject - public void setSupertypesResolver(JavaSupertypesResolver supertypesResolver) { + public void setSupertypesResolver(JavaSupertypeResolver supertypesResolver) { this.supertypesResolver = supertypesResolver; } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java index 9d2b1e36e8c..2bdcb373269 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java @@ -74,7 +74,7 @@ public final class JavaClassResolver { private PsiClassFinder psiClassFinder; private JavaNamespaceResolver namespaceResolver; private JavaClassObjectResolver classObjectResolver; - private JavaSupertypesResolver supertypesResolver; + private JavaSupertypeResolver supertypesResolver; public JavaClassResolver() { } @@ -120,7 +120,7 @@ public final class JavaClassResolver { } @Inject - public void setSupertypesResolver(JavaSupertypesResolver supertypesResolver) { + public void setSupertypesResolver(JavaSupertypeResolver supertypesResolver) { this.supertypesResolver = supertypesResolver; } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaSupertypesResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaSupertypeResolver.java similarity index 99% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaSupertypesResolver.java rename to compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaSupertypeResolver.java index df8d5939b31..43a0ad30137 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaSupertypesResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaSupertypeResolver.java @@ -43,7 +43,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -public final class JavaSupertypesResolver { +public final class JavaSupertypeResolver { private BindingTrace trace; private JavaSemanticServices semanticServices;