MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

use getInstance() methods to locate Executor and Runner instances

Browse Source
This commit is contained in:
Dmitry Jemerov
2013-07-25 09:28:12 +02:00
parent b55d6e8c86
commit 3d57891052
6 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/execution/impl/src/com/intellij/execution/impl/DefaultJavaProgramRunner.java
+9 -5
View File
@@ -15,10 +15,7 @@
*/
package com.intellij.execution.impl;
import com.intellij.execution.ExecutionBundle;
import com.intellij.execution.ExecutionException;
import com.intellij.execution.ExecutionResult;
import com.intellij.execution.Executor;
import com.intellij.execution.*;
import com.intellij.execution.configurations.*;
import com.intellij.execution.executors.DefaultRunExecutor;
import com.intellij.execution.process.CapturingProcessAdapter;
@@ -40,6 +37,7 @@ import com.intellij.unscramble.ThreadDumpConsoleFactory;
import com.intellij.unscramble.ThreadDumpParser;
import com.intellij.unscramble.ThreadState;
import com.intellij.util.text.DateFormatUtil;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import javax.swing.*;
@@ -53,6 +51,8 @@ import java.util.List;
public class DefaultJavaProgramRunner extends JavaPatchableProgramRunner {
private final static String ourWiseThreadDumpProperty = "idea.java.run.wise.thread.dump";
@NonNls public static final String DEFAULT_JAVA_RUNNER_ID = "Run";
@Override
public boolean canRun(@NotNull final String executorId, @NotNull final RunProfile profile) {
return executorId.equals(DefaultRunExecutor.EXECUTOR_ID) &&
@@ -269,6 +269,10 @@ public class DefaultJavaProgramRunner extends JavaPatchableProgramRunner {
@Override
@NotNull
public String getRunnerId() {
return "Run";
return DEFAULT_JAVA_RUNNER_ID;
}
public static ProgramRunner getInstance() {
return RunnerRegistry.getInstance().findRunnerById(DEFAULT_JAVA_RUNNER_ID);
}
}
java/testFramework/src/com/intellij/debugger/DebuggerTestCase.java
+7 -5
View File
@@ -128,8 +128,8 @@ public abstract class DebuggerTestCase extends ExecutionWithDebuggerToolsTestCas
final RemoteConnection debugParameters = DebuggerManagerImpl.createDebugParameters(javaParameters, debuggerRunnerSettings, false);
ExecutionEnvironment environment = new ExecutionEnvironment(new MockConfiguration(), new DefaultDebugExecutor(), myProject,
debuggerRunnerSettings);
ExecutionEnvironment environment = new ExecutionEnvironment(new MockConfiguration(), DefaultDebugExecutor.getDebugExecutorInstance(),
myProject, debuggerRunnerSettings);
final JavaCommandLineState javaCommandLineState = new JavaCommandLineState(environment){
@Override
protected JavaParameters createJavaParameters() {
@@ -148,7 +148,7 @@ public abstract class DebuggerTestCase extends ExecutionWithDebuggerToolsTestCas
@Override
public void run() {
try {
myDebuggerSession = DebuggerManagerEx.getInstanceEx(myProject).attachVirtualMachine(new DefaultDebugExecutor(),
myDebuggerSession = DebuggerManagerEx.getInstanceEx(myProject).attachVirtualMachine(DefaultDebugExecutor.getDebugExecutorInstance(),
runner, new MockConfiguration(), javaCommandLineState, debugParameters, false);
}
catch (ExecutionException e) {
@@ -185,7 +185,7 @@ public abstract class DebuggerTestCase extends ExecutionWithDebuggerToolsTestCas
debuggerRunnerSettings.LOCAL = true;
debuggerRunnerSettings.DEBUG_PORT = "3456";
ExecutionEnvironment environment = new ExecutionEnvironment(new MockConfiguration(), new DefaultDebugExecutor(), myProject,
ExecutionEnvironment environment = new ExecutionEnvironment(new MockConfiguration(), DefaultDebugExecutor.getDebugExecutorInstance(), myProject,
debuggerRunnerSettings);
final JavaCommandLineState javaCommandLineState = new JavaCommandLineState(environment) {
@Override
@@ -438,7 +438,9 @@ public abstract class DebuggerTestCase extends ExecutionWithDebuggerToolsTestCas
}
protected DebuggerSession attachVirtualMachine(RunProfileState state, RemoteConnection remoteConnection, boolean pollConnection) throws ExecutionException {
return DebuggerManagerEx.getInstanceEx(myProject).attachVirtualMachine(new DefaultDebugExecutor(), new GenericDebuggerRunner(), new MockConfiguration(), state, remoteConnection, pollConnection);
return DebuggerManagerEx.getInstanceEx(myProject).attachVirtualMachine(DefaultDebugExecutor.getDebugExecutorInstance(),
new GenericDebuggerRunner(),
new MockConfiguration(), state, remoteConnection, pollConnection);
}
private static class MockConfiguration implements ModuleRunConfiguration {
platform/lang-impl/src/com/intellij/execution/RunContentExecutor.java
+1 -1
View File
@@ -101,7 +101,7 @@ public class RunContentExecutor {
if (myHelpId != null) {
view.setHelpId(myHelpId);
}
Executor executor = ExecutorRegistry.getInstance().getExecutorById(DefaultRunExecutor.EXECUTOR_ID);
Executor executor = DefaultRunExecutor.getRunExecutorInstance();
DefaultActionGroup actions = new DefaultActionGroup();
final JComponent consolePanel = createConsolePanel(view, actions);
platform/lang-impl/src/com/intellij/execution/runners/AbstractConsoleRunnerWithHistory.java
+1 -1
View File
@@ -105,7 +105,7 @@ public abstract class AbstractConsoleRunnerWithHistory<T extends LanguageConsole
myConsoleView.attachToProcess(myProcessHandler);
// Runner creating
final Executor defaultExecutor = ExecutorRegistry.getInstance().getExecutorById(DefaultRunExecutor.EXECUTOR_ID);
final Executor defaultExecutor = DefaultRunExecutor.getRunExecutorInstance();
final DefaultActionGroup toolbarActions = new DefaultActionGroup();
final ActionToolbar actionToolbar = ActionManager.getInstance().createActionToolbar(ActionPlaces.UNKNOWN, toolbarActions, false);
plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunConfigurationType.java
+2 -1
View File
@@ -23,6 +23,7 @@ import com.intellij.execution.configurations.ConfigurationType;
import com.intellij.execution.configurations.ConfigurationTypeUtil;
import com.intellij.execution.configurations.RunConfiguration;
import com.intellij.execution.executors.DefaultRunExecutor;
import com.intellij.execution.impl.DefaultJavaProgramRunner;
import com.intellij.execution.runners.ExecutionEnvironment;
import com.intellij.execution.runners.ProgramRunner;
import com.intellij.openapi.project.Project;
@@ -184,7 +185,7 @@ public class MavenRunConfigurationType implements ConfigurationType {
params,
project);
ProgramRunner runner = RunnerRegistry.getInstance().findRunnerById(DefaultRunExecutor.EXECUTOR_ID);
ProgramRunner runner = DefaultJavaProgramRunner.getInstance();
Executor executor = DefaultRunExecutor.getRunExecutorInstance();
ExecutionEnvironment env = new ExecutionEnvironment(executor, runner, configSettings, project);
plugins/terminal/src/org/jetbrains/plugins/terminal/AbstractTerminalRunner.java
+1 -2
View File
@@ -2,7 +2,6 @@ package org.jetbrains.plugins.terminal;
import com.intellij.execution.ExecutionManager;
import com.intellij.execution.Executor;
import com.intellij.execution.ExecutorRegistry;
import com.intellij.execution.executors.DefaultRunExecutor;
import com.intellij.execution.process.ProcessHandler;
import com.intellij.execution.ui.RunContentDescriptor;
@@ -95,7 +94,7 @@ public abstract class AbstractTerminalRunner<T extends Process> {
}
private void initConsoleUI(final T process) {
final Executor defaultExecutor = ExecutorRegistry.getInstance().getExecutorById(DefaultRunExecutor.EXECUTOR_ID);
final Executor defaultExecutor = DefaultRunExecutor.getRunExecutorInstance();
final DefaultActionGroup toolbarActions = new DefaultActionGroup();
final ActionToolbar actionToolbar = ActionManager.getInstance().createActionToolbar(ActionPlaces.UNKNOWN, toolbarActions, false);