From 0c15dccf2353276664e513f0e3f13cf141813c1f Mon Sep 17 00:00:00 2001 From: anna Date: Mon, 16 Apr 2012 14:02:30 +0200 Subject: [PATCH] good code red fixed --- .../intellij/psi/util/TypeConversionUtil.java | 2 +- .../CapturedWildcardAssignments.java | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/java/java-psi-api/src/com/intellij/psi/util/TypeConversionUtil.java b/java/java-psi-api/src/com/intellij/psi/util/TypeConversionUtil.java index ab97e1b3b53d..22e0c9dc0a0b 100644 --- a/java/java-psi-api/src/com/intellij/psi/util/TypeConversionUtil.java +++ b/java/java-psi-api/src/com/intellij/psi/util/TypeConversionUtil.java @@ -659,7 +659,7 @@ public class TypeConversionUtil { return left.equals(right) || isAssignable(((PsiCapturedWildcardType)left).getLowerBound(), right, false); } if (right instanceof PsiCapturedWildcardType) { - return isAssignable(left, ((PsiCapturedWildcardType)right).getUpperBound(), false); + return isAssignable(left, ((PsiCapturedWildcardType)right).getUpperBound(), allowUncheckedConversion); } if (left instanceof PsiWildcardType) { diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/CapturedWildcardAssignments.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/CapturedWildcardAssignments.java index f105923eb1b1..b750cd27b9a7 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/CapturedWildcardAssignments.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/CapturedWildcardAssignments.java @@ -14,7 +14,7 @@ * limitations under the License. */ -import java.util.Iterator; +import java.util.*; public class Test { public static void bar() { @@ -24,4 +24,16 @@ public class Test { public static Class foo() { return null; } -} \ No newline at end of file +} + +class Example { + static List treeNodes = null; + + public static void main(String[] args) { + for (AbstractTreeNode treeNode : treeNodes) { + + } + } + +} +class AbstractTreeNode {} \ No newline at end of file