From 90e724330525178ef42575d69f40ea511e1dbcd5 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Thu, 20 Feb 2014 14:39:25 +0100 Subject: [PATCH] CR-IC-4381#CFR-71852 --- .../execution/runners/AsyncGenericProgramRunner.java | 8 ++++---- .../intellij/execution/runners/BaseProgramRunner.java | 10 +++++----- .../execution/runners/GenericProgramRunner.java | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/platform/lang-api/src/com/intellij/execution/runners/AsyncGenericProgramRunner.java b/platform/lang-api/src/com/intellij/execution/runners/AsyncGenericProgramRunner.java index 9ea188f8440e..806537a98162 100644 --- a/platform/lang-api/src/com/intellij/execution/runners/AsyncGenericProgramRunner.java +++ b/platform/lang-api/src/com/intellij/execution/runners/AsyncGenericProgramRunner.java @@ -34,10 +34,10 @@ import org.jetbrains.annotations.Nullable; */ public abstract class AsyncGenericProgramRunner extends BaseProgramRunner { @Override - protected final void startRunProfile(@NotNull final ExecutionEnvironment environment, - @Nullable final Callback callback, - @NotNull final Project project, - @NotNull final RunProfileState state) throws ExecutionException { + protected final void execute(@NotNull final ExecutionEnvironment environment, + @Nullable final Callback callback, + @NotNull final Project project, + @NotNull final RunProfileState state) throws ExecutionException { prepare(project, environment, state).doWhenProcessed(new Consumer() { @Override public void consume(@Nullable final RunProfileStarter result) { diff --git a/platform/lang-api/src/com/intellij/execution/runners/BaseProgramRunner.java b/platform/lang-api/src/com/intellij/execution/runners/BaseProgramRunner.java index b4a6450416bd..53f0670030ee 100644 --- a/platform/lang-api/src/com/intellij/execution/runners/BaseProgramRunner.java +++ b/platform/lang-api/src/com/intellij/execution/runners/BaseProgramRunner.java @@ -63,13 +63,13 @@ abstract class BaseProgramRunner implements Pro Project project = environment.getProject(); RunManager.getInstance(project).refreshUsagesList(environment.getRunProfile()); - startRunProfile(environment, callback, project, state); + execute(environment, callback, project, state); } - protected abstract void startRunProfile(@NotNull ExecutionEnvironment environment, - @Nullable Callback callback, - @NotNull Project project, - @NotNull RunProfileState state) throws ExecutionException; + protected abstract void execute(@NotNull ExecutionEnvironment environment, + @Nullable Callback callback, + @NotNull Project project, + @NotNull RunProfileState state) throws ExecutionException; @Nullable protected static RunContentDescriptor postProcess(@NotNull ExecutionEnvironment environment, @Nullable RunContentDescriptor descriptor, @Nullable Callback callback) { 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 ae783ca31a4b..ab33eb532621 100644 --- a/platform/lang-api/src/com/intellij/execution/runners/GenericProgramRunner.java +++ b/platform/lang-api/src/com/intellij/execution/runners/GenericProgramRunner.java @@ -36,7 +36,7 @@ public abstract class GenericProgramRunner exte public static final String CONTENT_TO_REUSE = CONTENT_TO_REUSE_DATA_KEY.getName(); @Override - protected void startRunProfile(@NotNull ExecutionEnvironment environment, @Nullable final Callback callback, @NotNull Project project, @NotNull RunProfileState state) + protected void execute(@NotNull ExecutionEnvironment environment, @Nullable final Callback callback, @NotNull Project project, @NotNull RunProfileState state) throws ExecutionException { ExecutionManager.getInstance(project).startRunProfile(new RunProfileStarter() { @Override