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

[java] modular JDK definition should only include modular roots (IDEA-165523)

Browse Source
This commit is contained in:
Roman Shevchenko
2017-01-31 09:19:43 +03:00
parent 418ca9d9dd
commit 4a31c8c554
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaSdkImpl.java
+10 -7
View File
@@ -606,14 +606,17 @@ public class JavaSdkImpl extends JavaSdk {
List<VirtualFile> result = ContainerUtil.newArrayList();
VirtualFileManager fileManager = VirtualFileManager.getInstance();
VirtualFile jrt = fileManager.findFileByUrl(JrtFileSystem.PROTOCOL_PREFIX + getPath(file) + JrtFileSystem.SEPARATOR);
if (jrt != null) {
ContainerUtil.addAll(result, jrt.getChildren());
if (JrtFileSystem.isModularJdk(file.getPath())) {
VirtualFile jrt = fileManager.findFileByUrl(JrtFileSystem.PROTOCOL_PREFIX + getPath(file) + JrtFileSystem.SEPARATOR);
if (jrt != null) {
ContainerUtil.addAll(result, jrt.getChildren());
}
}
for (File root : JavaSdkUtil.getJdkClassesRoots(file, isJre)) {
String url = VfsUtil.getUrlForLibraryRoot(root);
ContainerUtil.addIfNotNull(result, fileManager.findFileByUrl(url));
else {
for (File root : JavaSdkUtil.getJdkClassesRoots(file, isJre)) {
String url = VfsUtil.getUrlForLibraryRoot(root);
ContainerUtil.addIfNotNull(result, fileManager.findFileByUrl(url));
}
}
Collections.sort(result, Comparator.comparing(VirtualFile::getPath));
jps/model-impl/src/org/jetbrains/jps/model/java/impl/JavaSdkUtil.java
+2 -3
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2016 JetBrains s.r.o.
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -58,8 +58,7 @@ public class JavaSdkUtil {
}
}
else if (new File(home, "lib/modules").exists()) {
File libDir = new File(home, "lib");
jarDirs = new File[]{libDir};
jarDirs = ArrayUtil.EMPTY_FILE_ARRAY;
}
else {
File libDir = new File(home, isJre ? "lib" : "jre/lib");