From f0d97f16081255f6cecf21cae0dcc7c75ccfa712 Mon Sep 17 00:00:00 2001
From: Konstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Date: Tue, 24 Nov 2015 19:02:52 +0300
Subject: [PATCH] svn: Register "ShowSvnMapAction" as global action (in
 plugin.xml) and reuse it where necessary

---
 .../src/com/intellij/vcs/VcsShowToolWindowTabAction.java | 9 ---------
 plugins/svn4idea/src/META-INF/plugin.xml                 | 5 +++++
 .../src/org/jetbrains/idea/svn/SvnBundle.properties      | 3 ---
 .../org/jetbrains/idea/svn/actions/ShowSvnMapAction.java | 6 ------
 .../org/jetbrains/idea/svn/history/RootsAndBranches.java | 3 +--
 5 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/platform/vcs-impl/src/com/intellij/vcs/VcsShowToolWindowTabAction.java b/platform/vcs-impl/src/com/intellij/vcs/VcsShowToolWindowTabAction.java
index e955b22187fd..e60c107ab579 100644
--- a/platform/vcs-impl/src/com/intellij/vcs/VcsShowToolWindowTabAction.java
+++ b/platform/vcs-impl/src/com/intellij/vcs/VcsShowToolWindowTabAction.java
@@ -25,19 +25,10 @@ import com.intellij.openapi.wm.ToolWindowManager;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import javax.swing.*;
-
 import static com.intellij.util.ObjectUtils.assertNotNull;
 
 public abstract class VcsShowToolWindowTabAction extends DumbAwareAction {
 
-  protected VcsShowToolWindowTabAction() {
-  }
-
-  protected VcsShowToolWindowTabAction(@Nullable String text, @Nullable String description, @Nullable Icon icon) {
-    super(text, description, icon);
-  }
-
   @Override
   public void actionPerformed(@NotNull AnActionEvent e) {
     final Project project = e.getRequiredData(CommonDataKeys.PROJECT);
diff --git a/plugins/svn4idea/src/META-INF/plugin.xml b/plugins/svn4idea/src/META-INF/plugin.xml
index 735d93561401..ed321ffd4efb 100644
--- a/plugins/svn4idea/src/META-INF/plugin.xml
+++ b/plugins/svn4idea/src/META-INF/plugin.xml
@@ -111,6 +111,11 @@
     <action class="org.jetbrains.idea.svn.actions.CleanupProjectAction" id="Subversion.CleanupProject">
       <add-to-group group-id="VcsGlobalGroup" anchor="after" relative-to-action="Subversion.MergeFrom"/>
     </action>
+
+    <action id="Svn.Show.Working.Copies" class="org.jetbrains.idea.svn.actions.ShowSvnMapAction" text="Show Working Copies"
+            description="Shows working copies information: working copy formats and URLs" icon="SvnIcons.ShowWorkingCopies">
+      <add-to-group group-id="Vcs.Show.Toolwindow.Tab"/>
+    </action>
   </actions>
 
   <extensions defaultExtensionNs="com.intellij">
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnBundle.properties b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnBundle.properties
index ad0eecf42281..29e5a8f29f3f 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnBundle.properties
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnBundle.properties
@@ -553,9 +553,6 @@ update.switch.to.branch.text=Use branch:
 select.branch.popup.general.title=Select branch
 progress.live.provider.loading.revisions.text=Loading revisions from server
 progress.live.provider.loading.revisions.details.text=Loading revisions from server...
-action.show.svn.map.text=Show Working Copies...
-action.show.svn.map.text.reference=Show Working Copies
-action.show.svn.map.description=Shows working copies information: working copy formats and URLs
 dialog.show.svn.map.title=Subversion Working Copies Information
 dialog.show.svn.map.label.table.header=Detected working copies
 dialog.show.svn.map.change.format.button.text=&Change Working Copy Format
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ShowSvnMapAction.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ShowSvnMapAction.java
index eb8b64ac2447..889da6b2bf43 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ShowSvnMapAction.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/actions/ShowSvnMapAction.java
@@ -16,17 +16,11 @@
 package org.jetbrains.idea.svn.actions;
 
 import com.intellij.vcs.VcsShowToolWindowTabAction;
-import icons.SvnIcons;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.idea.svn.SvnBundle;
 import org.jetbrains.idea.svn.WorkingCopiesContent;
 
 public class ShowSvnMapAction extends VcsShowToolWindowTabAction {
 
-  public ShowSvnMapAction() {
-    super(SvnBundle.message("action.show.svn.map.text"), SvnBundle.message("action.show.svn.map.description"), SvnIcons.ShowWorkingCopies);
-  }
-
   @NotNull
   @Override
   protected String getTabName() {
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/RootsAndBranches.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/RootsAndBranches.java
index 6cf03d0c5a5a..9b7ec032feda 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/RootsAndBranches.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/RootsAndBranches.java
@@ -37,7 +37,6 @@ import org.jetbrains.annotations.Nullable;
 import org.jetbrains.idea.svn.SvnBundle;
 import org.jetbrains.idea.svn.SvnVcs;
 import org.jetbrains.idea.svn.actions.AbstractIntegrateChangesAction;
-import org.jetbrains.idea.svn.actions.ShowSvnMapAction;
 import org.jetbrains.idea.svn.dialogs.WCInfoWithBranches;
 import org.jetbrains.idea.svn.integrate.ChangeListsMergerFactory;
 import org.jetbrains.idea.svn.integrate.MergerFactory;
@@ -315,7 +314,7 @@ public class RootsAndBranches implements CommittedChangeListDecorator {
     svnGroup.add(myFilterMerged);
     svnGroup.add(myFilterNotMerged);
     svnGroup.add(myFilterAlien);
-    svnGroup.add(new ShowSvnMapAction());
+    svnGroup.add(ActionManager.getInstance().getAction("Svn.Show.Working.Copies"));
     svnGroup.add(new MyRefresh());
     return svnGroup;
   }