diff options
Diffstat (limited to 'java/execution')
-rw-r--r-- | java/execution/impl/src/com/intellij/execution/impl/DefaultJavaProgramRunner.java | 19 | ||||
-rw-r--r-- | java/execution/openapi/src/com/intellij/execution/JavaExecutionUtil.java | 15 |
2 files changed, 14 insertions, 20 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 3190e19dcee4..27280b193c2c 100644 --- a/java/execution/impl/src/com/intellij/execution/impl/DefaultJavaProgramRunner.java +++ b/java/execution/impl/src/com/intellij/execution/impl/DefaultJavaProgramRunner.java @@ -99,24 +99,19 @@ public class DefaultJavaProgramRunner extends JavaPatchableProgramRunner { onProcessStarted(env.getRunnerSettings(), executionResult); - final RunContentBuilder contentBuilder = new RunContentBuilder(this, executionResult, env); + final RunContentBuilder contentBuilder = new RunContentBuilder(executionResult, env); Disposer.register(project, contentBuilder); if (shouldAddDefaultActions) { addDefaultActions(contentBuilder); } - - RunContentDescriptor runContent = contentBuilder.showRunContent(contentToReuse); - - AnAction[] actions = createActions(contentBuilder.getExecutionResult()); - - for (AnAction action : actions) { - contentBuilder.addAction(action); - } - - return runContent; + return contentBuilder.showRunContent(contentToReuse); } - protected AnAction[] createActions(final ExecutionResult executionResult) { + @Deprecated + /** + * @deprecated to remove in IDEA 14 + */ + protected AnAction[] createActions(@SuppressWarnings("UnusedParameters") final ExecutionResult executionResult) { return AnAction.EMPTY_ARRAY; } diff --git a/java/execution/openapi/src/com/intellij/execution/JavaExecutionUtil.java b/java/execution/openapi/src/com/intellij/execution/JavaExecutionUtil.java index 53861de25c3c..4c59e267b209 100644 --- a/java/execution/openapi/src/com/intellij/execution/JavaExecutionUtil.java +++ b/java/execution/openapi/src/com/intellij/execution/JavaExecutionUtil.java @@ -21,7 +21,8 @@ import com.intellij.execution.filters.Filter; import com.intellij.execution.filters.TextConsoleBuilder; import com.intellij.execution.filters.TextConsoleBuilderFactory; import com.intellij.execution.runners.ExecutionEnvironment; -import com.intellij.execution.runners.ProgramRunner; +import com.intellij.execution.runners.ExecutionEnvironmentBuilder; +import com.intellij.execution.runners.ExecutionUtil; import com.intellij.execution.util.ExecutionErrorDialog; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.module.Module; @@ -56,13 +57,11 @@ public class JavaExecutionUtil { public static boolean executeRun(@NotNull final Project project, String contentName, Icon icon, DataContext dataContext, Filter[] filters) throws ExecutionException { final JavaParameters cmdLine = JavaParameters.JAVA_PARAMETERS.getData(dataContext); final DefaultRunProfile profile = new DefaultRunProfile(project, cmdLine, contentName, icon, filters); - final ProgramRunner runner = RunnerRegistry.getInstance().getRunner(DefaultRunExecutor.EXECUTOR_ID, profile); - if (runner != null) { - Executor executor = DefaultRunExecutor.getRunExecutorInstance(); - runner.execute(new ExecutionEnvironment(profile, executor, project, null)); + ExecutionEnvironmentBuilder builder = ExecutionEnvironmentBuilder.createOrNull(project, DefaultRunExecutor.getRunExecutorInstance(), profile); + if (builder != null) { + builder.buildAndExecute(); return true; } - return false; } @@ -114,7 +113,7 @@ public class JavaExecutionUtil { } @Override - public RunProfileState getState(@NotNull final Executor executor, @NotNull final ExecutionEnvironment env) throws ExecutionException { + public RunProfileState getState(@NotNull final Executor executor, @NotNull final ExecutionEnvironment env) { final JavaCommandLineState state = new JavaCommandLineState(env) { @Override protected JavaParameters createJavaParameters() { @@ -146,7 +145,7 @@ public class JavaExecutionUtil { } /** - * {@link JavaExecutionUtil#getPresentableClassName(java.lang.String)} + * {@link JavaExecutionUtil#getPresentableClassName(java.lang.String)} */ @Deprecated @Nullable |