From f8d097897ed45fb4a851322fcb6fb0ae8193700e Mon Sep 17 00:00:00 2001
From: Alexey Pegov <Alexey.Pegov@jetbrains.com>
Date: Tue, 15 Sep 2009 20:00:50 +0400
Subject: [PATCH] Pin tab action now available in Tool Window toolbar for run,
 debug, find usages and hierarchy toolwindows

---
 .../debugger/ui/DebuggerSessionTab.java       |   2 +
 platform/icons/src/general/pin_tab.png        | Bin 0 -> 849 bytes
 .../execution/runners/RunContentBuilder.java  |   2 +
 .../ide/hierarchy/HierarchyBrowserBase.java   |   2 +
 .../openapi/wm/impl/InternalDecorator.java    |   8 ++-
 .../wm/impl/content/ToolWindowContentUi.java  |   6 +-
 .../ui/content/TabbedPaneContentUI.java       |   8 ++-
 .../content/tabs/PinToolwindowTabAction.java  |  67 ++++++++++++++++++
 .../ui/content/tabs/TabbedContentAction.java  |  27 -------
 .../src/idea/PlatformActions.xml              |   2 +
 .../intellij/usages/impl/UsageViewImpl.java   |   1 +
 .../xdebugger/impl/ui/XDebugSessionTab.java   |   2 +
 12 files changed, 95 insertions(+), 32 deletions(-)
 create mode 100644 platform/icons/src/general/pin_tab.png
 create mode 100644 platform/platform-impl/src/com/intellij/ui/content/tabs/PinToolwindowTabAction.java

diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/DebuggerSessionTab.java b/java/debugger/impl/src/com/intellij/debugger/ui/DebuggerSessionTab.java
index 927a4ef55c86..7e1cb650c9e8 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/DebuggerSessionTab.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/DebuggerSessionTab.java
@@ -42,6 +42,7 @@ import com.intellij.ui.content.AlertIcon;
 import com.intellij.ui.content.Content;
 import com.intellij.ui.content.ContentManagerAdapter;
 import com.intellij.ui.content.ContentManagerEvent;
+import com.intellij.ui.content.tabs.PinToolwindowTabAction;
 import com.intellij.unscramble.ThreadDumpPanel;
 import com.intellij.unscramble.ThreadState;
 import com.intellij.xdebugger.XDebuggerBundle;
@@ -333,6 +334,7 @@ public class DebuggerSessionTab extends DebuggerLogConsoleManagerBase implements
 
     group.addSeparator();
 
+    addActionToGroup(group, PinToolwindowTabAction.ACTION_NAME);
     group.add(new CloseAction(executor, myRunContentDescriptor, getProject()));
     group.add(new ContextHelpAction(executor.getHelpId()));
 
