From 27d4e583a824f36e43da523a9079546ead8dc680 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Fri, 21 Mar 2014 15:32:12 +0400 Subject: [PATCH] Unneeded field removed --- .../jetbrains/jet/di/InjectorForLazyResolveWithJava.java | 1 - .../jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java | 1 - .../src/org/jetbrains/jet/di/InjectorForBodyResolve.java | 1 - .../src/org/jetbrains/jet/di/InjectorForLazyResolve.java | 1 - .../src/org/jetbrains/jet/di/InjectorForMacros.java | 1 - .../jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java | 1 - .../org/jetbrains/jet/lang/resolve/AnnotationResolver.java | 7 ------- compiler/tests/org/jetbrains/jet/di/InjectorForTests.java | 1 - .../jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java | 1 - 9 files changed, 15 deletions(-) diff --git a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForLazyResolveWithJava.java b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForLazyResolveWithJava.java index c58c6b528f5..d96daa3ecb4 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForLazyResolveWithJava.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForLazyResolveWithJava.java @@ -174,7 +174,6 @@ public class InjectorForLazyResolveWithJava { psiBasedMethodSignatureChecker.setExternalSignatureResolver(traceBasedExternalSignatureResolver); annotationResolver.setCallResolver(callResolver); - annotationResolver.setExpressionTypingServices(expressionTypingServices); callResolver.setArgumentTypeResolver(argumentTypeResolver); callResolver.setCandidateResolver(candidateResolver); diff --git a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java index 2542a5f49ab..b2dcb5fc294 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java @@ -219,7 +219,6 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly bodyResolver.setTrace(bindingTrace); annotationResolver.setCallResolver(callResolver); - annotationResolver.setExpressionTypingServices(expressionTypingServices); callResolver.setArgumentTypeResolver(argumentTypeResolver); callResolver.setCandidateResolver(candidateResolver); diff --git a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForBodyResolve.java b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForBodyResolve.java index 6e655a12b3e..e244531d24e 100644 --- a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForBodyResolve.java +++ b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForBodyResolve.java @@ -120,7 +120,6 @@ public class InjectorForBodyResolve { this.bodyResolver.setTrace(bindingTrace); annotationResolver.setCallResolver(callResolver); - annotationResolver.setExpressionTypingServices(expressionTypingServices); callResolver.setArgumentTypeResolver(argumentTypeResolver); callResolver.setCandidateResolver(candidateResolver); diff --git a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForLazyResolve.java b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForLazyResolve.java index 21a37509834..8f7cae50a74 100644 --- a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForLazyResolve.java +++ b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForLazyResolve.java @@ -115,7 +115,6 @@ public class InjectorForLazyResolve { this.resolveSession.setTypeResolver(typeResolver); annotationResolver.setCallResolver(callResolver); - annotationResolver.setExpressionTypingServices(expressionTypingServices); callResolver.setArgumentTypeResolver(argumentTypeResolver); callResolver.setCandidateResolver(candidateResolver); diff --git a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForMacros.java b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForMacros.java index e8129541668..0f9767d4526 100644 --- a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForMacros.java +++ b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForMacros.java @@ -106,7 +106,6 @@ public class InjectorForMacros { this.expressionTypingComponents.setPlatformToKotlinClassMap(platformToKotlinClassMap); annotationResolver.setCallResolver(callResolver); - annotationResolver.setExpressionTypingServices(expressionTypingServices); callResolver.setArgumentTypeResolver(argumentTypeResolver); callResolver.setCandidateResolver(candidateResolver); diff --git a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java index 88bc7e93606..f779acabdb3 100644 --- a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java +++ b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java @@ -161,7 +161,6 @@ public class InjectorForTopDownAnalyzerBasic { bodyResolver.setTrace(bindingTrace); annotationResolver.setCallResolver(callResolver); - annotationResolver.setExpressionTypingServices(expressionTypingServices); callResolver.setArgumentTypeResolver(argumentTypeResolver); callResolver.setCandidateResolver(candidateResolver); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java index 5d1f2a967c2..61cf6289dbb 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java @@ -39,7 +39,6 @@ import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; import org.jetbrains.jet.lang.types.ErrorUtils; import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.expressions.ExpressionTypingServices; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; import javax.inject.Inject; @@ -52,14 +51,8 @@ import static org.jetbrains.jet.lang.types.TypeUtils.NO_EXPECTED_TYPE; public class AnnotationResolver { - private ExpressionTypingServices expressionTypingServices; private CallResolver callResolver; - @Inject - public void setExpressionTypingServices(ExpressionTypingServices expressionTypingServices) { - this.expressionTypingServices = expressionTypingServices; - } - @Inject public void setCallResolver(CallResolver callResolver) { this.callResolver = callResolver; diff --git a/compiler/tests/org/jetbrains/jet/di/InjectorForTests.java b/compiler/tests/org/jetbrains/jet/di/InjectorForTests.java index 2ee4da2f44d..447625986a9 100644 --- a/compiler/tests/org/jetbrains/jet/di/InjectorForTests.java +++ b/compiler/tests/org/jetbrains/jet/di/InjectorForTests.java @@ -108,7 +108,6 @@ public class InjectorForTests { this.typeResolver.setQualifiedExpressionResolver(qualifiedExpressionResolver); annotationResolver.setCallResolver(callResolver); - annotationResolver.setExpressionTypingServices(expressionTypingServices); callResolver.setArgumentTypeResolver(argumentTypeResolver); callResolver.setCandidateResolver(candidateResolver); diff --git a/js/js.translator/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java b/js/js.translator/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java index 32a2e8e72be..95e9984dda3 100644 --- a/js/js.translator/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java +++ b/js/js.translator/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java @@ -161,7 +161,6 @@ public class InjectorForTopDownAnalyzerForJs { bodyResolver.setTrace(bindingTrace); annotationResolver.setCallResolver(callResolver); - annotationResolver.setExpressionTypingServices(expressionTypingServices); callResolver.setArgumentTypeResolver(argumentTypeResolver); callResolver.setCandidateResolver(candidateResolver);