From 25198531c741a42b24cd5945e26911eb83b9985c Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Fri, 12 Sep 2014 17:15:50 +0200 Subject: [PATCH] =?UTF-8?q?cleanup=20=E2=80=94=20don't=20expose=20executio?= =?UTF-8?q?n=20result?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../intellij/execution/impl/DefaultJavaProgramRunner.java | 6 ++---- .../com/intellij/execution/runners/RunContentBuilder.java | 5 ----- 2 files changed, 2 insertions(+), 9 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 0b8f32964d59..3e6d6062cd2c 100644 --- a/java/execution/impl/src/com/intellij/execution/impl/DefaultJavaProgramRunner.java +++ b/java/execution/impl/src/com/intellij/execution/impl/DefaultJavaProgramRunner.java @@ -97,7 +97,7 @@ public class DefaultJavaProgramRunner extends JavaPatchableProgramRunner { final RunContentBuilder contentBuilder = new RunContentBuilder(executionResult, env); if (shouldAddDefaultActions) { - addDefaultActions(contentBuilder); + addDefaultActions(contentBuilder, executionResult); } return contentBuilder.showRunContent(env.getContentToReuse()); } @@ -110,8 +110,7 @@ public class DefaultJavaProgramRunner extends JavaPatchableProgramRunner { return AnAction.EMPTY_ARRAY; } - protected static void addDefaultActions(final RunContentBuilder contentBuilder) { - final ExecutionResult executionResult = contentBuilder.getExecutionResult(); + private static void addDefaultActions(@NotNull RunContentBuilder contentBuilder, @NotNull ExecutionResult executionResult) { final ExecutionConsole executionConsole = executionResult.getExecutionConsole(); final JComponent consoleComponent = executionConsole != null ? executionConsole.getComponent() : null; final ControlBreakAction controlBreakAction = new ControlBreakAction(executionResult.getProcessHandler()); @@ -131,7 +130,6 @@ public class DefaultJavaProgramRunner extends JavaPatchableProgramRunner { contentBuilder.addAction(new SoftExitAction(executionResult.getProcessHandler())); } - private abstract static class LauncherBasedAction extends AnAction { protected final ProcessHandler myProcessHandler; diff --git a/platform/lang-impl/src/com/intellij/execution/runners/RunContentBuilder.java b/platform/lang-impl/src/com/intellij/execution/runners/RunContentBuilder.java index 14877309db74..841c13f1eb7d 100644 --- a/platform/lang-impl/src/com/intellij/execution/runners/RunContentBuilder.java +++ b/platform/lang-impl/src/com/intellij/execution/runners/RunContentBuilder.java @@ -100,11 +100,6 @@ public class RunContentBuilder extends RunTab { return SearchScopeProvider.createSearchScope(project, runProfile); } - @NotNull - public ExecutionResult getExecutionResult() { - return myExecutionResult; - } - public void addAction(@NotNull final AnAction action) { myRunnerActions.add(action); }