bug 403235 - CommandContributionItem have to restore contributed tooltipN20130318-2000I20130319-1000

when handler changes

Change-Id: Ic9f692b96b8c3d9693363220d27c6956f26f47fb

1 files changed, 5 insertions, 1 deletions

diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/menus/CommandContributionItem.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/menus/CommandContributionItem.java
index f9469357b57..a7091f5f2b7 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/menus/CommandContributionItem.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/menus/CommandContributionItem.java
@@ -164,6 +164,8 @@ public class CommandContributionItem extends ContributionItem {
 	// items contributed
 	private String contributedLabel;
 
+	private String contributedTooltip;
+
 	private ImageDescriptor contributedIcon;
 
 	private ImageDescriptor contributedDisabledIcon;
@@ -184,6 +186,7 @@ public class CommandContributionItem extends ContributionItem {
 		super(contributionParameters.id);
 
 		contributedLabel = contributionParameters.label;
+		contributedTooltip = contributionParameters.tooltip;
 		contributedIcon = contributionParameters.icon;
 		contributedDisabledIcon = contributionParameters.disabledIcon;
 		contributedHoverIcon = contributionParameters.hoverIcon;
@@ -332,6 +335,7 @@ public class CommandContributionItem extends ContributionItem {
 					IHandler handler = commandEvent.getCommand().getHandler();
 					if (shouldRestoreAppearance(handler)) {
 						label = contributedLabel;
+						tooltip = contributedTooltip;
 						icon = contributedIcon;
 						disabledIcon = contributedDisabledIcon;
 						hoverIcon = contributedHoverIcon;
@@ -1031,9 +1035,9 @@ public class CommandContributionItem extends ContributionItem {
 		data.disabledIcon = contributedDisabledIcon;
 		data.hoverIcon = contributedHoverIcon;
 		data.label = contributedLabel;
+		data.tooltip = contributedTooltip;
 		data.helpContextId = helpContextId;
 		data.mnemonic = mnemonic;
-		data.tooltip = tooltip;
 		return data;
 	}