[groovy] script configuration: use get/setWorkingDirectory

This commit is contained in:
Daniil Ovchinnikov
2016-11-23 14:56:20 +03:00
parent 3e8c949bcf
commit 0434c65c21
3 changed files with 3 additions and 11 deletions
@@ -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());
}
@@ -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();
@@ -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;