Attachment 65324 Details for Bug 184597 – Fix

[patch] Fix

184597_patch.txt (text/plain), 1.34 KB, created by Markus Keller

on 2007-04-28 08:31:58 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Markus Keller

Created: 2007-04-28 08:31:58 EDT

Size: 1.34 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jface
>Index: src/org/eclipse/jface/action/ActionContributionItem.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jface/src/org/eclipse/jface/action/ActionContributionItem.java,v
>retrieving revision 1.78
>diff -u -r1.78 ActionContributionItem.java
>--- src/org/eclipse/jface/action/ActionContributionItem.java	11 Apr 2007 15:09:40 -0000	1.78
>+++ src/org/eclipse/jface/action/ActionContributionItem.java	28 Apr 2007 12:32:29 -0000
>@@ -833,9 +833,6 @@
> 							acceleratorText = callback
> 									.getAcceleratorText(commandId);
> 						}
>-					} else {
>-						acceleratorText = Action
>-								.convertAccelerator(accelerator);
> 					}
> 
> 					IContributionManagerOverrides overrides = null;
>@@ -854,6 +851,14 @@
> 						text = updatedAction.getText();
> 					}
> 
>+					if (text != null && acceleratorText == null) {
>+						// use extracted accelerator text in case accelerator cannot be fully represented in one int (e.g. multi-stroke keys) 
>+						acceleratorText = LegacyActionTools.extractAcceleratorText(text);
>+						if (acceleratorText == null && accelerator != 0) {
>+							acceleratorText= Action.convertAccelerator(accelerator);
>+						}
>+					}
>+
> 					if (text == null) {
> 						text = ""; //$NON-NLS-1$
> 					} else {

Actions: View | Diff

Attachments on bug 184597: 65324