View | Details | Raw Unified | Return to bug 184597
Collapse All | Expand All

(-)src/org/eclipse/jface/action/ActionContributionItem.java (-3 / +8 lines)
Lines 833-841 Link Here
833
							acceleratorText = callback
833
							acceleratorText = callback
834
									.getAcceleratorText(commandId);
834
									.getAcceleratorText(commandId);
835
						}
835
						}
836
					} else {
837
						acceleratorText = Action
838
								.convertAccelerator(accelerator);
839
					}
836
					}
840
837
841
					IContributionManagerOverrides overrides = null;
838
					IContributionManagerOverrides overrides = null;
Lines 854-859 Link Here
854
						text = updatedAction.getText();
851
						text = updatedAction.getText();
855
					}
852
					}
856
853
854
					if (text != null && acceleratorText == null) {
855
						// use extracted accelerator text in case accelerator cannot be fully represented in one int (e.g. multi-stroke keys) 
856
						acceleratorText = LegacyActionTools.extractAcceleratorText(text);
857
						if (acceleratorText == null && accelerator != 0) {
858
							acceleratorText= Action.convertAccelerator(accelerator);
859
						}
860
					}
861
857
					if (text == null) {
862
					if (text == null) {
858
						text = ""; //$NON-NLS-1$
863
						text = ""; //$NON-NLS-1$
859
					} else {
864
					} else {

Return to bug 184597