From 91105b8183b5a4b442aee67ab72781fbc119efe5 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Thu, 16 Oct 2014 21:12:28 +0400 Subject: [PATCH] Minor, fix some warnings in DeclarationsChecker --- .../di/InjectorForTopDownAnalyzerForJvm.java | 1 - .../jet/di/InjectorForBodyResolve.java | 1 - .../di/InjectorForTopDownAnalyzerBasic.java | 1 - .../jet/lang/resolve/DeclarationsChecker.java | 21 ++++--------------- .../di/InjectorForTopDownAnalyzerForJs.java | 1 - 5 files changed, 4 insertions(+), 21 deletions(-) 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 f715687108c..c523ddbece0 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJvm.java @@ -310,7 +310,6 @@ public class InjectorForTopDownAnalyzerForJvm implements InjectorForTopDownAnaly controlFlowAnalyzer.setTrace(bindingTrace); - declarationsChecker.setAdditionalCheckerProvider(additionalCheckerProvider); declarationsChecker.setDescriptorResolver(descriptorResolver); declarationsChecker.setModifiersChecker(modifiersChecker); declarationsChecker.setTrace(bindingTrace); diff --git a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForBodyResolve.java b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForBodyResolve.java index 7e4fc3f1870..a5eff9705fe 100644 --- a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForBodyResolve.java +++ b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForBodyResolve.java @@ -186,7 +186,6 @@ public class InjectorForBodyResolve { controlFlowAnalyzer.setTrace(bindingTrace); - declarationsChecker.setAdditionalCheckerProvider(additionalCheckerProvider); declarationsChecker.setDescriptorResolver(descriptorResolver); declarationsChecker.setModifiersChecker(modifiersChecker); declarationsChecker.setTrace(bindingTrace); diff --git a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java index f526ed34720..b5267bb4497 100644 --- a/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java +++ b/compiler/frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerBasic.java @@ -235,7 +235,6 @@ public class InjectorForTopDownAnalyzerBasic { controlFlowAnalyzer.setTrace(bindingTrace); - declarationsChecker.setAdditionalCheckerProvider(additionalCheckerProvider); declarationsChecker.setDescriptorResolver(descriptorResolver); declarationsChecker.setModifiersChecker(modifiersChecker); declarationsChecker.setTrace(bindingTrace); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationsChecker.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationsChecker.java index 8bfb4484bd4..73cc22af25a 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationsChecker.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationsChecker.java @@ -24,7 +24,10 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.diagnostics.Errors; import org.jetbrains.jet.lang.psi.*; -import org.jetbrains.jet.lang.types.*; +import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.jet.lang.types.SubstitutionUtils; +import org.jetbrains.jet.lang.types.TypeConstructor; +import org.jetbrains.jet.lang.types.TypeProjection; import org.jetbrains.jet.lang.types.checker.JetTypeChecker; import org.jetbrains.jet.lexer.JetModifierKeywordToken; import org.jetbrains.jet.lexer.JetTokens; @@ -39,16 +42,10 @@ import static org.jetbrains.jet.lang.resolve.DescriptorUtils.classCanHaveAbstrac import static org.jetbrains.jet.lang.resolve.DescriptorUtils.classCanHaveOpenMembers; public class DeclarationsChecker { - @NotNull private BindingTrace trace; - @NotNull private ModifiersChecker modifiersChecker; - @NotNull private DescriptorResolver descriptorResolver; - @NotNull - private AdditionalCheckerProvider additionalCheckerProvider; - @Inject public void setTrace(@NotNull BindingTrace trace) { this.trace = trace; @@ -59,11 +56,6 @@ public class DeclarationsChecker { this.descriptorResolver = descriptorResolver; } - @Inject - public void setAdditionalCheckerProvider(@NotNull AdditionalCheckerProvider additionalCheckerProvider) { - this.additionalCheckerProvider = additionalCheckerProvider; - } - @Inject public void setModifiersChecker(@NotNull ModifiersChecker modifiersChecker) { this.modifiersChecker = modifiersChecker; @@ -401,11 +393,6 @@ public class DeclarationsChecker { } if (propertyDescriptor.getModality() == Modality.ABSTRACT) { - JetType returnType = propertyDescriptor.getReturnType(); - if (returnType instanceof DeferredType) { - returnType = ((DeferredType) returnType).getDelegate(); - } - JetExpression initializer = property.getInitializer(); if (initializer != null) { trace.report(ABSTRACT_PROPERTY_WITH_INITIALIZER.on(initializer)); diff --git a/js/js.frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java b/js/js.frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java index 01c87a2504b..60b3e0fedfe 100644 --- a/js/js.frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java +++ b/js/js.frontend/src/org/jetbrains/jet/di/InjectorForTopDownAnalyzerForJs.java @@ -234,7 +234,6 @@ public class InjectorForTopDownAnalyzerForJs { controlFlowAnalyzer.setTrace(bindingTrace); - declarationsChecker.setAdditionalCheckerProvider(additionalCheckerProvider); declarationsChecker.setDescriptorResolver(descriptorResolver); declarationsChecker.setModifiersChecker(modifiersChecker); declarationsChecker.setTrace(bindingTrace);