diff --git a/platform/icons/src/general/pin_tab.png b/platform/icons/src/general/pin_tab.png
new file mode 100644
index 0000000000000000000000000000000000000000..ccf38390572f20cc303686fdfe8e9be258f358c1
GIT binary patch
literal 849
zcmV-X1FrmuP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!^GQTORCwB?Q(Z_DQ5Ze<&g`h|PP4X2
z3MCs7WRgf^Fa2OjR8*u^L_~%LJ@p_26;YJ*)Jysj6=E)gy(Sb0g<$p)WnvFT64ti0
zYX0ob?z-##%$@0**;;$=US_^Kcjlb?edjyFUUeUUMU&B_*kD@xJOHmS*=u33LDOVG
zilBW66UdqQwILWfZa;%eA3I<hBq{3Pwmt0{mnAHQCY$HJPIM;{dJmCwox1))$3NrI
z%~mIJ`(|fAr__0Teyx1VPLyrjimmmBu($ORs(0+~<gTKRPwpJ6`<FoEp??S{CCfrE
z8JmZdS%#I3!^|#&Ws~q%RbgM_!Ag&+jrQGYDUcW<AGuwhMT^6iUj~zjrC>4|g2=>(
zNXKL_fuVPC=*b-R)>o@;ck$@`8z&qR!}^l}olK&zd|HBaeSSX#b7cu46@ea&V0=o)
z!{<x*Ij3WH^%_-TeB|D>Q(jv{hrk9KX8xi1>QEpw{dpofJB?iG7phBVP+~<9o=>3v
zWehC2h}yEaW>`|cF!^c;SyL*A6G_SKV;{y7DSZxddI4v)|G=(_MXXnJq~lBQNel3~
zR+<fyH#h|Gw2V*Tk^;f-RH=XLD_40g2_vP$Wya82GmEpeGcYnKGC~@g+%ek^wqGEJ
zqYB=B_c-9DqZho96$IW)8HmKfXxi>VO<4wt$UqQKX4JeA56Tq-Vg~sP5?Ptp^7W9O
z{iKMN&RU2Wr6b=KdCRLW#i8lA3SR7nvQ~ra_F!FU5p_ZGI~gzr$A^taE_AwN-ki<=
zs_N|;c-nh=fcEcRIXyBK_S_nuQQIqhLR%vnNadJaLcnoxN8364(3LvIq)|hNAY;63
z_<8TdUriL5V}qukz3rrz+H8yGr>^OA1$rJl*5wdsV4CQshV~J-i!#y=9KYz)Q=u8y
z>`T*<+aA%W)PUV``q2tTk_p@i&Irf`nPY1PiQWk!Sk7`}ganDf(P<UT3RY&8ZN>i>
bzXccot+;GKD|<jk00000NkvXXu0mjfjgE=j

literal 0
HcmV?d00001

diff --git a/platform/lang-impl/src/com/intellij/execution/runners/RunContentBuilder.java b/platform/lang-impl/src/com/intellij/execution/runners/RunContentBuilder.java
index fb9c915830bc..5c1f71f9a2c2 100644
--- a/platform/lang-impl/src/com/intellij/execution/runners/RunContentBuilder.java
+++ b/platform/lang-impl/src/com/intellij/execution/runners/RunContentBuilder.java
@@ -28,6 +28,7 @@ import com.intellij.openapi.util.IconLoader;
 import com.intellij.ui.content.Content;
 import com.intellij.ui.content.ContentManagerAdapter;
 import com.intellij.ui.content.ContentManagerEvent;
+import com.intellij.ui.content.tabs.PinToolwindowTabAction;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 
@@ -215,6 +216,7 @@ public class RunContentBuilder implements LogConsoleManager, Disposable  {
     actionGroup.addSeparator();
     actionGroup.add(myUi.getOptions().getLayoutActions());
     actionGroup.addSeparator();
+    actionGroup.add(PinToolwindowTabAction.getPinAction());
     actionGroup.add(new CloseAction(myExecutor, contentDescriptor, myProject));
     actionGroup.add(new ContextHelpAction(myExecutor.getHelpId()));
     return actionGroup;
diff --git a/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserBase.java b/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserBase.java
index df66908aa2f2..fd944c0f4d41 100644
--- a/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserBase.java
+++ b/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserBase.java
@@ -10,6 +10,7 @@ import com.intellij.pom.Navigatable;
 import com.intellij.psi.NavigatablePsiElement;
 import com.intellij.psi.PsiElement;
 import com.intellij.ui.content.Content;
+import com.intellij.ui.content.tabs.PinToolwindowTabAction;
 import com.intellij.ui.AutoScrollToSourceHandler;
 import com.intellij.ui.TreeSpeedSearch;
 import com.intellij.ui.TreeToolTipHandler;
@@ -75,6 +76,7 @@ public abstract class HierarchyBrowserBase extends SimpleToolWindowPanel impleme
 
   protected void appendActions(@NotNull DefaultActionGroup actionGroup, @Nullable String helpID) {
     actionGroup.add(myAutoScrollToSourceHandler.createToggleAction());
+    actionGroup.add(PinToolwindowTabAction.getPinAction());
     actionGroup.add(new CloseAction());
     if (helpID != null) {
       actionGroup.add(new ContextHelpAction(helpID));
diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/InternalDecorator.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/InternalDecorator.java
index edad790f3511..d979510378ab 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/InternalDecorator.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/InternalDecorator.java
@@ -40,7 +40,7 @@ import java.util.Map;
  * @author Eugene Belyaev
  * @author Vladimir Kondratyev
  */
-public final class InternalDecorator extends JPanel implements TestableUi {
+public final class InternalDecorator extends JPanel implements TestableUi, TypeSafeDataProvider {
   private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.wm.impl.InternalDecorator");
 
   private static final int DIVIDER_WIDTH = 5;
@@ -268,6 +268,12 @@ public final class InternalDecorator extends JPanel implements TestableUi {
     }
   }
 
+  public void calcData(DataKey key, DataSink sink) {
+    if (PlatformDataKeys.TOOL_WINDOW.equals(key)) {
+      sink.put(PlatformDataKeys.TOOL_WINDOW, myToolWindow);
+    }
+  }
+
   final void addInternalDecoratorListener(final InternalDecoratorListener l) {
     myListenerList.add(InternalDecoratorListener.class, l);
   }
diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/content/ToolWindowContentUi.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/content/ToolWindowContentUi.java
index 419d2c98fc53..b5b331f5bb59 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/content/ToolWindowContentUi.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/content/ToolWindowContentUi.java
@@ -8,6 +8,7 @@ import com.intellij.openapi.wm.impl.ToolWindowImpl;
 import com.intellij.ui.PopupHandler;
 import com.intellij.ui.content.*;
 import com.intellij.ui.content.tabs.TabbedContentAction;
+import com.intellij.ui.content.tabs.PinToolwindowTabAction;
 import com.intellij.ui.tabs.impl.singleRow.MoreIcon;
 import com.intellij.util.ui.BaseButtonBehavior;
 import com.intellij.util.ui.UIUtil;
@@ -28,6 +29,7 @@ import java.util.HashMap;
 import java.util.Map;
 
 public class ToolWindowContentUi extends JPanel implements ContentUI, PropertyChangeListener, DataProvider {
+  public static final String POPUP_PLACE = "ToolwindowPopup";
 
   private ContentManager myManager;
 
@@ -499,7 +501,7 @@ public class ToolWindowContentUi extends JPanel implements ContentUI, PropertyCh
       contentGroup.add(new TabbedContentAction.CloseAllButThisAction(content));
       contentGroup.addSeparator();
       if (content.isPinnable()) {
-        contentGroup.add(new TabbedContentAction.MyPinTabAction(content));
+        contentGroup.add(PinToolwindowTabAction.getPinAction());
         contentGroup.addSeparator();
       }
 
@@ -518,7 +520,7 @@ public class ToolWindowContentUi extends JPanel implements ContentUI, PropertyCh
           group.addAll(windowPopup);
         }
 
-        final ActionPopupMenu popupMenu = ActionManager.getInstance().createActionPopupMenu(ActionPlaces.UNKNOWN, group);
+        final ActionPopupMenu popupMenu = ActionManager.getInstance().createActionPopupMenu(POPUP_PLACE, group);
         popupMenu.getComponent().show(comp, x, y);
       }
     });
diff --git a/platform/platform-impl/src/com/intellij/ui/content/TabbedPaneContentUI.java b/platform/platform-impl/src/com/intellij/ui/content/TabbedPaneContentUI.java
index d1afb0e007fd..fb13cb526919 100644
--- a/platform/platform-impl/src/com/intellij/ui/content/TabbedPaneContentUI.java
+++ b/platform/platform-impl/src/com/intellij/ui/content/TabbedPaneContentUI.java
@@ -8,6 +8,7 @@ import com.intellij.ui.TabbedPaneWrapper;
 import com.intellij.ui.TabbedPaneImpl;
 import com.intellij.ui.TabbedPane;
 import com.intellij.ui.content.tabs.TabbedContentAction;
+import com.intellij.ui.content.tabs.PinToolwindowTabAction;
 import com.intellij.util.IJSwingUtilities;
 
 import javax.swing.*;
@@ -26,6 +27,8 @@ import java.util.List;
  * @author Vladimir Kondratyev
  */
 public class TabbedPaneContentUI implements ContentUI, PropertyChangeListener {
+  public static final String POPUP_PLACE = "TabbedPanePopup";
+
   private ContentManager myManager;
   private TabbedPaneWrapper myTabbedPaneWrapper;
 
@@ -118,6 +121,7 @@ public class TabbedPaneContentUI implements ContentUI, PropertyChangeListener {
     }
 
     private class MyTabbedPane extends TabbedPaneImpl {
+
       public MyTabbedPane(int tabPlacement) {
         super(tabPlacement);
         addMouseListener(new MyPopupHandler());
@@ -230,7 +234,7 @@ public class TabbedPaneContentUI implements ContentUI, PropertyChangeListener {
           group.add(new TabbedContentAction.CloseAllButThisAction(content));
         }
         group.addSeparator();
-        group.add(new TabbedContentAction.MyPinTabAction(content));
+        group.add(PinToolwindowTabAction.getPinAction());
         group.addSeparator();
         group.add(new TabbedContentAction.MyNextTabAction(myManager));
         group.add(new TabbedContentAction.MyPreviousTabAction(myManager));
@@ -241,7 +245,7 @@ public class TabbedPaneContentUI implements ContentUI, PropertyChangeListener {
             group.add(anAction);
           }
         }
-        ActionPopupMenu menu = ActionManager.getInstance().createActionPopupMenu(ActionPlaces.UNKNOWN, group);
+        ActionPopupMenu menu = ActionManager.getInstance().createActionPopupMenu(POPUP_PLACE, group);
         menu.getComponent().show(myTabbedPaneWrapper.getComponent(), x, y);
       }
     }
diff --git a/platform/platform-impl/src/com/intellij/ui/content/tabs/PinToolwindowTabAction.java b/platform/platform-impl/src/com/intellij/ui/content/tabs/PinToolwindowTabAction.java
new file mode 100644
index 000000000000..b624be955212
--- /dev/null
+++ b/platform/platform-impl/src/com/intellij/ui/content/tabs/PinToolwindowTabAction.java
@@ -0,0 +1,67 @@
+package com.intellij.ui.content.tabs;
+
+import com.intellij.openapi.actionSystem.*;
+import com.intellij.openapi.util.IconLoader;
+import com.intellij.openapi.wm.ToolWindow;
+import com.intellij.openapi.wm.impl.content.ToolWindowContentUi;
+import com.intellij.ui.content.Content;
+import com.intellij.ui.content.ContentManager;
+import com.intellij.ui.content.TabbedPaneContentUI;
+import org.jetbrains.annotations.Nullable;
+
+import javax.swing.*;
+
+/**
+ * @author spleaner
+ */
+public class PinToolwindowTabAction extends ToggleAction {
+  public static final String ACTION_NAME = "PinToolwindowTab";
+
+  private static final Icon ICON = IconLoader.getIcon("/general/pin_tab.png");
+
+  public static AnAction getPinAction() {
+    return ActionManager.getInstance().getAction(ACTION_NAME);
+  }
+
+  public PinToolwindowTabAction() {
+    super("Pin Tab", "Pin tool window tab", ICON);
+  }
+
+  @Nullable
+  private static Content getContextContent(AnActionEvent event) {
+    final ToolWindow window = PlatformDataKeys.TOOL_WINDOW.getData(event.getDataContext());
+    if (window != null) {
+      final ContentManager contentManager = window.getContentManager();
+      if (contentManager != null) {
+        return contentManager.getSelectedContent();
+      }
+    }
+
+    return null;
+  }
+
+  public boolean isSelected(AnActionEvent event) {
+    final Content content = getContextContent(event);
+    return content != null && content.isPinned();
+  }
+
+  public void setSelected(AnActionEvent event, boolean flag) {
+    final Content content = getContextContent(event);
+    if (content != null) content.setPinned(flag);
+  }
+
+  public void update(AnActionEvent event) {
+    super.update(event);
+    Presentation presentation = event.getPresentation();
+    final Content content = getContextContent(event);
+    boolean enabled = content != null && content.isPinnable();
+
+    if (enabled) {
+      presentation.setIcon(
+        TabbedPaneContentUI.POPUP_PLACE.equals(event.getPlace()) || ToolWindowContentUi.POPUP_PLACE.equals(event.getPlace()) ? null : ICON);
+    }
+
+    presentation.setEnabled(enabled);
+    presentation.setVisible(enabled);
+  }
+}
diff --git a/platform/platform-impl/src/com/intellij/ui/content/tabs/TabbedContentAction.java b/platform/platform-impl/src/com/intellij/ui/content/tabs/TabbedContentAction.java
index e9d6ad0d8bf7..cffdf5fc4ea0 100644
--- a/platform/platform-impl/src/com/intellij/ui/content/tabs/TabbedContentAction.java
+++ b/platform/platform-impl/src/com/intellij/ui/content/tabs/TabbedContentAction.java
@@ -101,33 +101,6 @@ public abstract class TabbedContentAction extends AnAction implements DumbAware
     }
   }
 
-  public static class MyPinTabAction extends ToggleAction {
-    private final Content myContent;
-
-    public MyPinTabAction(Content content) {
-      myContent = content;
-      Presentation presentation = getTemplatePresentation();
-      presentation.setText(UIBundle.message("tabbed.pane.pin.tab.action.name"));
-      presentation.setDescription(UIBundle.message("tabbed.pane.pin.tab.action.description"));
-    }
-
-    public boolean isSelected(AnActionEvent event) {
-      return myContent != null && myContent.isPinned();
-    }
-
-    public void setSelected(AnActionEvent event, boolean flag) {
-      myContent.setPinned(flag);
-    }
-
-    public void update(AnActionEvent event) {
-      super.update(event);
-      Presentation presentation = event.getPresentation();
-      boolean enabled = myContent != null && myContent.isPinnable();
-      presentation.setEnabled(enabled);
-      presentation.setVisible(enabled);
-    }
-  }
-
   public static class CloseAllAction extends TabbedContentAction {
     public CloseAllAction(ContentManager manager) {
       super(manager, ActionManager.getInstance().getAction(IdeActions.ACTION_CLOSE_ALL_EDITORS), UIBundle.message("tabbed.pane.close.all.action.name"));
diff --git a/platform/platform-resources/src/idea/PlatformActions.xml b/platform/platform-resources/src/idea/PlatformActions.xml
index a85ecc06f90f..5b1a9e29524e 100644
--- a/platform/platform-resources/src/idea/PlatformActions.xml
+++ b/platform/platform-resources/src/idea/PlatformActions.xml
@@ -92,6 +92,8 @@
 
     <action id="ScrollTreeToCenter" class="com.intellij.ide.actions.ScrollTreeToCenterAction" use-shortcut-of="EditorScrollToCenter"/>
 
+    <action id="PinToolwindowTab" class="com.intellij.ui.content.tabs.PinToolwindowTabAction"/>
+
     <group id="MainMenu">
       <group id="FileMenu" popup="true">
         <group id="FileOpenGroup">
diff --git a/platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java b/platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java
index 2476c6d8efce..7580bbe2b6f8 100644
--- a/platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java
+++ b/platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java
@@ -423,6 +423,7 @@ public class UsageViewImpl implements UsageView, UsageModelTracker.UsageModelTra
     return new AnAction[]{
       canPerformReRun() ? new ReRunAction() : null,
       new CloseAction(),
+      ActionManager.getInstance().getAction("PinToolwindowTab"),
       createRecentFindUsagesAction(),
       expandAllAction,
       collapseAllAction,
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebugSessionTab.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebugSessionTab.java
index c74334b91ac7..fa5523c39b4e 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebugSessionTab.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebugSessionTab.java
@@ -23,6 +23,7 @@ import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.wm.ex.WindowManagerEx;
 import com.intellij.ui.content.Content;
+import com.intellij.ui.content.tabs.PinToolwindowTabAction;
 import com.intellij.xdebugger.XDebugProcess;
 import com.intellij.xdebugger.XDebugSession;
 import com.intellij.xdebugger.XDebuggerBundle;
@@ -207,6 +208,7 @@ public class XDebugSessionTab extends DebuggerLogConsoleManagerBase {
 
     group.addSeparator();
 
+    group.add(PinToolwindowTabAction.getPinAction());
     group.add(new CloseAction(executor, myRunContentDescriptor, getProject()));
     group.add(new ContextHelpAction(executor.getHelpId()));