From 9cdeb66be9a7296d2bd38e590e708c5c9838711e Mon Sep 17 00:00:00 2001
From: Evgeny Zakrevsky <evgeny.zakrevsky@jetbrains.com>
Date: Tue, 23 Aug 2011 14:14:09 +0400
Subject: [PATCH] Run configaration's form refactored and some other forms too

---
 .../execution/applet/AppletConfigurable.form  | 21 ++++---
 .../application/ApplicationConfigurable.form  | 17 +++---
 .../execution/ui/AlternativeJREPanel.java     | 17 ++++--
 .../ui/CommonJavaParametersPanel.java         |  8 ++-
 .../ExtractMethodObjectPanel.form             |  4 +-
 .../application/options/CodeCompletion.form   | 56 ++++++++++---------
 .../ConfigurationSettingsEditorWrapper.form   |  2 +-
 .../ui/CommonProgramParametersPanel.java      | 25 ++++++++-
 .../intellij/openapi/ui/LabeledComponent.java |  9 ++-
 .../src/com/intellij/ui/TitledSeparator.java  | 15 ++---
 .../pathMacros/PathMacroListEditor.form       | 26 ++++-----
 .../run/AndroidRunConfigurationEditor.form    |  4 +-
 .../run/testing/TestRunParameters.form        | 19 +++----
 .../src/run/PluginRunConfigurationEditor.java |  4 +-
 .../groovy/mvc/MvcRunConfigurationEditor.form |  3 +-
 .../runner/GroovyRunConfigurationEditor.form  | 16 ++----
 .../configuration/JUnitConfigurable.form      |  9 ++-
 .../maven/project/MavenEnvironmentForm.form   | 40 ++++++++++---
 .../project/MavenGeneralConfigurable.form     | 17 +++---
 .../TestNGConfigurationEditor.form            | 16 ++++--
 .../TestNGConfigurationEditor.java            |  1 +
 21 files changed, 206 insertions(+), 123 deletions(-)

diff --git a/java/execution/impl/src/com/intellij/execution/applet/AppletConfigurable.form b/java/execution/impl/src/com/intellij/execution/applet/AppletConfigurable.form
index 6a0c22b8ae78..0e182b599bb7 100644
--- a/java/execution/impl/src/com/intellij/execution/applet/AppletConfigurable.form
+++ b/java/execution/impl/src/com/intellij/execution/applet/AppletConfigurable.form
@@ -3,7 +3,7 @@
   <grid id="e5f4d" binding="myWholePanel" layout-manager="GridLayoutManager" row-count="8" 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="133" y="39" width="564" height="584"/>
+      <xy x="133" y="39" width="708" height="584"/>
     </constraints>
     <properties/>
     <border type="none"/>
@@ -43,7 +43,7 @@
           <componentClass value="com.intellij.openapi.ui.TextFieldWithBrowseButton"/>
           <labelInsets top="0" left="0" bottom="0" right="0"/>
           <labelLocation value="West"/>
-          <labelPreferredSize width="212" height="16"/>
+          <labelPreferredSize width="215" height="16"/>
           <text resource-bundle="messages/ExecutionBundle" key="applet.configuration.policy.file.label"/>
         </properties>
       </component>
@@ -57,7 +57,7 @@
           <componentClass value="com.intellij.ui.RawCommandLineEditor"/>
           <labelInsets top="0" left="0" bottom="0" right="0"/>
           <labelLocation value="West"/>
-          <labelPreferredSize width="212" height="16"/>
+          <labelPreferredSize width="215" height="16"/>
           <text resource-bundle="messages/ExecutionBundle" key="applet.configuration.vm.parameters.for.appletviewer.label"/>
         </properties>
       </component>
@@ -69,6 +69,7 @@
           <componentClass value="javax.swing.JComboBox"/>
           <labelInsets top="0" left="0" bottom="0" right="0"/>
           <labelLocation value="West"/>
+          <labelPreferredSize width="215" height="16"/>
           <text resource-bundle="messages/ExecutionBundle" key="applet.configuration.use.classpath.and.jdk.of.module.label"/>
         </properties>
       </component>
@@ -260,18 +261,20 @@
           <grid row="7" 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="b2d36" class="com.intellij.execution.ui.AlternativeJREPanel" binding="myAlternativeJREPanel">
-        <constraints>
-          <grid row="6" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
-        </constraints>
-        <properties/>
-      </component>
       <component id="9e31a" class="javax.swing.JSeparator">
         <constraints>
           <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="7" hsize-policy="0" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
       </component>
+      <component id="b2d36" class="com.intellij.execution.ui.AlternativeJREPanel" binding="myAlternativeJREPanel">
+        <constraints>
+          <grid row="6" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <checkBoxPreferredSize width="215" height="23"/>
+        </properties>
+      </component>
     </children>
   </grid>
 </form>
diff --git a/java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurable.form b/java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurable.form
index d3c691ce357d..2eb76848a983 100644
--- a/java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurable.form
+++ b/java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurable.form
@@ -3,7 +3,7 @@
   <grid id="93687" binding="myWholePanel" layout-manager="GridLayoutManager" row-count="6" 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="53" y="36" width="596" height="433"/>
+      <xy x="53" y="36" width="708" height="433"/>
     </constraints>
     <properties/>
     <border type="none"/>
@@ -17,17 +17,17 @@
         <constraints>
           <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
         </constraints>
