From 90bb5ab61ca5d63356e0adc62c7afee73ab17235 Mon Sep 17 00:00:00 2001
From: Eugene Zhuravlev <jeka@intellij.com>
Date: Wed, 23 Apr 2014 17:22:22 +0400
Subject: [PATCH] IDEA-124301 jdk9 builds cannot be used for project/module
 compilation

---
 .../com/intellij/openapi/projectRoots/JavaSdkVersion.java   | 4 +++-
 .../com/intellij/openapi/projectRoots/JdkVersionUtil.java   | 1 +
 .../src/com/intellij/pom/java/LanguageLevel.java            | 6 ++++--
 java/java-psi-api/src/messages/JavaCoreBundle.properties    | 1 +
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/java/java-psi-api/src/com/intellij/openapi/projectRoots/JavaSdkVersion.java b/java/java-psi-api/src/com/intellij/openapi/projectRoots/JavaSdkVersion.java
index 9a469ab2d40f..b185b481c315 100644
--- a/java/java-psi-api/src/com/intellij/openapi/projectRoots/JavaSdkVersion.java
+++ b/java/java-psi-api/src/com/intellij/openapi/projectRoots/JavaSdkVersion.java
@@ -31,7 +31,9 @@ public enum JavaSdkVersion {
   JDK_1_5(LanguageLevel.JDK_1_5, "1.5"),
   JDK_1_6(LanguageLevel.JDK_1_6, "1.6"),
   JDK_1_7(LanguageLevel.JDK_1_7, "1.7"),
-  JDK_1_8(LanguageLevel.JDK_1_8, "1.8");
+  JDK_1_8(LanguageLevel.JDK_1_8, "1.8"),
+  JDK_1_9(LanguageLevel.JDK_1_9, "1.9");
+  
   private final LanguageLevel myMaxLanguageLevel;
   private final String myDescription;
 
diff --git a/java/java-psi-api/src/com/intellij/openapi/projectRoots/JdkVersionUtil.java b/java/java-psi-api/src/com/intellij/openapi/projectRoots/JdkVersionUtil.java
index d26b1ca84c6b..98893c1b509e 100644
--- a/java/java-psi-api/src/com/intellij/openapi/projectRoots/JdkVersionUtil.java
+++ b/java/java-psi-api/src/com/intellij/openapi/projectRoots/JdkVersionUtil.java
@@ -33,6 +33,7 @@ public class JdkVersionUtil {
     VERSION_STRINGS.put(JavaSdkVersion.JDK_1_6, new String[]{"1.6", "6.0"});
     VERSION_STRINGS.put(JavaSdkVersion.JDK_1_7, new String[]{"1.7", "7.0"});
     VERSION_STRINGS.put(JavaSdkVersion.JDK_1_8, new String[]{"1.8", "8.0"});
+    VERSION_STRINGS.put(JavaSdkVersion.JDK_1_9, new String[]{"1.9", "9.0"});
   }
 
   public static JavaSdkVersion getVersion(@NotNull String versionString) {
diff --git a/java/java-psi-api/src/com/intellij/pom/java/LanguageLevel.java b/java/java-psi-api/src/com/intellij/pom/java/LanguageLevel.java
index e980c0a01c10..6dc8cfb75449 100644
--- a/java/java-psi-api/src/com/intellij/pom/java/LanguageLevel.java
+++ b/java/java-psi-api/src/com/intellij/pom/java/LanguageLevel.java
@@ -30,9 +30,10 @@ public enum LanguageLevel {
   JDK_1_5(JavaCoreBundle.message("jdk.1.5.language.level.description")),
   JDK_1_6(JavaCoreBundle.message("jdk.1.6.language.level.description")),
   JDK_1_7(JavaCoreBundle.message("jdk.1.7.language.level.description")),
-  JDK_1_8(JavaCoreBundle.message("jdk.1.8.language.level.description"));
+  JDK_1_8(JavaCoreBundle.message("jdk.1.8.language.level.description")),
+  JDK_1_9(JavaCoreBundle.message("jdk.1.9.language.level.description"));
 
-  public static final LanguageLevel HIGHEST = JDK_1_8;
+  public static final LanguageLevel HIGHEST = JDK_1_8; // TODO! when language level 9 is really supported, update this field
   public static final Key<LanguageLevel> KEY = Key.create("LANGUAGE_LEVEL");
 
   private final String myPresentableText;
@@ -59,6 +60,7 @@ public enum LanguageLevel {
     if ("1.6".equals(value)) return JDK_1_6;
     if ("1.7".equals(value)) return JDK_1_7;
     if ("1.8".equals(value)) return JDK_1_8;
+    if ("1.9".equals(value)) return JDK_1_9;
 
     return null;
   }
diff --git a/java/java-psi-api/src/messages/JavaCoreBundle.properties b/java/java-psi-api/src/messages/JavaCoreBundle.properties
index 31dc1a7440a7..5ea4ebc4c8f4 100644
--- a/java/java-psi-api/src/messages/JavaCoreBundle.properties
+++ b/java/java-psi-api/src/messages/JavaCoreBundle.properties
@@ -6,3 +6,4 @@ jdk.1.5.language.level.description=5.0 - 'enum' keyword, autoboxing etc.
 jdk.1.6.language.level.description=6.0 - @Override in interfaces
 jdk.1.7.language.level.description=7.0 - Diamonds, ARM, multi-catch etc.
 jdk.1.8.language.level.description=8.0 - Lambdas, type annotations etc.
+jdk.1.9.language.level.description=9.0 - Jigsaw project etc.