Bug 198319 handler conflict occurred between two team actions

2 files changed, 7 insertions, 3 deletions

diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSActionDelegateWrapper.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSActionDelegateWrapper.java
index c17763c4b..974ead939 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSActionDelegateWrapper.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSActionDelegateWrapper.java
@@ -22,10 +22,14 @@ import org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration;
  */
 public class CVSActionDelegateWrapper extends ActionDelegateWrapper {
 
-	public CVSActionDelegateWrapper(CVSAction delegate, ISynchronizePageConfiguration configuration) {
-		super(delegate, configuration, delegate.getId());
+	public CVSActionDelegateWrapper(CVSAction delegate, ISynchronizePageConfiguration configuration, String id) {
+		super(delegate, configuration, id);
 		Utils.initAction(this, getBundleKeyPrefix(), Policy.getActionBundle());
 	}
+	
+	public CVSActionDelegateWrapper(CVSAction delegate, ISynchronizePageConfiguration configuration) {
+		this(delegate, configuration, delegate.getId());
+	}
 
 	/**
 	 * Return the key to the action text in the resource bundle.
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizardPageActionGroup.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizardPageActionGroup.java
index 8947193b9..ed6057e8a 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizardPageActionGroup.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/SharingWizardPageActionGroup.java
@@ -32,7 +32,7 @@ public class SharingWizardPageActionGroup extends SynchronizePageActionGroup {
 		appendToGroup(
 				ISynchronizePageConfiguration.P_TOOLBAR_MENU, 
 				ACTION_GROUP,
-				new CVSActionDelegateWrapper(new IgnoreAction(), configuration){ 
+				new CVSActionDelegateWrapper(new IgnoreAction(), configuration, null /* no id to avoid conflict with context menu (bug 198319)*/){ 
 					protected String getBundleKeyPrefix() {
 						return "SharingWizardIgnore."; //$NON-NLS-1$
 					}