diff options
Diffstat (limited to 'bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/WorkingSetFilterActionGroup.java')
-rw-r--r-- | bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/WorkingSetFilterActionGroup.java | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/WorkingSetFilterActionGroup.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/WorkingSetFilterActionGroup.java index 7a8479f27..cd15249f1 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/WorkingSetFilterActionGroup.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/WorkingSetFilterActionGroup.java @@ -13,8 +13,6 @@ package org.eclipse.team.internal.ui.synchronize.actions; import org.eclipse.jface.action.*; import org.eclipse.jface.util.*; import org.eclipse.swt.widgets.Shell; -import org.eclipse.team.ui.synchronize.ISynchronizeView; -import org.eclipse.team.ui.synchronize.subscribers.SubscriberParticipant; import org.eclipse.ui.*; import org.eclipse.ui.actions.ActionGroup; @@ -43,11 +41,11 @@ public class WorkingSetFilterActionGroup extends ActionGroup { * @param workingSetUpdater property change listener notified when a * working set is set */ - public WorkingSetFilterActionGroup(Shell shell, IPropertyChangeListener workingSetUpdater, ISynchronizeView view, SubscriberParticipant participant) { + public WorkingSetFilterActionGroup(Shell shell, String uniqueId, IPropertyChangeListener workingSetUpdater, IWorkingSet initialWorkingSet) { Assert.isNotNull(shell); - this.id = participant.toString(); + this.id = uniqueId; this.workingSetUpdater = workingSetUpdater; - this.workingSet = participant.getWorkingSet(); + this.workingSet = initialWorkingSet; clearWorkingSetAction = new ClearWorkingSetAction(this); selectWorkingSetAction = new SelectWorkingSetAction(this, shell); editWorkingSetAction = new EditWorkingSetAction(this, shell); @@ -67,7 +65,7 @@ public class WorkingSetFilterActionGroup extends ActionGroup { menuManager.add(editWorkingSetAction); menuManager.add(new Separator(id)); updateMruContribution(menuManager); - }; + } private void updateMruContribution(IMenuManager menuManager) { IWorkingSet[] sets = PlatformUI.getWorkbench().getWorkingSetManager().getRecentWorkingSets(); @@ -123,7 +121,7 @@ public class WorkingSetFilterActionGroup extends ActionGroup { // before the menu is shown. // It is also quite possible that this menu hasn't been created when a // setWorking set property change occurs. - if(bars.getMenuManager().find(id) != null) { + if(bars != null && bars.getMenuManager().find(id) != null) { updateMruContribution(bars.getMenuManager()); } //bars.updateActionBars(); |