Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"

1 files changed, 7 insertions, 12 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;
   }