Attachment 225216 Details for Bug 366528 – Partial patch 4, test failures down to 10

[patch] Partial patch 4, test failures down to 10

366528-popup.patch (text/plain), 2.66 KB, created by Mikaël Barbero

on 2013-01-04 09:45:25 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Mikaël Barbero

Created: 2013-01-04 09:45:25 EST

Size: 2.66 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.ui.workbench
>diff --git Eclipse UI/org/eclipse/ui/internal/menus/WorkbenchMenuService.java Eclipse UI/org/eclipse/ui/internal/menus/WorkbenchMenuService.java
>index 10a9180..917552a 100755
>--- Eclipse UI/org/eclipse/ui/internal/menus/WorkbenchMenuService.java
>+++ Eclipse UI/org/eclipse/ui/internal/menus/WorkbenchMenuService.java
>@@ -281,7 +281,7 @@
> 				MenuManagerRenderer renderer = (MenuManagerRenderer) obj;
> 				mMenu.setRenderer(renderer);
> 				renderer.reconcileManagerToModel(menu, mMenu);
>-				renderer.processContributions(mMenu, false, false);
>+				renderer.processContributions(mMenu, false, "popup".equals(uri.getScheme())); //$NON-NLS-1$
> 				// double cast because we're bad people
> 				renderer.processContents((MElementContainer<MUIElement>) ((Object) mMenu));
> 			}
>@@ -327,7 +327,9 @@
> 		if (mToolBar == null) {
> 			mToolBar = MenuFactoryImpl.eINSTANCE.createToolBar();
> 			mToolBar.setElementId(location.getPath());
>-			mToolBar.getTags().add("toolbar:" + location.getPath()); //$NON-NLS-1$
>+			mToolBar.getTags().add(ContributionsAnalyzer.MC_TOOLBAR);
>+			String tag = "toolbar:" + location.getPath(); //$NON-NLS-1$
>+			mToolBar.getTags().add(tag);
> 			final MPart part = getPartToExtend();
> 			if (part != null) {
> 				part.getToolbars().add(mToolBar);
>@@ -341,7 +343,7 @@
> 
> 		renderer.linkModelToManager(mToolBar, toolbarManager);
> 
>-		return null;
>+		return mToolBar;
> 	}
> 
> 	protected MMenu getMenuModel(MenuManager menuManager, MenuLocationURI location) {
>@@ -355,7 +357,12 @@
> 		MenuManagerRenderer renderer = (MenuManagerRenderer) obj;
> 		MMenu mMenu = renderer.getMenuModel(menuManager);
> 		if (mMenu != null) {
>-			String tag = "menu:" + location.getPath(); //$NON-NLS-1$
>+			final String tag;
>+			if ("popup".equals(location.getScheme())) { //$NON-NLS-1$
>+				tag = "popup:" + location.getPath(); //$NON-NLS-1$
>+			} else {
>+				tag = "menu:" + location.getPath(); //$NON-NLS-1$
>+			}
> 			if (!mMenu.getTags().contains(tag)) {
> 				mMenu.getTags().add(tag);
> 			}
>@@ -368,8 +375,14 @@
> 			if (mMenu.getElementId() == null) {
> 				mMenu.setElementId(location.getPath());
> 			}
>-			mMenu.getTags().add(ContributionsAnalyzer.MC_MENU);
>-			String tag = "menu:" + location.getPath(); //$NON-NLS-1$
>+			final String tag;
>+			if ("popup".equals(location.getScheme())) { //$NON-NLS-1$
>+				mMenu.getTags().add(ContributionsAnalyzer.MC_POPUP);
>+				tag = "popup:" + location.getPath(); //$NON-NLS-1$
>+			} else {
>+				mMenu.getTags().add(ContributionsAnalyzer.MC_MENU);
>+				tag = "menu:" + location.getPath(); //$NON-NLS-1$
>+			}
> 			mMenu.getTags().add(tag);
> 			mMenu.setLabel(menuManager.getMenuText());
> 			final MPart part = getPartToExtend();

Actions: View | Diff

Attachments on bug 366528: 219171 | 224911 | 224912 | 225216 | 225598 | 232176