diff options
| author | Thomas Wolf | 2019-03-14 17:48:27 +0000 |
|---|---|---|
| committer | Thomas Wolf | 2019-03-21 18:13:41 +0000 |
| commit | df1a467b47432ab761dcf0c4f0f48869e23a70c2 (patch) | |
| tree | 916a4dbb351792d4448cd683cfc5773134841653 /org.eclipse.egit.ui/src | |
| parent | 82d18c1621aac781fe987ab21fda542ae7af904a (diff) | |
| download | egit-df1a467b47432ab761dcf0c4f0f48869e23a70c2.tar.gz egit-df1a467b47432ab761dcf0c4f0f48869e23a70c2.tar.xz egit-df1a467b47432ab761dcf0c4f0f48869e23a70c2.zip | |
Unify "Show in History" commands
Use the same command id for both the "Team" sub-menu and for the
commit editor. Remove the extra command for the commit editor from
plugin.xml, but leave the two different handlers.
Bug: 545031
Change-Id: If9f530c032b6a7cfe11f90cdc19f1bc00f988b83
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
Diffstat (limited to 'org.eclipse.egit.ui/src')
3 files changed, 9 insertions, 7 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/ActionCommands.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/ActionCommands.java index 42a8a00b2a..2ab426433d 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/ActionCommands.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/ActionCommands.java @@ -118,6 +118,13 @@ public class ActionCommands { /** "Rebase" action command id */ public static final String REBASE_ACTION = "org.eclipse.egit.ui.team.Rebase"; //$NON-NLS-1$ + /** + * "Show in History" action command id. Normally, this is dealt with through + * the platform's "Show In" sub-menu, but EGit has this action also in the + * Team sub-menu and in the commit editor. + */ + public static final String SHOW_IN_HISTORY = "org.eclipse.egit.ui.team.ShowHistory"; //$NON-NLS-1$ + /** "Stash Changes" action command id */ public static final String STASH_CREATE = "org.eclipse.egit.ui.team.stash.create"; //$NON-NLS-1$ diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/CommitEditor.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/CommitEditor.java index d380041473..4ff1e42ca0 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/CommitEditor.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/CommitEditor.java @@ -26,7 +26,6 @@ import org.eclipse.egit.ui.internal.UIIcons; import org.eclipse.egit.ui.internal.UIText; import org.eclipse.egit.ui.internal.actions.ActionCommands; import org.eclipse.egit.ui.internal.commit.command.RevertHandler; -import org.eclipse.egit.ui.internal.commit.command.ShowInHistoryHandler; import org.eclipse.egit.ui.internal.repository.RepositoriesView; import org.eclipse.jface.action.Action; import org.eclipse.jface.action.ActionContributionItem; @@ -359,7 +358,8 @@ public class CommitEditor extends SharedHeaderFormEditor implements UIIcons.CHERRY_PICK)); toolbar.add(createActionContributionItem(RevertHandler.ID, UIText.CommitEditor_toolbarRevert, UIIcons.REVERT)); - toolbar.add(createActionContributionItem(ShowInHistoryHandler.ID, + toolbar.add(createActionContributionItem( + ActionCommands.SHOW_IN_HISTORY, UIText.CommitEditor_toolbarShowInHistory, UIIcons.HISTORY)); } addContributions(toolbar); diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/command/ShowInHistoryHandler.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/command/ShowInHistoryHandler.java index dff0b5056f..77ce59e204 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/command/ShowInHistoryHandler.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/commit/command/ShowInHistoryHandler.java @@ -24,11 +24,6 @@ import org.eclipse.ui.PlatformUI; */ public class ShowInHistoryHandler extends CommitCommandHandler { - /** - * Command id - */ - public static final String ID = "org.eclipse.egit.ui.commit.ShowInHistory"; //$NON-NLS-1$ - @Override public Object execute(final ExecutionEvent event) throws ExecutionException { List<RepositoryCommit> commits = getCommits(event); |