From 3d57891052e51f45720404a97fd1a5ecba096147 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Thu, 25 Jul 2013 09:28:12 +0200 Subject: [PATCH] use getInstance() methods to locate Executor and Runner instances --- .../execution/impl/DefaultJavaProgramRunner.java | 14 +++++++++----- .../com/intellij/debugger/DebuggerTestCase.java | 12 +++++++----- .../com/intellij/execution/RunContentExecutor.java | 2 +- .../runners/AbstractConsoleRunnerWithHistory.java | 2 +- .../maven/execution/MavenRunConfigurationType.java | 3 ++- .../plugins/terminal/AbstractTerminalRunner.java | 3 +-- 6 files changed, 21 insertions(+), 15 deletions(-) diff --git a/java/execution/impl/src/com/intellij/execution/impl/DefaultJavaProgramRunner.java b/java/execution/impl/src/com/intellij/execution/impl/DefaultJavaProgramRunner.java index 6db25e1d4c58..94b4e0601f4d 100644 --- a/java/execution/impl/src/com/intellij/execution/impl/DefaultJavaProgramRunner.java +++ b/java/execution/impl/src/com/intellij/execution/impl/DefaultJavaProgramRunner.java @@ -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); } } diff --git a/java/testFramework/src/com/intellij/debugger/DebuggerTestCase.java b/java/testFramework/src/com/intellij/debugger/DebuggerTestCase.java index f15207a584ab..2ab6507b86a3 100644 --- a/java/testFramework/src/com/intellij/debugger/DebuggerTestCase.java +++ b/java/testFramework/src/com/intellij/debugger/DebuggerTestCase.java @@ -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 { diff --git a/platform/lang-impl/src/com/intellij/execution/RunContentExecutor.java b/platform/lang-impl/src/com/intellij/execution/RunContentExecutor.java index 85af7fd2533b..bcc6d3394fa7 100644 --- a/platform/lang-impl/src/com/intellij/execution/RunContentExecutor.java +++ b/platform/lang-impl/src/com/intellij/execution/RunContentExecutor.java @@ -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); diff --git a/platform/lang-impl/src/com/intellij/execution/runners/AbstractConsoleRunnerWithHistory.java b/platform/lang-impl/src/com/intellij/execution/runners/AbstractConsoleRunnerWithHistory.java index 65a8a91e3e54..fac9d8c7ba55 100644 --- a/platform/lang-impl/src/com/intellij/execution/runners/AbstractConsoleRunnerWithHistory.java +++ b/platform/lang-impl/src/com/intellij/execution/runners/AbstractConsoleRunnerWithHistory.java @@ -105,7 +105,7 @@ public abstract class AbstractConsoleRunnerWithHistory { } 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);