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

Move JavaDescriptorSignatureResolver to resolver package and rename it to JavaSignatureResolver

Browse Source 
Injectors regenerated
This commit is contained in:
Pavel V. Talanov
2012-10-15 14:19:59 +04:00
parent 717f424152
commit 5c20a07c00
7 changed files with 35 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaDescriptorResolver.java
+7 -7
View File
@@ -32,7 +32,7 @@ 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.JavaDescriptorSignatureResolver;
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;
@@ -59,7 +59,7 @@ public class InjectorForJavaDescriptorResolver {
private JavaClassObjectResolver javaClassObjectResolver;
private JavaSupertypesResolver javaSupertypesResolver;
private JavaNamespaceResolver javaNamespaceResolver;
private JavaDescriptorSignatureResolver javaDescriptorSignatureResolver;
private JavaSignatureResolver javaSignatureResolver;
private JavaConstructorResolver javaConstructorResolver;
private JavaValueParameterResolver javaValueParameterResolver;
private JavaFunctionResolver javaFunctionResolver;
@@ -87,7 +87,7 @@ public class InjectorForJavaDescriptorResolver {
this.javaClassObjectResolver = new JavaClassObjectResolver();
this.javaSupertypesResolver = new JavaSupertypesResolver();
this.javaNamespaceResolver = new JavaNamespaceResolver();
this.javaDescriptorSignatureResolver = new JavaDescriptorSignatureResolver();
this.javaSignatureResolver = new JavaSignatureResolver();
this.javaConstructorResolver = new JavaConstructorResolver();
this.javaValueParameterResolver = new JavaValueParameterResolver();
this.javaFunctionResolver = new JavaFunctionResolver();
@@ -121,7 +121,7 @@ public class InjectorForJavaDescriptorResolver {
javaClassResolver.setNamespaceResolver(javaNamespaceResolver);
javaClassResolver.setPsiClassFinder(psiClassFinder);
javaClassResolver.setSemanticServices(javaSemanticServices);
javaClassResolver.setSignatureResolver(javaDescriptorSignatureResolver);
javaClassResolver.setSignatureResolver(javaSignatureResolver);
javaClassResolver.setSupertypesResolver(javaSupertypesResolver);
javaClassResolver.setTrace(bindingTrace);
@@ -145,7 +145,7 @@ public class InjectorForJavaDescriptorResolver {
javaNamespaceResolver.setPsiClassFinder(psiClassFinder);
javaNamespaceResolver.setTrace(bindingTrace);
javaDescriptorSignatureResolver.setJavaSemanticServices(javaSemanticServices);
javaSignatureResolver.setJavaSemanticServices(javaSemanticServices);
javaConstructorResolver.setTrace(bindingTrace);
javaConstructorResolver.setTypeTransformer(javaTypeTransformer);
@@ -155,7 +155,7 @@ public class InjectorForJavaDescriptorResolver {
javaFunctionResolver.setAnnotationResolver(javaAnnotationResolver);
javaFunctionResolver.setParameterResolver(javaValueParameterResolver);
javaFunctionResolver.setSignatureResolver(javaDescriptorSignatureResolver);
javaFunctionResolver.setSignatureResolver(javaSignatureResolver);
javaFunctionResolver.setTrace(bindingTrace);
javaFunctionResolver.setTypeTransformer(javaTypeTransformer);
@@ -163,7 +163,7 @@ public class InjectorForJavaDescriptorResolver {
javaPropertiesResolver.setAnnotationResolver(javaAnnotationResolver);
javaPropertiesResolver.setClassResolver(javaClassResolver);
javaPropertiesResolver.setJavaDescriptorSignatureResolver(javaDescriptorSignatureResolver);
javaPropertiesResolver.setJavaSignatureResolver(javaSignatureResolver);
javaPropertiesResolver.setSemanticServices(javaSemanticServices);
javaPropertiesResolver.setTrace(bindingTrace);
compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaSemanticServices.java
+7 -7
View File
@@ -32,7 +32,7 @@ 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.JavaDescriptorSignatureResolver;
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;
@@ -59,7 +59,7 @@ public class InjectorForJavaSemanticServices {
private JavaClassObjectResolver javaClassObjectResolver;
private JavaSupertypesResolver javaSupertypesResolver;
private JavaNamespaceResolver javaNamespaceResolver;
private JavaDescriptorSignatureResolver javaDescriptorSignatureResolver;
private JavaSignatureResolver javaSignatureResolver;
private JavaConstructorResolver javaConstructorResolver;
private JavaValueParameterResolver javaValueParameterResolver;
private JavaFunctionResolver javaFunctionResolver;
@@ -85,7 +85,7 @@ public class InjectorForJavaSemanticServices {
this.javaClassObjectResolver = new JavaClassObjectResolver();
this.javaSupertypesResolver = new JavaSupertypesResolver();
this.javaNamespaceResolver = new JavaNamespaceResolver();
this.javaDescriptorSignatureResolver = new JavaDescriptorSignatureResolver();
this.javaSignatureResolver = new JavaSignatureResolver();
this.javaConstructorResolver = new JavaConstructorResolver();
this.javaValueParameterResolver = new JavaValueParameterResolver();
this.javaFunctionResolver = new JavaFunctionResolver();
@@ -119,7 +119,7 @@ public class InjectorForJavaSemanticServices {
javaClassResolver.setNamespaceResolver(javaNamespaceResolver);
javaClassResolver.setPsiClassFinder(psiClassFinder);
javaClassResolver.setSemanticServices(javaSemanticServices);
javaClassResolver.setSignatureResolver(javaDescriptorSignatureResolver);
javaClassResolver.setSignatureResolver(javaSignatureResolver);
javaClassResolver.setSupertypesResolver(javaSupertypesResolver);
javaClassResolver.setTrace(bindingTrace);
@@ -143,7 +143,7 @@ public class InjectorForJavaSemanticServices {
javaNamespaceResolver.setPsiClassFinder(psiClassFinder);
javaNamespaceResolver.setTrace(bindingTrace);
javaDescriptorSignatureResolver.setJavaSemanticServices(javaSemanticServices);
javaSignatureResolver.setJavaSemanticServices(javaSemanticServices);
javaConstructorResolver.setTrace(bindingTrace);
javaConstructorResolver.setTypeTransformer(javaTypeTransformer);
@@ -153,7 +153,7 @@ public class InjectorForJavaSemanticServices {
javaFunctionResolver.setAnnotationResolver(javaAnnotationResolver);
javaFunctionResolver.setParameterResolver(javaValueParameterResolver);
javaFunctionResolver.setSignatureResolver(javaDescriptorSignatureResolver);
javaFunctionResolver.setSignatureResolver(javaSignatureResolver);
javaFunctionResolver.setTrace(bindingTrace);
javaFunctionResolver.setTypeTransformer(javaTypeTransformer);
@@ -161,7 +161,7 @@ public class InjectorForJavaSemanticServices {
javaPropertiesResolver.setAnnotationResolver(javaAnnotationResolver);
javaPropertiesResolver.setClassResolver(javaClassResolver);
javaPropertiesResolver.setJavaDescriptorSignatureResolver(javaDescriptorSignatureResolver);
javaPropertiesResolver.setJavaSignatureResolver(javaSignatureResolver);
javaPropertiesResolver.setSemanticServices(javaSemanticServices);
javaPropertiesResolver.setTrace(bindingTrace);
compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java
+7 -7
View File
@@ -54,7 +54,7 @@ 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.JavaDescriptorSignatureResolver;
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;
@@ -102,7 +102,7 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly
private JavaClassObjectResolver javaClassObjectResolver;
private JavaSupertypesResolver javaSupertypesResolver;
private JavaNamespaceResolver javaNamespaceResolver;
private JavaDescriptorSignatureResolver javaDescriptorSignatureResolver;
private JavaSignatureResolver javaSignatureResolver;
private JavaConstructorResolver javaConstructorResolver;
private JavaValueParameterResolver javaValueParameterResolver;
private JavaFunctionResolver javaFunctionResolver;
@@ -152,7 +152,7 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly
this.javaClassObjectResolver = new JavaClassObjectResolver();
this.javaSupertypesResolver = new JavaSupertypesResolver();
this.javaNamespaceResolver = new JavaNamespaceResolver();
this.javaDescriptorSignatureResolver = new JavaDescriptorSignatureResolver();
this.javaSignatureResolver = new JavaSignatureResolver();
this.javaConstructorResolver = new JavaConstructorResolver();
this.javaValueParameterResolver = new JavaValueParameterResolver();
this.javaFunctionResolver = new JavaFunctionResolver();
@@ -276,7 +276,7 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly
javaClassResolver.setNamespaceResolver(javaNamespaceResolver);
javaClassResolver.setPsiClassFinder(psiClassFinder);
javaClassResolver.setSemanticServices(javaSemanticServices);
javaClassResolver.setSignatureResolver(javaDescriptorSignatureResolver);
javaClassResolver.setSignatureResolver(javaSignatureResolver);
javaClassResolver.setSupertypesResolver(javaSupertypesResolver);
javaClassResolver.setTrace(bindingTrace);
@@ -300,7 +300,7 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly
javaNamespaceResolver.setPsiClassFinder(psiClassFinder);
javaNamespaceResolver.setTrace(bindingTrace);
javaDescriptorSignatureResolver.setJavaSemanticServices(javaSemanticServices);
javaSignatureResolver.setJavaSemanticServices(javaSemanticServices);
javaConstructorResolver.setTrace(bindingTrace);
javaConstructorResolver.setTypeTransformer(javaTypeTransformer);
@@ -310,7 +310,7 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly
javaFunctionResolver.setAnnotationResolver(javaAnnotationResolver);
javaFunctionResolver.setParameterResolver(javaValueParameterResolver);
javaFunctionResolver.setSignatureResolver(javaDescriptorSignatureResolver);
javaFunctionResolver.setSignatureResolver(javaSignatureResolver);
javaFunctionResolver.setTrace(bindingTrace);
javaFunctionResolver.setTypeTransformer(javaTypeTransformer);
@@ -318,7 +318,7 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly
javaPropertiesResolver.setAnnotationResolver(javaAnnotationResolver);
javaPropertiesResolver.setClassResolver(javaClassResolver);
javaPropertiesResolver.setJavaDescriptorSignatureResolver(javaDescriptorSignatureResolver);
javaPropertiesResolver.setJavaSignatureResolver(javaSignatureResolver);
javaPropertiesResolver.setSemanticServices(javaSemanticServices);
javaPropertiesResolver.setTrace(bindingTrace);
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java
+5 -5
View File
@@ -65,7 +65,7 @@ public final class JavaClassResolver {
private BindingTrace trace;
private JavaDescriptorResolver javaDescriptorResolver;
private JavaDescriptorSignatureResolver signatureResolver;
private JavaSignatureResolver signatureResolver;
private JavaSemanticServices semanticServices;
private JavaAnnotationResolver annotationResolver;
private PsiClassFinder psiClassFinder;
@@ -87,7 +87,7 @@ public final class JavaClassResolver {
}
@Inject
public void setSignatureResolver(JavaDescriptorSignatureResolver signatureResolver) {
public void setSignatureResolver(JavaSignatureResolver signatureResolver) {
this.signatureResolver = signatureResolver;
}
@@ -217,7 +217,7 @@ public final class JavaClassResolver {
classDescriptorCache.put(fqName, classData);
classDescriptor.setName(Name.identifier(psiClass.getName()));
List<JavaDescriptorSignatureResolver.TypeParameterDescriptorInitialization> typeParameterDescriptorInitializations
List<JavaSignatureResolver.TypeParameterDescriptorInitialization> typeParameterDescriptorInitializations
= signatureResolver.createUninitializedClassTypeParameters(psiClass, classData);
classDescriptor.setTypeParameterDescriptors(getTypeParametersDescriptors(typeParameterDescriptorInitializations));
@@ -251,10 +251,10 @@ public final class JavaClassResolver {
@NotNull
private static List<TypeParameterDescriptor> getTypeParametersDescriptors(
@NotNull List<JavaDescriptorSignatureResolver.TypeParameterDescriptorInitialization> typeParameterDescriptorInitializations
@NotNull List<JavaSignatureResolver.TypeParameterDescriptorInitialization> typeParameterDescriptorInitializations
) {
List<TypeParameterDescriptor> typeParameters = Lists.newArrayList();
for (JavaDescriptorSignatureResolver.TypeParameterDescriptorInitialization typeParameter : typeParameterDescriptorInitializations) {
for (JavaSignatureResolver.TypeParameterDescriptorInitialization typeParameter : typeParameterDescriptorInitializations) {
typeParameters.add(typeParameter.getDescriptor());
}
return typeParameters;
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaFunctionResolver.java
+2 -2
View File
@@ -43,7 +43,7 @@ public final class JavaFunctionResolver {
private JavaTypeTransformer typeTransformer;
private BindingTrace trace;
private JavaDescriptorSignatureResolver signatureResolver;
private JavaSignatureResolver signatureResolver;
private JavaValueParameterResolver parameterResolver;
private JavaAnnotationResolver annotationResolver;
@@ -61,7 +61,7 @@ public final class JavaFunctionResolver {
}
@Inject
public void setSignatureResolver(JavaDescriptorSignatureResolver signatureResolver) {
public void setSignatureResolver(JavaSignatureResolver signatureResolver) {
this.signatureResolver = signatureResolver;
}
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPropertiesResolver.java
+4 -4
View File
@@ -46,7 +46,7 @@ import java.util.*;
public final class JavaPropertiesResolver {
private JavaSemanticServices semanticServices;
private JavaDescriptorSignatureResolver javaDescriptorSignatureResolver;
private JavaSignatureResolver javaSignatureResolver;
private BindingTrace trace;
private JavaAnnotationResolver annotationResolver;
private JavaClassResolver classResolver;
@@ -65,8 +65,8 @@ public final class JavaPropertiesResolver {
}
@Inject
public void setJavaDescriptorSignatureResolver(JavaDescriptorSignatureResolver javaDescriptorSignatureResolver) {
this.javaDescriptorSignatureResolver = javaDescriptorSignatureResolver;
public void setJavaSignatureResolver(JavaSignatureResolver javaSignatureResolver) {
this.javaSignatureResolver = javaSignatureResolver;
}
@Inject
@@ -333,7 +333,7 @@ public final class JavaPropertiesResolver {
// TODO: Can't get type parameters from field - only from accessors
if (characteristicMember == members.setter || characteristicMember == members.getter) {
PsiMethodWrapper method = (PsiMethodWrapper) characteristicMember.getMember();
return javaDescriptorSignatureResolver.resolveMethodTypeParameters(method, propertyDescriptor);
return javaSignatureResolver.resolveMethodTypeParameters(method, propertyDescriptor);
}
return Collections.emptyList();
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorSignatureResolver.java → compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaSignatureResolver.java
+3 -5
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jetbrains.jet.lang.resolve.java;
package org.jetbrains.jet.lang.resolve.java.resolver;
import com.google.common.collect.Lists;
import com.intellij.psi.*;
@@ -24,6 +24,7 @@ import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;
import org.jetbrains.jet.lang.resolve.DescriptorUtils;
import org.jetbrains.jet.lang.resolve.java.*;
import org.jetbrains.jet.lang.resolve.java.data.ResolverClassData;
import org.jetbrains.jet.lang.resolve.java.kt.JetClassAnnotation;
import org.jetbrains.jet.lang.resolve.java.wrapper.PsiMethodWrapper;
@@ -42,10 +43,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
/**
* @author Stepan Koltsov
*/
public class JavaDescriptorSignatureResolver {
public final class JavaSignatureResolver {
@NotNull
private JavaSemanticServices semanticServices;