Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomasz Zarna2010-12-03 04:45:59 -0500
committerTomasz Zarna2010-12-03 04:45:59 -0500
commit7d9ca9acef06cc77668cb86ed2e7dc87654e8bd4 (patch)
treec0581fe56904a11a1f949eadaab7a79d683f6a7a
parent27e042260a6e1ff4f864aef4ddaa82cd670e7053 (diff)
downloadeclipse.platform.team-7d9ca9acef06cc77668cb86ed2e7dc87654e8bd4.tar.gz
eclipse.platform.team-7d9ca9acef06cc77668cb86ed2e7dc87654e8bd4.tar.xz
eclipse.platform.team-7d9ca9acef06cc77668cb86ed2e7dc87654e8bd4.zip
bug 262718: File path labels in compare editor should escape mnemonics
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java
index ec139eb7e..b47931690 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java
@@ -40,6 +40,7 @@ import org.eclipse.core.runtime.ListenerList;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.ActionContributionItem;
import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.action.LegacyActionTools;
import org.eclipse.jface.action.Separator;
import org.eclipse.jface.action.ToolBarManager;
import org.eclipse.jface.dialogs.IDialogConstants;
@@ -1054,7 +1055,7 @@ public abstract class ContentMergeViewer extends ContentViewer
fAncestorLabel.setImage(ancestorImage);
String ancestorLabel = content.getAncestorLabel(input);
if (ancestorLabel != null)
- fAncestorLabel.setText(TextProcessor.process(ancestorLabel));
+ fAncestorLabel.setText(LegacyActionTools.escapeMnemonics(TextProcessor.process(ancestorLabel)));
}
if (fLeftLabel != null) {
Image leftImage = content.getLeftImage(input);
@@ -1062,7 +1063,7 @@ public abstract class ContentMergeViewer extends ContentViewer
fLeftLabel.setImage(leftImage);
String leftLabel = content.getLeftLabel(input);
if (leftLabel != null)
- fLeftLabel.setText(leftLabel);
+ fLeftLabel.setText(LegacyActionTools.escapeMnemonics(leftLabel));
}
if (fRightLabel != null) {
Image rightImage = content.getRightImage(input);
@@ -1070,7 +1071,7 @@ public abstract class ContentMergeViewer extends ContentViewer
fRightLabel.setImage(rightImage);
String rightLabel = content.getRightLabel(input);
if (rightLabel != null)
- fRightLabel.setText(rightLabel);
+ fRightLabel.setText(LegacyActionTools.escapeMnemonics(rightLabel));
}
}

Back to the top