View | Details | Raw Unified | Return to bug 336584 | Differences between
and this patch

Collapse All | Expand All

(-)Eclipse UI/org/eclipse/ui/menus/CommandContributionItem.java (-2 / +7 lines)
Lines 24-30 Link Here
24
import org.eclipse.core.runtime.Status;
24
import org.eclipse.core.runtime.Status;
25
import org.eclipse.jface.action.ContributionItem;
25
import org.eclipse.jface.action.ContributionItem;
26
import org.eclipse.jface.action.IContributionManager;
26
import org.eclipse.jface.action.IContributionManager;
27
import org.eclipse.jface.action.IMenuListener;
27
import org.eclipse.jface.action.IMenuListener2;
28
import org.eclipse.jface.action.IMenuManager;
28
import org.eclipse.jface.action.IMenuManager;
29
import org.eclipse.jface.action.MenuManager;
29
import org.eclipse.jface.action.MenuManager;
30
import org.eclipse.jface.bindings.BindingManagerEvent;
30
import org.eclipse.jface.bindings.BindingManagerEvent;
Lines 863-869 Link Here
863
					if (workbenchHelpSystem != null) {
863
					if (workbenchHelpSystem != null) {
864
						workbenchHelpSystem.setHelp(menu, helpContextId);
864
						workbenchHelpSystem.setHelp(menu, helpContextId);
865
					}
865
					}
866
					menuManager.addMenuListener(new IMenuListener() {
866
					menuManager.addMenuListener(new IMenuListener2() {
867
						public void menuAboutToShow(IMenuManager manager) {
867
						public void menuAboutToShow(IMenuManager manager) {
868
							String id = getId();
868
							String id = getId();
869
							if (dropDownMenuOverride != null) {
869
							if (dropDownMenuOverride != null) {
Lines 872-877 Link Here
872
							menuService.populateContributionManager(
872
							menuService.populateContributionManager(
873
									menuManager, "menu:" + id); //$NON-NLS-1$
873
									menuManager, "menu:" + id); //$NON-NLS-1$
874
						}
874
						}
875
876
						public void menuAboutToHide(IMenuManager manager) {
877
							menuService.releaseContributions(menuManager);
878
							menuManager.dispose();
879
						}
875
					});
880
					});
876
881
877
					// position the menu below the drop down item
882
					// position the menu below the drop down item

Return to bug 336584