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

OverloadingConflictResolver made singleton

Browse Source
This commit is contained in:
Svetlana Isakova
2012-11-08 15:20:46 +04:00
parent adcb9e6e8a
commit e7750c6dc7
10 changed files with 20 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/di/InjectorForTests.java
-9
View File
@@ -27,8 +27,6 @@ import com.intellij.openapi.project.Project;
import org.jetbrains.jet.lang.resolve.AnnotationResolver;
import org.jetbrains.jet.lang.resolve.QualifiedExpressionResolver;
import org.jetbrains.jet.lang.resolve.calls.CandidateResolver;
import org.jetbrains.jet.lang.resolve.calls.results.ResolutionResultsHandler;
import org.jetbrains.jet.lang.resolve.calls.results.OverloadingConflictResolver;
import org.jetbrains.annotations.NotNull;
import javax.annotation.PreDestroy;
@@ -45,8 +43,6 @@ public class InjectorForTests {
private AnnotationResolver annotationResolver;
private QualifiedExpressionResolver qualifiedExpressionResolver;
private CandidateResolver candidateResolver;
private ResolutionResultsHandler resolutionResultsHandler;
private OverloadingConflictResolver overloadingConflictResolver;
public InjectorForTests(
@NotNull Project project
@@ -61,8 +57,6 @@ public class InjectorForTests {
this.annotationResolver = new AnnotationResolver();
this.qualifiedExpressionResolver = new QualifiedExpressionResolver();
this.candidateResolver = new CandidateResolver();
this.resolutionResultsHandler = new ResolutionResultsHandler();
this.overloadingConflictResolver = new OverloadingConflictResolver();
this.descriptorResolver.setAnnotationResolver(annotationResolver);
this.descriptorResolver.setExpressionTypingServices(expressionTypingServices);
@@ -80,7 +74,6 @@ public class InjectorForTests {
this.callResolver.setCandidateResolver(candidateResolver);
this.callResolver.setExpressionTypingServices(expressionTypingServices);
this.callResolver.setResolutionResultsHandler(resolutionResultsHandler);
this.callResolver.setTypeResolver(typeResolver);
annotationResolver.setCallResolver(callResolver);
@@ -89,8 +82,6 @@ public class InjectorForTests {
candidateResolver.setExpressionTypingServices(expressionTypingServices);
candidateResolver.setTypeResolver(typeResolver);
resolutionResultsHandler.setOverloadingConflictResolver(overloadingConflictResolver);
}
@PreDestroy