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

add missing UI for specifying alternative JRE path to Kotlin run configuration

Browse Source
This commit is contained in:
Dmitry Jemerov
2015-06-23 14:11:36 +02:00
parent 7b0458f1a9
commit 308b9ffc39
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationEditor.form
+10 -4
View File
@@ -1,9 +1,9 @@
<?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"/>
@@ -18,7 +18,7 @@
</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">
@@ -31,7 +31,7 @@
</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"/>
<grid row="3" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
</constraints>
<properties/>
<border type="none"/>
@@ -43,6 +43,12 @@
</constraints>
<properties/>
</component>
<component id="b06d8" class="com.intellij.execution.ui.AlternativeJREPanel" binding="alternativeJREPanel">
<constraints>
<grid row="2" 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
+5
View File
@@ -16,6 +16,7 @@
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;
@@ -34,6 +35,7 @@ public class JetRunConfigurationEditor extends SettingsEditor<JetRunConfiguratio
private JTextField myMainClassField;
private JPanel myModuleChooserHolder;
private CommonJavaParametersPanel myCommonProgramParameters;
private AlternativeJREPanel alternativeJREPanel;
private ConfigurationModuleSelector myModuleSelector;
public JetRunConfigurationEditor(Project project) {
@@ -54,6 +56,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 +64,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