-        <properties/>
+        <properties>
+          <labelsPreferredSize width="215" height="16"/>
+        </properties>
       </component>
       <component id="50d08" class="com.intellij.openapi.ui.LabeledComponent" binding="myMainClass" custom-create="true">
         <constraints>
-          <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false">
-            <preferred-size width="154" height="25"/>
-          </grid>
+          <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <labelLocation value="West"/>
-          <labelPreferredSize width="144" height="16"/>
+          <labelPreferredSize width="215" height="16"/>
           <text resource-bundle="messages/ExecutionBundle" key="application.configuration.main.class.label"/>
         </properties>
       </component>
@@ -38,6 +38,7 @@
         <properties>
           <componentClass value="javax.swing.JComboBox"/>
           <labelLocation value="West"/>
+          <labelPreferredSize width="215" height="16"/>
           <text resource-bundle="messages/ExecutionBundle" key="application.configuration.use.classpath.and.jdk.of.module.label"/>
         </properties>
       </component>
@@ -45,7 +46,9 @@
         <constraints>
           <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
         </constraints>
-        <properties/>
+        <properties>
+          <checkBoxPreferredSize width="215" height="23"/>
+        </properties>
       </component>
       <component id="b45cf" class="javax.swing.JCheckBox" binding="myShowSwingInspectorCheckbox">
         <constraints>
diff --git a/java/execution/impl/src/com/intellij/execution/ui/AlternativeJREPanel.java b/java/execution/impl/src/com/intellij/execution/ui/AlternativeJREPanel.java
index 973cc74c180b..f7a081f79cc7 100644
--- a/java/execution/impl/src/com/intellij/execution/ui/AlternativeJREPanel.java
+++ b/java/execution/impl/src/com/intellij/execution/ui/AlternativeJREPanel.java
@@ -45,9 +45,8 @@ public class AlternativeJREPanel extends JPanel {
     super(new GridBagLayout());
 
     myCbEnabled = new JCheckBox(ExecutionBundle.message("run.configuration.use.alternate.jre.checkbox"));
-    myCbEnabled.setPreferredSize(new Dimension(154, 16));
     final GridBagConstraints gc = new GridBagConstraints(0, 0, 1, 1, 0, 0, GridBagConstraints.WEST,
-                                                         GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 0), 0, 0);
+                                                         GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0);
     add(myCbEnabled, gc);
 
     myFieldWithHistory = new TextFieldWithHistory();
@@ -64,11 +63,13 @@ public class AlternativeJREPanel extends JPanel {
                                         TextComponentAccessor.TEXT_FIELD_WITH_HISTORY_WHOLE_TEXT);
     gc.gridx = 1;
     gc.weightx = 1;
+    gc.fill = GridBagConstraints.HORIZONTAL;
+    gc.insets.left = 10;
     add(myPathField, gc);
     InsertPathAction.addTo(myFieldWithHistory.getTextEditor());
 
