From f1ba7574e33f535be0fa78784aa48269b33123ab Mon Sep 17 00:00:00 2001
From: Evgeny Zakrevsky <evgeny.zakrevsky@jetbrains.com>
Date: Thu, 3 Nov 2011 03:59:03 +0300
Subject: [PATCH] Run configurations layout fixes

---
 .../execution/applet/AppletConfigurable.java  |  2 +-
 .../application/ApplicationConfigurable.java  | 30 ++++++++++++-------
 .../execution/impl/RunConfigurable.java       |  1 -
 .../impl/SingleConfigurationConfigurable.form | 12 ++++++--
 .../impl/SingleConfigurationConfigurable.java |  5 ++++
 .../intellij/openapi/ui/LabeledComponent.java |  5 +++-
 .../util/src/com/intellij/util/ui/UIUtil.java |  2 +-
 .../run/AndroidRunConfigurationEditor.form    |  3 ++
 8 files changed, 42 insertions(+), 18 deletions(-)

diff --git a/java/execution/impl/src/com/intellij/execution/applet/AppletConfigurable.java b/java/execution/impl/src/com/intellij/execution/applet/AppletConfigurable.java
index 281f7e3bf159..51ab7fdf97dc 100644
--- a/java/execution/impl/src/com/intellij/execution/applet/AppletConfigurable.java
+++ b/java/execution/impl/src/com/intellij/execution/applet/AppletConfigurable.java
@@ -158,7 +158,7 @@ public class AppletConfigurable extends SettingsEditor<AppletConfiguration> impl
       }
     });
 
-    setAnchor(myModule.getLabel());
+    setAnchor(myVMParameters.getLabel());
   }
 
   private void removeParameter() {
diff --git a/java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurable.java b/java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurable.java
index 0b63e7d13a4c..eabbb0172e21 100644
--- a/java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurable.java
+++ b/java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurable.java
@@ -31,13 +31,15 @@ import com.intellij.psi.PsiClass;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.util.PsiMethodUtil;
 import com.intellij.ui.EditorTextFieldWithBrowseButton;
+import com.intellij.ui.PanelWithAnchor;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
-public class ApplicationConfigurable extends SettingsEditor<ApplicationConfiguration> {
+public class ApplicationConfigurable extends SettingsEditor<ApplicationConfiguration> implements PanelWithAnchor {
   private CommonJavaParametersPanel myCommonProgramParameters;
   private LabeledComponent<EditorTextFieldWithBrowseButton> myMainClass;
   private LabeledComponent<JComboBox> myModule;
@@ -48,6 +50,7 @@ public class ApplicationConfigurable extends SettingsEditor<ApplicationConfigura
   private JCheckBox myShowSwingInspectorCheckbox;
   private final JreVersionDetector myVersionDetector;
   private final Project myProject;
+  private JComponent myAnchor;
 
   public ApplicationConfigurable(final Project project) {
     myProject = project;
@@ -61,16 +64,7 @@ public class ApplicationConfigurable extends SettingsEditor<ApplicationConfigura
     ClassBrowser.createApplicationClassBrowser(project, myModuleSelector).setField(getMainClassField());
     myVersionDetector = new JreVersionDetector();
 
-    settingAnchors();
-  }
-
-  private void settingAnchors() {
-    JComponent anchor = myCommonProgramParameters.getAnchor();
-    myMainClass.setAnchor(anchor);
-    myCommonProgramParameters.setAnchor(anchor);
-
-    anchor = myModule.getLabel();
-    myAlternativeJREPanel.setAnchor(anchor);
+    setAnchor(myModule.getAnchor());
   }
 
   public void applyEditorTo(final ApplicationConfiguration configuration) throws ConfigurationException {
@@ -137,4 +131,18 @@ public class ApplicationConfigurable extends SettingsEditor<ApplicationConfigura
       }
     }));
   }
+
+  @Override
+  public JComponent getAnchor() {
+    return myAnchor;
+  }
+
+  @Override
+  public void setAnchor(@Nullable JComponent anchor) {
+    this.myAnchor = anchor;
+    myMainClass.setAnchor(anchor);
+    myCommonProgramParameters.setAnchor(anchor);
+    myAlternativeJREPanel.setAnchor(anchor);
+    myModule.setAnchor(anchor);
+  }
 }
diff --git a/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java b/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java
index f3b59350e9cf..1fcdb43be9e1 100644
--- a/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java
+++ b/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java
@@ -364,7 +364,6 @@ class RunConfigurable extends BaseConfigurable {
     panel.add(new JLabel("Press the"));
 
     final JEditorPane browser = new JEditorPane();
-    browser.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 0));
     browser.setEditable(false);
     browser.setEditorKit(new HTMLEditorKit());
     browser.setBackground(myRightPanel.getBackground());
diff --git a/platform/lang-impl/src/com/intellij/execution/impl/SingleConfigurationConfigurable.form b/platform/lang-impl/src/com/intellij/execution/impl/SingleConfigurationConfigurable.form
index 773320abeffe..ea72388c87f8 100644
--- a/platform/lang-impl/src/com/intellij/execution/impl/SingleConfigurationConfigurable.form
+++ b/platform/lang-impl/src/com/intellij/execution/impl/SingleConfigurationConfigurable.form
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.intellij.execution.impl.SingleConfigurationConfigurable.MyValidatableComponent">
-  <grid id="cae26" binding="myWholePanel" layout-manager="GridLayoutManager" row-count="3" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+  <grid id="cae26" binding="myWholePanel" layout-manager="GridLayoutManager" row-count="4" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
       <xy x="13" y="24" width="615" height="174"/>
