MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-08 15:09:39 +07:00
Code Issues Packages Projects Releases Wiki Activity

EA-533262 - F: JrePathEditor.buildModel

Browse Source 
using VFS instead of native UI

GitOrigin-RevId: 4fc8b9facc1ce2c8ec6c2714f760bea946e99b1a
This commit is contained in:
Dmitry Avdeev
2022-12-01 22:06:39 +01:00
committed by intellij-monorepo-bot
parent 54f549eef2
commit d953edb7a8
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
java/execution/impl/src/com/intellij/execution/ui/JrePathEditor.java
View File

@@ -23,6 +23,7 @@ import com.intellij.openapi.util.NlsSafe;
import com.intellij.openapi.util.SystemInfo;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.ui.*;
import com.intellij.ui.components.JBTextField;
import com.intellij.ui.components.fields.ExtendableTextField;
@@ -42,7 +43,6 @@ import java.awt.*;
import java.awt.event.ActionListener;
import java.awt.event.FocusEvent;
import java.awt.event.FocusListener;
import java.io.File;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
@@ -192,9 +192,12 @@ public class JrePathEditor extends LabeledComponent<ComboBox<JrePathEditor.JreCo
String homePath = jdk.getHomePath();
if (!SystemInfo.isMac) {
final File jre = new File(jdk.getHomePath(), "jre");
if (jre.isDirectory()) {
homePath = jre.getPath();
VirtualFile homeDirectory = jdk.getHomeDirectory();
if (homeDirectory != null) {
VirtualFile jre = homeDirectory.findChild("jre");
if (jre != null && jre.isDirectory()) {
homePath = jre.getPath();
}
}
}
if (jrePaths.add(homePath)) {