diff options
| author | Andrey Loskutov | 2019-01-15 21:42:30 +0000 |
|---|---|---|
| committer | Andrey Loskutov | 2019-01-15 21:42:30 +0000 |
| commit | d7e34dabfab460f62eed04eb36cbeb6f46506e03 (patch) | |
| tree | d732b7162c2362e13756e4a73c37f1e7fcb4ada3 | |
| parent | e0dddbcd150fcb3588ec4306ee78d580e0772246 (diff) | |
| download | eclipse.platform.team-d7e34dabfab460f62eed04eb36cbeb6f46506e03.tar.gz eclipse.platform.team-d7e34dabfab460f62eed04eb36cbeb6f46506e03.tar.xz eclipse.platform.team-d7e34dabfab460f62eed04eb36cbeb6f46506e03.zip | |
Bug 543146 - fixed typo in TextMergeViewer.createToolItems()
Change-Id: Ic1f08ca714596074535e0bdc1143f25df715781f
Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
| -rw-r--r-- | bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java | 2 |
1 files changed, 1 insertions, 1 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 c652562a7..99d72c01a 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 @@ -3818,7 +3818,7 @@ public class TextMergeViewer extends ContentMergeViewer implements IAdaptable { fHandlerService.registerAction(fIgnoreWhitespace, fIgnoreWhitespace.getActionDefinitionId()); boolean needsLeftPainter= !isEditorBacked(fLeft.getSourceViewer()); - boolean needsRightPainter= !isEditorBacked(fLeft.getSourceViewer()); + boolean needsRightPainter= !isEditorBacked(fRight.getSourceViewer()); boolean needsAncestorPainter= !isEditorBacked(fAncestor.getSourceViewer()); showWhitespaceAction = new ShowWhitespaceAction( new MergeSourceViewer[] {fLeft, fRight, fAncestor}, |