From 17e4025abddb8f390d07b0604233ec229a5d63bc Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Sun, 12 Aug 2012 17:59:37 +0400
Subject: [PATCH] IDEA-86406 add a hotkey support for "Show all affected paths"

* Define ShowAllAffectedGenericAction in the XML, so that it is registered.
* Don't create new instances of the action from the plugins: use getInstance() instead.
  (otherwise, in particular, title and icon won't be applied)
* Define default shortcuts for Default (alt shift A) and Mac (meta ctrl A) schemes (both are free).
---
 .../src/messages/ActionsBundle.properties           |  2 ++
 .../platform-resources/src/idea/Keymap_Default.xml  |  3 +++
 platform/platform-resources/src/idea/Keymap_Mac.xml |  4 +++-
 platform/platform-resources/src/idea/VcsActions.xml |  5 +++++
 .../vcs/annotate/ShowAllAffectedGenericAction.java  | 13 ++++++++++---
 .../cvsSupport2/history/CvsHistoryProvider.java     |  2 +-
 .../src/git4idea/history/GitHistoryProvider.java    |  2 +-
 .../src/git4idea/update/GitSkippedCommits.java      |  2 +-
 .../idea/svn/history/SvnHistoryProvider.java        |  2 +-
 9 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/platform/platform-resources-en/src/messages/ActionsBundle.properties b/platform/platform-resources-en/src/messages/ActionsBundle.properties
index 88818f70dc8c..227dc4b4b0df 100644
--- a/platform/platform-resources-en/src/messages/ActionsBundle.properties
+++ b/platform/platform-resources-en/src/messages/ActionsBundle.properties
@@ -1095,6 +1095,8 @@ action.ConfigureFileDefaultEncoding.text=Configure Default Encoding...
 action.ConfigureFileDefaultEncoding.description=Configure default encoding for files, files in directories or in the whole project
 action.ChangeFileEncodingGroupAction.text=Change File Encoding
 action.ChangeFileEncodingGroupAction.description=Change File Encoding
+action.VcsHistory.ShowAllAffected.text=Show all affected files
+action.VcsHistory.ShowAllAffected.description=Show all changes made in the chosen revision
 
 action.AddFrameworkSupport.text=Add Framework Support...
 
diff --git a/platform/platform-resources/src/idea/Keymap_Default.xml b/platform/platform-resources/src/idea/Keymap_Default.xml
index c585c6f45931..c57881b3977c 100644
--- a/platform/platform-resources/src/idea/Keymap_Default.xml
+++ b/platform/platform-resources/src/idea/Keymap_Default.xml
@@ -909,6 +909,9 @@
   <action id="Vcs.QuickListPopupAction">
     <keyboard-shortcut first-keystroke="alt BACK_QUOTE"/>
   </action>
+  <action id="VcsHistory.ShowAllAffected">
+    <keyboard-shortcut first-keystroke="alt shift A" />
+  </action>
 
   <action id="Jdbc.OpenConsole"><keyboard-shortcut first-keystroke="control shift F10"/></action>
   <action id="Jpa.OpenConsole"><keyboard-shortcut first-keystroke="control shift F10"/></action>
diff --git a/platform/platform-resources/src/idea/Keymap_Mac.xml b/platform/platform-resources/src/idea/Keymap_Mac.xml
index a8a319d903d2..23936d2c7ebe 100644
--- a/platform/platform-resources/src/idea/Keymap_Mac.xml
+++ b/platform/platform-resources/src/idea/Keymap_Mac.xml
@@ -302,7 +302,9 @@
     <action id="Vcs.QuickListPopupAction">
       <keyboard-shortcut first-keystroke="ctrl V" />
     </action>
-
+    <action id="VcsHistory.ShowAllAffected">
+      <keyboard-shortcut first-keystroke="meta ctrl A" />
+    </action>
 
     <action id="EditorSelectWord">
       <keyboard-shortcut first-keystroke="alt UP"/>
diff --git a/platform/platform-resources/src/idea/VcsActions.xml b/platform/platform-resources/src/idea/VcsActions.xml
index 79425a6bd13f..3505751a1a77 100644
--- a/platform/platform-resources/src/idea/VcsActions.xml
+++ b/platform/platform-resources/src/idea/VcsActions.xml
@@ -172,6 +172,11 @@
       <reference ref="Vcs.UpdateProject"/>
     </group>
 
+    <group id="Vcs.History">
+      <action id="VcsHistory.ShowAllAffected" class="com.intellij.openapi.vcs.annotate.ShowAllAffectedGenericAction"
+              icon="AllIcons.Vcs.AllRevisions" />
+    </group>
+
     <action id="ChangesView.Browse" class="com.intellij.openapi.vcs.changes.actions.BrowseChangesAction"/>
 
     <action id="Diff.PrevChange" class="com.intellij.openapi.vcs.changes.actions.ShowPrevChangeAction"
diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/annotate/ShowAllAffectedGenericAction.java b/platform/vcs-api/src/com/intellij/openapi/vcs/annotate/ShowAllAffectedGenericAction.java
index eae879c38401..1d18f36cbc43 100644
--- a/platform/vcs-api/src/com/intellij/openapi/vcs/annotate/ShowAllAffectedGenericAction.java
+++ b/platform/vcs-api/src/com/intellij/openapi/vcs/annotate/ShowAllAffectedGenericAction.java
@@ -15,7 +15,7 @@
  */
 package com.intellij.openapi.vcs.annotate;
 
-import com.intellij.icons.AllIcons;
+import com.intellij.openapi.actionSystem.ActionManager;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.PlatformDataKeys;
@@ -43,8 +43,15 @@ import java.util.List;
  *         Time: 2:41 PM
  */
 public class ShowAllAffectedGenericAction extends AnAction {
-  public ShowAllAffectedGenericAction() {
-    super("Show all affected files", null, AllIcons.Vcs.AllRevisions);
+
+  private static final String ACTION_ID = "VcsHistory.ShowAllAffected";
+
+ // use getInstance()
+  private ShowAllAffectedGenericAction() {
+  }
+
+  public static ShowAllAffectedGenericAction getInstance() {
+    return (ShowAllAffectedGenericAction)ActionManager.getInstance().getAction(ACTION_ID);
   }
 
   @Override
diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/history/CvsHistoryProvider.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/history/CvsHistoryProvider.java
index c27efb41ba65..ab3bba99b2e7 100644
--- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/history/CvsHistoryProvider.java
+++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/history/CvsHistoryProvider.java
@@ -246,7 +246,7 @@ public class CvsHistoryProvider implements VcsHistoryProvider {
   }
 
   public AnAction[] getAdditionalActions(final Runnable refresher) {
-    return new AnAction[]{new ShowAllAffectedGenericAction()};
+    return new AnAction[]{ ShowAllAffectedGenericAction.getInstance() };
   }
 
   public boolean supportsHistoryForDirectories() {
diff --git a/plugins/git4idea/src/git4idea/history/GitHistoryProvider.java b/plugins/git4idea/src/git4idea/history/GitHistoryProvider.java
index 422c1286e5ec..37515a44a695 100644
--- a/plugins/git4idea/src/git4idea/history/GitHistoryProvider.java
+++ b/plugins/git4idea/src/git4idea/history/GitHistoryProvider.java
@@ -63,7 +63,7 @@ public class GitHistoryProvider implements VcsHistoryProvider, VcsCacheableHisto
   }
 
   public AnAction[] getAdditionalActions(Runnable refresher) {
-    return new AnAction[]{new ShowAllAffectedGenericAction(), new GitCopyHistoryRevisionNumberAction()};
+    return new AnAction[]{ ShowAllAffectedGenericAction.getInstance(), new GitCopyHistoryRevisionNumberAction()};
   }
 
   public boolean isDateOmittable() {
diff --git a/plugins/git4idea/src/git4idea/update/GitSkippedCommits.java b/plugins/git4idea/src/git4idea/update/GitSkippedCommits.java
index 7a1e99d115b8..0257832ed4c8 100644
--- a/plugins/git4idea/src/git4idea/update/GitSkippedCommits.java
+++ b/plugins/git4idea/src/git4idea/update/GitSkippedCommits.java
@@ -143,7 +143,7 @@ public class GitSkippedCommits extends PanelWithActionsAndCloseButton {
   @Override
   protected void addActionsTo(DefaultActionGroup group) {
     super.addActionsTo(group);
-    ShowAllAffectedGenericAction showCommit = new ShowAllAffectedGenericAction();
+    ShowAllAffectedGenericAction showCommit = ShowAllAffectedGenericAction.getInstance();
     showCommit.registerCustomShortcutSet(new CustomShortcutSet(
       CommonShortcuts.DOUBLE_CLICK_1.getShortcuts()[0]), myTree);
     group.addAction(showCommit);
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnHistoryProvider.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnHistoryProvider.java
index dde857e27197..4b5c9040d08d 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnHistoryProvider.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnHistoryProvider.java
@@ -466,7 +466,7 @@ public class SvnHistoryProvider
   }
 
   public AnAction[] getAdditionalActions(final Runnable refresher) {
-    return new AnAction[]{new ShowAllAffectedGenericAction(), new MergeSourceDetailsAction()};
+    return new AnAction[]{ ShowAllAffectedGenericAction.getInstance(), new MergeSourceDetailsAction()};
   }
 
   public boolean isDateOmittable() {