This commit is contained in:
Vladimir Krivosheev
2016-11-08 14:04:52 +01:00
parent 18530b2b12
commit 572d70091c
2 changed files with 5 additions and 6 deletions
@@ -31,9 +31,9 @@ import org.jetbrains.concurrency.Promise;
*/
public abstract class AsyncGenericProgramRunner<Settings extends RunnerSettings> extends BaseProgramRunner<Settings> {
@Override
protected final void execute(@NotNull final ExecutionEnvironment environment,
@Nullable final Callback callback,
@NotNull final RunProfileState state) throws ExecutionException {
protected final void execute(@NotNull ExecutionEnvironment environment,
@Nullable Callback callback,
@NotNull RunProfileState state) throws ExecutionException {
prepare(environment, state)
.done(result -> UIUtil.invokeLaterIfNeeded(() -> {
if (!environment.getProject().isDisposed()) {
@@ -24,15 +24,12 @@ import com.intellij.execution.configurations.RunnerSettings;
import com.intellij.execution.ui.RunContentDescriptor;
import com.intellij.openapi.actionSystem.DataKey;
import com.intellij.openapi.project.Project;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
public abstract class GenericProgramRunner<Settings extends RunnerSettings> extends BaseProgramRunner<Settings> {
@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();
@Override
protected void execute(@NotNull ExecutionEnvironment environment, @Nullable final Callback callback, @NotNull RunProfileState state)
@@ -47,12 +44,14 @@ public abstract class GenericProgramRunner<Settings extends RunnerSettings> exte
@Nullable
protected RunContentDescriptor doExecute(@NotNull RunProfileState state, @NotNull ExecutionEnvironment environment) throws ExecutionException {
//noinspection deprecation
return doExecute(environment.getProject(), state, environment.getContentToReuse(), environment);
}
/**
* @deprecated to remove in IDEA 16
*/
@SuppressWarnings({"unused", "DeprecatedIsStillUsed"})
@Deprecated
@Nullable
protected RunContentDescriptor doExecute(@NotNull Project project,