From 30dce02dfc739e618fcda720c25fcfc234fe008d Mon Sep 17 00:00:00 2001
From: anna <Anna.Kozlova@jetbrains.com>
Date: Mon, 5 Aug 2013 16:31:00 +0200
Subject: [PATCH] primitive/class conversions are available since language
 level 1.5 (IDEA-111451)

---
 .../src/com/intellij/psi/util/TypeConversionUtil.java      | 2 +-
 .../advHighlighting6/Java5CastConventions.java             | 7 +++++++
 .../advHighlighting7/Java7CastConventions.java             | 7 -------
 .../codeInsight/daemon/LightAdvHighlightingJdk6Test.java   | 1 +
 .../codeInsight/daemon/LightAdvHighlightingJdk7Test.java   | 1 -
 5 files changed, 9 insertions(+), 9 deletions(-)
 create mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting6/Java5CastConventions.java
 delete mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/Java7CastConventions.java

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 46de3614f352..2a7ba4f0364e 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
@@ -480,7 +480,7 @@ public class TypeConversionUtil {
       else {
         if (isPrimitiveAndNotNull(ltype)) {
           return rtype instanceof PsiClassType &&
-                 ((PsiClassType)rtype).getLanguageLevel().isAtLeast(LanguageLevel.JDK_1_7) &&
+                 ((PsiClassType)rtype).getLanguageLevel().isAtLeast(LanguageLevel.JDK_1_5) &&
                  areTypesConvertible(ltype, rtype);
         }
         if (isPrimitiveAndNotNull(rtype)) {
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting6/Java5CastConventions.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting6/Java5CastConventions.java
new file mode 100644
index 000000000000..dae77befb928
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting6/Java5CastConventions.java
@@ -0,0 +1,7 @@
+class Test {
+  public static void main(String[] args) {
+    Object o = null;
+    if (<error descr="Operator '==' cannot be applied to 'java.lang.Object', 'int'">o == 1</error>) {}
+    if (1 == o) {}
+  }
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/Java7CastConventions.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/Java7CastConventions.java
deleted file mode 100644
index 370371584122..000000000000
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/Java7CastConventions.java
+++ /dev/null
@@ -1,7 +0,0 @@
-class Test {
-  public static void main(String[] args) {
-    Object o = null;
-    if (o == 1) {}
-    if (1 == o) {}
-  }
-}
\ No newline at end of file
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/LightAdvHighlightingJdk6Test.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/LightAdvHighlightingJdk6Test.java
index f155db7baa18..b7790ae82d0d 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/LightAdvHighlightingJdk6Test.java
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/LightAdvHighlightingJdk6Test.java
@@ -57,4 +57,5 @@ public class LightAdvHighlightingJdk6Test extends LightDaemonAnalyzerTestCase {
   public void testIDEA108285() throws Exception { setLanguageLevel(LanguageLevel.JDK_1_6); doTest(false, false); }
   public void testClassObjectAccessibility() throws Exception { setLanguageLevel(LanguageLevel.JDK_1_6); doTest(false, false); }
   public void testRedundantCastInConditionalExpression() throws Exception { setLanguageLevel(LanguageLevel.JDK_1_6); doTest(true, false); }
+  public void testJava5CastConventions() { setLanguageLevel(LanguageLevel.JDK_1_5); doTest(true, false); }
 }
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/LightAdvHighlightingJdk7Test.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/LightAdvHighlightingJdk7Test.java
index 571e7c5ad2e7..c2bd75e8bd8a 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/LightAdvHighlightingJdk7Test.java
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/LightAdvHighlightingJdk7Test.java
@@ -156,7 +156,6 @@ public class LightAdvHighlightingJdk7Test extends LightDaemonAnalyzerTestCase {
   public void testMethodReferences() { doTest(false, true, false); }
   public void testUsedMethodsByMethodReferences() { doTest(true, true, false); }
   public void testLambdaExpressions() { doTest(false, true, false); }
-  public void testJava7CastConventions() { doTest(false, true, false); }
   public void testUncheckedWarning() { doTest(true, false); }
   public void testUncheckedWarningIDEA59290() { doTest(true, false); }
   public void testUncheckedWarningIDEA70620() { doTest(true, false); }