From d81030be6e8a1c8165096b9fb1893ee7a31bb149 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Tue, 23 Aug 2011 13:32:54 +0400
Subject: [PATCH 1/6] don't register resource for XSLT in Relax-NG test

---
 .../org/intellij/plugins/relaxNG/RngXmlHighlightingTest.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xml/relaxng/test/org/intellij/plugins/relaxNG/RngXmlHighlightingTest.java b/xml/relaxng/test/org/intellij/plugins/relaxNG/RngXmlHighlightingTest.java
index b21f37c0ee78..25b6c10a400f 100644
--- a/xml/relaxng/test/org/intellij/plugins/relaxNG/RngXmlHighlightingTest.java
+++ b/xml/relaxng/test/org/intellij/plugins/relaxNG/RngXmlHighlightingTest.java
@@ -42,7 +42,7 @@ public class RngXmlHighlightingTest extends HighlightingTestBase {
         final ExternalResourceManagerEx m = ExternalResourceManagerEx.getInstanceEx();
         m.addResource("urn:test:simple.rng", toAbsolutePath("highlighting/simple.rng"));
         m.addResource("urn:test:addressBook", toAbsolutePath("highlighting/rnc/addressbook.rnc"));
-        m.addResource("http://www.w3.org/1999/XSL/Transform", toAbsolutePath("highlighting/relaxng.rng"));
+        //m.addResource("http://www.w3.org/1999/XSL/Transform", toAbsolutePath("highlighting/relaxng.rng"));
         m.addResource("http://www.w3.org/1999/XSL/Format", toAbsolutePath("highlighting/rnc/fo/main.rnc"));
         m.addResource("http://docbook.org/ns/docbook", toAbsolutePath("highlighting/docbook.rng"));
         m.addResource("urn:intelliForm:AttachmentFilter", toAbsolutePath("highlighting/attachment-filter.rng"));

From e5f988b078bde907cf41ee60c8950aac5eb44626 Mon Sep 17 00:00:00 2001
From: Evgeny Zakrevsky <evgeny.zakrevsky@jetbrains.com>
Date: Tue, 23 Aug 2011 14:06:15 +0400
Subject: [PATCH 2/6] UIUtil. applyStyle fix. font size for borders.

---
 .../util/src/com/intellij/util/ui/UIUtil.java    | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/platform/util/src/com/intellij/util/ui/UIUtil.java b/platform/util/src/com/intellij/util/ui/UIUtil.java
index 0fc33f329d8d..7c144205fe6a 100644
--- a/platform/util/src/com/intellij/util/ui/UIUtil.java
+++ b/platform/util/src/com/intellij/util/ui/UIUtil.java
@@ -74,10 +74,9 @@ public class UIUtil {
 
     JComponent c = (JComponent)comp;
 
-    if (SystemInfo.isMac) {
+    if (isUnderAquaLookAndFeel()) {
       c.putClientProperty("JComponent.sizeVariant", style == Style.REGULAR ? "regular" : style == Style.SMALL ? "small" : "mini");
-    }
-    else {
+    } else {
       c.setFont(getFont(style == Style.REGULAR ? FontSize.NORMAL : style == Style.SMALL ? FontSize.SMALL : FontSize.MINI, c.getFont()));
     }
     Container p = c.getParent();
@@ -260,9 +259,9 @@ public class UIUtil {
 
     switch (size) {
       case SMALL:
-        return base.deriveFont(defFont.getSize() * (SystemInfo.isMac ? 0.85f: 0.8f));
+        return base.deriveFont(defFont.getSize() - 2f);
       case MINI:
-        return base.deriveFont(defFont.getSize() * 0.7f);
+        return base.deriveFont(defFont.getSize() - 4f);
       default:
         return base.deriveFont(defFont.getSize());
     }
@@ -270,12 +269,13 @@ public class UIUtil {
 
   @NotNull
   public static Font getBorderFont(@NotNull UIUtil.FontSize size, boolean isBold) {
-    Font defFont = UIUtil.getBorderFont();
+    Font defFont = getBorderFont();
     if (size == UIUtil.FontSize.SMALL) {
+      defFont = defFont.deriveFont(defFont.getSize() - 2f);
       if (isBold) {
-        return defFont.deriveFont((float)Math.max(defFont.getSize() - 2, 11)).deriveFont(Font.BOLD);
+        defFont = defFont.deriveFont(Font.BOLD);
       }
-      return defFont.deriveFont((float)Math.max(defFont.getSize() - 2, 11));
+      return defFont;
     }
     if (isBold) {
       return defFont.deriveFont(Font.BOLD);

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 3/6] 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());

From 0ed308689d164c4caae8a3ca40004522b5644c86 Mon Sep 17 00:00:00 2001
From: Sergey Evdokimov <sergey.evdokimov@jetbrains.com>
Date: Tue, 23 Aug 2011 14:29:17 +0400
Subject: [PATCH 4/6] Method getDomainClass should be add only if grails >= 1.4

---
 .../dynamicMembers/DynamicMemberUtils.java    | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/util/dynamicMembers/DynamicMemberUtils.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/util/dynamicMembers/DynamicMemberUtils.java
index cc51497a12a0..79e5891fd61a 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/util/dynamicMembers/DynamicMemberUtils.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/util/dynamicMembers/DynamicMemberUtils.java
@@ -8,6 +8,8 @@ import com.intellij.psi.scope.PsiScopeProcessor;
 import com.intellij.util.containers.MultiMap;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.plugins.groovy.lang.groovydoc.psi.api.GrDocComment;
+import org.jetbrains.plugins.groovy.lang.groovydoc.psi.api.GrDocTag;
 import org.jetbrains.plugins.groovy.lang.psi.GroovyPsiElement;
 import org.jetbrains.plugins.groovy.lang.psi.GroovyPsiElementFactory;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrField;
@@ -26,6 +28,8 @@ import java.util.concurrent.ConcurrentHashMap;
 
 public class DynamicMemberUtils {
 
+  public static final Key<Map<String, String>> COMMENT_KEY = Key.create("DynamicMemberUtils:COMMENT_KEY");
+  
   private static final Key<ConcurrentHashMap<String, ClassMemberHolder>> KEY = Key.create("DynamicMemberUtils");
 
   private DynamicMemberUtils() {
@@ -82,6 +86,20 @@ public class DynamicMemberUtils {
     return true;
   }
 
+  public static boolean checkVersion(PsiMethod method, String grailsVersion) {
+    String since = getCommentValue(method, "@since");
+    if (since == null) return true;
+
+    return grailsVersion.compareTo(since) >= 0;
+  }
+  
+  @Nullable
+  public static String getCommentValue(PsiMethod method, String commentTagName) {
+    Map<String, String> commentMap = method.getUserData(COMMENT_KEY);
+    if (commentMap == null) return null;
+    return commentMap.get(commentTagName);
+  }
+  
   public static class ClassMemberHolder {
     private final String myClassSource;
 
@@ -140,6 +158,20 @@ public class DynamicMemberUtils {
       for (GrMethod method : psiClass.getGroovyMethods()) {
         PsiMethod dynamicMethod = new GrDynamicMethodWithCache(method, classSource);
 
+        GrDocComment comment = method.getDocComment();
+        if (comment != null) {
+          Map<String, String> commentMap = new HashMap<String, String>();
+          for (GrDocTag tag : comment.getTags()) {
+            String tagText = tag.getText().trim();
+            String valueText = tag.getValueElement().getText().trim();
+            assert tagText.endsWith(valueText);
+            
+            commentMap.put(tagText.substring(0, tagText.length() - valueText.length()).trim(), valueText);
+          }
+          
+          dynamicMethod.putUserData(COMMENT_KEY, commentMap);
+        }
+
         multiMap.putValue(null, dynamicMethod);
         multiMap.putValue(method.getName(), dynamicMethod);
 

From 8ff68533ac6a6a94787eb49349f0425b0de03dd8 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Tue, 23 Aug 2011 12:32:40 +0200
Subject: [PATCH 5/6] Symlink support for Windows (native part)

---
 bin/win/IdeaWin32.dll          | Bin 9216 -> 32768 bytes
 native/IdeaWin32/IdeaWin32.cpp | 217 +++++++++++++++++----------------
 native/IdeaWin32/stdafx.h      |   2 +
 3 files changed, 115 insertions(+), 104 deletions(-)

diff --git a/bin/win/IdeaWin32.dll b/bin/win/IdeaWin32.dll
index 068dd30aecb07b6fded18468ae0e0c345175ef02..9807643f9124aa5728560a362973846264d3ede4 100644
GIT binary patch
literal 32768
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
M{5LLve`yK)56aXdPXGV_

literal 9216
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

diff --git a/native/IdeaWin32/IdeaWin32.cpp b/native/IdeaWin32/IdeaWin32.cpp
index f4ce19c5ee01..8dd09c310cb1 100644
--- a/native/IdeaWin32/IdeaWin32.cpp
+++ b/native/IdeaWin32/IdeaWin32.cpp
@@ -3,20 +3,27 @@
 #include "jni_util.h"
 #include "windows.h"
 
-jfieldID nameId;
+jfieldID nameID;
+jfieldID attributesID;
+jfieldID timestampID;
+jfieldID lengthID;
 
-HANDLE FindFileInner(JNIEnv *env, jstring path, LPWIN32_FIND_DATA lpData) {
-	const jchar* str = env->GetStringChars(path, 0);
-	HANDLE h = FindFirstFile((LPCWSTR)str, lpData);
-	env->ReleaseStringChars(path, str);
-	return h;
+JNIEXPORT void JNICALL Java_com_intellij_openapi_vfs_impl_win32_FileInfo_initIDs(JNIEnv *env, jclass cls) {
+    nameID = env->GetFieldID(cls, "name", "Ljava/lang/String;");
+    attributesID = env->GetFieldID(cls, "attributes", "I");
+    timestampID = env->GetFieldID(cls, "timestamp", "J");
+    lengthID = env->GetFieldID(cls, "length", "J");
 }
 
-bool CopyObjectArray(JNIEnv *env, jobjectArray dst, jobjectArray src,
-                         jint count)
-{
-    int i;
-    for (i=0; i<count; i++) {
+static HANDLE FindFileInner(JNIEnv *env, jstring path, LPWIN32_FIND_DATA lpData) {
+    const jchar* str = env->GetStringChars(path, 0);
+    const HANDLE h = FindFirstFile((LPCWSTR)str, lpData);
+    env->ReleaseStringChars(path, str);
+    return h;
+}
+
+static bool CopyObjectArray(JNIEnv *env, jobjectArray dst, jobjectArray src, jint count) {
+    for (int i = 0; i < count; i++) {
         jobject p = env->GetObjectArrayElement(src, i);
         env->SetObjectArrayElement(dst, i, p);
         env->DeleteLocalRef(p);
@@ -24,121 +31,123 @@ bool CopyObjectArray(JNIEnv *env, jobjectArray dst, jobjectArray src,
     return true;
 }
 
-static LONGLONG
-fileTimeToInt64 (const FILETIME * time)
-{
-    ULARGE_INTEGER _time;
-
-    _time.LowPart = time->dwLowDateTime;
-    _time.HighPart = time->dwHighDateTime;
-
-    return _time.QuadPart;
+static LONGLONG pairToInt64(DWORD lowPart, DWORD highPart) {
+    ULARGE_INTEGER large;
+    large.LowPart = lowPart;
+    large.HighPart = highPart;
+    return large.QuadPart;
 }
 
-jfieldID nameID; 
-jfieldID attributesID;
-jfieldID timestampID;
-jfieldID lengthID;
+#define IS_SET(flags, flag) ((flags & flag) == flag)
 
-jobject CreateFileInfo(JNIEnv *env, LPWIN32_FIND_DATA lpData, jclass cls) {
+static jobject CreateFileInfo(JNIEnv *env, jstring path, bool append, LPWIN32_FIND_DATA lpData, jclass cls) {
+    jobject o = env->AllocObject(cls);
+    if (o == NULL) {
+        return NULL;
+    }
 
-	jobject o = env->AllocObject(cls);
-	if (o == NULL) {
-		return NULL;
-	}
-	jstring fileName = env->NewString((jchar*)lpData->cFileName, (jsize)wcslen(lpData->cFileName));
-	if (fileName == NULL) {
-		return NULL;
-	}
-	env->SetObjectField(o, nameID, fileName);
-	env->SetIntField(o, attributesID, lpData->dwFileAttributes);
-	env->SetLongField(o, timestampID, fileTimeToInt64(&lpData->ftLastWriteTime));
+    jstring fileName = env->NewString((jchar*)lpData->cFileName, (jsize)wcslen(lpData->cFileName));
+    if (fileName == NULL) {
+        return NULL;
+    }
+    env->SetObjectField(o, nameID, fileName);
 
-	ULARGE_INTEGER size;
-	size.LowPart = lpData->nFileSizeLow;
-	size.HighPart = lpData->nFileSizeHigh;
-	env->SetLongField(o, lengthID, size.QuadPart);
-	return o;
-}
+    bool read = false;
+    if (IS_SET(lpData->dwFileAttributes, FILE_ATTRIBUTE_REPARSE_POINT) && IS_SET(lpData->dwReserved0, IO_REPARSE_TAG_SYMLINK)) {
+        int nameLen = env->GetStringLength(path) + wcslen(lpData->cFileName) + 2;
+        wchar_t *lpName = (wchar_t *)malloc(nameLen * sizeof(wchar_t));
 
-JNIEXPORT void JNICALL Java_com_intellij_openapi_vfs_impl_win32_FileInfo_initIDs(JNIEnv *env, jclass cls) {
-	nameID = env->GetFieldID(cls, "name", "Ljava/lang/String;");
-	attributesID = env->GetFieldID(cls, "attributes", "I");
-	timestampID = env->GetFieldID(cls, "timestamp", "J");
-	lengthID = env->GetFieldID(cls, "length", "J");
+        if (lpName != NULL) {
+            const jchar *dirName = env->GetStringChars(path, 0);
+            wcscpy_s(lpName, nameLen, (LPCWSTR)dirName);
+            env->ReleaseStringChars(path, dirName);
+            if (append) {
+                wcscat_s(lpName, nameLen, L"\\");
+                wcscat_s(lpName, nameLen, lpData->cFileName);
+            }
+
+            // read symlink target attributes
+            HANDLE th = CreateFile(lpName, FILE_READ_ATTRIBUTES, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL,
+                                   OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL);
+            if (th != INVALID_HANDLE_VALUE) {
+                BY_HANDLE_FILE_INFORMATION targetData;
+                if (GetFileInformationByHandle(th, &targetData)) {
+                    env->SetIntField(o, attributesID, targetData.dwFileAttributes);
+                    env->SetLongField(o, timestampID, pairToInt64(targetData.ftLastWriteTime.dwLowDateTime, targetData.ftLastWriteTime.dwHighDateTime));
+                    env->SetLongField(o, lengthID, pairToInt64(targetData.nFileSizeLow, targetData.nFileSizeHigh));
+                    read = true;
+                }
+                CloseHandle(th);
+            }
+
+            free(lpName);
+        }
+    }
+
+    if (!read) {
+        env->SetIntField(o, attributesID, lpData->dwFileAttributes);
+        env->SetLongField(o, timestampID, pairToInt64(lpData->ftLastWriteTime.dwLowDateTime, lpData->ftLastWriteTime.dwHighDateTime));
+        env->SetLongField(o, lengthID, pairToInt64(lpData->nFileSizeLow, lpData->nFileSizeHigh));
+    }
+
+    return o;
 }
 
 JNIEXPORT jobject JNICALL Java_com_intellij_openapi_vfs_impl_win32_IdeaWin32_getInfo(JNIEnv *env, jobject method, jstring path) {
-	WIN32_FIND_DATA data;
-	HANDLE h = FindFileInner(env, path, &data);
-	if (h == INVALID_HANDLE_VALUE) {
-	  return NULL;
-	}
-	FindClose(h);	
-	jclass infoClass = env->FindClass("com/intellij/openapi/vfs/impl/win32/FileInfo");
-	return CreateFileInfo(env, &data, infoClass);
+    WIN32_FIND_DATA data;
+    HANDLE h = FindFileInner(env, path, &data);
+    if (h == INVALID_HANDLE_VALUE) {
+        return NULL;
+    }
+    FindClose(h);	
+    jclass infoClass = env->FindClass("com/intellij/openapi/vfs/impl/win32/FileInfo");
+    return CreateFileInfo(env, path, false, &data, infoClass);
 }
 
-JNIEXPORT jboolean JNICALL Java_com_intellij_openapi_vfs_impl_win32_IdeaWin32_checkExist(JNIEnv *env, jobject method, jstring path) {
-	jint result = 0;
-    WIN32_FILE_ATTRIBUTE_DATA wfad;
-	const jchar* str = env->GetStringChars(path, 0);
+JNIEXPORT jobjectArray JNICALL Java_com_intellij_openapi_vfs_impl_win32_IdeaWin32_listChildren(JNIEnv *env, jobject method, jstring path) {
+    WIN32_FIND_DATA data;
+    HANDLE h = FindFileInner(env, path, &data);
+    if (h == INVALID_HANDLE_VALUE) {
+        return NULL;
+    }
 
-    if (GetFileAttributesEx((LPCWSTR)path, GetFileExInfoStandard, &wfad)) return JNI_TRUE;
-	return JNI_FALSE;
-}
+    jobjectArray rv, old;
+    int len = 0, maxlen = 16;
+    jclass infoClass = env->FindClass("com/intellij/openapi/vfs/impl/win32/FileInfo");
+    rv = env->NewObjectArray(maxlen, infoClass, NULL);
+    if (rv == NULL) {
+        goto error;
+    }
 
-JNIEXPORT jobjectArray JNICALL Java_com_intellij_openapi_vfs_impl_win32_IdeaWin32_listChildren(JNIEnv *env, jobject method, jstring path)
-{
-
-  WIN32_FIND_DATA data;
-  HANDLE h = FindFileInner(env, path, &data);
-  if (h == INVALID_HANDLE_VALUE) {
-	  return NULL;
-  }
-
-  jobjectArray rv, old;
-  int len, maxlen;
-
-  len = 0;
-  maxlen = 16;
-  jclass infoClass = env->FindClass("com/intellij/openapi/vfs/impl/win32/FileInfo");
-  rv = env->NewObjectArray(maxlen, infoClass, NULL);
-  if (rv == NULL) goto error;
-  do  {
+    do {
         if (len == maxlen) {
             old = rv;
-            rv = env->NewObjectArray(maxlen <<= 1,
-                                        infoClass, NULL);
-            if (rv == NULL) goto error;
-            if (!CopyObjectArray(env, rv, old, len)) goto error;
+            rv = env->NewObjectArray(maxlen <<= 1, infoClass, NULL);
+            if (rv == NULL || !CopyObjectArray(env, rv, old, len)) {
+                goto error;
+            }
             env->DeleteLocalRef(old);
         }
-		jobject o = CreateFileInfo(env, &data, infoClass);
-	  env->SetObjectArrayElement(rv, len++, o);
-	  env->DeleteLocalRef(o);
-  }
-  while (FindNextFile(h, &data));
+        jobject o = CreateFileInfo(env, path, true, &data, infoClass);
+        env->SetObjectArrayElement(rv, len++, o);
+        env->DeleteLocalRef(o);
+    }
+    while (FindNextFile(h, &data));
 
-  FindClose(h);	
-
-	old = rv;
-	rv = env->NewObjectArray(len, infoClass, NULL);
-	if (rv == NULL) goto error;
-	if (!CopyObjectArray(env, rv, old, len)) goto error;
-	return rv;
+    FindClose(h);	
 
+    old = rv;
+    rv = env->NewObjectArray(len, infoClass, NULL);
+    if (rv == NULL || !CopyObjectArray(env, rv, old, len)) {
+        goto error;
+    }
+    return rv;
 
 error:
-  FindClose(h);	
-  return NULL;
+    FindClose(h);	
+    return NULL;
 }
 
-BOOL APIENTRY DllMain( HMODULE hModule,
-                       DWORD  ul_reason_for_call,
-                       LPVOID lpReserved
-					 )
-{
+BOOL APIENTRY DllMain(HMODULE hModule, DWORD  ul_reason_for_call, LPVOID lpReserved) {
     return TRUE;
 }
-
diff --git a/native/IdeaWin32/stdafx.h b/native/IdeaWin32/stdafx.h
index 2bdfa89d3315..5cb1cb9f9e68 100644
--- a/native/IdeaWin32/stdafx.h
+++ b/native/IdeaWin32/stdafx.h
@@ -26,3 +26,5 @@
 #define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers
 // Windows Header Files:
 #include <windows.h>
+
+#include <malloc.h>

From 7f6c10e7d5a390ede72ee3ec9fb47b9d6c30cdce Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Tue, 23 Aug 2011 12:33:27 +0200
Subject: [PATCH 6/6] Load  IdeaWin32 in tests; cleanup

---
 .../openapi/vfs/impl/win32/IdeaWin32.java     |  7 ++-
 .../openapi/vfs/impl/win32/Win32Kernel.java   |  9 ++--
 .../vfs/impl/win32/Win32LocalFileSystem.java  | 38 ++++++++++-----
 .../vfs/local/SymLinkHandlingTest.java        | 46 +++++++++++++++----
 4 files changed, 68 insertions(+), 32 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/win32/IdeaWin32.java b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/win32/IdeaWin32.java
index b041683762de..3e5e0cf6048a 100644
--- a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/win32/IdeaWin32.java
+++ b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/win32/IdeaWin32.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2011 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,8 +19,7 @@ package com.intellij.openapi.vfs.impl.win32;
  * @author Dmitry Avdeev
  */
 public class IdeaWin32 {
+  public native FileInfo getInfo(String path);
 
-    public native FileInfo getInfo(String path);
-
-    public native FileInfo[] listChildren(String path); 
+  public native FileInfo[] listChildren(String path);
 }
diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/win32/Win32Kernel.java b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/win32/Win32Kernel.java
index 4cda8acc9758..c7fe8b9b2706 100644
--- a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/win32/Win32Kernel.java
+++ b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/win32/Win32Kernel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2011 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,9 +26,8 @@ import java.util.Map;
  * @author Dmitry Avdeev
  */
 public class Win32Kernel {
-
+  public static final int FILE_ATTRIBUTE_READONLY = 0x0001;
   public static final int FILE_ATTRIBUTE_DIRECTORY = 0x0010;
-  public static final int FILE_ATTRIBUTE_READONLY =  0x0001;
 
   private final IdeaWin32 myKernel = new IdeaWin32();
 
@@ -39,7 +38,6 @@ public class Win32Kernel {
   }
 
   public String[] list(String absolutePath) {
-
     FileInfo[] fileInfos = myKernel.listChildren(absolutePath.replace('/', '\\') + "\\*.*");
     if (fileInfos == null) {
       return ArrayUtil.EMPTY_STRING_ARRAY;
@@ -62,7 +60,7 @@ public class Win32Kernel {
   }
 
   public void exists(String path) throws FileNotFoundException {
-      getInfo(path);
+    getInfo(path);
   }
 
   public boolean isDirectory(String path) throws FileNotFoundException {
@@ -88,7 +86,6 @@ public class Win32Kernel {
   private FileInfo getInfo(String path) throws FileNotFoundException {
     FileInfo info = myCache.get(path);
     if (info == null) {
-
       info = myKernel.getInfo(path.replace('/', '\\'));
       if (info == null) {
         throw new FileNotFoundException(path);
diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/win32/Win32LocalFileSystem.java b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/win32/Win32LocalFileSystem.java
index ee771618520f..5490753ea84e 100644
--- a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/win32/Win32LocalFileSystem.java
+++ b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/win32/Win32LocalFileSystem.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2011 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,9 @@
  */
 package com.intellij.openapi.vfs.impl.win32;
 
+import com.intellij.openapi.application.PathManager;
 import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.util.SystemInfo;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.vfs.impl.local.LocalFileSystemBase;
 import org.jetbrains.annotations.NotNull;
@@ -29,18 +31,31 @@ import java.util.Set;
  * @author Dmitry Avdeev
  */
 public class Win32LocalFileSystem extends LocalFileSystemBase {
-
   private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.vfs.impl.win32.Win32LocalFileSystem");
 
   private static boolean ourIsAvailable;
 
   static {
-    try {
-      System.loadLibrary("IdeaWin32");
-      ourIsAvailable = true;
-    }
-    catch (Throwable e) {
-      ourIsAvailable = false;
+    if (SystemInfo.isWindows) {
+      try {
+        System.load(PathManager.getHomePath() + "/community/bin/win/IdeaWin32.dll");
+        ourIsAvailable = true;
+      }
+      catch (Throwable t0) {
+        try {
+          System.load(PathManager.getHomePath() + "/bin/win/IdeaWin32.dll");
+          ourIsAvailable = true;
+        }
+        catch (Throwable t1) {
+          try {
+            System.loadLibrary("IdeaWin32");
+            ourIsAvailable = true;
+          }
+          catch (Throwable t2) {
+            ourIsAvailable = false;
+          }
+        }
+      }
     }
   }
 
@@ -56,7 +71,7 @@ public class Win32LocalFileSystem extends LocalFileSystemBase {
   };
 
   public static Win32LocalFileSystem getWin32Instance() {
-    if (!isAvailable()) throw new RuntimeException("dll is not loaded");
+    if (!isAvailable()) throw new RuntimeException("DLL is not loaded");
     Win32LocalFileSystem fileSystem = THREAD_LOCAL.get();
     fileSystem.myKernel.clearCache();
     return fileSystem;
@@ -65,8 +80,7 @@ public class Win32LocalFileSystem extends LocalFileSystemBase {
   private final Win32Kernel myKernel = new Win32Kernel();
   public static boolean checkMe = false;
 
-  private Win32LocalFileSystem() {
-  }
+  private Win32LocalFileSystem() { }
 
   @NotNull
   @Override
@@ -157,7 +171,7 @@ public class Win32LocalFileSystem extends LocalFileSystemBase {
     }
   }
 
-    @Override
+  @Override
   public WatchRequest addRootToWatch(@NotNull String rootPath, boolean toWatchRecursively) {
     throw new UnsupportedOperationException();
   }
diff --git a/platform/platform-impl/testSrc/com/intellij/openapi/vfs/local/SymLinkHandlingTest.java b/platform/platform-impl/testSrc/com/intellij/openapi/vfs/local/SymLinkHandlingTest.java
index 95c3aae8c9e1..0dfcf29017a3 100644
--- a/platform/platform-impl/testSrc/com/intellij/openapi/vfs/local/SymLinkHandlingTest.java
+++ b/platform/platform-impl/testSrc/com/intellij/openapi/vfs/local/SymLinkHandlingTest.java
@@ -28,22 +28,36 @@ import java.io.File;
 import java.io.IOException;
 
 public class SymLinkHandlingTest extends LightPlatformTestCase {
+  private LocalFileSystem myFileSystem;
+
   @SuppressWarnings("JUnitTestCaseWithNonTrivialConstructors")
   public SymLinkHandlingTest() {
     PlatformTestCase.initPlatformLangPrefix();
   }
 
+  @Override
+  protected void setUp() throws Exception {
+    super.setUp();
+    myFileSystem = LocalFileSystem.getInstance();
+  }
+
+  @Override
+  protected void tearDown() throws Exception {
+    myFileSystem = null;
+    super.tearDown();
+  }
+
   public void testBadLinksAreIgnored() throws Exception {
     if (!SystemInfo.areSymLinksSupported) return;
 
     final File missingFile = new File(FileUtil.getTempDirectory(), "missing_file");
     assertTrue(missingFile.getAbsolutePath(), !missingFile.exists() || missingFile.delete());
     final File missingLinkFile = createTempLink(missingFile.getAbsolutePath(), "missing_link");
-    final VirtualFile missingLinkVFile = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(missingLinkFile);
+    final VirtualFile missingLinkVFile = refreshAndFind(missingLinkFile);
     assertNull(missingLinkVFile);
 
     final File selfLinkFile = createTempLink("self_link", "self_link");
-    final VirtualFile selfLinkVFile = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(selfLinkFile);
+    final VirtualFile selfLinkVFile = refreshAndFind(selfLinkFile);
     assertNull(selfLinkVFile);
   }
 
@@ -52,27 +66,27 @@ public class SymLinkHandlingTest extends LightPlatformTestCase {
 
     final File targetFile = FileUtil.createTempFile("target", "");
     final File linkFile = createTempLink(targetFile.getAbsolutePath(), "link");
-    final VirtualFile linkVFile = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(linkFile);
+    final VirtualFile linkVFile = refreshAndFind(linkFile);
     assertTrue("link=" + linkFile + ", vLink=" + linkVFile, linkVFile != null && !linkVFile.isDirectory() && linkVFile.isSymLink());
 
     assertTrue(targetFile.getAbsolutePath(), targetFile.setWritable(true, false) && targetFile.canWrite());
-    linkVFile.refresh(false, false);
+    refresh();
     assertTrue(linkVFile.getPath(), linkVFile.isWritable());
     assertTrue(targetFile.getAbsolutePath(), targetFile.setWritable(false, false) && !targetFile.canWrite());
-    linkVFile.refresh(false, false);
+    refresh();
     assertFalse(linkVFile.getPath(), linkVFile.isWritable());
 
     final File targetDir = FileUtil.createTempDirectory("targetDir", "");
     final File linkDir = createTempLink(targetDir.getAbsolutePath(), "linkDir");
-    final VirtualFile linkVDir = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(linkDir);
+    final VirtualFile linkVDir = refreshAndFind(linkDir);
     assertTrue("link=" + linkDir + ", vLink=" + linkVDir, linkVDir != null && linkVDir.isDirectory() && linkVDir.isSymLink());
 
     if (!SystemInfo.isWindows) {
       assertTrue(targetDir.getAbsolutePath(), targetDir.setWritable(true, false) && targetDir.canWrite());
-      linkVDir.refresh(false, true);
+      refresh();
       assertTrue(linkVDir.getPath(), linkVDir.isWritable());
       assertTrue(targetDir.getAbsolutePath(), targetDir.setWritable(false, false) && !targetDir.canWrite());
-      linkVDir.refresh(false, true);
+      refresh();
       assertFalse(linkVDir.getPath(), linkVDir.isWritable());
     }
     else {
@@ -85,7 +99,7 @@ public class SymLinkHandlingTest extends LightPlatformTestCase {
 
     final File targetFile = FileUtil.createTempFile("target", "");
     final File linkFile = createTempLink(targetFile.getAbsolutePath(), "link");
-    final VirtualFile linkVFile = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(linkFile);
+    final VirtualFile linkVFile = refreshAndFind(linkFile);
     assertTrue("link=" + linkFile + ", vLink=" + linkVFile, linkVFile != null && !linkVFile.isDirectory() && linkVFile.isSymLink());
 
     AccessToken token = ApplicationManager.getApplication().acquireWriteActionLock(getClass());
@@ -103,7 +117,7 @@ public class SymLinkHandlingTest extends LightPlatformTestCase {
     final File childFile = new File(targetDir, "child.txt");
     assertTrue(childFile.getAbsolutePath(), childFile.exists() || childFile.createNewFile());
     final File linkDir = createTempLink(targetDir.getAbsolutePath(), "linkDir");
-    final VirtualFile linkVDir = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(linkDir);
+    final VirtualFile linkVDir = refreshAndFind(linkDir);
     assertTrue("link=" + linkDir + ", vLink=" + linkVDir,
                linkVDir != null && linkVDir.isDirectory() && linkVDir.isSymLink() && linkVDir.getChildren().length == 1);
 
@@ -143,4 +157,16 @@ public class SymLinkHandlingTest extends LightPlatformTestCase {
     assertEquals("target=" + target + ", link=" + linkFile, targetFile.exists(), linkFile.exists());
     return linkFile;
   }
+
+  private VirtualFile refreshAndFind(final File ioFile) {
+    refresh();
+    return myFileSystem.findFileByPath(ioFile.getAbsolutePath());
+  }
+
+  private void refresh() {
+    final String tempPath = FileUtil.getTempDirectory();
+    final VirtualFile tempDir = myFileSystem.findFileByPath(tempPath);
+    assertNotNull(tempPath, tempDir);
+    tempDir.refresh(false, true);
+  }
 }