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

Remove unused dependencies from JavaDescriptorResolver

Browse Source
This commit is contained in:
Pavel V. Talanov
2012-10-10 18:23:22 +04:00
parent 340e8d0b28
commit 7693d99d1a
5 changed files with 1 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaDescriptorResolver.java
-3
View File
@@ -102,10 +102,7 @@ public class InjectorForJavaDescriptorResolver {
this.javaDescriptorResolver.setFunctionResolver(javaFunctionResolver);
this.javaDescriptorResolver.setInnerClassResolver(javaInnerClassResolver);
this.javaDescriptorResolver.setNamespaceResolver(javaNamespaceResolver);
this.javaDescriptorResolver.setProject(project);
this.javaDescriptorResolver.setPropertiesResolver(javaPropertiesResolver);
this.javaDescriptorResolver.setSemanticServices(javaSemanticServices);
this.javaDescriptorResolver.setTrace(bindingTrace);
this.psiClassFinder.setProject(project);
compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForJavaSemanticServices.java
-3
View File
@@ -96,10 +96,7 @@ public class InjectorForJavaSemanticServices {
this.javaDescriptorResolver.setFunctionResolver(javaFunctionResolver);
this.javaDescriptorResolver.setInnerClassResolver(javaInnerClassResolver);
this.javaDescriptorResolver.setNamespaceResolver(javaNamespaceResolver);
this.javaDescriptorResolver.setProject(project);
this.javaDescriptorResolver.setPropertiesResolver(javaPropertiesResolver);
this.javaDescriptorResolver.setSemanticServices(javaSemanticServices);
this.javaDescriptorResolver.setTrace(bindingTrace);
javaBridgeConfiguration.setBuiltinsScopeExtensionMode(builtinsScopeExtensionMode);
javaBridgeConfiguration.setJavaSemanticServices(javaSemanticServices);
compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java
-3
View File
@@ -194,10 +194,7 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly
javaDescriptorResolver.setFunctionResolver(javaFunctionResolver);
javaDescriptorResolver.setInnerClassResolver(javaInnerClassResolver);
javaDescriptorResolver.setNamespaceResolver(javaNamespaceResolver);
javaDescriptorResolver.setProject(project);
javaDescriptorResolver.setPropertiesResolver(javaPropertiesResolver);
javaDescriptorResolver.setSemanticServices(javaSemanticServices);
javaDescriptorResolver.setTrace(bindingTrace);
psiClassFinder.setProject(project);
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
-24
View File
@@ -16,12 +16,10 @@
package org.jetbrains.jet.lang.resolve.java;
import com.intellij.openapi.project.Project;
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.resolve.BindingTrace;
import org.jetbrains.jet.lang.resolve.DescriptorUtils;
import org.jetbrains.jet.lang.resolve.java.data.ResolverClassData;
import org.jetbrains.jet.lang.resolve.java.data.ResolverScopeData;
@@ -61,9 +59,6 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes
}
};
protected Project project;
protected JavaSemanticServices semanticServices;
private BindingTrace trace;
private JavaPropertiesResolver propertiesResolver;
private JavaClassResolver classResolver;
private JavaConstructorResolver constructorResolver;
@@ -71,21 +66,6 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes
private JavaNamespaceResolver namespaceResolver;
private JavaInnerClassResolver innerClassResolver;
@Inject
public void setProject(Project project) {
this.project = project;
}
@Inject
public void setSemanticServices(JavaSemanticServices semanticServices) {
this.semanticServices = semanticServices;
}
@Inject
public void setTrace(BindingTrace trace) {
this.trace = trace;
}
@Inject
public void setFunctionResolver(JavaFunctionResolver functionResolver) {
this.functionResolver = functionResolver;
@@ -126,10 +106,6 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes
return classResolver.resolveClass(qualifiedName);
}
public BindingTrace getTrace() {
return trace;
}
@NotNull
public Collection<ConstructorDescriptor> resolveConstructors(@NotNull ResolverClassData classData) {
return constructorResolver.resolveConstructors(classData);
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaClassResolver.java
+1 -1
View File
@@ -257,7 +257,7 @@ public final class JavaClassResolver {
classData.getClassDescriptor().setAnnotations(annotationResolver.resolveAnnotations(psiClass, taskList));
javaDescriptorResolver.getTrace().record(BindingContext.CLASS, psiClass, classData.getClassDescriptor());
trace.record(BindingContext.CLASS, psiClass, classData.getClassDescriptor());
return classData;
}