Bug 544913 - [Accessibility] LTK refactoring: Some information can't beI20191122-1800I20191120-2335I20191120-1800I20191120-0840I20191120-0600I20191119-2200I20191119-1800I20191119-1250I20191119-1235I20191119-1215I20191119-1155I20191119-0850I20191119-0725I20191119-0510I20191119-0315I20191119-0020I20191118-2230I20191118-1800I20191118-0600I20191117-1800I20191117-0600I20191116-1800I20191116-0600I20191115-1800I20191114-1800I20191114-0410I20191113-2315I20191113-1800I20191112-1800

read in preview

Change-Id: I2ec716195e08f93e9b20dce5bdf381d7af833a6d
Signed-off-by: Niraj Modi <niraj.modi@in.ibm.com>

2 files changed, 5 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 d29f8dd3d..5aea68136 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
@@ -2096,6 +2096,7 @@ public class TextMergeViewer extends ContentMergeViewer implements IAdaptable {
 			public void getName(AccessibleEvent e) {
 				// Check for Mirrored status flag before returning the left label's text.
 				e.result = NLS.bind(CompareMessages.TextMergeViewer_accessible_left,
+						getControl().getData(CompareUI.COMPARE_VIEWER_TITLE),
 						getCompareConfiguration().isMirrored() ? getCompareConfiguration().getRightLabel(getInput())
 								: getCompareConfiguration().getLeftLabel(getInput()));
 			}
@@ -2109,6 +2110,7 @@ public class TextMergeViewer extends ContentMergeViewer implements IAdaptable {
 			public void getName(AccessibleEvent e) {
 				// Check for Mirrored status flag before returning the right label's text.
 				e.result = NLS.bind(CompareMessages.TextMergeViewer_accessible_right,
+						getControl().getData(CompareUI.COMPARE_VIEWER_TITLE),
 						getCompareConfiguration().isMirrored() ? getCompareConfiguration().getLeftLabel(getInput())
 								: getCompareConfiguration().getRightLabel(getInput()));
 			}
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareMessages.properties b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareMessages.properties
index d40c24459..8cdcff78b 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareMessages.properties
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareMessages.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2000, 2015 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
@@ -49,7 +49,7 @@ TextMergeViewer_direction_incoming= incoming
 TextMergeViewer_direction_conflicting= conflicting
 
 TextMergeViewer_diffType_format= {0} {1}
-TextMergeViewer_accessible_left=Left: {0}
+TextMergeViewer_accessible_left={0} Left: {1}
 
 TextMergeViewer_diffDescription_noDiff_format= no diff
 TextMergeViewer_diffDescription_diff_format= {0} #{1} (Left: {2}, Right: {3})
@@ -77,7 +77,7 @@ TextMergeViewer_17=Do &nothing
 TextMergeViewer_atEnd_message= End of document reached. Continue from beginning?
 
 TextMergeViewer_atBeginning_title= Go to Previous Difference
-TextMergeViewer_accessible_right=Right: {0}
+TextMergeViewer_accessible_right={0} Right: {1}
 TextMergeViewer_atBeginning_message= Beginning of document reached. Continue from end?
 TextMergeViewer_accessible_ancestor=Ancestor: {0}