diff options
Diffstat (limited to 'bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team')
7 files changed, 39 insertions, 56 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSParticipantAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSParticipantAction.java index bfa265324..853ddd1e9 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSParticipantAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSParticipantAction.java @@ -10,6 +10,7 @@ *******************************************************************************/ package org.eclipse.team.internal.ccvs.ui.subscriber; +import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.team.internal.ui.Utils; import org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration; @@ -25,6 +26,11 @@ public abstract class CVSParticipantAction extends SynchronizeModelAction { super(null, configuration); Utils.initAction(this, getBundleKeyPrefix(), Policy.getBundle()); } + + protected CVSParticipantAction(ISynchronizePageConfiguration configuration, ISelectionProvider provider, String bundleKey) { + super(null, configuration, provider); + Utils.initAction(this, bundleKey, Policy.getBundle()); + } /** * 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/subscriber/MergeSynchronizeParticipant.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeSynchronizeParticipant.java index 932037678..043766631 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeSynchronizeParticipant.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeSynchronizeParticipant.java @@ -30,7 +30,6 @@ import org.eclipse.team.internal.ccvs.ui.Policy; import org.eclipse.team.internal.ccvs.ui.actions.ShowAnnotationAction; import org.eclipse.team.internal.ccvs.ui.actions.ShowResourceInHistoryAction; import org.eclipse.team.ui.TeamUI; -import org.eclipse.team.ui.synchronize.ISynchronizeModelElement; import org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration; import org.eclipse.team.ui.synchronize.ISynchronizeParticipantDescriptor; import org.eclipse.team.ui.synchronize.SynchronizePageActionGroup; @@ -63,14 +62,10 @@ public class MergeSynchronizeParticipant extends CVSParticipant { public void initialize(ISynchronizePageConfiguration configuration) { super.initialize(configuration); - updateAction = new MergeUpdateAction(configuration) { - protected void initialize(ISynchronizePageConfiguration configuration) { - // Override to avoid registering a selection listener - } - protected String getBundleKeyPrefix() { - return "WorkspaceToolbarUpdateAction."; //$NON-NLS-1$ - } - }; + updateAction = new MergeUpdateAction( + configuration, + getVisibleRootsSelectionProvider(), + "WorkspaceToolbarUpdateAction."); //$NON-NLS-1$ updateAction.setPromptBeforeUpdate(true); appendToGroup( ISynchronizePageConfiguration.P_TOOLBAR_MENU, @@ -98,11 +93,6 @@ public class MergeSynchronizeParticipant extends CVSParticipant { } } - public void modelChanged(ISynchronizeModelElement input) { - if (updateAction != null) { - updateAction.setSelection(input); - } - } } public MergeSynchronizeParticipant() { diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeUpdateAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeUpdateAction.java index 15811ac00..2a1cd7045 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeUpdateAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeUpdateAction.java @@ -11,6 +11,7 @@ package org.eclipse.team.internal.ccvs.ui.subscriber; import org.eclipse.compare.structuremergeviewer.IDiffElement; +import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.team.core.synchronize.FastSyncInfoFilter; import org.eclipse.team.core.synchronize.SyncInfo; import org.eclipse.team.core.synchronize.FastSyncInfoFilter.OrSyncInfoFilter; @@ -25,6 +26,10 @@ public class MergeUpdateAction extends CVSParticipantAction { super(configuration); } + public MergeUpdateAction(ISynchronizePageConfiguration configuration, ISelectionProvider provider, String bundleKey) { + super(configuration, provider, bundleKey); + } + private boolean promptBeforeUpdate; /* (non-Javadoc) diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceCommitAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceCommitAction.java index d8aa8da25..e1bc49fc4 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceCommitAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceCommitAction.java @@ -11,6 +11,7 @@ package org.eclipse.team.internal.ccvs.ui.subscriber; import org.eclipse.compare.structuremergeviewer.IDiffElement; +import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.team.core.synchronize.FastSyncInfoFilter; import org.eclipse.team.core.synchronize.SyncInfo; import org.eclipse.team.core.synchronize.FastSyncInfoFilter.SyncInfoDirectionFilter; @@ -23,6 +24,10 @@ public class WorkspaceCommitAction extends CVSParticipantAction { super(configuration); } + public WorkspaceCommitAction(ISynchronizePageConfiguration configuration, ISelectionProvider provider, String bundleKey) { + super(configuration, provider, bundleKey); + } + /* (non-Javadoc) * @see org.eclipse.team.ui.sync.SubscriberAction#getSyncInfoFilter() */ diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceSynchronizeParticipant.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceSynchronizeParticipant.java index b12f5b097..e6deff927 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceSynchronizeParticipant.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceSynchronizeParticipant.java @@ -17,7 +17,6 @@ import org.eclipse.team.internal.ccvs.ui.actions.GenerateDiffFileAction; import org.eclipse.team.internal.ccvs.ui.actions.IgnoreAction; import org.eclipse.team.internal.ccvs.ui.actions.ShowAnnotationAction; import org.eclipse.team.internal.ccvs.ui.actions.ShowResourceInHistoryAction; -import org.eclipse.team.ui.synchronize.ISynchronizeModelElement; import org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration; import org.eclipse.team.ui.synchronize.SynchronizePageActionGroup; import org.eclipse.ui.IMemento; @@ -48,28 +47,20 @@ public class WorkspaceSynchronizeParticipant extends CVSParticipant { public void initialize(ISynchronizePageConfiguration configuration) { super.initialize(configuration); - updateToolbar = new WorkspaceUpdateAction(configuration) { - protected void initialize(ISynchronizePageConfiguration configuration) { - // Override to prevent registering as a selection listener - } - protected String getBundleKeyPrefix() { - return "WorkspaceToolbarUpdateAction."; //$NON-NLS-1$ - } - }; + updateToolbar = new WorkspaceUpdateAction( + configuration, + getVisibleRootsSelectionProvider(), + "WorkspaceToolbarUpdateAction."); //$NON-NLS-1$ updateToolbar.setPromptBeforeUpdate(true); appendToGroup( ISynchronizePageConfiguration.P_TOOLBAR_MENU, TOOLBAR_CONTRIBUTION_GROUP, updateToolbar); - commitToolbar = new WorkspaceCommitAction(configuration) { - protected void initialize(ISynchronizePageConfiguration configuration) { - // Override to prevent registering as a selection listener - } - protected String getBundleKeyPrefix() { - return "WorkspaceToolbarCommitAction."; //$NON-NLS-1$ - } - }; + commitToolbar = new WorkspaceCommitAction( + configuration, + getVisibleRootsSelectionProvider(), + "WorkspaceToolbarCommitAction."); //$NON-NLS-1$ appendToGroup( ISynchronizePageConfiguration.P_TOOLBAR_MENU, TOOLBAR_CONTRIBUTION_GROUP, @@ -122,14 +113,6 @@ public class WorkspaceSynchronizeParticipant extends CVSParticipant { CONTEXT_MENU_CONTRIBUTION_GROUP_4, new RefreshDirtyStateAction(configuration)); } - public void modelChanged(ISynchronizeModelElement element) { - if (commitToolbar != null) { - commitToolbar.setSelection(element); - } - if (updateToolbar != null) { - updateToolbar.setSelection(element); - } - } } /* (non-Javadoc) diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceUpdateAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceUpdateAction.java index fe4d57930..282422d6b 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceUpdateAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceUpdateAction.java @@ -11,6 +11,7 @@ package org.eclipse.team.internal.ccvs.ui.subscriber; import org.eclipse.compare.structuremergeviewer.IDiffElement; +import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.team.core.synchronize.FastSyncInfoFilter; import org.eclipse.team.core.synchronize.SyncInfo; import org.eclipse.team.core.synchronize.FastSyncInfoFilter.SyncInfoDirectionFilter; @@ -25,6 +26,10 @@ public class WorkspaceUpdateAction extends CVSParticipantAction { super(configuration); } + public WorkspaceUpdateAction(ISynchronizePageConfiguration configuration, ISelectionProvider provider, String bundleKey) { + super(configuration, provider, bundleKey); + } + /* (non-Javadoc) * @see org.eclipse.team.ui.sync.SubscriberAction#getSyncInfoFilter() */ 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 60057d774..4e9337169 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 @@ -11,6 +11,7 @@ package org.eclipse.team.internal.ccvs.ui.wizards; import org.eclipse.compare.structuremergeviewer.IDiffElement; +import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.team.core.synchronize.FastSyncInfoFilter; import org.eclipse.team.core.synchronize.SyncInfo; import org.eclipse.team.core.synchronize.FastSyncInfoFilter.SyncInfoDirectionFilter; @@ -18,7 +19,6 @@ import org.eclipse.team.internal.ccvs.ui.actions.IgnoreAction; import org.eclipse.team.internal.ccvs.ui.subscriber.CVSActionDelegateWrapper; import org.eclipse.team.internal.ccvs.ui.subscriber.CVSParticipantAction; import org.eclipse.team.internal.ccvs.ui.subscriber.WorkspaceCommitOperation; -import org.eclipse.team.ui.synchronize.ISynchronizeModelElement; import org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration; import org.eclipse.team.ui.synchronize.SynchronizeModelOperation; import org.eclipse.team.ui.synchronize.SynchronizePageActionGroup; @@ -36,14 +36,8 @@ public class SharingWizardPageActionGroup extends SynchronizePageActionGroup { * Custom commit that includes outgoing and conflicting. */ class SharingCommitAction extends CVSParticipantAction { - protected SharingCommitAction(ISynchronizePageConfiguration configuration) { - super(configuration); - } - protected void initialize(ISynchronizePageConfiguration configuration) { - // Override to avoid being registered as a selection listener - } - protected String getBundleKeyPrefix() { - return "SharingCommitAction."; //$NON-NLS-1$ + public SharingCommitAction(ISynchronizePageConfiguration configuration, ISelectionProvider provider) { + super(configuration, provider, "SharingCommitAction."); //$NON-NLS-1$ } protected FastSyncInfoFilter getSyncInfoFilter() { return new SyncInfoDirectionFilter(new int[] {SyncInfo.CONFLICTING, SyncInfo.OUTGOING}); @@ -61,7 +55,9 @@ public class SharingWizardPageActionGroup extends SynchronizePageActionGroup { super.initialize(configuration); configuration.addMenuGroup(ISynchronizePageConfiguration.P_TOOLBAR_MENU, ACTION_GROUP); - commitAction = new SharingCommitAction(configuration); + commitAction = new SharingCommitAction( + configuration, + getVisibleRootsSelectionProvider()); appendToGroup( ISynchronizePageConfiguration.P_TOOLBAR_MENU, ACTION_GROUP, @@ -76,11 +72,4 @@ public class SharingWizardPageActionGroup extends SynchronizePageActionGroup { } }); } - - /* (non-Javadoc) - * @see org.eclipse.team.ui.synchronize.presentation.ISynchronizeModelChangeListener#inputChanged(org.eclipse.team.ui.synchronize.presentation.SynchronizeModelProvider) - */ - public void modelChanged(final ISynchronizeModelElement root) { - commitAction.setSelection(root); - } } |