From 2c1f108284e749398b2d9db66932fc0e12cd8e96 Mon Sep 17 00:00:00 2001 From: Dennis Ushakov Date: Tue, 14 Dec 2010 17:10:40 +0300 Subject: [PATCH] RUBY-7331 autotest shouldn't popup run toolwindow --- .../execution/ui/RunContentManagerImpl.java | 21 +++++++------------ 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/execution/ui/RunContentManagerImpl.java b/platform/lang-impl/src/com/intellij/execution/ui/RunContentManagerImpl.java index 3d7ad9371fa0..7b7f2513907a 100644 --- a/platform/lang-impl/src/com/intellij/execution/ui/RunContentManagerImpl.java +++ b/platform/lang-impl/src/com/intellij/execution/ui/RunContentManagerImpl.java @@ -252,9 +252,6 @@ public class RunContentManagerImpl implements RunContentManager, Disposable { public void showRunContent(@NotNull final Executor executor, final RunContentDescriptor descriptor) { if(ApplicationManager.getApplication().isUnitTestMode()) return; - final ToolWindow toolWindow = ToolWindowManager.getInstance(myProject).getToolWindow(executor.getToolWindowId()); - final boolean wasInActiveWindow = toolWindow != null && toolWindow.isActive(); - final ContentManager contentManager = getContentManagerForRunner(executor); RunContentDescriptor oldDescriptor = chooseReuseContentForDescriptor(contentManager, descriptor); @@ -311,17 +308,13 @@ public class RunContentManagerImpl implements RunContentManager, Disposable { ApplicationManager.getApplication().invokeLater(new Runnable() { public void run() { ToolWindow window = ToolWindowManager.getInstance(myProject).getToolWindow(executor.getToolWindowId()); - if (wasInActiveWindow) { - window.activate(null, true, false); - } else { - // let's activate tool window, but don't move focus - // - // window.show() isn't valid here, because it will not - // mark the window as "last activated" windows and thus - // some action like navigation up/down in stactrace wont - // work correctly - window.activate(null, false, false); - } + // let's activate tool window, but don't move focus + // + // window.show() isn't valid here, because it will not + // mark the window as "last activated" windows and thus + // some action like navigation up/down in stactrace wont + // work correctly + window.activate(null, false, false); } }); }