From e61918f015274269b526a4a9907f5135f4b810de Mon Sep 17 00:00:00 2001
From: Julia Beliaeva <Julia.Beliaeva@jetbrains.com>
Date: Thu, 25 Feb 2016 21:33:33 +0300
Subject: [PATCH] [vcs-log] register Refresh shortcut in xml

---
 platform/vcs-log/impl/src/META-INF/vcs-log.xml              | 2 +-
 .../src/com/intellij/vcs/log/ui/VcsLogActionPlaces.java     | 1 -
 .../impl/src/com/intellij/vcs/log/ui/frame/MainFrame.java   | 6 ------
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/platform/vcs-log/impl/src/META-INF/vcs-log.xml b/platform/vcs-log/impl/src/META-INF/vcs-log.xml
index 9333ee119303..c9fc0d0f0ca6 100644
--- a/platform/vcs-log/impl/src/META-INF/vcs-log.xml
+++ b/platform/vcs-log/impl/src/META-INF/vcs-log.xml
@@ -49,7 +49,7 @@
     <group class="com.intellij.vcs.log.ui.actions.HighlightersActionGroup" id="Vcs.Log.HighlightersActionGroup"/>
     <action class="com.intellij.vcs.log.ui.actions.OpenAnotherLogTabAction" id="Vcs.Log.OpenAnotherTab"/>
     <action class="com.intellij.vcs.log.ui.actions.CloseLogTabAction" id="Vcs.Log.CloseLogTabAction"/>
-    <action class="com.intellij.vcs.log.ui.actions.RefreshLogAction" id="Vcs.Log.Refresh"/>
+    <action class="com.intellij.vcs.log.ui.actions.RefreshLogAction" id="Vcs.Log.Refresh" use-shortcut-of="Refresh"/>
 
     <group id="Vcs.Log.Settings">
       <reference id="Vcs.Log.ShowBranchesPanelAction"/>
diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/VcsLogActionPlaces.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/VcsLogActionPlaces.java
index 3e187013cc2a..3e40084743c3 100644
--- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/VcsLogActionPlaces.java
+++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/VcsLogActionPlaces.java
@@ -21,6 +21,5 @@ public class VcsLogActionPlaces {
   public static final String SETTINGS_ACTION_GROUP = "Vcs.Log.Settings";
   public static final String VCS_LOG_TABLE_PLACE = "Vcs.Log.ContextMenu";
   public static final String VCS_LOG_INTELLI_SORT_ACTION = "Vcs.Log.IntelliSortChooser";
-  public static final String VCS_LOG_REFRESH_ACTION = "Vcs.Log.Refresh";
   public static final String VCS_LOG_QUICK_SETTINGS_ACTION = "Vcs.Log.QuickSettings";
 }
diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/MainFrame.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/MainFrame.java
index 11ee2d74b3a3..d4e7c5a607f9 100644
--- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/MainFrame.java
+++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/MainFrame.java
@@ -38,7 +38,6 @@ import com.intellij.vcs.log.impl.VcsLogUtil;
 import com.intellij.vcs.log.ui.VcsLogActionPlaces;
 import com.intellij.vcs.log.ui.VcsLogUiImpl;
 import com.intellij.vcs.log.ui.actions.IntelliSortChooserPopupAction;
-import com.intellij.vcs.log.ui.actions.RefreshLogAction;
 import com.intellij.vcs.log.ui.filter.VcsLogClassicFilterUi;
 import com.intellij.vcs.log.util.BekUtil;
 import net.miginfocom.swing.MigLayout;
@@ -199,11 +198,6 @@ public class MainFrame extends JPanel implements DataProvider, Disposable {
   }
 
   private JComponent createActionsToolbar() {
-    AnAction refreshLogAction = ActionManager.getInstance().getAction(VcsLogActionPlaces.VCS_LOG_REFRESH_ACTION);
-    if (refreshLogAction instanceof RefreshLogAction) {
-      ((RefreshLogAction)refreshLogAction).registerShortcutOn(this);
-    }
-
     DefaultActionGroup toolbarGroup = new DefaultActionGroup();
     toolbarGroup.add(ActionManager.getInstance().getAction(VcsLogActionPlaces.TOOLBAR_ACTION_GROUP));