@@ -11,7 +11,7 @@
       <grid id="cd390" layout-manager="GridLayoutManager" row-count="2" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
         <margin top="0" left="5" bottom="0" right="0"/>
         <constraints>
-          <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="2" fill="1" indent="0" use-parent-layout="false"/>
+          <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="2" fill="1" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
         <border type="none"/>
@@ -46,7 +46,7 @@
       <xy id="49cf" binding="myComponentPlace" layout-manager="XYLayout" hgap="-1" vgap="-1">
         <margin top="0" left="0" bottom="0" right="0"/>
         <constraints>
-          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="7" hsize-policy="7" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+          <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="7" hsize-policy="7" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
         <border type="none"/>
@@ -79,6 +79,12 @@
           </component>
         </children>
       </grid>
+      <component id="c89fa" class="javax.swing.JSeparator">
+        <constraints>
+          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties/>
+      </component>
     </children>
   </grid>
 </form>
diff --git a/platform/lang-impl/src/com/intellij/execution/impl/SingleConfigurationConfigurable.java b/platform/lang-impl/src/com/intellij/execution/impl/SingleConfigurationConfigurable.java
index 93a8e10c9773..957597304bcc 100644
--- a/platform/lang-impl/src/com/intellij/execution/impl/SingleConfigurationConfigurable.java
+++ b/platform/lang-impl/src/com/intellij/execution/impl/SingleConfigurationConfigurable.java
@@ -239,6 +239,11 @@ public final class SingleConfigurationConfigurable<Config extends RunConfigurati
           updateWarning();
         }
       });
+
+      settingAnchor();
+    }
+
+    private void settingAnchor() {
     }
 
     public final JComponent getWholePanel() {
diff --git a/platform/platform-api/src/com/intellij/openapi/ui/LabeledComponent.java b/platform/platform-api/src/com/intellij/openapi/ui/LabeledComponent.java
index a0b79e36419e..7159f733c243 100644
--- a/platform/platform-api/src/com/intellij/openapi/ui/LabeledComponent.java
+++ b/platform/platform-api/src/com/intellij/openapi/ui/LabeledComponent.java
@@ -32,6 +32,7 @@ public class LabeledComponent<Comp extends JComponent> extends JPanel implements
   private final JBLabel myLabel = new JBLabel();
   private Comp myComponent;
   private String myLabelConstraints = BorderLayout.NORTH;
+  private JComponent myAnchor;
 
   public LabeledComponent() {
     super(new BorderLayout(UIUtil.DEFAULT_HGAP, 2));
@@ -49,6 +50,7 @@ public class LabeledComponent<Comp extends JComponent> extends JPanel implements
   private void insertLabel() {
     remove(myLabel);
     add(myLabel, myLabelConstraints);
+    setAnchor(myLabel);
   }
 
   public void setText(String textWithMnemonic) {
@@ -142,11 +144,12 @@ public class LabeledComponent<Comp extends JComponent> extends JPanel implements
 
   @Override
   public JComponent getAnchor() {
-    return myLabel.getAnchor();
+    return myAnchor;
   }
 
   @Override
   public void setAnchor(@Nullable JComponent labelAnchor) {
+    myAnchor = labelAnchor;
     myLabel.setAnchor(labelAnchor);
   }
 
diff --git a/platform/util/src/com/intellij/util/ui/UIUtil.java b/platform/util/src/com/intellij/util/ui/UIUtil.java
index bb02b5029b25..257fa681b227 100644
--- a/platform/util/src/com/intellij/util/ui/UIUtil.java
+++ b/platform/util/src/com/intellij/util/ui/UIUtil.java
@@ -125,7 +125,7 @@ public class UIUtil {
   public static final Color AQUA_SEPARATOR_BACKGROUND_COLOR = new Color(240, 240, 240);
   public static final Color TRANSPARENT_COLOR = new Color(0, 0, 0, 0);
 
-  public static final int DEFAULT_HGAP = 8;
+  public static final int DEFAULT_HGAP = 10;
   public static final int DEFAULT_VGAP = 4;
   public static final int LARGE_HGAP = 30;
   public static final int LARGE_VGAP = 20;
diff --git a/plugins/android/src/org/jetbrains/android/run/AndroidRunConfigurationEditor.form b/plugins/android/src/org/jetbrains/android/run/AndroidRunConfigurationEditor.form
index 3f54177154cf..07bf420c713a 100644
--- a/plugins/android/src/org/jetbrains/android/run/AndroidRunConfigurationEditor.form
+++ b/plugins/android/src/org/jetbrains/android/run/AndroidRunConfigurationEditor.form
@@ -71,6 +71,9 @@
                   <grid row="2" column="0" row-span="1" col-span="3" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties/>
+                <clientProperties>
+                  <BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$PlainSmallWithIndent"/>
+                </clientProperties>
                 <border type="etched" title-resource-bundle="messages/AndroidBundle" title-key="deployment.target.settings.title"/>
                 <children>
                   <component id="69acb" class="javax.swing.JRadioButton" binding="myEmulatorRadioButton">