aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Sawicki2011-04-18 14:35:59 (EDT)
committerKevin Sawicki2011-04-18 14:35:59 (EDT)
commitd4f2823f388e3231649aa6b9ee047e4c644bd347 (patch)
tree8d2b9c2e8d827efcbc6e9c3e3a51927e54fef20c
parentf3108b59f9e9059cc2e3032ae62cf51a57286285 (diff)
downloadegit-d4f2823f388e3231649aa6b9ee047e4c644bd347.zip
egit-d4f2823f388e3231649aa6b9ee047e4c644bd347.tar.gz
egit-d4f2823f388e3231649aa6b9ee047e4c644bd347.tar.bz2
[sync] Remove duplicate toolbar entries.refs/changes/53/3153/1
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.java4
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 5e038aa..a6389f2 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$