diff --git a/platform/lang-impl/src/com/intellij/execution/util/ProgramParametersConfigurator.java b/platform/lang-impl/src/com/intellij/execution/util/ProgramParametersConfigurator.java
new file mode 100644
index 000000000000..3d632c97273e
--- /dev/null
+++ b/platform/lang-impl/src/com/intellij/execution/util/ProgramParametersConfigurator.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright 2000-2012 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.execution.util;
+
+import com.intellij.execution.CommonProgramRunConfigurationParameters;
+import com.intellij.execution.configurations.ModuleBasedConfiguration;
+import com.intellij.execution.configurations.RuntimeConfigurationWarning;
+import com.intellij.execution.configurations.SimpleProgramParameters;
+import com.intellij.openapi.components.PathMacroManager;
+import com.intellij.openapi.module.Module;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.util.io.FileUtil;
+import com.intellij.util.PathUtil;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
+
+public class ProgramParametersConfigurator {
+  public void configureConfiguration(SimpleProgramParameters parameters, CommonProgramRunConfigurationParameters configuration) {
+    Project project = configuration.getProject();
+    Module module = getModule(configuration);
+
+    parameters.getProgramParametersList().addParametersString(expandPath(configuration.getProgramParameters(), module, project));
+
+    parameters.setWorkingDirectory(getWorkingDir(configuration, project, module));
+
+    parameters.setupEnvs(configuration.getEnvs(), configuration.isPassParentEnvs());
+    if (parameters.getEnv() != null) {
+      Map<String, String> expanded = new HashMap<String, String>();
+      for (Map.Entry<String, String> each : parameters.getEnv().entrySet()) {
+        expanded.put(each.getKey(), expandPath(each.getValue(), module, project));
+      }
+      parameters.setEnv(expanded);
+    }
+  }
+
+  public String getWorkingDir(CommonProgramRunConfigurationParameters configuration, Project project, Module module) {
+    String workingDirectory = configuration.getWorkingDirectory();
+    String defaultWorkingDir = getDefaultWorkingDir(project);
+
+    if (workingDirectory == null || workingDirectory.trim().length() == 0) {
+      workingDirectory = defaultWorkingDir;
+    }
+    workingDirectory = expandPath(workingDirectory, module, project);
+    if (!FileUtil.isAbsolute(workingDirectory) && defaultWorkingDir != null) {
+      workingDirectory = defaultWorkingDir + "/" + workingDirectory;
+    }
+    return workingDirectory;
+  }
+
+  @Nullable
+  protected String getDefaultWorkingDir(@NotNull Project project) {
+    return PathUtil.getLocalPath(project.getBaseDir());
+  }
+
+  public void checkWorkingDirectoryExist(CommonProgramRunConfigurationParameters configuration, Project project, Module module)
+    throws RuntimeConfigurationWarning {
+    final String workingDir = getWorkingDir(configuration, project, module);
+    if (!new File(workingDir).exists()) {
+      throw new RuntimeConfigurationWarning("Working directory '" + workingDir + "' doesn't exist");
+    }
+  }
+
+  protected String expandPath(String path, Module module, Project project) {
+    path = PathMacroManager.getInstance(project).expandPath(path);
+    if (module != null) {
+      path = PathMacroManager.getInstance(module).expandPath(path);
+    }
+    return path;
+  }
+
+  @Nullable
+  protected Module getModule(CommonProgramRunConfigurationParameters configuration) {
+    if (configuration instanceof ModuleBasedConfiguration) {
+      return ((ModuleBasedConfiguration)configuration).getConfigurationModule().getModule();
+    }
+    return null;
+  }
+}
diff --git a/platform/lang-impl/src/com/intellij/execution/util/ProgramParametersUtil.java b/platform/lang-impl/src/com/intellij/execution/util/ProgramParametersUtil.java
index df0c41facec0..a513136a5af9 100644
--- a/platform/lang-impl/src/com/intellij/execution/util/ProgramParametersUtil.java
+++ b/platform/lang-impl/src/com/intellij/execution/util/ProgramParametersUtil.java
@@ -16,75 +16,32 @@
 package com.intellij.execution.util;
 
 import com.intellij.execution.CommonProgramRunConfigurationParameters;
-import com.intellij.execution.configurations.ModuleBasedConfiguration;
 import com.intellij.execution.configurations.RuntimeConfigurationWarning;
 import com.intellij.execution.configurations.SimpleProgramParameters;
-import com.intellij.openapi.components.PathMacroManager;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.io.FileUtil;
-import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.util.PathUtil;
 import org.jetbrains.annotations.Nullable;
 
-import java.io.File;
-import java.util.HashMap;
-import java.util.Map;
-
 public class ProgramParametersUtil {
   public static void configureConfiguration(SimpleProgramParameters parameters, CommonProgramRunConfigurationParameters configuration) {
-    Project project = configuration.getProject();
-    Module module = getModule(configuration);
-
-    parameters.getProgramParametersList().addParametersString(expandPath(configuration.getProgramParameters(), module, project));
-
-    parameters.setWorkingDirectory(getWorkingDir(configuration, project, module));
-
-    parameters.setupEnvs(configuration.getEnvs(), configuration.isPassParentEnvs());
-    if (parameters.getEnv() != null) {
-      Map<String, String> expanded = new HashMap<String, String>();
-      for (Map.Entry<String, String> each : parameters.getEnv().entrySet()) {
-        expanded.put(each.getKey(), expandPath(each.getValue(), module, project));
-      }
-      parameters.setEnv(expanded);
-    }
+    new ProgramParametersConfigurator().configureConfiguration(parameters, configuration);
   }
 
   public static String getWorkingDir(CommonProgramRunConfigurationParameters configuration, Project project, Module module) {
-    String workingDirectory = configuration.getWorkingDirectory();
-    VirtualFile baseDir = project.getBaseDir();
-
-    if (workingDirectory == null || workingDirectory.trim().length() == 0) {
-      workingDirectory = PathUtil.getLocalPath(baseDir);
-    }
-    workingDirectory = expandPath(workingDirectory, module, project);
-    if (!FileUtil.isAbsolute(workingDirectory) && baseDir != null) {
-      workingDirectory = baseDir.getPath() + "/" + workingDirectory;
-    }
-    return workingDirectory;
+    return new ProgramParametersConfigurator().getWorkingDir(configuration, project, module);
   }
 
   public static void checkWorkingDirectoryExist(CommonProgramRunConfigurationParameters configuration, Project project, Module module)
     throws RuntimeConfigurationWarning {
-    final String workingDir = getWorkingDir(configuration, project, module);
-    if (!new File(workingDir).exists()) {
-      throw new RuntimeConfigurationWarning("Working directory '" + workingDir + "' doesn't exist");
-    }
+    new ProgramParametersConfigurator().checkWorkingDirectoryExist(configuration, project, module);
   }
 
   protected static String expandPath(String path, Module module, Project project) {
-    path = PathMacroManager.getInstance(project).expandPath(path);
-    if (module != null) {
-      path = PathMacroManager.getInstance(module).expandPath(path);
-    }
-    return path;
+    return new ProgramParametersConfigurator().expandPath(path, module, project);
   }
 
   @Nullable
   protected static Module getModule(CommonProgramRunConfigurationParameters configuration) {
-    if (configuration instanceof ModuleBasedConfiguration) {
-      return ((ModuleBasedConfiguration)configuration).getConfigurationModule().getModule();
-    }
-    return null;
+    return new ProgramParametersConfigurator().getModule(configuration);
   }
 }