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

EA-33419 - CCE: SimpleJavaParameters.createOSProcessHandler

Browse Source
This commit is contained in:
Sascha Weinreuter
2012-03-09 14:17:17 +01:00
parent 9bcc30f3d0
commit b140b171a1
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/XsltRunConfiguration.java
+4
View File
@@ -473,6 +473,10 @@ public final class XsltRunConfiguration extends RunConfigurationBase implements
if (jdk == null) {
jdk = ProjectRootManager.getInstance(getProject()).getProjectSdk();
}
// EA-33419
if (jdk == null || !(jdk.getSdkType() instanceof JavaSdkType)) {
return getDefaultSdk();
}
return jdk;
}
plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/XsltRunSettingsEditor.java
+12 -4
View File
@@ -29,6 +29,7 @@ import com.intellij.openapi.module.ModuleType;
import com.intellij.openapi.options.ConfigurationException;
import com.intellij.openapi.options.SettingsEditor;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.projectRoots.JavaSdkType;
import com.intellij.openapi.projectRoots.ProjectJdkTable;
import com.intellij.openapi.projectRoots.Sdk;
import com.intellij.openapi.roots.ProjectRootManager;
@@ -36,6 +37,7 @@ import com.intellij.openapi.ui.ComboBox;
import com.intellij.openapi.ui.TextComponentAccessor;
import com.intellij.openapi.ui.TextFieldWithBrowseButton;
import com.intellij.openapi.util.Computable;
import com.intellij.openapi.util.Condition;
import com.intellij.openapi.util.IconLoader;
import com.intellij.openapi.util.Pair;
import com.intellij.openapi.vfs.VfsUtil;
@@ -44,13 +46,14 @@ import com.intellij.openapi.vfs.VirtualFileManager;
import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiManager;
import com.intellij.ui.ComboboxWithBrowseButton;
import com.intellij.ui.PanelWithAnchor;
import com.intellij.ui.DocumentAdapter;
import com.intellij.ui.PanelWithAnchor;
import com.intellij.ui.RawCommandLineEditor;
import com.intellij.ui.components.JBLabel;
import com.intellij.ui.components.JBRadioButton;
import com.intellij.ui.table.JBTable;
import com.intellij.util.ArrayUtil;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.ui.UIUtil;
import org.intellij.lang.xpath.xslt.XsltSupport;
import org.intellij.lang.xpath.xslt.associations.FileAssociationsManager;
@@ -304,9 +307,14 @@ class XsltRunSettingsEditor extends SettingsEditor<XsltRunConfiguration> {
}
});
final Sdk[] allJdks = ProjectJdkTable.getInstance().getAllJdks();
myJDK.setModel(new DefaultComboBoxModel(allJdks));
if (allJdks.length > 0) {
final List<Sdk> allJdks = ContainerUtil.filter(ProjectJdkTable.getInstance().getAllJdks(), new Condition<Sdk>() {
@Override
public boolean value(Sdk sdk) {
return sdk.getSdkType() instanceof JavaSdkType;
}
});
myJDK.setModel(new DefaultComboBoxModel(allJdks.toArray()));
if (allJdks.size() > 0) {
myJDK.setSelectedIndex(0);
}
else {