From 0513994749b7bf245fa36e4a5ddf3a2a999c4a90 Mon Sep 17 00:00:00 2001
From: "Pavel V. Talanov" <talanov.pavel@gmail.com>
Date: Wed, 29 Jul 2015 16:44:57 +0300
Subject: [PATCH] Minor: remove "? extends" when injecting iterable into java
 class

---
 .../src/org/jetbrains/kotlin/resolve/ModifiersChecker.java    | 4 ++--
 .../jetbrains/kotlin/types/expressions/DataFlowAnalyzer.java  | 4 ++--
 .../kotlin/types/expressions/ExpressionTypingComponents.java  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.java
index 21a9cbb7d97..152541939ba 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.java
@@ -472,9 +472,9 @@ public class ModifiersChecker {
     }
 
     @NotNull
-    private final Iterable<? extends DeclarationChecker> declarationCheckers;
+    private final Iterable<DeclarationChecker> declarationCheckers;
 
-    public ModifiersChecker(@NotNull Iterable<? extends DeclarationChecker> declarationCheckers) {
+    public ModifiersChecker(@NotNull Iterable<DeclarationChecker> declarationCheckers) {
         this.declarationCheckers = declarationCheckers;
     }
 
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/DataFlowAnalyzer.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/DataFlowAnalyzer.java
index 96013992289..ba04062450d 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/DataFlowAnalyzer.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/DataFlowAnalyzer.java
@@ -48,12 +48,12 @@ import static org.jetbrains.kotlin.types.TypeUtils.*;
 
 public class DataFlowAnalyzer {
 
-    private final Iterable<? extends AdditionalTypeChecker> additionalTypeCheckers;
+    private final Iterable<AdditionalTypeChecker> additionalTypeCheckers;
     private final ConstantExpressionEvaluator constantExpressionEvaluator;
     private final KotlinBuiltIns builtIns;
 
     public DataFlowAnalyzer(
-            @NotNull Iterable<? extends AdditionalTypeChecker> additionalTypeCheckers,
+            @NotNull Iterable<AdditionalTypeChecker> additionalTypeCheckers,
             @NotNull ConstantExpressionEvaluator constantExpressionEvaluator,
             @NotNull KotlinBuiltIns builtIns
     ) {
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingComponents.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingComponents.java
index b46266dc0f3..ba2453cb2f4 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingComponents.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingComponents.java
@@ -53,7 +53,7 @@ public class ExpressionTypingComponents {
     /*package*/ ConstantExpressionEvaluator constantExpressionEvaluator;
     /*package*/ ModifiersChecker modifiersChecker;
     /*package*/ DataFlowAnalyzer dataFlowAnalyzer;
-    /*package*/ Iterable<? extends CallChecker> callCheckers;
+    /*package*/ Iterable<CallChecker> callCheckers;
 
     @Inject
     public void setGlobalContext(@NotNull GlobalContext globalContext) {
@@ -166,7 +166,7 @@ public class ExpressionTypingComponents {
     }
 
     @Inject
-    public void setCallCheckers(@NotNull Iterable<? extends CallChecker> callCheckers) {
+    public void setCallCheckers(@NotNull Iterable<CallChecker> callCheckers) {
         this.callCheckers = callCheckers;
     }
 }