-    gc.weighty = 1;
-    add(Box.createVerticalBox(), gc);
+    //gc.weighty = 1;
+    //add(Box.createVerticalBox(), gc);
 
     myCbEnabled.addActionListener(new ActionListener() {
       public void actionPerformed(ActionEvent e) {
@@ -105,4 +106,12 @@ public class AlternativeJREPanel extends JPanel {
     setPathEnabled(isEnabled);
     setPath(path);
   }
+  
+  public void setCheckBoxPreferredSize(Dimension d) {
+    myCbEnabled.setPreferredSize(d);
+  }
+  
+  public Dimension getCheckBoxPreferredSize() {
+    return myCbEnabled.getPreferredSize();
+  }
 }
diff --git a/java/execution/impl/src/com/intellij/execution/ui/CommonJavaParametersPanel.java b/java/execution/impl/src/com/intellij/execution/ui/CommonJavaParametersPanel.java
index 35442ec0d697..de2122fdaae2 100644
--- a/java/execution/impl/src/com/intellij/execution/ui/CommonJavaParametersPanel.java
+++ b/java/execution/impl/src/com/intellij/execution/ui/CommonJavaParametersPanel.java
@@ -19,6 +19,7 @@ import com.intellij.execution.CommonJavaRunConfigurationParameters;
 import com.intellij.execution.ExecutionBundle;
 import com.intellij.openapi.ui.LabeledComponent;
 import com.intellij.ui.RawCommandLineEditor;
+import org.jetbrains.annotations.Nullable;
 
 import java.awt.*;
 
@@ -36,12 +37,17 @@ public class CommonJavaParametersPanel extends CommonProgramParametersPanel {
     copyDialogCaption(myVMParameters);
 
     myVMParameters.setLabelLocation(BorderLayout.WEST);
-    myVMParameters.setLabelPreferredSize(super.getProgramParametersComponent().getLabelPreferredSize());
 
     add(myVMParameters);
     super.addComponents();
   }
 
+  @Override
+  public void setLabelsPreferredSize(Dimension d) {
+    super.setLabelsPreferredSize(d);
+    myVMParameters.setLabelPreferredSize(d);
+  }
+
   public void setVMParameters(String text) {
     myVMParameters.getComponent().setText(text);
   }
diff --git a/java/java-impl/src/com/intellij/refactoring/extractMethodObject/ExtractMethodObjectPanel.form b/java/java-impl/src/com/intellij/refactoring/extractMethodObject/ExtractMethodObjectPanel.form
index 361e2292b919..cc1201f81c73 100644
--- a/java/java-impl/src/com/intellij/refactoring/extractMethodObject/ExtractMethodObjectPanel.form
+++ b/java/java-impl/src/com/intellij/refactoring/extractMethodObject/ExtractMethodObjectPanel.form
@@ -3,7 +3,7 @@
   <grid id="27dc6" binding="myWholePanel" layout-manager="GridLayoutManager" row-count="9" 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="35" y="92" width="544" height="389"/>
+      <xy x="35" y="92" width="544" height="396"/>
     </constraints>
     <properties/>
     <border type="none"/>
@@ -170,6 +170,7 @@
           <grid row="7" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="7" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
+          <smallFont value="true"/>
           <text value="Signature preview"/>
         </properties>
       </component>
@@ -186,6 +187,7 @@
           <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="7" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
+          <smallFont value="true"/>
           <text value="Parameters"/>
         </properties>
       </component>
diff --git a/platform/lang-impl/src/com/intellij/application/options/CodeCompletion.form b/platform/lang-impl/src/com/intellij/application/options/CodeCompletion.form
index 2506873a81ce..d2ad379b5095 100644
--- a/platform/lang-impl/src/com/intellij/application/options/CodeCompletion.form
+++ b/platform/lang-impl/src/com/intellij/application/options/CodeCompletion.form
@@ -18,7 +18,7 @@
         <properties/>
         <border type="none"/>
         <children>
-          <grid id="7f988" layout-manager="GridLayoutManager" row-count="11" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+          <grid id="7f988" layout-manager="GridLayoutManager" row-count="10" 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>
               <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"/>
@@ -135,38 +135,44 @@
                 </constraints>
                 <properties/>
               </component>
-              <component id="749a1" class="javax.swing.JCheckBox" binding="myCbAutopopupJavaDoc">
-                <constraints>
-                  <grid row="9" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-                </constraints>
-                <properties>
-                  <margin top="2" left="2" bottom="0" right="2"/>
-                  <text resource-bundle="messages/ApplicationBundle" key="editbox.autopopup.javadoc.in.ms"/>
-                </properties>
-              </component>
-              <component id="b0975" class="com.intellij.ui.components.JBLabel">
-                <constraints>
-                  <grid row="10" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="5" fill="0" indent="0" use-parent-layout="false"/>
-                </constraints>
-                <properties>
-                  <horizontalAlignment value="4"/>
-                  <style value="SMALL"/>
-                  <text value="For explicitly invoked completion"/>
-                </properties>
-              </component>
               <component id="a1f3b" class="javax.swing.JTextField" binding="myAutopopupJavaDocField">
                 <constraints>
-                  <grid row="9" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="9" fill="0" indent="0" use-parent-layout="false">
-                    <minimum-size width="50" height="-1"/>
-                    <preferred-size width="144" height="28"/>
-                    <maximum-size width="50" height="-1"/>
-                  </grid>
+                  <grid row="9" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="9" fill="0" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties>
                   <columns value="4"/>
                   <text value="1000"/>
                 </properties>
               </component>
+              <grid id="f8961" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="0">
+                <margin top="0" left="0" bottom="0" right="0"/>
+                <constraints>
+                  <grid row="9" 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/>
+                <border type="none"/>
+                <children>
+                  <component id="749a1" class="javax.swing.JCheckBox" binding="myCbAutopopupJavaDoc">
+                    <constraints>
+                      <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+                    </constraints>
+                    <properties>
+                      <margin top="2" left="2" bottom="0" right="2"/>
+                      <text resource-bundle="messages/ApplicationBundle" key="editbox.autopopup.javadoc.in.ms"/>
+                    </properties>
+                  </component>
+                  <component id="b0975" class="com.intellij.ui.components.JBLabel">
+                    <constraints>
+                      <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="5" fill="0" indent="0" use-parent-layout="false"/>
+                    </constraints>
+                    <properties>
+                      <horizontalAlignment value="4"/>
+                      <style value="SMALL"/>
+                      <text value="For explicitly invoked completion"/>
+                    </properties>
+                  </component>
+                </children>
+              </grid>
             </children>
           </grid>
           <grid id="8dae3" layout-manager="GridLayoutManager" row-count="2" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
diff --git a/platform/lang-impl/src/com/intellij/execution/impl/ConfigurationSettingsEditorWrapper.form b/platform/lang-impl/src/com/intellij/execution/impl/ConfigurationSettingsEditorWrapper.form
index 5e48ae721831..b031eaccf6da 100644
--- a/platform/lang-impl/src/com/intellij/execution/impl/ConfigurationSettingsEditorWrapper.form
+++ b/platform/lang-impl/src/com/intellij/execution/impl/ConfigurationSettingsEditorWrapper.form
@@ -28,7 +28,7 @@
         </constraints>
         <properties/>
         <clientProperties>
-          <BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$BoldWithIndent"/>
+          <BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$SimpleWithIndent"/>
         </clientProperties>
         <border type="etched" title-resource-bundle="messages/ExecutionBundle" title-key="before.launch.panel.title"/>
         <children/>
diff --git a/platform/lang-impl/src/com/intellij/execution/ui/CommonProgramParametersPanel.java b/platform/lang-impl/src/com/intellij/execution/ui/CommonProgramParametersPanel.java
index 495a6ece9d23..d783d2a7899b 100644
--- a/platform/lang-impl/src/com/intellij/execution/ui/CommonProgramParametersPanel.java
+++ b/platform/lang-impl/src/com/intellij/execution/ui/CommonProgramParametersPanel.java
@@ -27,6 +27,7 @@ import com.intellij.openapi.module.Module;
 import com.intellij.openapi.ui.FixedSizeButton;
 import com.intellij.openapi.ui.LabeledComponent;
 import com.intellij.openapi.ui.TextFieldWithBrowseButton;
+import com.intellij.openapi.ui.VerticalFlowLayout;
 import com.intellij.openapi.ui.popup.JBPopup;
 import com.intellij.openapi.ui.popup.JBPopupFactory;
 import com.intellij.openapi.util.IconLoader;
@@ -34,6 +35,8 @@ import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.ui.RawCommandLineEditor;
 import com.intellij.ui.components.JBList;
 import com.intellij.util.ArrayUtil;
+import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 import java.awt.*;
@@ -53,9 +56,12 @@ public class CommonProgramParametersPanel extends JPanel {
   private Module myModuleContext = null;
   private boolean myHaveModuleContext = false;
 
+  protected static final Dimension notSpecifiedSize = new Dimension(-1, -1);
+  protected Dimension labelsPreferredSize = notSpecifiedSize;
+
   public CommonProgramParametersPanel() {
     super();
-    setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
+    setLayout(new VerticalFlowLayout(VerticalFlowLayout.MIDDLE, 0, 5, true, false));
     
     initComponents();
     copyDialogCaption(myProgramParametersComponent);
@@ -106,8 +112,6 @@ public class CommonProgramParametersPanel extends JPanel {
     myEnvVariablesComponent.setLabelLocation(BorderLayout.WEST);
     myProgramParametersComponent.setLabelLocation(BorderLayout.WEST);
     myWorkingDirectoryComponent.setLabelLocation(BorderLayout.WEST);
-    myProgramParametersComponent.setLabelPreferredSize(new Dimension(myEnvVariablesComponent.getLabelPreferredSize().width - 4, myEnvVariablesComponent.getLabelPreferredSize().height));
-    myWorkingDirectoryComponent.setLabelPreferredSize(myProgramParametersComponent.getLabelPreferredSize());
 
     addComponents();
 
@@ -167,4 +171,19 @@ public class CommonProgramParametersPanel extends JPanel {
     myEnvVariablesComponent.setEnvs(configuration.getEnvs());
     myEnvVariablesComponent.setPassParentEnvs(configuration.isPassParentEnvs());
   }
+
+  public void setLabelsPreferredSize(Dimension d) {
+    if (notSpecifiedSize.equals(d)) {
+      d = null;
+    }
+    labelsPreferredSize = d;
+    myEnvVariablesComponent.setLabelPreferredSize(d);
+    myProgramParametersComponent.setLabelPreferredSize(d);
+    myWorkingDirectoryComponent.setLabelPreferredSize(d);
+  }
+
+  @Nullable
+  public Dimension getLabelsPreferredSize() {
+    return labelsPreferredSize;
+  }
 }
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 07665c4a2ad1..dbdd2fe79cd7 100644
--- a/platform/platform-api/src/com/intellij/openapi/ui/LabeledComponent.java
+++ b/platform/platform-api/src/com/intellij/openapi/ui/LabeledComponent.java
@@ -31,6 +31,9 @@ public class LabeledComponent<Comp extends JComponent> extends JPanel {
   private Comp myComponent;
   private String myLabelConstraints = BorderLayout.NORTH;
 
+  private static final Dimension notSpecifiedSize = new Dimension(-1, -1);
+  private Dimension labelPreferredSize = notSpecifiedSize;
+
   public LabeledComponent() {
     super(new BorderLayout(AbstractLayout.DEFAULT_HGAP, AbstractLayout.DEFAULT_VGAP));
     insertLabel();
@@ -50,11 +53,15 @@ public class LabeledComponent<Comp extends JComponent> extends JPanel {
   }
 
   public void setLabelPreferredSize(Dimension d) {
+    if (notSpecifiedSize.equals(d)) {
+      d = null;
+    }
+    labelPreferredSize = d;
     myLabel.setPreferredSize(d);
   }
 
   public Dimension getLabelPreferredSize() {
-    return myLabel.getPreferredSize();
+    return labelPreferredSize;
   }
 
   public void setText(String textWithMnemonic) {
diff --git a/platform/platform-api/src/com/intellij/ui/TitledSeparator.java b/platform/platform-api/src/com/intellij/ui/TitledSeparator.java
index 09c18e2c4adb..e6e6ae11a215 100644
--- a/platform/platform-api/src/com/intellij/ui/TitledSeparator.java
+++ b/platform/platform-api/src/com/intellij/ui/TitledSeparator.java
@@ -36,24 +36,25 @@ public class TitledSeparator extends JPanel {
   public TitledSeparator(String text) {
     this(text, false, true);
   }
-  
+
   public TitledSeparator(String text, boolean boldFont, boolean smallFont) {
     setLayout(new GridBagLayout());
+
     this.myLabel = new JLabel();
     add(myLabel, new GridBagConstraints(0, 0, 1, 1, 0, 1, GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 0, 0, 8), 0, 0));
-    Color oldColor = UIManager.getColor("Separator.foreground");
-    UIManager.put("Separator.foreground", UIUtil.getBorderColor());
+
     JSeparator separator = new JSeparator(SwingConstants.HORIZONTAL);
-    UIManager.put("Separator.foreground", oldColor);
+    separator.setForeground(UIUtil.getBorderColor());
     add(separator,
         new GridBagConstraints(1, 0, GridBagConstraints.REMAINDER, 1, 1, 1, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL,
                                new Insets(3, 0, 0, 0), 0, 0));
-    setBorder(IdeBorderFactory.createEmptyBorder(3, 0, 5, 5));
 
-    setTitleFont(UIUtil.getBorderFont(smallFont ? UIUtil.FontSize.SMALL : UIUtil.FontSize.NORMAL, boldFont));
+    setBorder(IdeBorderFactory.createEmptyBorder(5, 0, 5, 5));
+
+    myLabel.setFont(UIUtil.getBorderFont(smallFont ? UIUtil.FontSize.SMALL : UIUtil.FontSize.NORMAL, boldFont));
+    myLabel.setText(text);
     this.boldFont = boldFont;
     this.smallFont = smallFont;
-    setText(text);
   }
 
   public String getText() {
diff --git a/platform/platform-impl/src/com/intellij/application/options/pathMacros/PathMacroListEditor.form b/platform/platform-impl/src/com/intellij/application/options/pathMacros/PathMacroListEditor.form
index 7f7c4ab2c5bd..a7a1454e8230 100644
--- a/platform/platform-impl/src/com/intellij/application/options/pathMacros/PathMacroListEditor.form
+++ b/platform/platform-impl/src/com/intellij/application/options/pathMacros/PathMacroListEditor.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.application.options.pathMacros.PathMacroListEditor">
-  <grid id="f12c5" binding="myPanel" layout-manager="GridLayoutManager" row-count="2" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+  <grid id="f12c5" binding="myPanel" 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="0" bottom="0" right="0"/>
     <constraints>
       <xy x="33" y="34" width="588" height="355"/>
@@ -10,14 +10,16 @@
     <children>
       <component id="10b63" class="com.intellij.ui.components.JBScrollPane" binding="myScrollPane">
         <constraints>
-          <grid row="0" 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="0" column="0" row-span="1" col-span="1" vsize-policy="7" hsize-policy="7" anchor="0" fill="3" indent="0" use-parent-layout="false">
+            <minimum-size width="-1" height="200"/>
+          </grid>
         </constraints>
         <properties/>
       </component>
       <grid id="6e973" 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>
-          <grid row="0" column="2" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+          <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties/>
         <border type="none"/>
@@ -55,17 +57,10 @@
           </vspacer>
         </children>
       </grid>
-      <vspacer id="f7f12">
-        <constraints>
-          <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false">
-            <minimum-size width="-1" height="200"/>
-          </grid>
-        </constraints>
-      </vspacer>
-      <grid id="972af" layout-manager="GridLayoutManager" row-count="2" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+      <grid id="972af" layout-manager="GridLayoutManager" row-count="2" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="0">
         <margin top="0" left="0" bottom="0" right="0"/>
         <constraints>
-          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+          <grid row="1" 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"/>
@@ -86,12 +81,13 @@
             </constraints>
             <properties/>
           </component>
-          <component id="295b9" class="javax.swing.JLabel">
+          <component id="557df" class="com.intellij.ui.components.JBLabel">
             <constraints>
-              <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+              <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="5" fill="0" indent="0" use-parent-layout="false"/>
             </constraints>
             <properties>
-              <text value="Use ; to separate ignored variables."/>
+              <style value="SMALL"/>
+              <text value="use ; to separate ignored variables"/>
             </properties>
           </component>
         </children>
diff --git a/plugins/android/src/org/jetbrains/android/run/AndroidRunConfigurationEditor.form b/plugins/android/src/org/jetbrains/android/run/AndroidRunConfigurationEditor.form
index 0be0894ddcb9..72830af20906 100644
--- a/plugins/android/src/org/jetbrains/android/run/AndroidRunConfigurationEditor.form
+++ b/plugins/android/src/org/jetbrains/android/run/AndroidRunConfigurationEditor.form
@@ -3,7 +3,7 @@
   <grid id="27dc6" binding="myPanel" layout-manager="GridLayoutManager" row-count="2" 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="20" y="20" width="430" height="330"/>
+      <xy x="20" y="20" width="707" height="413"/>
     </constraints>
     <properties/>
     <border type="none"/>
@@ -66,6 +66,7 @@
                 </constraints>
                 <properties>
                   <componentClass value="com.intellij.ui.ComboboxWithBrowseButton"/>
+                  <labelLocation value="West"/>
                   <text value="&amp;Prefer Android Virtual Device for deployment"/>
                 </properties>
               </component>
@@ -101,6 +102,7 @@
                     </constraints>
                     <properties>
                       <componentClass value="com.intellij.ui.RawCommandLineEditor"/>
+                      <labelLocation value="West"/>
                       <text resource-bundle="messages/AndroidBundle" key="android.run.configuration.command.line.label"/>
                     </properties>
                   </component>
diff --git a/plugins/android/src/org/jetbrains/android/run/testing/TestRunParameters.form b/plugins/android/src/org/jetbrains/android/run/testing/TestRunParameters.form
index 25c888f56fc9..36c9e94c2b74 100644
--- a/plugins/android/src/org/jetbrains/android/run/testing/TestRunParameters.form
+++ b/plugins/android/src/org/jetbrains/android/run/testing/TestRunParameters.form
@@ -1,18 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="org.jetbrains.android.run.testing.TestRunParameters">
-  <grid id="27dc6" binding="myPanel" layout-manager="GridLayoutManager" row-count="5" column-count="6" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="10">
+  <grid id="27dc6" binding="myPanel" layout-manager="GridLayoutManager" row-count="5" column-count="6" 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="475" height="272"/>
+      <xy x="20" y="20" width="475" height="187"/>
     </constraints>
     <properties/>
     <border type="none"/>
     <children>
       <component id="cacd8" class="javax.swing.JRadioButton" binding="myAllInPackageButton">
         <constraints>
-          <grid row="0" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false">
-            <preferred-size width="92" height="45"/>
-          </grid>
+          <grid row="0" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <actionCommand resource-bundle="messages/ExecutionBundle" key="jnit.configuration.all.tests.in.package.radio"/>
@@ -21,9 +19,7 @@
       </component>
       <component id="45298" class="javax.swing.JRadioButton" binding="myClassButton">
         <constraints>
-          <grid row="0" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false">
-            <preferred-size width="52" height="45"/>
-          </grid>
+          <grid row="0" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <actionCommand resource-bundle="messages/ExecutionBundle" key="junit.configuration.test.class.radio"/>
@@ -34,9 +30,7 @@
       </component>
       <component id="43d58" class="javax.swing.JRadioButton" binding="myTestMethodButton">
         <constraints>
-          <grid row="0" column="4" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false">
-            <preferred-size width="63" height="45"/>
-          </grid>
+          <grid row="0" column="4" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <actionCommand resource-bundle="messages/ExecutionBundle" key="junit.configuration.test.method.radio"/>
@@ -47,7 +41,7 @@
       <component id="23c94" 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">
-            <preferred-size width="29" height="45"/>
+            <preferred-size width="29" height="30"/>
           </grid>
         </constraints>
         <properties>
@@ -109,6 +103,7 @@
         <properties>
           <componentClass value="com.intellij.openapi.ui.TextFieldWithBrowseButton"/>
           <enabled value="true"/>
+          <labelLocation value="West"/>
           <text resource-bundle="messages/AndroidBundle" key="android.test.run.configuration.instrumentation.label"/>
         </properties>
       </component>
diff --git a/plugins/devkit/src/run/PluginRunConfigurationEditor.java b/plugins/devkit/src/run/PluginRunConfigurationEditor.java
index e583397b813d..0bcbfb99be04 100644
--- a/plugins/devkit/src/run/PluginRunConfigurationEditor.java
+++ b/plugins/devkit/src/run/PluginRunConfigurationEditor.java
@@ -141,7 +141,9 @@ public class PluginRunConfigurationEditor extends SettingsEditor<PluginRunConfig
     myProgramParameters.setComponent(new RawCommandLineEditor());
     myProgramParameters.getComponent().setDialogCaption(myProgramParameters.getRawText());
     myProgramParameters.setLabelLocation(BorderLayout.WEST);
-    myVMParameters.setLabelPreferredSize(new Dimension(myProgramParameters.getLabelPreferredSize().width - 4, myProgramParameters.getLabelPreferredSize().height));
+
+    myProgramParameters.setLabelPreferredSize(myProgramParameters.getLabelPreferredSize());
+    myVMParameters.setLabelPreferredSize(myProgramParameters.getLabelPreferredSize());
 
 
     GridBagConstraints gc = new GridBagConstraints(0, GridBagConstraints.RELATIVE, 2, 1, 1, 0, GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, new Insets(5, 0, 5, 0), 0, 0);
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcRunConfigurationEditor.form b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcRunConfigurationEditor.form
index 812eb385d51b..d7adedd8b7f3 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcRunConfigurationEditor.form
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcRunConfigurationEditor.form
@@ -19,7 +19,7 @@
       <component id="bb2b7" class="javax.swing.JLabel">
         <constraints>
           <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false">
-            <preferred-size width="144" height="-1"/>
+            <preferred-size width="145" height="-1"/>
           </grid>
         </constraints>
         <properties>
@@ -79,6 +79,7 @@
         </constraints>
         <properties>
           <labelLocation value="West"/>
+          <labelPreferredSize width="145" height="16"/>
         </properties>
       </component>
     </children>
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyRunConfigurationEditor.form b/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyRunConfigurationEditor.form
index b3a3c9d424a4..0d54583af6a3 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyRunConfigurationEditor.form
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyRunConfigurationEditor.form
@@ -55,7 +55,6 @@
             </constraints>
             <properties>
               <selected value="false"/>
-              <text resource-bundle="org/jetbrains/plugins/groovy/GroovyBundle" key="debug.option"/>
             </properties>
           </component>
           <hspacer id="317a0">
@@ -71,13 +70,12 @@
         </constraints>
         <properties>
           <labelLocation value="West"/>
+          <labelPreferredSize width="145" height="16"/>
         </properties>
       </component>
       <component id="5f62b" class="javax.swing.JLabel">
         <constraints>
-          <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false">
-            <preferred-size width="144" height="-1"/>
-          </grid>
+          <grid row="3" 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="Script Parameters:"/>
@@ -85,9 +83,7 @@
       </component>
       <component id="c5c05" class="javax.swing.JLabel">
         <constraints>
-          <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false">
-            <preferred-size width="144" height="-1"/>
-          </grid>
+          <grid row="2" 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="VM Options:"/>
@@ -95,9 +91,7 @@
       </component>
       <component id="86e25" class="javax.swing.JLabel">
         <constraints>
-          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false">
-            <preferred-size width="144" height="-1"/>
-          </grid>
+          <grid row="1" 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>
           <labelFor value="d1e7d"/>
@@ -113,7 +107,7 @@
       <component id="5194" 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">
-            <preferred-size width="144" height="-1"/>
+            <preferred-size width="145" height="-1"/>
           </grid>
         </constraints>
         <properties>
diff --git a/plugins/junit/src/com/intellij/execution/junit2/configuration/JUnitConfigurable.form b/plugins/junit/src/com/intellij/execution/junit2/configuration/JUnitConfigurable.form
index 1b1617ebcb38..0761fbe4bcda 100644
--- a/plugins/junit/src/com/intellij/execution/junit2/configuration/JUnitConfigurable.form
+++ b/plugins/junit/src/com/intellij/execution/junit2/configuration/JUnitConfigurable.form
@@ -224,7 +224,9 @@
             <constraints>
               <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
             </constraints>
-            <properties/>
+            <properties>
+              <labelsPreferredSize width="213" height="16"/>
+            </properties>
           </component>
           <component id="350c9" class="com.intellij.openapi.ui.LabeledComponent" binding="myModule">
             <constraints>
@@ -235,6 +237,7 @@
               <enabled value="true"/>
               <labelInsets top="7" left="0" bottom="2" right="0"/>
               <labelLocation value="West"/>
+              <labelPreferredSize width="213" height="25"/>
               <text resource-bundle="messages/ExecutionBundle" key="junit.configuration.use.classpath.and.jdk.of.module.label"/>
             </properties>
           </component>
@@ -242,7 +245,9 @@
             <constraints>
               <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
             </constraints>
-            <properties/>
+            <properties>
+              <checkBoxPreferredSize width="213" height="23"/>
+            </properties>
           </component>
         </children>
       </grid>
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenEnvironmentForm.form b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenEnvironmentForm.form
index 49cd3eee3d6f..324e6a67e580 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenEnvironmentForm.form
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenEnvironmentForm.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.idea.maven.project.MavenEnvironmentForm">
-  <grid id="27dc6" binding="panel" 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="panel" layout-manager="GridLayoutManager" row-count="6" 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="434" height="172"/>
+      <xy x="20" y="20" width="568" height="225"/>
     </constraints>
     <properties/>
     <border type="none"/>
@@ -14,21 +14,25 @@
         </constraints>
         <properties>
           <componentClass value="com.intellij.openapi.ui.TextFieldWithBrowseButton"/>
-          <text value="Maven &amp;home directory (M2_HOME is used by default)"/>
+          <labelLocation value="West"/>
+          <labelPreferredSize width="190" height="16"/>
+          <text value="Maven &amp;home directory"/>
         </properties>
       </component>
       <component id="7c064" class="com.intellij.openapi.ui.LabeledComponent" binding="settingsFileComponent">
         <constraints>
-          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="7" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+          <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="7" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <componentClass value="com.intellij.openapi.ui.TextFieldWithBrowseButton"/>
+          <labelLocation value="West"/>
+          <labelPreferredSize width="190" height="16"/>
           <text value="User &amp;settings file"/>
         </properties>
       </component>
       <component id="3d84d" class="javax.swing.JCheckBox" binding="settingsOverrideCheckBox">
         <constraints>
-          <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="6" fill="0" indent="0" use-parent-layout="false"/>
+          <grid row="3" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="6" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <text value="Override"/>
@@ -44,26 +48,46 @@
       </component>
       <vspacer id="9e56d">
         <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="5" 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="fa492" class="com.intellij.openapi.ui.LabeledComponent" binding="localRepositoryComponent">
         <constraints>
-          <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="7" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
+          <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="7" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <componentClass value="com.intellij.openapi.ui.TextFieldWithBrowseButton"/>
+          <labelLocation value="West"/>
+          <labelPreferredSize width="190" height="16"/>
           <text value="Local &amp;repository"/>
         </properties>
       </component>
       <component id="d8828" class="javax.swing.JCheckBox" binding="localRepositoryOverrideCheckBox">
         <constraints>
-          <grid row="2" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="6" fill="0" indent="0" use-parent-layout="false"/>
+          <grid row="4" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="6" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <text value="Override"/>
         </properties>
       </component>
+      <component id="4becc" class="com.intellij.ui.components.JBLabel">
+        <constraints>
+          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="5" fill="0" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <style value="SMALL"/>
+          <text value="M2_HOME is used by default"/>
+        </properties>
+      </component>
+      <vspacer id="7e28">
+        <constraints>
+          <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false">
+            <minimum-size width="-1" height="15"/>
+            <preferred-size width="-1" height="15"/>
+            <maximum-size width="-1" height="15"/>
+          </grid>
+        </constraints>
+      </vspacer>
     </children>
   </grid>
 </form>
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenGeneralConfigurable.form b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenGeneralConfigurable.form
index 30e31a7549c3..0de2154e7246 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenGeneralConfigurable.form
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenGeneralConfigurable.form
@@ -3,7 +3,7 @@
   <grid id="27dc6" binding="panel" layout-manager="GridLayoutManager" row-count="11" column-count="3" 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="455" height="436"/>
+      <xy x="20" y="20" width="455" height="451"/>
     </constraints>
     <properties/>
     <border type="none"/>
@@ -16,7 +16,7 @@
         </constraints>
         <properties>
           <labelFor value="ca510"/>
-          <text value="Output &amp;level"/>
+          <text value="Output &amp;level:"/>
         </properties>
       </component>
       <component id="ca510" class="javax.swing.JComboBox" binding="outputLevelCombo">
@@ -31,7 +31,7 @@
         </constraints>
         <properties>
           <labelFor value="14e1e"/>
-          <text value="&amp;Checksum policy"/>
+          <text value="&amp;Checksum policy:"/>
         </properties>
       </component>
       <component id="14e1e" class="javax.swing.JComboBox" binding="checksumPolicyCombo">
@@ -42,11 +42,14 @@
       </component>
       <component id="83fac" class="javax.swing.JLabel">
         <constraints>
-          <grid row="6" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+          <grid row="6" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false">
+            <minimum-size width="190" height="-1"/>
+            <preferred-size width="190" height="-1"/>
+          </grid>
         </constraints>
         <properties>
           <labelFor value="c58ed"/>
-          <text value="Multiproject build &amp;fail policy"/>
+          <text value="Multiproject build &amp;fail policy:"/>
         </properties>
       </component>
       <component id="c58ed" class="javax.swing.JComboBox" binding="failPolicyCombo">
@@ -61,7 +64,7 @@
         </constraints>
         <properties>
           <labelFor value="4e889"/>
-          <text value="&amp;Plugin update policy"/>
+          <text value="&amp;Plugin update policy:"/>
         </properties>
       </component>
       <component id="4e889" class="javax.swing.JComboBox" binding="pluginUpdatePolicyCombo">
@@ -128,7 +131,7 @@
         </constraints>
         <properties>
           <labelFor value="4e889"/>
-          <text value="&amp;Snapshot update policy"/>
+          <text value="&amp;Snapshot update policy:"/>
         </properties>
       </component>
       <component id="5b29b" class="javax.swing.JComboBox" binding="snapshotUpdatePolicyCombo">
diff --git a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationEditor.form b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationEditor.form
index 01045803e59f..fb47f583ebed 100644
--- a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationEditor.form
+++ b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationEditor.form
@@ -49,7 +49,7 @@
             </constraints>
             <properties>
               <labelLocation value="West"/>
-              <labelPreferredSize width="108" height="16"/>
+              <labelPreferredSize width="109" height="16"/>
               <text value="M&amp;ethod"/>
             </properties>
           </component>
@@ -59,7 +59,7 @@
             </constraints>
             <properties>
               <labelLocation value="West"/>
-              <labelPreferredSize width="108" height="16"/>
+              <labelPreferredSize width="109" height="16"/>
               <text value="&amp;Suite"/>
             </properties>
           </component>
@@ -85,7 +85,7 @@
                 </constraints>
                 <properties>
                   <labelLocation value="West"/>
-                  <labelPreferredSize width="108" height="16"/>
+                  <labelPreferredSize width="109" height="16"/>
                   <text value="Packa&amp;ge"/>
                 </properties>
               </component>
@@ -124,7 +124,7 @@
             </constraints>
             <properties>
               <labelLocation value="West"/>
-              <labelPreferredSize width="108" height="16"/>
+              <labelPreferredSize width="109" height="16"/>
               <text value="&amp;Class"/>
             </properties>
           </component>
@@ -134,6 +134,7 @@
             </constraints>
             <properties>
               <labelLocation value="West"/>
+              <labelPreferredSize width="109" height="16"/>
               <text value="&amp;Output directory"/>
             </properties>
           </component>
@@ -143,7 +144,7 @@
             </constraints>
             <properties>
               <labelLocation value="West"/>
-              <labelPreferredSize width="108" height="16"/>
+              <labelPreferredSize width="109" height="16"/>
               <text value="&amp;Group"/>
             </properties>
           </component>
@@ -172,6 +173,7 @@
                 </constraints>
                 <properties>
                   <labelLocation value="West"/>
+                  <labelPreferredSize width="213" height="16"/>
                   <text value="Use classpath and JDK of m&amp;odule"/>
                 </properties>
               </component>
@@ -179,7 +181,9 @@
                 <constraints>
                   <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
                 </constraints>
-                <properties/>
+                <properties>
+                  <checkBoxPreferredSize width="213" height="23"/>
+                </properties>
               </component>
               <grid id="f5de" binding="commonParametersPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
                 <constraints>
diff --git a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationEditor.java b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationEditor.java
index 100d9cfd2d45..23c3f9194df3 100644
--- a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationEditor.java
+++ b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationEditor.java
@@ -119,6 +119,7 @@ public class TestNGConfigurationEditor extends SettingsEditor<TestNGConfiguratio
     createView();
     moduleSelector = new ConfigurationModuleSelector(project, getModulesComponent());
     commonJavaParameters.setModuleContext(moduleSelector.getModule());
+    commonJavaParameters.setLabelsPreferredSize(moduleClasspath.getLabelPreferredSize());
     moduleClasspath.getComponent().addActionListener(new ActionListener() {
       public void actionPerformed(ActionEvent e) {
         commonJavaParameters.setModuleContext(moduleSelector.getModule());