Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNiraj Modi2019-11-22 09:39:15 +0000
committerNiraj Modi2019-11-22 09:39:15 +0000
commite5eec30c484df196d8c4fae5149dda2d1735590e (patch)
treec889ee8f73d9ede19cfa8b08b3ec4dad631eee21
parent94b7ed61702a6a09efb85038b33dd7edf9b2d9c7 (diff)
downloadeclipse.platform.team-R4_6_maintenance.tar.gz
eclipse.platform.team-R4_6_maintenance.tar.xz
eclipse.platform.team-R4_6_maintenance.zip
Bug 544913 - [Accessibility] LTK refactoring: Some information can't beR4_6_maintenance
read in preview Change-Id: I884522fbe45902e0a1d41389fa31b523f121377f 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 cdb527ecc..bd487a310 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
@@ -2131,6 +2131,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()));
}
@@ -2144,6 +2145,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 b4cc2924e..9d416e03d 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.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -46,7 +46,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})
@@ -74,7 +74,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