From c2c0e72d7c06e03c018167a428ad927ff66ec4e6 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Mon, 21 Nov 2011 16:26:19 +0100
Subject: [PATCH] IDEA-48089 Would like to be able to set Environment Variables
 in Run Groovy Script Dialog

---
 .../groovy/runner/GroovyScriptRunConfiguration.java   | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyScriptRunConfiguration.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyScriptRunConfiguration.java
index 90ab3c7e6c23..1df08f4cc8c9 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyScriptRunConfiguration.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyScriptRunConfiguration.java
@@ -22,6 +22,7 @@ import com.intellij.execution.Executor;
 import com.intellij.execution.configurations.*;
 import com.intellij.execution.filters.TextConsoleBuilderFactory;
 import com.intellij.execution.runners.ExecutionEnvironment;
+import com.intellij.execution.util.ProgramParametersUtil;
 import com.intellij.openapi.components.PathMacroManager;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleManager;
@@ -53,7 +54,6 @@ import org.jetbrains.plugins.groovy.lang.psi.GroovyFile;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.GrTypeDefinition;
 import org.jetbrains.plugins.groovy.lang.psi.impl.synthetic.GroovyScriptClass;
 
-import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -95,13 +95,6 @@ public class GroovyScriptRunConfiguration extends ModuleBasedConfiguration<RunCo
     return getConfigurationModule().getModule();
   }
 
-  private String getAbsoluteWorkDir() {
-    if (!FileUtil.isAbsolute(workDir)) {
-      return new File(getProject().getLocation(), workDir).getAbsolutePath();
-    }
-    return workDir;
-  }
-
   public Collection<Module> getValidModules() {
     Module[] modules = ModuleManager.getInstance(getProject()).getModules();
     final GroovyScriptRunner scriptRunner = findConfiguration();
@@ -186,7 +179,7 @@ public class GroovyScriptRunConfiguration extends ModuleBasedConfiguration<RunCo
     final JavaCommandLineState state = new JavaCommandLineState(environment) {
       protected JavaParameters createJavaParameters() throws ExecutionException {
         JavaParameters params = createJavaParametersWithSdk(module);
-        params.setWorkingDirectory(getAbsoluteWorkDir());
+        ProgramParametersUtil.configureConfiguration(params, GroovyScriptRunConfiguration.this);
         scriptRunner.configureCommandLine(params, module, tests, script, GroovyScriptRunConfiguration.this);
 
         return params;