diff options
Diffstat (limited to 'bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java')
| -rw-r--r-- | bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java index 0388ee25e..479b49808 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java @@ -49,8 +49,8 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.ui.IActionBars; import org.eclipse.ui.IKeyBindingService; -import org.eclipse.ui.IWorkbenchActionConstants; import org.eclipse.ui.IWorkbenchPartSite; +import org.eclipse.ui.actions.ActionFactory; import org.eclipse.ui.help.WorkbenchHelp; import org.eclipse.compare.*; @@ -120,14 +120,14 @@ public class TextMergeViewer extends ContentMergeViewer { private static final boolean DEBUG= false; private static final String[] GLOBAL_ACTIONS= { - IWorkbenchActionConstants.UNDO, - IWorkbenchActionConstants.REDO, - IWorkbenchActionConstants.CUT, - IWorkbenchActionConstants.COPY, - IWorkbenchActionConstants.PASTE, - IWorkbenchActionConstants.DELETE, - IWorkbenchActionConstants.SELECT_ALL, - IWorkbenchActionConstants.SAVE + ActionFactory.UNDO.getId(), + ActionFactory.REDO.getId(), + ActionFactory.CUT.getId(), + ActionFactory.COPY.getId(), + ActionFactory.PASTE.getId(), + ActionFactory.DELETE.getId(), + ActionFactory.SELECT_ALL.getId(), + ActionFactory.SAVE.getId() }; private static final String[] TEXT_ACTIONS= { MergeSourceViewer.UNDO_ID, |