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] reduces use of VFS on JDK classes root detection

Browse Source
This commit is contained in:
Roman Shevchenko
2018-11-07 20:55:02 +01:00
parent cdb4223e88
commit 89c426c062
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaSdkImpl.java
+5 -7
View File
@@ -410,13 +410,12 @@ public class JavaSdkImpl extends JavaSdk {
@NotNull
private static List<String> findClasses(@NotNull File file, boolean isJre) {
List<String> result = ContainerUtil.newArrayList();
VirtualFileManager fileManager = VirtualFileManager.getInstance();
if (JdkUtil.isExplodedModularRuntime(file.getPath())) {
VirtualFile exploded = fileManager.findFileByUrl(StandardFileSystems.FILE_PROTOCOL_PREFIX + getPath(new File(file, "modules")));
File[] exploded = new File(file, "modules").listFiles();
if (exploded != null) {
for (VirtualFile virtualFile : exploded.getChildren()) {
result.add(virtualFile.getUrl());
for (File root : exploded) {
result.add(VfsUtil.getUrlForLibraryRoot(root));
}
}
}
@@ -429,7 +428,7 @@ public class JavaSdkImpl extends JavaSdk {
}
}
else {
VirtualFile jrt = fileManager.findFileByUrl(jrtBaseUrl);
VirtualFile jrt = VirtualFileManager.getInstance().findFileByUrl(jrtBaseUrl);
if (jrt != null) {
for (VirtualFile virtualFile : jrt.getChildren()) {
result.add(virtualFile.getUrl());
@@ -439,8 +438,7 @@ public class JavaSdkImpl extends JavaSdk {
}
else {
for (File root : JavaSdkUtil.getJdkClassesRoots(file, isJre)) {
String url = VfsUtil.getUrlForLibraryRoot(root);
result.add(url);
result.add(VfsUtil.getUrlForLibraryRoot(root));
}
}