From e782c57d74000722f9db4c9426317410520670c6 Mon Sep 17 00:00:00 2001 From: Tor Norbye Date: Thu, 18 Sep 2014 11:43:07 -0700 Subject: Snapshot idea/138.2210 from git://git.jetbrains.org/idea/community.git Change-Id: I8f0204d7887ee78cf1fd8c09f936c5afff0edd2f --- .../xdebugger/impl/ui/DebuggerSessionTabBase.java | 57 +++++----------------- 1 file changed, 11 insertions(+), 46 deletions(-) (limited to 'platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/DebuggerSessionTabBase.java') diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/DebuggerSessionTabBase.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/DebuggerSessionTabBase.java index 053f18dd14bf..2bdbb7faa80d 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/DebuggerSessionTabBase.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/DebuggerSessionTabBase.java @@ -16,26 +16,22 @@ package com.intellij.xdebugger.impl.ui; import com.intellij.debugger.ui.DebuggerContentInfo; -import com.intellij.diagnostic.logging.AdditionalTabComponent; -import com.intellij.diagnostic.logging.DebuggerLogConsoleManager; import com.intellij.execution.ExecutionManager; import com.intellij.execution.configurations.RunConfigurationBase; import com.intellij.execution.configurations.RunProfile; import com.intellij.execution.executors.DefaultDebugExecutor; -import com.intellij.execution.process.ProcessHandler; -import com.intellij.execution.runners.ExecutionEnvironment; import com.intellij.execution.runners.RunContentBuilder; import com.intellij.execution.runners.RunTab; -import com.intellij.execution.ui.*; +import com.intellij.execution.ui.ConsoleViewContentType; +import com.intellij.execution.ui.ExecutionConsole; +import com.intellij.execution.ui.ObservableConsoleView; import com.intellij.execution.ui.layout.LayoutAttractionPolicy; import com.intellij.execution.ui.layout.LayoutViewOptions; -import com.intellij.icons.AllIcons; import com.intellij.ide.impl.ProjectUtil; import com.intellij.ide.ui.customization.CustomActionsSchema; import com.intellij.openapi.actionSystem.ActionGroup; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.Disposer; import com.intellij.openapi.util.registry.Registry; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.ui.AppIcon; @@ -44,20 +40,17 @@ import com.intellij.xdebugger.XDebuggerBundle; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import javax.swing.*; import java.util.Collection; /** * @author nik */ -public abstract class DebuggerSessionTabBase extends RunTab implements DebuggerLogConsoleManager { +public abstract class DebuggerSessionTabBase extends RunTab { protected ExecutionConsole myConsole; public DebuggerSessionTabBase(@NotNull Project project, @NotNull String runnerId, @NotNull String sessionName, @NotNull GlobalSearchScope searchScope) { super(project, searchScope, runnerId, XDebuggerBundle.message("xdebugger.default.content.title"), sessionName); - Disposer.register(project, this); - myUi.getDefaults() .initTabDefaults(0, XDebuggerBundle.message("xdebugger.debugger.tab.title"), null) .initFocusContent(DebuggerContentInfo.FRAME_CONTENT, XDebuggerUIConstants.LAYOUT_VIEW_BREAKPOINT_CONDITION) @@ -68,32 +61,6 @@ public abstract class DebuggerSessionTabBase extends RunTab implements DebuggerL return (ActionGroup)CustomActionsSchema.getInstance().getCorrectedAction(id); } - public abstract RunContentDescriptor getRunContentDescriptor(); - - @Override - public ProcessHandler getProcessHandler() { - return getRunContentDescriptor().getProcessHandler(); - } - - @Override - protected Content createLogContent(AdditionalTabComponent tabComponent, String id, Icon icon) { - Content result = super.createLogContent(tabComponent, id, icon); - result.setCloseable(false); - result.setDescription(tabComponent.getTooltip()); - return result; - } - - @Override - protected Icon getDefaultIcon() { - return AllIcons.FileTypes.Text; - } - - @Override - @NotNull - public RunnerLayoutUi getUi() { - return myUi; - } - protected void attachNotificationTo(final Content content) { if (myConsole instanceof ObservableConsoleView) { ObservableConsoleView observable = (ObservableConsoleView)myConsole; @@ -107,12 +74,11 @@ public abstract class DebuggerSessionTabBase extends RunTab implements DebuggerL }, content); RunProfile profile = getRunProfile(); if (profile instanceof RunConfigurationBase && !ApplicationManager.getApplication().isUnitTestMode()) { - final RunConfigurationBase runConfigurationBase = (RunConfigurationBase)profile; - observable.addChangeListener(new RunContentBuilder.ConsoleToFrontListener(runConfigurationBase, - getProject(), + observable.addChangeListener(new RunContentBuilder.ConsoleToFrontListener((RunConfigurationBase)profile, + myProject, DefaultDebugExecutor.getDebugExecutorInstance(), myRunContentDescriptor, - getUi()), + myUi), content); } } @@ -120,21 +86,20 @@ public abstract class DebuggerSessionTabBase extends RunTab implements DebuggerL @Nullable protected RunProfile getRunProfile() { - ExecutionEnvironment environment = getEnvironment(); - return environment != null ? environment.getRunProfile() : null; + return myEnvironment != null ? myEnvironment.getRunProfile() : null; } public void toFront(boolean focus) { if (!ApplicationManager.getApplication().isUnitTestMode()) { - ExecutionManager.getInstance(getProject()).getContentManager().toFrontRunContent(DefaultDebugExecutor.getDebugExecutorInstance(), myRunContentDescriptor); + ExecutionManager.getInstance(myProject).getContentManager().toFrontRunContent(DefaultDebugExecutor.getDebugExecutorInstance(), myRunContentDescriptor); if (focus) { ApplicationManager.getApplication().invokeLater(new Runnable() { @Override public void run() { boolean focusWnd = Registry.is("debugger.mayBringFrameToFrontOnBreakpoint"); - ProjectUtil.focusProjectWindow(getProject(), focusWnd); + ProjectUtil.focusProjectWindow(myProject, focusWnd); if (!focusWnd) { - AppIcon.getInstance().requestAttention(getProject(), true); + AppIcon.getInstance().requestAttention(myProject, true); } } }); -- cgit v1.2.3