azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #707 from JetBrains/rr/yole/run-configurations

Browse Source 
add missing UI for specifying alternative JRE path to Kotlin run configuration
This commit is contained in:
Natalia Ukhorskaya
2015-06-23 19:06:28 +03:00
parent 5b1d393d05 02211f1431
commit 25210c0c18
3 changed files with 63 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/run/JetRunConfiguration.java
+8
View File
@@ -23,6 +23,7 @@ import com.intellij.execution.configurations.*;
import com.intellij.execution.filters.TextConsoleBuilderFactory;
import com.intellij.execution.runners.ExecutionEnvironment;
import com.intellij.execution.util.JavaParametersUtil;
import com.intellij.execution.util.ProgramParametersUtil;
import com.intellij.openapi.components.PathMacroManager;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleManager;
@@ -202,6 +203,13 @@ public class JetRunConfiguration extends ModuleBasedConfiguration<RunConfigurati
ALTERNATIVE_JRE_PATH = path;
}
@Override
public void checkConfiguration() throws RuntimeConfigurationException {
JavaParametersUtil.checkAlternativeJRE(this);
ProgramParametersUtil.checkWorkingDirectoryExist(this, getProject(), getConfigurationModule().getModule());
JavaRunConfigurationExtensionManager.checkConfigurationIsValid(this);
}
@Override
public RunProfileState getState(@NotNull Executor executor, @NotNull ExecutionEnvironment executionEnvironment)
throws ExecutionException {
idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationEditor.form
+20 -21
View File
@@ -1,34 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="org.jetbrains.kotlin.idea.run.JetRunConfigurationEditor">
<grid id="27dc6" binding="myMainPanel" layout-manager="GridLayoutManager" row-count="4" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<grid id="27dc6" binding="myMainPanel" layout-manager="GridLayoutManager" row-count="5" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="0" left="0" bottom="0" right="0"/>
<constraints>
<xy x="20" y="20" width="500" height="400"/>
<xy x="20" y="20" width="811" height="400"/>
</constraints>
<properties/>
<border type="none"/>
<children>
<component id="6e659" class="javax.swing.JLabel">
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text value="Main class:"/>
</properties>
</component>
<vspacer id="f22cb">
<constraints>
<grid row="3" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
<grid row="4" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
</constraints>
</vspacer>
<component id="1378e" class="javax.swing.JTextField" binding="myMainClassField">
<component id="d9fac" class="com.intellij.execution.ui.CommonJavaParametersPanel" binding="myCommonProgramParameters">
<constraints>
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
<preferred-size width="150" height="-1"/>
</grid>
<grid row="1" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
</component>
<component id="b06d8" class="com.intellij.execution.ui.AlternativeJREPanel" binding="alternativeJREPanel">
<constraints>
<grid row="3" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
</component>
<component id="a5106" class="com.intellij.openapi.ui.LabeledComponent" binding="mainClass" custom-create="true">
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<labelLocation value="West"/>
<text value="Main class"/>
</properties>
</component>
<grid id="53a18" binding="myModuleChooserHolder" layout-manager="BorderLayout" hgap="0" vgap="0">
<constraints>
<grid row="2" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
@@ -37,12 +42,6 @@
<border type="none"/>
<children/>
</grid>
<component id="d9fac" class="com.intellij.execution.ui.CommonJavaParametersPanel" binding="myCommonProgramParameters">
<constraints>
<grid row="1" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
</component>
</children>
</grid>
</form>
idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationEditor.java
+35 -2
View File
@@ -16,12 +16,15 @@
package org.jetbrains.kotlin.idea.run;
import com.intellij.execution.ui.AlternativeJREPanel;
import com.intellij.execution.ui.CommonJavaParametersPanel;
import com.intellij.execution.ui.ConfigurationModuleSelector;
import com.intellij.openapi.options.ConfigurationException;
import com.intellij.openapi.options.SettingsEditor;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.LabeledComponent;
import com.intellij.ui.PanelWithAnchor;
import com.intellij.util.ui.UIUtil;
import org.jetbrains.annotations.NotNull;
import javax.swing.*;
@@ -29,15 +32,20 @@ import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
public class JetRunConfigurationEditor extends SettingsEditor<JetRunConfiguration> {
public class JetRunConfigurationEditor extends SettingsEditor<JetRunConfiguration> implements PanelWithAnchor {
private JPanel myMainPanel;
private JTextField myMainClassField;
private JPanel myModuleChooserHolder;
private CommonJavaParametersPanel myCommonProgramParameters;
private AlternativeJREPanel alternativeJREPanel;
private LabeledComponent<JTextField> mainClass;
private ConfigurationModuleSelector myModuleSelector;
private JComponent anchor;
private final LabeledComponent<JComboBox> moduleChooser;
public JetRunConfigurationEditor(Project project) {
LabeledComponent<JComboBox> moduleChooser = LabeledComponent.create(new JComboBox(), "Use classpath and JDK of module:");
moduleChooser = LabeledComponent.create(new JComboBox(), "Use classpath of module:");
moduleChooser.setLabelLocation(BorderLayout.WEST);
myModuleChooserHolder.add(moduleChooser, BorderLayout.CENTER);
myModuleSelector = new ConfigurationModuleSelector(project, moduleChooser.getComponent());
myCommonProgramParameters.setModuleContext(myModuleSelector.getModule());
@@ -47,6 +55,8 @@ public class JetRunConfigurationEditor extends SettingsEditor<JetRunConfiguratio
myCommonProgramParameters.setModuleContext(myModuleSelector.getModule());
}
});
anchor = UIUtil.mergeComponentsWithAnchor(mainClass, myCommonProgramParameters, alternativeJREPanel, moduleChooser);
}
@Override
@@ -54,6 +64,7 @@ public class JetRunConfigurationEditor extends SettingsEditor<JetRunConfiguratio
myCommonProgramParameters.reset(configuration);
myMainClassField.setText(configuration.getRunClass() == null ? null : configuration.getRunClass());
myModuleSelector.reset(configuration);
alternativeJREPanel.init(configuration.getAlternativeJrePath(), configuration.isAlternativeJrePathEnabled());
}
@Override
@@ -61,6 +72,8 @@ public class JetRunConfigurationEditor extends SettingsEditor<JetRunConfiguratio
myModuleSelector.applyTo(configuration);
myCommonProgramParameters.applyTo(configuration);
configuration.setRunClass(myMainClassField.getText());
configuration.setAlternativeJrePath(alternativeJREPanel.getPath());
configuration.setAlternativeJrePathEnabled(alternativeJREPanel.isPathEnabled());
}
@NotNull
@@ -72,4 +85,24 @@ public class JetRunConfigurationEditor extends SettingsEditor<JetRunConfiguratio
@Override
protected void disposeEditor() {
}
@Override
public JComponent getAnchor() {
return anchor;
}
@Override
public void setAnchor(JComponent anchor) {
this.anchor = anchor;
mainClass.setAnchor(anchor);
myCommonProgramParameters.setAnchor(anchor);
alternativeJREPanel.setAnchor(anchor);
moduleChooser.setAnchor(anchor);
}
private void createUIComponents() {
mainClass = new LabeledComponent<JTextField>();
myMainClassField = new JTextField();
mainClass.setComponent(myMainClassField);
}
}