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

Rename JavaPropertiesResolver -> JavaPropertyResolver

Browse Source
This commit is contained in:
Pavel V. Talanov
2012-10-19 18:17:23 +04:00
parent 334c7d237d
commit 67248b19c7
4 changed files with 30 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaDescriptorResolver.java
+13 -27
View File
@@ -18,26 +18,12 @@
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.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.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; 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! */
@@ -62,7 +48,7 @@ public class InjectorForJavaDescriptorResolver {
private JavaValueParameterResolver javaValueParameterResolver; private JavaValueParameterResolver javaValueParameterResolver;
private JavaFunctionResolver javaFunctionResolver; private JavaFunctionResolver javaFunctionResolver;
private JavaInnerClassResolver javaInnerClassResolver; private JavaInnerClassResolver javaInnerClassResolver;
private JavaPropertiesResolver javaPropertiesResolver; private JavaPropertyResolver javaPropertyResolver;
public InjectorForJavaDescriptorResolver( public InjectorForJavaDescriptorResolver(
@NotNull Project project, @NotNull Project project,
@@ -88,7 +74,7 @@ public class InjectorForJavaDescriptorResolver {
this.javaValueParameterResolver = new JavaValueParameterResolver(); this.javaValueParameterResolver = new JavaValueParameterResolver();
this.javaFunctionResolver = new JavaFunctionResolver(); this.javaFunctionResolver = new JavaFunctionResolver();
this.javaInnerClassResolver = new JavaInnerClassResolver(); this.javaInnerClassResolver = new JavaInnerClassResolver();
this.javaPropertiesResolver = new JavaPropertiesResolver(); this.javaPropertyResolver = new JavaPropertyResolver();
javaBridgeConfiguration.setJavaSemanticServices(javaSemanticServices); javaBridgeConfiguration.setJavaSemanticServices(javaSemanticServices);
javaBridgeConfiguration.setProject(project); javaBridgeConfiguration.setProject(project);
@@ -103,7 +89,7 @@ public class InjectorForJavaDescriptorResolver {
this.javaDescriptorResolver.setFunctionResolver(javaFunctionResolver); this.javaDescriptorResolver.setFunctionResolver(javaFunctionResolver);
this.javaDescriptorResolver.setInnerClassResolver(javaInnerClassResolver); this.javaDescriptorResolver.setInnerClassResolver(javaInnerClassResolver);
this.javaDescriptorResolver.setNamespaceResolver(javaNamespaceResolver); this.javaDescriptorResolver.setNamespaceResolver(javaNamespaceResolver);
this.javaDescriptorResolver.setPropertiesResolver(javaPropertiesResolver); this.javaDescriptorResolver.setPropertiesResolver(javaPropertyResolver);
this.psiClassFinder.setProject(project); this.psiClassFinder.setProject(project);
@@ -156,11 +142,11 @@ public class InjectorForJavaDescriptorResolver {
javaInnerClassResolver.setClassResolver(javaClassResolver); javaInnerClassResolver.setClassResolver(javaClassResolver);
javaPropertiesResolver.setAnnotationResolver(javaAnnotationResolver); javaPropertyResolver.setAnnotationResolver(javaAnnotationResolver);
javaPropertiesResolver.setClassResolver(javaClassResolver); javaPropertyResolver.setClassResolver(javaClassResolver);
javaPropertiesResolver.setJavaSignatureResolver(javaSignatureResolver); javaPropertyResolver.setJavaSignatureResolver(javaSignatureResolver);
javaPropertiesResolver.setSemanticServices(javaSemanticServices); javaPropertyResolver.setSemanticServices(javaSemanticServices);
javaPropertiesResolver.setTrace(bindingTrace); javaPropertyResolver.setTrace(bindingTrace);
javaBridgeConfiguration.init(); javaBridgeConfiguration.init();
compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaSemanticServices.java
+13 -27
View File
@@ -17,27 +17,13 @@
package org.jetbrains.jet.di; 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 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.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; 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! */
@@ -62,7 +48,7 @@ public class InjectorForJavaSemanticServices {
private JavaValueParameterResolver javaValueParameterResolver; private JavaValueParameterResolver javaValueParameterResolver;
private JavaFunctionResolver javaFunctionResolver; private JavaFunctionResolver javaFunctionResolver;
private JavaInnerClassResolver javaInnerClassResolver; private JavaInnerClassResolver javaInnerClassResolver;
private JavaPropertiesResolver javaPropertiesResolver; private JavaPropertyResolver javaPropertyResolver;
public InjectorForJavaSemanticServices( public InjectorForJavaSemanticServices(
@NotNull Project project @NotNull Project project
@@ -86,7 +72,7 @@ public class InjectorForJavaSemanticServices {
this.javaValueParameterResolver = new JavaValueParameterResolver(); this.javaValueParameterResolver = new JavaValueParameterResolver();
this.javaFunctionResolver = new JavaFunctionResolver(); this.javaFunctionResolver = new JavaFunctionResolver();
this.javaInnerClassResolver = new JavaInnerClassResolver(); this.javaInnerClassResolver = new JavaInnerClassResolver();
this.javaPropertiesResolver = new JavaPropertiesResolver(); this.javaPropertyResolver = new JavaPropertyResolver();
this.javaSemanticServices.setDescriptorResolver(javaDescriptorResolver); this.javaSemanticServices.setDescriptorResolver(javaDescriptorResolver);
this.javaSemanticServices.setPsiClassFinder(psiClassFinder); this.javaSemanticServices.setPsiClassFinder(psiClassFinder);
@@ -98,7 +84,7 @@ public class InjectorForJavaSemanticServices {
this.javaDescriptorResolver.setFunctionResolver(javaFunctionResolver); this.javaDescriptorResolver.setFunctionResolver(javaFunctionResolver);
this.javaDescriptorResolver.setInnerClassResolver(javaInnerClassResolver); this.javaDescriptorResolver.setInnerClassResolver(javaInnerClassResolver);
this.javaDescriptorResolver.setNamespaceResolver(javaNamespaceResolver); this.javaDescriptorResolver.setNamespaceResolver(javaNamespaceResolver);
this.javaDescriptorResolver.setPropertiesResolver(javaPropertiesResolver); this.javaDescriptorResolver.setPropertiesResolver(javaPropertyResolver);
javaBridgeConfiguration.setJavaSemanticServices(javaSemanticServices); javaBridgeConfiguration.setJavaSemanticServices(javaSemanticServices);
javaBridgeConfiguration.setProject(project); javaBridgeConfiguration.setProject(project);
@@ -154,11 +140,11 @@ public class InjectorForJavaSemanticServices {
javaInnerClassResolver.setClassResolver(javaClassResolver); javaInnerClassResolver.setClassResolver(javaClassResolver);
javaPropertiesResolver.setAnnotationResolver(javaAnnotationResolver); javaPropertyResolver.setAnnotationResolver(javaAnnotationResolver);
javaPropertiesResolver.setClassResolver(javaClassResolver); javaPropertyResolver.setClassResolver(javaClassResolver);
javaPropertiesResolver.setJavaSignatureResolver(javaSignatureResolver); javaPropertyResolver.setJavaSignatureResolver(javaSignatureResolver);
javaPropertiesResolver.setSemanticServices(javaSemanticServices); javaPropertyResolver.setSemanticServices(javaSemanticServices);
javaPropertiesResolver.setTrace(bindingTrace); javaPropertyResolver.setTrace(bindingTrace);
javaBridgeConfiguration.init(); javaBridgeConfiguration.init();
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
+2 -2
View File
@@ -59,7 +59,7 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes
} }
}; };
private JavaPropertiesResolver propertiesResolver; private JavaPropertyResolver propertiesResolver;
private JavaClassResolver classResolver; private JavaClassResolver classResolver;
private JavaConstructorResolver constructorResolver; private JavaConstructorResolver constructorResolver;
private JavaFunctionResolver functionResolver; private JavaFunctionResolver functionResolver;
@@ -82,7 +82,7 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes
} }
@Inject @Inject
public void setPropertiesResolver(JavaPropertiesResolver propertiesResolver) { public void setPropertiesResolver(JavaPropertyResolver propertiesResolver) {
this.propertiesResolver = propertiesResolver; this.propertiesResolver = propertiesResolver;
} }
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPropertiesResolver.java → compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaPropertyResolver.java
+2 -2
View File
@@ -43,7 +43,7 @@ import org.jetbrains.jet.lang.types.TypeUtils;
import javax.inject.Inject; import javax.inject.Inject;
import java.util.*; import java.util.*;
public final class JavaPropertiesResolver { public final class JavaPropertyResolver {
private JavaSemanticServices semanticServices; private JavaSemanticServices semanticServices;
private JavaSignatureResolver javaSignatureResolver; private JavaSignatureResolver javaSignatureResolver;
@@ -51,7 +51,7 @@ public final class JavaPropertiesResolver {
private JavaAnnotationResolver annotationResolver; private JavaAnnotationResolver annotationResolver;
private JavaClassResolver classResolver; private JavaClassResolver classResolver;
public JavaPropertiesResolver() { public JavaPropertyResolver() {
} }
@Inject @Inject