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: fix computation of path to jdkAnnotation for case when Java support is installed as a plugin (IDEA-195719)

Browse Source
This commit is contained in:
nik
2019-03-29 20:10:53 +03:00
parent 3316b57a54
commit 69e838ead8
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaSdkImpl.java
+13 -3
View File
@@ -272,9 +272,19 @@ public class JavaSdkImpl extends JavaSdk {
pathsChecked.add(path);
if (root == null) { // build
String url = "jar://" + FileUtil.toSystemIndependentName(PathManager.getHomePath()) + "/lib/jdkAnnotations.jar!/";
root = VirtualFileManager.getInstance().findFileByUrl(url);
pathsChecked.add(FileUtil.toSystemIndependentName(PathManager.getHomePath()) + "/lib/jdkAnnotations.jar");
String javaPluginClassesRootPath = PathManager.getJarPathForClass(JavaSdkImpl.class);
LOG.assertTrue(javaPluginClassesRootPath != null);
File javaPluginClassesRoot = new File(javaPluginClassesRootPath);
if (javaPluginClassesRoot.isFile()) {
String annotationsJarPath = FileUtil.toSystemIndependentName(new File(javaPluginClassesRoot.getParentFile(), "jdkAnnotations.jar").getAbsolutePath());
root = VirtualFileManager.getInstance().findFileByUrl("jar://" + annotationsJarPath + "!/");
pathsChecked.add(annotationsJarPath);
}
if (root == null) {
String url = "jar://" + FileUtil.toSystemIndependentName(PathManager.getHomePath()) + "/lib/jdkAnnotations.jar!/";
root = VirtualFileManager.getInstance().findFileByUrl(url);
pathsChecked.add(FileUtil.toSystemIndependentName(PathManager.getHomePath()) + "/lib/jdkAnnotations.jar");
}
}
if (root == null) {