Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNiraj Modi2019-11-22 08:28:59 +0000
committerNiraj Modi2019-11-22 08:28:59 +0000
commit480d50435a33e11757644f6fcab04aa0d5897920 (patch)
treee58d2092c12fd85e345baa9352f29bdf1b7d99ef
parent1f640d4a4d568811884cf7d65b67df91f8d88ef5 (diff)
downloadeclipse.platform.team-R4_11_maintenance.tar.gz
eclipse.platform.team-R4_11_maintenance.tar.xz
eclipse.platform.team-R4_11_maintenance.zip
Bug 544913 - [Accessibility] LTK refactoring: Some information can't beR4_11_maintenance
read in preview Change-Id: I7aa69050974d54989cd28ce47a07e3718c316783 Signed-off-by: Niraj Modi <niraj.modi@in.ibm.com>
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java2
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareMessages.properties6
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 f4e7bef6e..adf4fe6de 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
@@ -2090,6 +2090,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()));
}
@@ -2103,6 +2104,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}

Back to the top