MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-124301 jdk9 builds cannot be used for project/module compilation

Browse Source
This commit is contained in:
Eugene Zhuravlev
2014-04-23 17:24:28 +04:00
parent 1236318f32
commit 90bb5ab61c
4 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-api/src/com/intellij/openapi/projectRoots/JavaSdkVersion.java
+3 -1
View File
@@ -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;
java/java-psi-api/src/com/intellij/openapi/projectRoots/JdkVersionUtil.java
+1
View File
@@ -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) {
java/java-psi-api/src/com/intellij/pom/java/LanguageLevel.java
+4 -2
View File
@@ -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;
}
java/java-psi-api/src/messages/JavaCoreBundle.properties
+1
View File
@@ -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.