From 3c162f462d667779605c3682bdaf7df555b1ba66 Mon Sep 17 00:00:00 2001
From: Aleksey Pivovarov <AMPivovarov@gmail.com>
Date: Thu, 1 Oct 2015 13:04:43 +0300
Subject: [PATCH] [vcs-log] prepare for custom branch filter popup

---
 .../com/intellij/vcs/log/ui/VcsLogPopupComponent.java | 11 ++++++++---
 .../vcs/log/ui/filter/BranchFilterPopupComponent.java | 11 +++++++++++
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/VcsLogPopupComponent.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/VcsLogPopupComponent.java
index b9aa3fd66627..8b9e34c45ef3 100644
--- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/VcsLogPopupComponent.java
+++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/VcsLogPopupComponent.java
@@ -146,12 +146,17 @@ public abstract class VcsLogPopupComponent extends JPanel {
   }
 
   private void showPopupMenu() {
-    ListPopup popup = JBPopupFactory.getInstance()
-      .createActionGroupPopup(null, createActionGroup(), DataManager.getInstance().getDataContext(this),
-                              JBPopupFactory.ActionSelectionAid.SPEEDSEARCH, false);
+    ListPopup popup = createPopupMenu();
     popup.showUnderneathOf(this);
   }
 
+  @NotNull
+  protected ListPopup createPopupMenu() {
+    return JBPopupFactory.getInstance().
+      createActionGroupPopup(null, createActionGroup(), DataManager.getInstance().getDataContext(this),
+                             JBPopupFactory.ActionSelectionAid.SPEEDSEARCH, false);
+  }
+
   private static Border createFocusedBorder() {
     return BorderFactory.createCompoundBorder(new RoundedLineBorder(UIUtil.getHeaderActiveColor(), 10, BORDER_SIZE), INNER_MARGIN_BORDER);
   }
diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/BranchFilterPopupComponent.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/BranchFilterPopupComponent.java
index 1118104ad97d..a81e36dc949d 100644
--- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/BranchFilterPopupComponent.java
+++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/BranchFilterPopupComponent.java
@@ -15,11 +15,14 @@
  */
 package com.intellij.vcs.log.ui.filter;
 
+import com.intellij.ide.DataManager;
 import com.intellij.openapi.actionSystem.ActionGroup;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.DefaultActionGroup;
+import com.intellij.openapi.ui.popup.ListPopup;
 import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.ui.popup.PopupFactoryImpl;
 import com.intellij.util.Function;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.vcs.log.VcsLogBranchFilter;
@@ -84,6 +87,14 @@ public class BranchFilterPopupComponent extends MultipleValueFilterPopupComponen
     return true;
   }
 
+  @NotNull
+  @Override
+  protected ListPopup createPopupMenu() {
+    return new PopupFactoryImpl.ActionGroupPopup(null, createActionGroup(), DataManager.getInstance().getDataContext(this),
+                                                 false, false, false, false,
+                                                 null, -1, null, null);
+  }
+
   @Override
   protected ActionGroup createActionGroup() {
     DefaultActionGroup actionGroup = new DefaultActionGroup();