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

setup jdk: ensure comparison of system dependent types to avoid duplicated items on win

Browse Source 
GitOrigin-RevId: 7611048f22f11ed9364bf8101387a3ca425b6e17
This commit is contained in:
Anna.Kozlova
2019-10-08 08:33:54 +00:00
committed by intellij-monorepo-bot
parent ccf0ec14e0
commit 2a3a1f57a5
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/idea-ui/src/com/intellij/ide/util/projectWizard/JdkChooserPanel.java
+10 -2
View File
@@ -19,6 +19,7 @@ import com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectSdksModel;
import com.intellij.openapi.ui.DialogWrapper;
import com.intellij.openapi.ui.LoadingDecorator;
import com.intellij.openapi.util.Comparing;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.registry.Registry;
import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VirtualFile;
@@ -155,7 +156,7 @@ public class JdkChooserPanel extends JPanel {
myCurrentJdk = myList.getSelectedValue();
}
public JList getPreferredFocusedComponent() {
public JList<Sdk> getPreferredFocusedComponent() {
return myList;
}
@@ -180,7 +181,14 @@ public class JdkChooserPanel extends JPanel {
myLoadingDecorator.startLoading(false);
ApplicationManager.getApplication().executeOnPooledThread(() -> {
List<String> suggestedPaths = JavaHomeFinder.suggestHomePaths();
suggestedPaths.removeAll(ContainerUtil.map(knownJdks, sdk -> sdk.getHomePath()));//remove all known path to avoid duplicates
//remove all known path to avoid duplicates
for (Sdk sdk : knownJdks) {
String homePath = sdk.getHomePath();
if (homePath != null) {
suggestedPaths.remove(FileUtil.toSystemDependentName(homePath));
}
}
ApplicationManager.getApplication().invokeLater(() -> {
for (String homePath : suggestedPaths) {
VirtualFile virtualFile = LocalFileSystem.getInstance().findFileByPath(homePath);