From a6f04e0949044851f7c74c4ef2f9a87d2e1b0cf2 Mon Sep 17 00:00:00 2001
From: nik <Nikolay.Chashnikov@jetbrains.com>
Date: Thu, 20 Jan 2011 16:04:38 +0300
Subject: [PATCH] content ui: fixed showing tabs & toolbar [rev by kirillk]

---
 .../execution/ui/layout/impl/RunnerContentUi.java        | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/RunnerContentUi.java b/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/RunnerContentUi.java
index 208a3efcb376..52a483d61463 100644
--- a/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/RunnerContentUi.java
+++ b/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/RunnerContentUi.java
@@ -84,7 +84,7 @@ public class RunnerContentUi implements ContentUI, Disposable, CellTransform.Fac
 
   Map<GridImpl, Wrapper> myMinimizedButtonsPlaceholder = new HashMap<GridImpl, Wrapper>();
   Map<GridImpl, Wrapper> myCommonActionsPlaceholder = new HashMap<GridImpl, Wrapper>();
-  Map<GridImpl, Set<Content>> myContextActions = new HashMap<GridImpl, Set<Content>>();
+  Map<GridImpl, AnAction[]> myContextActions = new HashMap<GridImpl, AnAction[]>();
 
   boolean myUiLastStateWasRestored;
 
@@ -447,7 +447,8 @@ public class RunnerContentUi implements ContentUI, Disposable, CellTransform.Fac
         groupToBuild = group;
       }
 
-      if (!contents.equals(myContextActions.get(entry.getKey()))) {
+      final AnAction[] actions = groupToBuild.getChildren(null);
+      if (!Arrays.equals(actions, myContextActions.get(entry.getKey()))) {
         ActionToolbar tb = myActionManager.createActionToolbar(myActionsPlace, groupToBuild, true);
         tb.setTargetComponent(contextComponent);
         eachPlaceholder.setContent(tb.getComponent());
@@ -457,7 +458,7 @@ public class RunnerContentUi implements ContentUI, Disposable, CellTransform.Fac
         hasToolbarContent = true;
       }
 
-      myContextActions.put(entry.getKey(), contents);
+      myContextActions.put(entry.getKey(), actions);
     }
 
     return hasToolbarContent;
@@ -486,7 +487,7 @@ public class RunnerContentUi implements ContentUI, Disposable, CellTransform.Fac
       hasToolbarContent |= updateTabUI(each);
     }
 
-    myTabs.getPresentation().setHideTabs(!hasToolbarContent);
+    myTabs.getPresentation().setHideTabs(!hasToolbarContent && tabs.size() <= 1);
 
     myTabs.updateTabActions(validateNow);