From 3fa64fe8c26f389dc0fff2ea566e5fd52e63c6cf Mon Sep 17 00:00:00 2001 From: nik Date: Thu, 3 Jun 2010 11:45:15 +0400 Subject: [PATCH] cleanup (IDEA-54906 fixed) --- .../execution/runners/GenericProgramRunner.java | 4 +--- .../com/intellij/execution/ExecutorRegistryImpl.java | 2 +- .../src/com/intellij/execution/ProgramRunnerUtil.java | 4 ++-- .../actions/ChooseRunConfigurationAction.java | 10 +++++----- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/platform/lang-api/src/com/intellij/execution/runners/GenericProgramRunner.java b/platform/lang-api/src/com/intellij/execution/runners/GenericProgramRunner.java index d05194d6fe41..33e85257de58 100644 --- a/platform/lang-api/src/com/intellij/execution/runners/GenericProgramRunner.java +++ b/platform/lang-api/src/com/intellij/execution/runners/GenericProgramRunner.java @@ -36,9 +36,7 @@ import org.jetbrains.annotations.Nullable; */ public abstract class GenericProgramRunner implements ProgramRunner { - /** - * @see com.intellij.execution.ui.RunContentDescriptor#myContent - */ + @Deprecated public static final DataKey CONTENT_TO_REUSE_DATA_KEY = DataKey.create("contentToReuse"); @Deprecated @NonNls public static final String CONTENT_TO_REUSE = CONTENT_TO_REUSE_DATA_KEY.getName(); diff --git a/platform/lang-impl/src/com/intellij/execution/ExecutorRegistryImpl.java b/platform/lang-impl/src/com/intellij/execution/ExecutorRegistryImpl.java index 292405449be9..979da8f2fb4a 100644 --- a/platform/lang-impl/src/com/intellij/execution/ExecutorRegistryImpl.java +++ b/platform/lang-impl/src/com/intellij/execution/ExecutorRegistryImpl.java @@ -189,7 +189,7 @@ public class ExecutorRegistryImpl extends ExecutorRegistry { return; } - ProgramRunnerUtil.executeConfiguration(project, getConfiguration(project), myExecutor, dataContext); + ProgramRunnerUtil.executeConfiguration(project, getConfiguration(project), myExecutor); } } } diff --git a/platform/lang-impl/src/com/intellij/execution/ProgramRunnerUtil.java b/platform/lang-impl/src/com/intellij/execution/ProgramRunnerUtil.java index 1943f957e62a..d07b4c7d2e6e 100644 --- a/platform/lang-impl/src/com/intellij/execution/ProgramRunnerUtil.java +++ b/platform/lang-impl/src/com/intellij/execution/ProgramRunnerUtil.java @@ -23,7 +23,6 @@ import com.intellij.execution.impl.RunManagerImpl; import com.intellij.execution.runners.ExecutionEnvironment; import com.intellij.execution.runners.ExecutionUtil; import com.intellij.execution.runners.ProgramRunner; -import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.Messages; @@ -49,7 +48,8 @@ public class ProgramRunnerUtil { return RunnerRegistry.getInstance().getRunner(executorId, configuration.getConfiguration()); } - public static void executeConfiguration(@NotNull final Project project, @NotNull final RunnerAndConfigurationSettings configuration, @NotNull final Executor executor, @NotNull final DataContext dataContext) { + public static void executeConfiguration(@NotNull final Project project, @NotNull final RunnerAndConfigurationSettings configuration, + @NotNull final Executor executor) { ProgramRunner runner = getRunner(executor.getId(), configuration); if (runner == null) { LOG.error("Runner MUST not be null! Cannot find runner for " + executor.getId() + " and " + configuration); diff --git a/platform/lang-impl/src/com/intellij/execution/actions/ChooseRunConfigurationAction.java b/platform/lang-impl/src/com/intellij/execution/actions/ChooseRunConfigurationAction.java index 0d36965482f5..4826fc67de61 100644 --- a/platform/lang-impl/src/com/intellij/execution/actions/ChooseRunConfigurationAction.java +++ b/platform/lang-impl/src/com/intellij/execution/actions/ChooseRunConfigurationAction.java @@ -219,7 +219,7 @@ public class ChooseRunConfigurationAction extends AnAction { PropertiesComponent.getInstance().setValue("run.configuration.edit.ad", Boolean.toString(true)); if (RunDialog.editConfiguration(project, configuration, "Edit configuration settings", executor.getActionName(), executor.getIcon())) { RunManagerEx.getInstanceEx(project).setSelectedConfiguration(configuration); - ProgramRunnerUtil.executeConfiguration(project, configuration, executor, DataManager.getInstance().getDataContext()); + ProgramRunnerUtil.executeConfiguration(project, configuration, executor); } } @@ -364,7 +364,7 @@ public class ChooseRunConfigurationAction extends AnAction { @Override public void perform(@NotNull Project project, @NotNull Executor executor, @NotNull DataContext context) { RunManagerEx.getInstanceEx(project).setSelectedConfiguration(getValue()); - ProgramRunnerUtil.executeConfiguration(project, getValue(), executor, DataManager.getInstance().getDataContext()); + ProgramRunnerUtil.executeConfiguration(project, getValue(), executor); } @Override @@ -497,7 +497,7 @@ public class ChooseRunConfigurationAction extends AnAction { final RunnerAndConfigurationSettings configuration = RunManager.getInstance(project).getSelectedConfiguration(); if (configuration instanceof RunnerAndConfigurationSettingsImpl) { if (canRun(executor, configuration)) { - ProgramRunnerUtil.executeConfiguration(project, configuration, executor, DataManager.getInstance().getDataContext()); + ProgramRunnerUtil.executeConfiguration(project, configuration, executor); } } } @@ -577,7 +577,7 @@ public class ChooseRunConfigurationAction extends AnAction { public void perform(@NotNull Project project, @NotNull Executor executor, @NotNull DataContext context) { manager.setTemporaryConfiguration(configuration); RunManagerEx.getInstanceEx(project).setSelectedConfiguration(configuration); - ProgramRunnerUtil.executeConfiguration(project, configuration, executor, DataManager.getInstance().getDataContext()); + ProgramRunnerUtil.executeConfiguration(project, configuration, executor); } @Override @@ -710,7 +710,7 @@ public class ChooseRunConfigurationAction extends AnAction { final RunManagerEx manager = RunManagerEx.getInstanceEx(project); if (dynamic) manager.setTemporaryConfiguration(settings); manager.setSelectedConfiguration(settings); - ProgramRunnerUtil.executeConfiguration(project, settings, executor, DataManager.getInstance().getDataContext()); + ProgramRunnerUtil.executeConfiguration(project, settings, executor); } }); }