From 0434c65c21c77c11b04bc23307cbe1100fe5cb70 Mon Sep 17 00:00:00 2001
From: Daniil Ovchinnikov <daniil.ovchinnikov@jetbrains.com>
Date: Wed, 23 Nov 2016 14:46:30 +0300
Subject: [PATCH] [groovy] script configuration: use get/setWorkingDirectory

---
 .../groovy/runner/GroovyRunConfigurationEditor.java       | 4 ++--
 .../groovy/runner/GroovyScriptRunConfiguration.java       | 8 --------
 .../runner/GroovyScriptRunConfigurationProducer.java      | 2 +-
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyRunConfigurationEditor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyRunConfigurationEditor.java
index 7ad7bc896c0c..73bcd2d2f742 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyRunConfigurationEditor.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyRunConfigurationEditor.java
@@ -85,7 +85,7 @@ public class GroovyRunConfigurationEditor extends SettingsEditor<GroovyScriptRun
     myParameters.setText(configuration.getProgramParameters());
 
     scriptPathField.setText(configuration.getScriptPath());
-    workDirField.setText(configuration.getWorkDir());
+    workDirField.setText(configuration.getWorkingDirectory());
 
     myDebugCB.setEnabled(true);
     myDebugCB.setSelected(configuration.isDebugEnabled());
@@ -106,7 +106,7 @@ public class GroovyRunConfigurationEditor extends SettingsEditor<GroovyScriptRun
     configuration.setAddClasspathToTheRunner(myAddClasspathCB.isSelected());
     configuration.setProgramParameters(myParameters.getText());
     configuration.setScriptPath(scriptPathField.getText().trim());
-    configuration.setWorkDir(workDirField.getText().trim());
+    configuration.setWorkingDirectory(workDirField.getText().trim());
     configuration.setEnvs(myEnvVariables.getEnvs());
   }
 
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 57db308d862a..482c9fd8297f 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyScriptRunConfiguration.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyScriptRunConfiguration.java
@@ -86,14 +86,6 @@ public class GroovyScriptRunConfiguration extends ModuleBasedConfiguration<RunCo
     workDir = PathUtil.getLocalPath(project.getBaseDir());
   }
 
-  public void setWorkDir(String dir) {
-    workDir = dir;
-  }
-
-  public String getWorkDir() {
-    return workDir;
-  }
-
   @Nullable
   public Module getModule() {
     return getConfigurationModule().getModule();
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyScriptRunConfigurationProducer.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyScriptRunConfigurationProducer.java
index f2f68b717e88..b12b80120bcf 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyScriptRunConfigurationProducer.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/GroovyScriptRunConfigurationProducer.java
@@ -130,7 +130,7 @@ public class GroovyScriptRunConfigurationProducer extends RuntimeConfigurationPr
     final PsiFile file = aClass.getContainingFile().getOriginalFile();
     final PsiDirectory dir = file.getContainingDirectory();
     if (dir != null) {
-      configuration.setWorkDir(dir.getVirtualFile().getPath());
+      configuration.setWorkingDirectory(dir.getVirtualFile().getPath());
     }
     final VirtualFile vFile = file.getVirtualFile();
     if (vFile == null) return null;