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

Conflicts:
	.idea/libraries/asm_tools.xml
	.idea/libraries/bouncy_castle.xml
	.idea/libraries/builder_model.xml
	.idea/libraries/commons_compress.xml
	.idea/libraries/easymock_tools.xml
	.idea/libraries/freemarker_2_3_20.xml
	.idea/libraries/guava_tools.xml
	.idea/libraries/kxml2.xml
	.idea/libraries/lombok_ast.xml
	.idea/libraries/mockito.xml
	.idea/modules.xml
	.idea/vcs.xml
	build/scripts/layouts.gant
	updater/src/com/intellij/updater/Runner.java

Change-Id: I8e1c173e00cd76c855b8a98543b0a0edfdd99d12

1 files changed, 19 insertions, 23 deletions

diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/XsltRunConfiguration.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/XsltRunConfiguration.java
index b45a08825d01..8cf2c67d4bc9 100644
--- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/XsltRunConfiguration.java
+++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/XsltRunConfiguration.java
@@ -15,7 +15,6 @@
  */
 package org.intellij.lang.xpath.xslt.run;
 
-import com.intellij.diagnostic.logging.DebuggerLogConsoleManager;
 import com.intellij.execution.ExecutionException;
 import com.intellij.execution.Executor;
 import com.intellij.execution.configurations.*;
@@ -140,32 +139,29 @@ public final class XsltRunConfiguration extends LocatableConfigurationBase imple
         return state;
     }
 
-    //invoke before run/debug tabs are shown.
-    //Should be overriden to add additional tabs for run/debug toolwindow
     @Override
     public void createAdditionalTabComponents(final AdditionalTabComponentManager manager, ProcessHandler startedProcess) {
-        if (myOutputType == OutputType.CONSOLE) {
-            final HighlightingOutputConsole console = new HighlightingOutputConsole(getProject(), myFileType);
-
-            final List<XsltRunnerExtension> extensions = XsltRunnerExtension.getExtensions(this, manager instanceof DebuggerLogConsoleManager);
-            boolean consoleTabAdded = false;
-            for (XsltRunnerExtension extension : extensions) {
-                if (extension.createTabs(getProject(), manager, console, startedProcess)) {
-                    consoleTabAdded = true;
-                }
-            }
-            if (!consoleTabAdded) {
-                manager.addAdditionalTabComponent(console, console.getTabTitle());    // TODO: verify parameter
-            }
-
-            final OutputTabAdapter listener = new OutputTabAdapter(startedProcess, console);
+      if (myOutputType == OutputType.CONSOLE) {
+        final HighlightingOutputConsole console = new HighlightingOutputConsole(getProject(), myFileType);
+
+        boolean consoleTabAdded = false;
+        for (XsltRunnerExtension extension : XsltRunnerExtension.getExtensions(this, false /* doesn't matter, xslt debugger uses own flag */)) {
+          if (extension.createTabs(getProject(), manager, console, startedProcess)) {
+            consoleTabAdded = true;
+          }
+        }
+        if (!consoleTabAdded) {
+          manager.addAdditionalTabComponent(console, console.getTabTitle());    // TODO: verify parameter
+        }
 
-            if (startedProcess.isStartNotified()) {
-                listener.startNotified(new ProcessEvent(startedProcess));
-            } else {
-                startedProcess.addProcessListener(listener);
-            }
+        final OutputTabAdapter listener = new OutputTabAdapter(startedProcess, console);
+        if (startedProcess.isStartNotified()) {
+          listener.startNotified(new ProcessEvent(startedProcess));
+        }
+        else {
+          startedProcess.addProcessListener(listener);
         }
+      }
     }
 
     @Override