diff options
Diffstat (limited to 'bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org')
2 files changed, 13 insertions, 12 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, diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditorContributor.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditorContributor.java index a1ecc745d..254d0d395 100644 --- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditorContributor.java +++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareEditorContributor.java @@ -15,10 +15,11 @@ import java.util.ResourceBundle; import org.eclipse.jface.action.*; import org.eclipse.ui.*; +import org.eclipse.ui.actions.ActionFactory; import org.eclipse.ui.help.WorkbenchHelp; import org.eclipse.ui.part.EditorActionBarContributor; -import org.eclipse.compare.*; +import org.eclipse.compare.*; public class CompareEditorContributor extends EditorActionBarContributor { @@ -94,8 +95,8 @@ public class CompareEditorContributor extends EditorActionBarContributor { CompareEditor editor= (CompareEditor) targetEditor; editor.setActionBars(actionBars); - actionBars.setGlobalActionHandler(IWorkbenchActionConstants.NEXT, fNext); - actionBars.setGlobalActionHandler(IWorkbenchActionConstants.PREVIOUS, fPrevious); + actionBars.setGlobalActionHandler(ActionFactory.NEXT.getId(), fNext); + actionBars.setGlobalActionHandler(ActionFactory.PREVIOUS.getId(), fPrevious); CompareConfiguration cc= editor.getCompareConfiguration(); fIgnoreWhitespace.setCompareConfiguration(cc); |