diff options
| author | Andre Weinand | 2002-06-01 10:48:18 +0000 |
|---|---|---|
| committer | Andre Weinand | 2002-06-01 10:48:18 +0000 |
| commit | 3c8009c0289493d2515cfd4c37e156113fea848f (patch) | |
| tree | caaa6d537f0e336042d1edbee35377056031e3e5 /bundles/org.eclipse.compare/compare/org/eclipse/compare | |
| parent | f7189665485f7483e21d634f1f8b92c8def2680c (diff) | |
| download | eclipse.platform.team-3c8009c0289493d2515cfd4c37e156113fea848f.tar.gz eclipse.platform.team-3c8009c0289493d2515cfd4c37e156113fea848f.tar.xz eclipse.platform.team-3c8009c0289493d2515cfd4c37e156113fea848f.zip | |
Work on #10234v20020601
Diffstat (limited to 'bundles/org.eclipse.compare/compare/org/eclipse/compare')
| -rw-r--r-- | bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java index f19349392..017e2e3fd 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java @@ -1091,10 +1091,15 @@ public class TextMergeViewer extends ContentMergeViewer { if (actionBars != null) {
for (int i= 0; i < GLOBAL_ACTIONS.length; i++) {
IAction action= null;
- if (part != null)
+ if (part != null) {
action= part.getAction(TEXT_ACTIONS[i]);
- if (i == 7)
- i= 7;
+ if (action == null && TEXT_ACTIONS[i].equals(MergeSourceViewer.SAVE_ID)) {
+ if (part == fLeft)
+ action= fLeftSaveAction;
+ else
+ action= fRightSaveAction;
+ }
+ }
actionBars.setGlobalActionHandler(GLOBAL_ACTIONS[i], action);
}
actionBars.updateActionBars();
|