diff options
| author | Kevin Sawicki | 2011-04-18 18:35:59 +0000 |
|---|---|---|
| committer | Kevin Sawicki | 2011-04-18 18:35:59 +0000 |
| commit | d4f2823f388e3231649aa6b9ee047e4c644bd347 (patch) | |
| tree | 8d2b9c2e8d827efcbc6e9c3e3a51927e54fef20c | |
| parent | f3108b59f9e9059cc2e3032ae62cf51a57286285 (diff) | |
| download | egit-d4f2823f388e3231649aa6b9ee047e4c644bd347.tar.gz egit-d4f2823f388e3231649aa6b9ee047e4c644bd347.tar.xz egit-d4f2823f388e3231649aa6b9ee047e4c644bd347.zip | |
[sync] Remove duplicate toolbar entries.
Extend SynchronizePageActionGroup in GitActionContributor
to prevent duplicate toolbar entries from being added for
contributions made from ModelSynchronizeParticipantActionGroup.
Bug: 341486
Change-Id: I4ec283bc189368b7a8522b927a704671613491e1
Signed-off-by: Kevin Sawicki <kevin@github.com>
| -rw-r--r-- | org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/GitActionContributor.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/GitActionContributor.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/GitActionContributor.java index 5e038aac41..a6389f2256 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/GitActionContributor.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/GitActionContributor.java @@ -31,7 +31,7 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration; import org.eclipse.team.ui.synchronize.ISynchronizePageSite; import org.eclipse.team.ui.synchronize.ModelSynchronizeParticipant; -import org.eclipse.team.ui.synchronize.ModelSynchronizeParticipantActionGroup; +import org.eclipse.team.ui.synchronize.SynchronizePageActionGroup; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchSite; import org.eclipse.ui.IWorkbenchWindow; @@ -40,7 +40,7 @@ import org.eclipse.ui.handlers.IHandlerService; import org.eclipse.ui.menus.CommandContributionItem; import org.eclipse.ui.menus.CommandContributionItemParameter; -class GitActionContributor extends ModelSynchronizeParticipantActionGroup { +class GitActionContributor extends SynchronizePageActionGroup { private static final String GIT_ACTIONS = "gitActions"; //$NON-NLS-1$ |