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

Rename: JavaSupertypesResolver -> JavaSupertypeResolver

Browse Source
This commit is contained in:
Pavel V. Talanov
2012-10-19 18:20:19 +04:00
parent 67248b19c7
commit f09185f80e
5 changed files with 64 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaDescriptorResolver.java
+27 -13
View File
@@ -18,12 +18,26 @@
package org.jetbrains.jet.di; package org.jetbrains.jet.di;
import com.intellij.openapi.project.Project; 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.BindingTrace;
import org.jetbrains.jet.lang.resolve.java.*; import org.jetbrains.jet.lang.descriptors.ModuleDescriptor;
import org.jetbrains.jet.lang.resolve.java.resolver.*; 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; import javax.annotation.PreDestroy;
/* This file is generated by org.jetbrains.jet.di.AllInjectorsGenerator. DO NOT EDIT! */ /* This file is generated by org.jetbrains.jet.di.AllInjectorsGenerator. DO NOT EDIT! */
@@ -41,7 +55,7 @@ public class InjectorForJavaDescriptorResolver {
private JavaAnnotationResolver javaAnnotationResolver; private JavaAnnotationResolver javaAnnotationResolver;
private JavaCompileTimeConstResolver javaCompileTimeConstResolver; private JavaCompileTimeConstResolver javaCompileTimeConstResolver;
private JavaClassObjectResolver javaClassObjectResolver; private JavaClassObjectResolver javaClassObjectResolver;
private JavaSupertypesResolver javaSupertypesResolver; private JavaSupertypeResolver javaSupertypeResolver;
private JavaNamespaceResolver javaNamespaceResolver; private JavaNamespaceResolver javaNamespaceResolver;
private JavaSignatureResolver javaSignatureResolver; private JavaSignatureResolver javaSignatureResolver;
private JavaConstructorResolver javaConstructorResolver; private JavaConstructorResolver javaConstructorResolver;
@@ -67,7 +81,7 @@ public class InjectorForJavaDescriptorResolver {
this.javaAnnotationResolver = new JavaAnnotationResolver(); this.javaAnnotationResolver = new JavaAnnotationResolver();
this.javaCompileTimeConstResolver = new JavaCompileTimeConstResolver(); this.javaCompileTimeConstResolver = new JavaCompileTimeConstResolver();
this.javaClassObjectResolver = new JavaClassObjectResolver(); this.javaClassObjectResolver = new JavaClassObjectResolver();
this.javaSupertypesResolver = new JavaSupertypesResolver(); this.javaSupertypeResolver = new JavaSupertypeResolver();
this.javaNamespaceResolver = new JavaNamespaceResolver(); this.javaNamespaceResolver = new JavaNamespaceResolver();
this.javaSignatureResolver = new JavaSignatureResolver(); this.javaSignatureResolver = new JavaSignatureResolver();
this.javaConstructorResolver = new JavaConstructorResolver(); this.javaConstructorResolver = new JavaConstructorResolver();
@@ -103,7 +117,7 @@ public class InjectorForJavaDescriptorResolver {
javaClassResolver.setPsiClassFinder(psiClassFinder); javaClassResolver.setPsiClassFinder(psiClassFinder);
javaClassResolver.setSemanticServices(javaSemanticServices); javaClassResolver.setSemanticServices(javaSemanticServices);
javaClassResolver.setSignatureResolver(javaSignatureResolver); javaClassResolver.setSignatureResolver(javaSignatureResolver);
javaClassResolver.setSupertypesResolver(javaSupertypesResolver); javaClassResolver.setSupertypesResolver(javaSupertypeResolver);
javaClassResolver.setTrace(bindingTrace); javaClassResolver.setTrace(bindingTrace);
javaAnnotationResolver.setClassResolver(javaClassResolver); javaAnnotationResolver.setClassResolver(javaClassResolver);
@@ -114,13 +128,13 @@ public class InjectorForJavaDescriptorResolver {
javaClassObjectResolver.setJavaDescriptorResolver(javaDescriptorResolver); javaClassObjectResolver.setJavaDescriptorResolver(javaDescriptorResolver);
javaClassObjectResolver.setSemanticServices(javaSemanticServices); javaClassObjectResolver.setSemanticServices(javaSemanticServices);
javaClassObjectResolver.setSupertypesResolver(javaSupertypesResolver); javaClassObjectResolver.setSupertypesResolver(javaSupertypeResolver);
javaClassObjectResolver.setTrace(bindingTrace); javaClassObjectResolver.setTrace(bindingTrace);
javaSupertypesResolver.setClassResolver(javaClassResolver); javaSupertypeResolver.setClassResolver(javaClassResolver);
javaSupertypesResolver.setSemanticServices(javaSemanticServices); javaSupertypeResolver.setSemanticServices(javaSemanticServices);
javaSupertypesResolver.setTrace(bindingTrace); javaSupertypeResolver.setTrace(bindingTrace);
javaSupertypesResolver.setTypeTransformer(javaTypeTransformer); javaSupertypeResolver.setTypeTransformer(javaTypeTransformer);
javaNamespaceResolver.setJavaSemanticServices(javaSemanticServices); javaNamespaceResolver.setJavaSemanticServices(javaSemanticServices);
javaNamespaceResolver.setPsiClassFinder(psiClassFinder); javaNamespaceResolver.setPsiClassFinder(psiClassFinder);
compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaSemanticServices.java
+28 -14
View File
@@ -17,13 +17,27 @@
package org.jetbrains.jet.di; package org.jetbrains.jet.di;
import com.intellij.openapi.project.Project; import org.jetbrains.jet.lang.resolve.java.JavaSemanticServices;
import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver;
import org.jetbrains.jet.lang.descriptors.ModuleDescriptor;
import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.BindingTrace;
import org.jetbrains.jet.lang.resolve.java.*; import org.jetbrains.jet.lang.resolve.java.JavaBridgeConfiguration;
import org.jetbrains.jet.lang.resolve.java.resolver.*; 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; import javax.annotation.PreDestroy;
/* This file is generated by org.jetbrains.jet.di.AllInjectorsGenerator. DO NOT EDIT! */ /* This file is generated by org.jetbrains.jet.di.AllInjectorsGenerator. DO NOT EDIT! */
@@ -41,7 +55,7 @@ public class InjectorForJavaSemanticServices {
private JavaAnnotationResolver javaAnnotationResolver; private JavaAnnotationResolver javaAnnotationResolver;
private JavaCompileTimeConstResolver javaCompileTimeConstResolver; private JavaCompileTimeConstResolver javaCompileTimeConstResolver;
private JavaClassObjectResolver javaClassObjectResolver; private JavaClassObjectResolver javaClassObjectResolver;
private JavaSupertypesResolver javaSupertypesResolver; private JavaSupertypeResolver javaSupertypeResolver;
private JavaNamespaceResolver javaNamespaceResolver; private JavaNamespaceResolver javaNamespaceResolver;
private JavaSignatureResolver javaSignatureResolver; private JavaSignatureResolver javaSignatureResolver;
private JavaConstructorResolver javaConstructorResolver; private JavaConstructorResolver javaConstructorResolver;
@@ -65,7 +79,7 @@ public class InjectorForJavaSemanticServices {
this.javaAnnotationResolver = new JavaAnnotationResolver(); this.javaAnnotationResolver = new JavaAnnotationResolver();
this.javaCompileTimeConstResolver = new JavaCompileTimeConstResolver(); this.javaCompileTimeConstResolver = new JavaCompileTimeConstResolver();
this.javaClassObjectResolver = new JavaClassObjectResolver(); this.javaClassObjectResolver = new JavaClassObjectResolver();
this.javaSupertypesResolver = new JavaSupertypesResolver(); this.javaSupertypeResolver = new JavaSupertypeResolver();
this.javaNamespaceResolver = new JavaNamespaceResolver(); this.javaNamespaceResolver = new JavaNamespaceResolver();
this.javaSignatureResolver = new JavaSignatureResolver(); this.javaSignatureResolver = new JavaSignatureResolver();
this.javaConstructorResolver = new JavaConstructorResolver(); this.javaConstructorResolver = new JavaConstructorResolver();
@@ -101,7 +115,7 @@ public class InjectorForJavaSemanticServices {
javaClassResolver.setPsiClassFinder(psiClassFinder); javaClassResolver.setPsiClassFinder(psiClassFinder);
javaClassResolver.setSemanticServices(javaSemanticServices); javaClassResolver.setSemanticServices(javaSemanticServices);
javaClassResolver.setSignatureResolver(javaSignatureResolver); javaClassResolver.setSignatureResolver(javaSignatureResolver);
javaClassResolver.setSupertypesResolver(javaSupertypesResolver); javaClassResolver.setSupertypesResolver(javaSupertypeResolver);
javaClassResolver.setTrace(bindingTrace); javaClassResolver.setTrace(bindingTrace);
javaAnnotationResolver.setClassResolver(javaClassResolver); javaAnnotationResolver.setClassResolver(javaClassResolver);
@@ -112,13 +126,13 @@ public class InjectorForJavaSemanticServices {
javaClassObjectResolver.setJavaDescriptorResolver(javaDescriptorResolver); javaClassObjectResolver.setJavaDescriptorResolver(javaDescriptorResolver);
javaClassObjectResolver.setSemanticServices(javaSemanticServices); javaClassObjectResolver.setSemanticServices(javaSemanticServices);
javaClassObjectResolver.setSupertypesResolver(javaSupertypesResolver); javaClassObjectResolver.setSupertypesResolver(javaSupertypeResolver);
javaClassObjectResolver.setTrace(bindingTrace); javaClassObjectResolver.setTrace(bindingTrace);
javaSupertypesResolver.setClassResolver(javaClassResolver); javaSupertypeResolver.setClassResolver(javaClassResolver);
javaSupertypesResolver.setSemanticServices(javaSemanticServices); javaSupertypeResolver.setSemanticServices(javaSemanticServices);
javaSupertypesResolver.setTrace(bindingTrace); javaSupertypeResolver.setTrace(bindingTrace);
javaSupertypesResolver.setTypeTransformer(javaTypeTransformer); javaSupertypeResolver.setTypeTransformer(javaTypeTransformer);
javaNamespaceResolver.setJavaSemanticServices(javaSemanticServices); javaNamespaceResolver.setJavaSemanticServices(javaSemanticServices);
javaNamespaceResolver.setPsiClassFinder(psiClassFinder); javaNamespaceResolver.setPsiClassFinder(psiClassFinder);
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassObjectResolver.java
+6 -3
View File
@@ -19,7 +19,10 @@ package org.jetbrains.jet.lang.resolve.java.resolver;
import com.intellij.psi.PsiClass; import com.intellij.psi.PsiClass;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; 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.BindingTrace;
import org.jetbrains.jet.lang.resolve.java.DescriptorResolverUtils; import org.jetbrains.jet.lang.resolve.java.DescriptorResolverUtils;
import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver; import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver;
@@ -51,10 +54,10 @@ public final class JavaClassObjectResolver {
private JavaDescriptorResolver javaDescriptorResolver; private JavaDescriptorResolver javaDescriptorResolver;
private BindingTrace trace; private BindingTrace trace;
private JavaSemanticServices semanticServices; private JavaSemanticServices semanticServices;
private JavaSupertypesResolver supertypesResolver; private JavaSupertypeResolver supertypesResolver;
@Inject @Inject
public void setSupertypesResolver(JavaSupertypesResolver supertypesResolver) { public void setSupertypesResolver(JavaSupertypeResolver supertypesResolver) {
this.supertypesResolver = supertypesResolver; this.supertypesResolver = supertypesResolver;
} }
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java
+2 -2
View File
@@ -74,7 +74,7 @@ public final class JavaClassResolver {
private PsiClassFinder psiClassFinder; private PsiClassFinder psiClassFinder;
private JavaNamespaceResolver namespaceResolver; private JavaNamespaceResolver namespaceResolver;
private JavaClassObjectResolver classObjectResolver; private JavaClassObjectResolver classObjectResolver;
private JavaSupertypesResolver supertypesResolver; private JavaSupertypeResolver supertypesResolver;
public JavaClassResolver() { public JavaClassResolver() {
} }
@@ -120,7 +120,7 @@ public final class JavaClassResolver {
} }
@Inject @Inject
public void setSupertypesResolver(JavaSupertypesResolver supertypesResolver) { public void setSupertypesResolver(JavaSupertypeResolver supertypesResolver) {
this.supertypesResolver = supertypesResolver; this.supertypesResolver = supertypesResolver;
} }
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaSupertypesResolver.java → compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaSupertypeResolver.java
+1 -1
View File
@@ -43,7 +43,7 @@ import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
public final class JavaSupertypesResolver { public final class JavaSupertypeResolver {
private BindingTrace trace; private BindingTrace trace;
private JavaSemanticServices semanticServices; private JavaSemanticServices semanticServices;