From ea734c47a93209fde50e533114be8ec26bc1f9f7 Mon Sep 17 00:00:00 2001
From: Ivan Bessonov <ivan.bessonov@jetbrains.com>
Date: Fri, 29 Jan 2016 15:54:13 +0300
Subject: [PATCH] IDEA-150559 - GWT - support of "Working directory" option in
 run configuration. Minor refactoring of CommonProgramParametersPanel and
 CommonJavaParametersPanel

---
 .../execution/ui/CommonJavaParametersPanel.java       | 11 +++++++++++
 .../execution/ui/CommonProgramParametersPanel.java    |  9 +++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

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 608bc40c832e..fb30f751dc6b 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 com.intellij.util.ui.UIUtil;
 
 import javax.swing.*;
 import java.awt.*;
@@ -50,12 +51,22 @@ public class CommonJavaParametersPanel extends CommonProgramParametersPanel {
     return myVMParametersComponent.getComponent().getText();
   }
 
+  public LabeledComponent<RawCommandLineEditor> getVMParametersComponent() {
+    return myVMParametersComponent;
+  }
+
   @Override
   public void setAnchor(JComponent labelAnchor) {
     super.setAnchor(labelAnchor);
     myVMParametersComponent.setAnchor(labelAnchor);
   }
 
+  @Override
+  protected void setupAnchor() {
+    super.setupAnchor();
+    myAnchor = UIUtil.mergeComponentsWithAnchor(this, myVMParametersComponent);
+  }
+
   public void applyTo(CommonJavaRunConfigurationParameters configuration) {
     super.applyTo(configuration);
     configuration.setVMParameters(getVMParameters());
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 79284abf8356..2b2d7ff5827d 100644
--- a/platform/lang-impl/src/com/intellij/execution/ui/CommonProgramParametersPanel.java
+++ b/platform/lang-impl/src/com/intellij/execution/ui/CommonProgramParametersPanel.java
@@ -38,6 +38,7 @@ import com.intellij.ui.components.JBList;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.PathUtil;
 import com.intellij.util.SmartList;
+import com.intellij.util.ui.UIUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jps.model.serialization.PathMacroUtil;
@@ -74,8 +75,12 @@ public class CommonProgramParametersPanel extends JPanel implements PanelWithAnc
 
   protected void init() {
     initComponents();
-    copyDialogCaption(myProgramParametersComponent);
     updateUI();
+    setupAnchor();
+  }
+
+  protected void setupAnchor() {
+    myAnchor = UIUtil.mergeComponentsWithAnchor(myProgramParametersComponent, myWorkingDirectoryComponent, myEnvVariablesComponent);
   }
 
   @Nullable
@@ -111,7 +116,7 @@ public class CommonProgramParametersPanel extends JPanel implements PanelWithAnc
 
     setPreferredSize(new Dimension(10, 10));
 
-    setAnchor(myEnvVariablesComponent.getLabel());
+    copyDialogCaption(myProgramParametersComponent);
   }
 
   protected JComponent createComponentWithMacroBrowse(@NotNull final TextFieldWithBrowseButton textAccessor) {