MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-16 22:51:17 +07:00
Code Issues Packages Projects Releases Wiki Activity

Move helpers enum to separate class.

Browse Source
This commit is contained in:
Dmitry Trofimov
2015-08-10 10:55:58 +02:00
parent 4e137f0ef0
commit 76df7fdddc
26 changed files with 274 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
python/python-rest/src/com/jetbrains/rest/run/RestCommandLineState.java
View File

@@ -26,8 +26,7 @@ import com.intellij.execution.runners.ExecutionEnvironment;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VirtualFile;
import com.jetbrains.python.PythonHelper;
import com.jetbrains.python.PythonHelpersLocator;
import com.jetbrains.python.HelperPackage;
import com.jetbrains.python.run.PythonCommandLineState;
import com.jetbrains.python.run.PythonProcessRunner;
import org.jetbrains.annotations.Nullable;
@@ -105,7 +104,7 @@ public abstract class RestCommandLineState extends PythonCommandLineState {
return null;
}
protected abstract PythonHelper getRunner();
protected abstract HelperPackage getRunner();
protected abstract String getTask();

6
python/python-rest/src/com/jetbrains/rest/run/docutils/DocutilsCommandLineState.java
View File

@@ -19,8 +19,8 @@ import com.intellij.execution.runners.ExecutionEnvironment;
import com.intellij.ide.BrowserUtil;
import com.intellij.openapi.fileEditor.FileEditorManager;
import com.intellij.openapi.vfs.VirtualFile;
import com.jetbrains.python.HelperPackage;
import com.jetbrains.python.PythonHelper;
import com.jetbrains.python.PythonHelpersLocator;
import com.jetbrains.rest.run.RestCommandLineState;
import org.jetbrains.annotations.Nullable;
@@ -53,8 +53,8 @@ public class DocutilsCommandLineState extends RestCommandLineState {
}
@Override
protected PythonHelper getRunner() {
return PythonHelpersLocator.REST_RUNNER;
protected HelperPackage getRunner() {
return PythonHelper.REST_RUNNER;
}
@Override

6
python/python-rest/src/com/jetbrains/rest/run/sphinx/SphinxCommandLineState.java
View File

@@ -18,8 +18,8 @@ package com.jetbrains.rest.run.sphinx;
import com.intellij.execution.runners.ExecutionEnvironment;
import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VirtualFile;
import com.jetbrains.python.HelperPackage;
import com.jetbrains.python.PythonHelper;
import com.jetbrains.python.PythonHelpersLocator;
import com.jetbrains.rest.run.RestCommandLineState;
import java.util.Collections;
@@ -47,8 +47,8 @@ public class SphinxCommandLineState extends RestCommandLineState {
}
@Override
protected PythonHelper getRunner() {
return PythonHelpersLocator.SPHINX_RUNNER;
protected HelperPackage getRunner() {
return PythonHelper.SPHINX_RUNNER;
}
@Override

4
python/python-rest/src/com/jetbrains/rest/sphinx/SphinxBaseCommand.java
View File

@@ -31,7 +31,7 @@ import com.intellij.openapi.ui.Messages;
import com.intellij.openapi.ui.TextFieldWithBrowseButton;
import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VirtualFile;
import com.jetbrains.python.PythonHelpersLocator;
import com.jetbrains.python.PythonHelper;
import com.jetbrains.python.ReSTService;
import com.jetbrains.python.buildout.BuildoutFacet;
import com.jetbrains.python.run.PythonCommandLineState;
@@ -148,7 +148,7 @@ public class SphinxBaseCommand {
String sdkHomePath = sdk.getHomePath();
final GeneralCommandLine cmd = PythonHelpersLocator.LOAD_ENTRY_POINT.newCommandLine(sdkHomePath, Lists.<String>newArrayList());
final GeneralCommandLine cmd = PythonHelper.LOAD_ENTRY_POINT.newCommandLine(sdkHomePath, Lists.<String>newArrayList());
cmd.setWorkDirectory(service.getWorkdir().isEmpty()? module.getProject().getBaseDir().getPath(): service.getWorkdir());
PythonCommandLineState.createStandardGroups(cmd);