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

cleanup (IDEA-54906 fixed)

Browse Source
This commit is contained in:
nik
2010-06-03 11:49:17 +04:00
parent b3b20f7dd5
commit 3fa64fe8c2
4 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-api/src/com/intellij/execution/runners/GenericProgramRunner.java
+1 -3
View File
@@ -36,9 +36,7 @@ import org.jetbrains.annotations.Nullable;
*/
public abstract class GenericProgramRunner<Settings extends JDOMExternalizable> implements ProgramRunner<Settings> {
/**
* @see com.intellij.execution.ui.RunContentDescriptor#myContent
*/
@Deprecated
public static final DataKey<RunContentDescriptor> CONTENT_TO_REUSE_DATA_KEY = DataKey.create("contentToReuse");
@Deprecated @NonNls public static final String CONTENT_TO_REUSE = CONTENT_TO_REUSE_DATA_KEY.getName();
platform/lang-impl/src/com/intellij/execution/ExecutorRegistryImpl.java
+1 -1
View File
@@ -189,7 +189,7 @@ public class ExecutorRegistryImpl extends ExecutorRegistry {
return;
}
ProgramRunnerUtil.executeConfiguration(project, getConfiguration(project), myExecutor, dataContext);
ProgramRunnerUtil.executeConfiguration(project, getConfiguration(project), myExecutor);
}
}
}
platform/lang-impl/src/com/intellij/execution/ProgramRunnerUtil.java
+2 -2
View File
@@ -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);
platform/lang-impl/src/com/intellij/execution/actions/ChooseRunConfigurationAction.java
+5 -5
View File
@@ -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);
}
});
}