From 7cb37653f01abad8f14ef73d2c31cc004b3d674e Mon Sep 17 00:00:00 2001 From: Niraj Modi Date: Wed, 24 Jul 2019 12:24:39 +0530 Subject: Bug 544868 - [Accessibility] Compare editor and accessibility: the column is read wrong when swapping left and right view Change-Id: I6c7cdcaef2189b36c3509a5d88bb982d52d1f553 Signed-off-by: Niraj Modi --- .../eclipse/compare/contentmergeviewer/TextMergeViewer.java | 12 +++++++++--- 1 file changed, 9 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 48d802d7c..ce2a828e0 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2018 IBM Corporation and others. + * Copyright (c) 2000, 2019 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -2086,7 +2086,10 @@ public class TextMergeViewer extends ContentMergeViewer implements IAdaptable { fLeft.getSourceViewer().getTextWidget().getAccessible().addAccessibleListener(new AccessibleAdapter() { @Override public void getName(AccessibleEvent e) { - e.result = NLS.bind(CompareMessages.TextMergeViewer_accessible_left, getCompareConfiguration().getLeftLabel(getInput())); + // Check for Mirrored status flag before returning the left label's text. + e.result = NLS.bind(CompareMessages.TextMergeViewer_accessible_left, + getCompareConfiguration().isMirrored() ? getCompareConfiguration().getRightLabel(getInput()) + : getCompareConfiguration().getLeftLabel(getInput())); } }); fLeft.getSourceViewer().addTextPresentationListener(new ChangeHighlighter(fLeft)); @@ -2096,7 +2099,10 @@ public class TextMergeViewer extends ContentMergeViewer implements IAdaptable { fRight.getSourceViewer().getTextWidget().getAccessible().addAccessibleListener(new AccessibleAdapter() { @Override public void getName(AccessibleEvent e) { - e.result = NLS.bind(CompareMessages.TextMergeViewer_accessible_right, getCompareConfiguration().getRightLabel(getInput())); + // Check for Mirrored status flag before returning the right label's text. + e.result = NLS.bind(CompareMessages.TextMergeViewer_accessible_right, + getCompareConfiguration().isMirrored() ? getCompareConfiguration().getLeftLabel(getInput()) + : getCompareConfiguration().getRightLabel(getInput())); } }); fRight.getSourceViewer().addTextPresentationListener(new ChangeHighlighter(fRight)); -- cgit v1.2.3