From ae1f60fad85201f6f1d1d4246b7e2a91db20ddf0 Mon Sep 17 00:00:00 2001
From: Alexey Pegov <alexey.pegov@jetbrains.com>
Date: Thu, 4 Feb 2010 17:01:09 +0300
Subject: [PATCH] Revert "use module dir as working directory checkbox"

This reverts commit 764f54693705779633214548904edf7dd55f052a.
---
 .../configuration/CommonJavaParameters.form   | 22 ++++++++-----------
 .../configuration/CommonJavaParameters.java   | 17 --------------
 2 files changed, 9 insertions(+), 30 deletions(-)

diff --git a/java/execution/impl/src/com/intellij/execution/junit2/configuration/CommonJavaParameters.form b/java/execution/impl/src/com/intellij/execution/junit2/configuration/CommonJavaParameters.form
index 74016d22149e..f669e9c28087 100644
--- a/java/execution/impl/src/com/intellij/execution/junit2/configuration/CommonJavaParameters.form
+++ b/java/execution/impl/src/com/intellij/execution/junit2/configuration/CommonJavaParameters.form
@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.intellij.execution.junit2.configuration.CommonJavaParameters">
-  <grid id="d88e6" binding="myWholePanel" layout-manager="GridLayoutManager" row-count="4" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="10">
+  <grid id="d88e6" binding="myWholePanel" row-count="3" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="10">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
-      <xy x="64" y="62" width="431" height="215"/>
+      <xy x="64" y="62" width="431" height="137"/>
+      <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3"/>
     </constraints>
     <properties/>
     <border type="none"/>
     <children>
       <component id="6e486" class="com.intellij.openapi.ui.LabeledComponent" binding="myVMParameters">
         <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">
+          <xy x="0" y="9" width="431" height="16"/>
+          <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1">
             <minimum-size width="0" height="-1"/>
             <preferred-size width="400" height="-1"/>
           </grid>
@@ -22,7 +24,8 @@
       </component>
       <component id="acecf" class="com.intellij.openapi.ui.LabeledComponent" binding="myProgramParameters">
         <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">
+          <xy x="0" y="53" width="431" height="16"/>
+          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1">
             <minimum-size width="0" height="-1"/>
             <preferred-size width="400" height="-1"/>
           </grid>
@@ -34,7 +37,8 @@
       </component>
       <component id="8c18f" class="com.intellij.openapi.ui.LabeledComponent" binding="myWorkingDirectory">
         <constraints>
-          <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false">
+          <xy x="0" y="94" width="431" height="36"/>
+          <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1">
             <minimum-size width="0" height="-1"/>
           </grid>
         </constraints>
@@ -44,14 +48,6 @@
           <text resource-bundle="messages/ExecutionBundle" key="junit.configuration.working.directory.label"/>
         </properties>
       </component>
-      <component id="dd2ea" class="javax.swing.JCheckBox" binding="myUseModuleDirectoryAsCheckBox" default-binding="true">
-        <constraints>
-          <grid row="3" 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>
-          <text value="Use Module Directory as a Working Directory"/>
-        </properties>
-      </component>
     </children>
   </grid>
 </form>
diff --git a/java/execution/impl/src/com/intellij/execution/junit2/configuration/CommonJavaParameters.java b/java/execution/impl/src/com/intellij/execution/junit2/configuration/CommonJavaParameters.java
index 0b027bc580c8..f3b7a1c991bd 100644
--- a/java/execution/impl/src/com/intellij/execution/junit2/configuration/CommonJavaParameters.java
+++ b/java/execution/impl/src/com/intellij/execution/junit2/configuration/CommonJavaParameters.java
@@ -45,7 +45,6 @@ public class CommonJavaParameters extends JPanel {
   private LabeledComponent<TextFieldWithBrowseButton> myWorkingDirectory;
   private LabeledComponent<RawCommandLineEditor> myProgramParameters;
   private LabeledComponent<RawCommandLineEditor> myVMParameters;
-  private JCheckBox myUseModuleDirectoryAsCheckBox;
 
   private final LabeledComponent[] myFields = new LabeledComponent[3];
   private Module myModule = null;
@@ -70,13 +69,6 @@ public class CommonJavaParameters extends JPanel {
     myFields[RunJavaConfiguration.PROGRAM_PARAMETERS_PROPERTY] = myProgramParameters;
     myFields[RunJavaConfiguration.VM_PARAMETERS_PROPERTY] = myVMParameters;
     myFields[RunJavaConfiguration.WORKING_DIRECTORY_PROPERTY] = myWorkingDirectory;
-
-    myUseModuleDirectoryAsCheckBox.addActionListener(new ActionListener() {
-      public void actionPerformed(ActionEvent e) {
-        final boolean selected = ((JCheckBox)e.getSource()).isSelected();
-        myWorkingDirectory.getComponent().setEnabled(!selected);
-      }
-    });
   }
 
   private static void copyDialogCaption(final LabeledComponent<RawCommandLineEditor> component) {
@@ -107,11 +99,6 @@ public class CommonJavaParameters extends JPanel {
   }
 
   public void setText(final int property, final String value) {
-    if (RunJavaConfiguration.WORKING_DIRECTORY_PROPERTY == property && value != null && "$MODULE_DIR$".equals(value.trim())) {
-      myUseModuleDirectoryAsCheckBox.setSelected(true);
-      myWorkingDirectory.getComponent().setEnabled(false);
-    }
-
     final JComponent component = getLabeledComponent(property).getComponent();
     if (component instanceof TextFieldWithBrowseButton)
       ((TextFieldWithBrowseButton)component).setText(value);
@@ -121,10 +108,6 @@ public class CommonJavaParameters extends JPanel {
   }
 
   public String getText(final int property) {
-    if (RunJavaConfiguration.WORKING_DIRECTORY_PROPERTY == property && myUseModuleDirectoryAsCheckBox.isSelected()) {
-      return "$MODULE_DIR$";
-    }
-
     final JComponent component = getLabeledComponent(property).getComponent();
     if (component instanceof TextFieldWithBrowseButton)
       return ((TextFieldWithBrowseButton)component).getText();