diff options
Diffstat (limited to 'plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run')
2 files changed, 21 insertions, 23 deletions
diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/HighlightingOutputConsole.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/HighlightingOutputConsole.java index 350973b4369d..90f088d86ad6 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/HighlightingOutputConsole.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/HighlightingOutputConsole.java @@ -29,6 +29,7 @@ import com.intellij.openapi.fileTypes.FileTypeEditorHighlighterProviders; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Disposer; import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import javax.swing.*; @@ -107,6 +108,7 @@ public class HighlightingOutputConsole extends AdditionalTabComponent implements } } + @NotNull public String getTabTitle() { return TAB_TITLE; } 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 |