From 308b9ffc394f72bad7b84ce7bd4300c5fc5c8748 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Tue, 23 Jun 2015 14:11:36 +0200
Subject: [PATCH 1/5] add missing UI for specifying alternative JRE path to
 Kotlin run configuration

---
 .../kotlin/idea/run/JetRunConfigurationEditor.form | 14 ++++++++++----
 .../kotlin/idea/run/JetRunConfigurationEditor.java |  5 +++++
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationEditor.form b/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationEditor.form
index 23783532227..527234af01d 100644
--- a/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationEditor.form
+++ b/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationEditor.form
@@ -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>
diff --git a/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationEditor.java b/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationEditor.java
index 2fd241402b1..a776d040e04 100644
--- a/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationEditor.java
+++ b/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationEditor.java
@@ -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

From 1ddf87fa2e86d8436f94abde28f38c48c4afb3b8 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Tue, 23 Jun 2015 16:32:15 +0200
Subject: [PATCH 2/5] validate some of the settings in KotlinRunConfiguration

---
 .../jetbrains/kotlin/idea/run/JetRunConfiguration.java    | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfiguration.java b/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfiguration.java
index f081f001690..57a41b23f6a 100644
--- a/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfiguration.java
+++ b/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfiguration.java
@@ -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 {

From e3846f01506e74686d0173b5db6f5757ec089c42 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Tue, 23 Jun 2015 17:16:32 +0200
Subject: [PATCH 3/5] use PanelWithAnchor to align all labels and text fields
 in Kotlin run configuration

---
 .../idea/run/JetRunConfigurationEditor.form   | 25 ++++++---------
 .../idea/run/JetRunConfigurationEditor.java   | 31 +++++++++++++++++--
 2 files changed, 38 insertions(+), 18 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationEditor.form b/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationEditor.form
index 527234af01d..47a50b2f982 100644
--- a/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationEditor.form
+++ b/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationEditor.form
@@ -8,27 +8,11 @@
     <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="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">
-        <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>
-        </constraints>
-        <properties/>
-      </component>
       <grid id="53a18" binding="myModuleChooserHolder" layout-manager="BorderLayout" hgap="0" vgap="0">
         <constraints>
           <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"/>
@@ -49,6 +33,15 @@
         </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>
     </children>
   </grid>
 </form>
diff --git a/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationEditor.java b/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationEditor.java
index a776d040e04..515b6ad9040 100644
--- a/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationEditor.java
+++ b/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationEditor.java
@@ -23,6 +23,8 @@ 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.*;
@@ -30,16 +32,19 @@ 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 and JDK of module:");
         myModuleChooserHolder.add(moduleChooser, BorderLayout.CENTER);
         myModuleSelector = new ConfigurationModuleSelector(project, moduleChooser.getComponent());
         myCommonProgramParameters.setModuleContext(myModuleSelector.getModule());
@@ -49,6 +54,8 @@ public class JetRunConfigurationEditor extends SettingsEditor<JetRunConfiguratio
                 myCommonProgramParameters.setModuleContext(myModuleSelector.getModule());
             }
         });
+
+        anchor = UIUtil.mergeComponentsWithAnchor(mainClass, myCommonProgramParameters, alternativeJREPanel, moduleChooser);
     }
 
     @Override
@@ -77,4 +84,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);
+    }
 }

From a3b543a05a7ba7b925be2cb90f33d24a38b5e233 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Tue, 23 Jun 2015 17:48:34 +0200
Subject: [PATCH 4/5] change module chooser to look like in IDEA's Java run
 configuration

---
 .../jetbrains/kotlin/idea/run/JetRunConfigurationEditor.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationEditor.java b/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationEditor.java
index 515b6ad9040..684786ac3fb 100644
--- a/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationEditor.java
+++ b/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationEditor.java
@@ -44,7 +44,8 @@ public class JetRunConfigurationEditor extends SettingsEditor<JetRunConfiguratio
     private final LabeledComponent<JComboBox> moduleChooser;
 
     public JetRunConfigurationEditor(Project project) {
-        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());

From 02211f14313b9bf703ac297c2a2a2160efc46781 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Tue, 23 Jun 2015 18:02:15 +0200
Subject: [PATCH 5/5] reorder fields to match Java

---
 .../idea/run/JetRunConfigurationEditor.form    | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationEditor.form b/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationEditor.form
index 47a50b2f982..c71fd05d308 100644
--- a/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationEditor.form
+++ b/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfigurationEditor.form
@@ -13,14 +13,6 @@
           <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>
-      <grid id="53a18" binding="myModuleChooserHolder" layout-manager="BorderLayout" hgap="0" vgap="0">
-        <constraints>
-          <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"/>
-        <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"/>
@@ -29,7 +21,7 @@
       </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"/>
+          <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>
@@ -42,6 +34,14 @@
           <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"/>
+        </constraints>
+        <properties/>
+        <border type="none"/>
+        <children/>
+      </grid>
     </children>
   </grid>
 </form>