Attachment #54428 for bug #46469

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

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

Lines 107-112 Link Here

(-)src/org/eclipse/jface/messages.properties (+1 lines)
107	#############################################################	107	#############################################################
108	Cancel_Current_Operation = Cancel Current Operation	108	Cancel_Current_Operation = Cancel Current Operation
109	Set_SubTask = {0} {1}	109	Set_SubTask = {0} {1}
		110	Toolbar_Tooltip_Accelerator = {0} ({1})
110		111
111	#############################################################	112	#############################################################
112	# org.eclipse.jface.dialog	113	# org.eclipse.jface.dialog




					if ((toolTip == null) || (toolTip.length() == 0)) {
						toolTip = text;
					}
					
					ExternalActionManager.ICallback callback = ExternalActionManager
							.getInstance().getCallback();
					String commandId = action.getActionDefinitionId();
					if ((callback != null) && (commandId != null) && (toolTip != null)) {
						String acceleratorText = callback.getAcceleratorText(commandId);
						if (acceleratorText != null && acceleratorText.length() != 0) {
							toolTip = JFaceResources.format(
									"Toolbar_Tooltip_Accelerator", //$NON-NLS-1$
									new Object[] { toolTip, acceleratorText });
						}
					}

					// if the text is showing, then only set the tooltip if
					// different
					if (!showText || toolTip != null && !toolTip.equals(text)) {

Return to bug 46469

Lines 729-734 Link Here

(-)src/org/eclipse/jface/action/ActionContributionItem.java (+13 lines)
729	if ((toolTip == null) \|\| (toolTip.length() == 0)) {	729	if ((toolTip == null) \|\| (toolTip.length() == 0)) {
730	toolTip = text;	730	toolTip = text;
731	}	731	}
		732
		733	ExternalActionManager.ICallback callback = ExternalActionManager
		734	.getInstance().getCallback();
		735	String commandId = action.getActionDefinitionId();
		736	if ((callback != null) && (commandId != null) && (toolTip != null)) {
		737	String acceleratorText = callback.getAcceleratorText(commandId);
		738	if (acceleratorText != null && acceleratorText.length() != 0) {
		739	toolTip = JFaceResources.format(
		740	"Toolbar_Tooltip_Accelerator", //$NON-NLS-1$
		741	new Object[] { toolTip, acceleratorText });
		742	}
		743	}
		744
732	// if the text is showing, then only set the tooltip if	745	// if the text is showing, then only set the tooltip if
733	// different	746	// different
734	if (!showText \|\| toolTip != null && !toolTip.equals(text)) {	747	if (!showText \|\| toolTip != null && !toolTip.equals(text)) {