diff options
Diffstat (limited to 'bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceModelActionProvider.java')
| -rw-r--r-- | bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceModelActionProvider.java | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceModelActionProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceModelActionProvider.java index 4cbe97c1a..24ded278a 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceModelActionProvider.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceModelActionProvider.java @@ -27,7 +27,7 @@ import org.eclipse.ui.navigator.*; public class ResourceModelActionProvider extends SynchronizationActionProvider { private RefactorActionGroup refactorActions; - + public ResourceModelActionProvider() { } @@ -39,17 +39,17 @@ public class ResourceModelActionProvider extends SynchronizationActionProvider { super.initialize(); // Register the merge, overwrite and mark-as-merged handlers ResourceMergeHandler mergeHandler = new ResourceMergeHandler( - (ISynchronizePageConfiguration)getExtensionStateModel().getProperty(ITeamContentProviderManager.P_SYNCHRONIZATION_PAGE_CONFIGURATION), + (ISynchronizePageConfiguration)getExtensionStateModel().getProperty(ITeamContentProviderManager.P_SYNCHRONIZATION_PAGE_CONFIGURATION), false /* overwrite */); registerHandler(MERGE_ACTION_ID, mergeHandler); ResourceMergeHandler overwriteHandler = new ResourceMergeHandler( - (ISynchronizePageConfiguration)getExtensionStateModel().getProperty(ITeamContentProviderManager.P_SYNCHRONIZATION_PAGE_CONFIGURATION), + (ISynchronizePageConfiguration)getExtensionStateModel().getProperty(ITeamContentProviderManager.P_SYNCHRONIZATION_PAGE_CONFIGURATION), true /* overwrite */); registerHandler(OVERWRITE_ACTION_ID, overwriteHandler); ResourceMarkAsMergedHandler markAsMergedHandler = new ResourceMarkAsMergedHandler( (ISynchronizePageConfiguration)getExtensionStateModel().getProperty(ITeamContentProviderManager.P_SYNCHRONIZATION_PAGE_CONFIGURATION)); registerHandler(MARK_AS_MERGE_ACTION_ID, markAsMergedHandler); - + ICommonViewerSite cvs = getActionSite().getViewSite(); ISynchronizePageConfiguration configuration = getSynchronizePageConfiguration(); if (cvs instanceof ICommonViewerWorkbenchSite && configuration != null) { @@ -60,7 +60,7 @@ public class ResourceModelActionProvider extends SynchronizationActionProvider { } } } - + private INavigatorContentService getNavigatorContentService(ISynchronizePageConfiguration configuration) { Viewer v = configuration.getPage().getViewer(); if (v instanceof CommonViewer) { @@ -78,7 +78,7 @@ public class ResourceModelActionProvider extends SynchronizationActionProvider { super.fillActionBars(actionBars); if (refactorActions != null) refactorActions.fillActionBars(actionBars); } - + /* (non-Javadoc) * @see org.eclipse.team.ui.mapping.SynchronizationActionProvider#fillContextMenu(org.eclipse.jface.action.IMenuManager) */ @@ -90,7 +90,7 @@ public class ResourceModelActionProvider extends SynchronizationActionProvider { refactorActions.fillContextMenu(menu, editGroup.getId()); } } - + /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionGroup#updateActionBars() */ @@ -99,7 +99,7 @@ public class ResourceModelActionProvider extends SynchronizationActionProvider { super.updateActionBars(); if (refactorActions != null) refactorActions.updateActionBars(); } - + /* (non-Javadoc) * @see org.eclipse.team.ui.synchronize.SynchronizePageActionGroup#dispose() */ @@ -108,7 +108,7 @@ public class ResourceModelActionProvider extends SynchronizationActionProvider { super.dispose(); if (refactorActions != null) refactorActions.dispose(); } - + /* (non-Javadoc) * @see org.eclipse.ui.actions.ActionGroup#setContext(org.eclipse.ui.actions.ActionContext) */ |