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

don't run external scripts under a write action (IDEA-54185)

Browse Source
This commit is contained in:
Dmitry Jemerov
2010-05-06 22:28:54 +04:00
parent acc0d8c5bb
commit 302c9c713a
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/SdkConfigurationUtil.java
+18 -18
View File
@@ -104,26 +104,26 @@ public class SdkConfigurationUtil {
@Nullable
public static Sdk setupSdk(final VirtualFile homeDir, final SdkType sdkType, final boolean silent) {
final Sdk[] sdks = ProjectJdkTable.getInstance().getAllJdks();
final ProjectJdkImpl projectJdk;
try {
final String sdkName = createUniqueSdkName(sdkType, homeDir.getPath(), Arrays.asList(sdks));
projectJdk = new ProjectJdkImpl(sdkName, sdkType);
projectJdk.setHomePath(homeDir.getPath());
sdkType.setupSdkPaths(projectJdk);
}
catch (Exception e) {
if (!silent) {
Messages.showErrorDialog("Error configuring SDK: " +
e.getMessage() +
".\nPlease make sure that " +
FileUtil.toSystemDependentName(homeDir.getPath()) +
" is a valid home path for this SDK type.", "Error configuring SDK");
}
return null;
}
return ApplicationManager.getApplication().runWriteAction(new NullableComputable<Sdk>() {
public Sdk compute() {
final Sdk[] sdks = ProjectJdkTable.getInstance().getAllJdks();
ProjectJdkImpl projectJdk;
try {
final String sdkName = createUniqueSdkName(sdkType, homeDir.getPath(), Arrays.asList(sdks));
projectJdk = new ProjectJdkImpl(sdkName, sdkType);
projectJdk.setHomePath(homeDir.getPath());
sdkType.setupSdkPaths(projectJdk);
}
catch (Exception e) {
if (!silent) {
Messages.showErrorDialog("Error configuring SDK: " +
e.getMessage() +
".\nPlease make sure that " +
FileUtil.toSystemDependentName(homeDir.getPath()) +
" is a valid home path for this SDK type.", "Error configuring SDK");
}
return null;
}
ProjectJdkTable.getInstance().addJdk(projectJdk);
return projectJdk;
}