Attachment 172806 Details for Bug 316303 – actionSet visibleWhen v04 (draft)

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

[patch] actionSet visibleWhen v04 (draft)

as-v04.txt (text/plain), 11.62 KB, created by Paul Webster

on 2010-06-25 16:07:01 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Paul Webster

Created: 2010-06-25 16:07:01 EDT

Size: 11.62 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.e4.ui.workbench
>Index: src/org/eclipse/e4/ui/internal/workbench/ContributionsAnalyzer.java
>===================================================================
>RCS file: /cvsroot/eclipse/e4/org.eclipse.e4.ui/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/ContributionsAnalyzer.java,v
>retrieving revision 1.8
>diff -u -r1.8 ContributionsAnalyzer.java
>--- src/org/eclipse/e4/ui/internal/workbench/ContributionsAnalyzer.java	25 Jun 2010 18:03:50 -0000	1.8
>+++ src/org/eclipse/e4/ui/internal/workbench/ContributionsAnalyzer.java	25 Jun 2010 20:05:21 -0000
>@@ -138,7 +138,7 @@
> 		}
> 	}
> 
>-	private static boolean processAddition(final MMenu menuModel,
>+	public static boolean processAddition(final MMenu menuModel,
> 			final ArrayList<MMenuElement> menuContributionsToRemove,
> 			MMenuContribution menuContribution, final HashSet<String> existingMenuIds,
> 			HashSet<String> existingSeparatorNames) {
>#P org.eclipse.e4.ui.workbench.renderers.swt
>Index: src/org/eclipse/e4/ui/workbench/renderers/swt/MenuRenderer.java
>===================================================================
>RCS file: /cvsroot/eclipse/e4/org.eclipse.e4.ui/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/MenuRenderer.java,v
>retrieving revision 1.3
>diff -u -r1.3 MenuRenderer.java
>--- src/org/eclipse/e4/ui/workbench/renderers/swt/MenuRenderer.java	16 Jun 2010 01:03:55 -0000	1.3
>+++ src/org/eclipse/e4/ui/workbench/renderers/swt/MenuRenderer.java	25 Jun 2010 20:05:21 -0000
>@@ -10,17 +10,26 @@
>  *******************************************************************************/
> package org.eclipse.e4.ui.workbench.renderers.swt;
> 
>+import java.util.ArrayList;
>+import java.util.HashMap;
>+import java.util.HashSet;
> import org.eclipse.e4.core.contexts.IEclipseContext;
>+import org.eclipse.e4.core.contexts.RunAndTrack;
>+import org.eclipse.e4.ui.internal.workbench.ContributionsAnalyzer;
>+import org.eclipse.e4.ui.model.application.MApplication;
> import org.eclipse.e4.ui.model.application.ui.MElementContainer;
> import org.eclipse.e4.ui.model.application.ui.MUIElement;
> import org.eclipse.e4.ui.model.application.ui.basic.MWindow;
> import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
>+import org.eclipse.e4.ui.model.application.ui.menu.MMenuContribution;
> import org.eclipse.e4.ui.model.application.ui.menu.MMenuElement;
> import org.eclipse.e4.ui.model.application.ui.menu.MMenuSeparator;
> import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuFactoryImpl;
>-import org.eclipse.e4.ui.workbench.swt.modeling.MenuServiceFilter;
>+import org.eclipse.e4.ui.workbench.modeling.ExpressionContext;
> import org.eclipse.emf.ecore.EObject;
> import org.eclipse.swt.SWT;
>+import org.eclipse.swt.events.DisposeEvent;
>+import org.eclipse.swt.events.DisposeListener;
> import org.eclipse.swt.widgets.Control;
> import org.eclipse.swt.widgets.Decorations;
> import org.eclipse.swt.widgets.Menu;
>@@ -31,20 +40,33 @@
>  * Create a contribute part.
>  */
> public class MenuRenderer extends SWTPartRenderer {
>+	private MApplication application;
>+	private HashMap<MMenu, ArrayList<ArrayList<MMenuElement>>> pendingCleanup = new HashMap<MMenu, ArrayList<ArrayList<MMenuElement>>>();
>+
>+	@Override
>+	public void init(IEclipseContext context) {
>+		super.init(context);
>+		application = context.get(MApplication.class);
>+	}
> 
> 	public Object createWidget(final MUIElement element, Object parent) {
> 		if (!(element instanceof MMenu))
> 			return null;
> 
>-		MMenu menuModel = (MMenu) element;
>+		final MMenu menuModel = (MMenu) element;
> 
> 		Menu newMenu = null;
> 		if (parent instanceof Decorations) {
> 			MUIElement container = (MUIElement) ((EObject) element)
> 					.eContainer();
>-			if (container instanceof MWindow)
>+			if (container instanceof MWindow) {
> 				newMenu = new Menu((Decorations) parent, SWT.BAR);
>-			else {
>+				newMenu.addDisposeListener(new DisposeListener() {
>+					public void widgetDisposed(DisposeEvent e) {
>+						cleanUp(menuModel);
>+					}
>+				});
>+			} else {
> 				newMenu = new Menu((Decorations) parent, SWT.POP_UP);
> 			}
> 		} else if (parent instanceof Menu) {
>@@ -71,27 +93,92 @@
> 	 */
> 	@Override
> 	public void processContents(MElementContainer<MUIElement> container) {
>-		Object obj = container.getWidget();
>-		Object menuModel = container;
>-		if ((obj instanceof Menu) && (((Menu) obj).getStyle() & SWT.BAR) != 0
>-				&& (menuModel instanceof MMenu)) {
>-			if (container.getChildren().isEmpty()) {
>-				return;
>-			}
>-			// this is a crazy fill and run
>-			IEclipseContext ctx = getContext(container);
>-			MenuServiceFilter filter = ctx.get(MenuServiceFilter.class);
>-			filter.showMenu(null, (Menu) obj, (MMenu) menuModel);
>-			return;
>-		}
> 		if (container.getChildren().size() == 0) {
> 			MMenuSeparator sep = MenuFactoryImpl.eINSTANCE
> 					.createMenuSeparator();
>-			sep.setElementId("placeholder"); //$NON-NLS-1$
>+			sep.setElementId("menu.placeholder"); //$NON-NLS-1$
> 			container.getChildren().add(sep);
> 		}
> 
> 		super.processContents(container);
>+
>+		Object obj = container.getWidget();
>+		Object menuObj = container;
>+		if ((obj instanceof Menu) && (((Menu) obj).getStyle() & SWT.BAR) != 0
>+				&& (menuObj instanceof MMenu)) {
>+			MMenu menuModel = (MMenu) menuObj;
>+			IEclipseContext ctx = getContext(container);
>+			ExpressionContext eContext = new ExpressionContext(ctx);
>+			ArrayList<MMenuContribution> toContribute = new ArrayList<MMenuContribution>();
>+			ContributionsAnalyzer.gatherMenuContributions(menuModel,
>+					application.getMenuContributions(),
>+					menuModel.getElementId(), toContribute, eContext, false);
>+			addMenuBarContributions(menuModel, toContribute, ctx, eContext);
>+		}
>+	}
>+
>+	// this is similar in nature to:
>+	// org.eclipse.e4.ui.internal.workbench.ContributionsAnalyzer.addMenuContributions(MMenu,
>+	// ArrayList<MMenuContribution>, ArrayList<MMenuElement>)
>+	// the difference is it needs to add all the contributions and manage their
>+	// visiblility through a RAT
>+	private void addMenuBarContributions(final MMenu menuModel,
>+			ArrayList<MMenuContribution> toContribute,
>+			final IEclipseContext ctx, final ExpressionContext eContext) {
>+		HashSet<String> existingMenuIds = new HashSet<String>();
>+		HashSet<String> existingSeparatorNames = new HashSet<String>();
>+		for (MMenuElement child : menuModel.getChildren()) {
>+			String elementId = child.getElementId();
>+			if (child instanceof MMenu && elementId != null) {
>+				existingMenuIds.add(elementId);
>+			} else if (child instanceof MMenuSeparator && elementId != null) {
>+				existingSeparatorNames.add(elementId);
>+			}
>+		}
>+
>+		boolean done = toContribute.size() == 0;
>+		while (!done) {
>+			ArrayList<MMenuContribution> curList = new ArrayList<MMenuContribution>(
>+					toContribute);
>+			int retryCount = toContribute.size();
>+			toContribute.clear();
>+
>+			for (final MMenuContribution menuContribution : curList) {
>+				final ArrayList<MMenuElement> menuContributionsToRemove = new ArrayList<MMenuElement>();
>+				if (!ContributionsAnalyzer.processAddition(menuModel,
>+						menuContributionsToRemove, menuContribution,
>+						existingMenuIds, existingSeparatorNames)) {
>+					toContribute.add(menuContribution);
>+				} else {
>+					ctx.runAndTrack(new RunAndTrack() {
>+						@Override
>+						public boolean changed(IEclipseContext context) {
>+							if (!menuModel.isToBeRendered()
>+									|| !menuModel.isVisible()
>+									|| menuModel.getWidget() == null) {
>+								return false;
>+							}
>+							boolean rc = ContributionsAnalyzer.isVisible(
>+									menuContribution, eContext);
>+							for (MMenuElement element : menuContributionsToRemove) {
>+								element.setToBeRendered(rc);
>+							}
>+							return true;
>+						}
>+					});
>+					ArrayList<ArrayList<MMenuElement>> lists = pendingCleanup
>+							.get(menuModel);
>+					if (lists == null) {
>+						lists = new ArrayList<ArrayList<MMenuElement>>();
>+						pendingCleanup.put(menuModel, lists);
>+					}
>+				}
>+			}
>+			// We're done if the retryList is now empty (everything done) or
>+			// if the list hasn't changed at all (no hope)
>+			done = (toContribute.size() == 0)
>+					|| (toContribute.size() == retryCount);
>+		}
> 	}
> 
> 	private void setItemText(MMenu model, MenuItem item) {
>@@ -145,4 +232,16 @@
> 		return super.getUIContainer(element);
> 	}
> 
>+	void cleanUp(MMenu menuModel) {
>+		ArrayList<ArrayList<MMenuElement>> lists = pendingCleanup
>+				.remove(menuModel);
>+		if (lists == null) {
>+			return;
>+		}
>+		for (ArrayList<MMenuElement> list : lists) {
>+			for (MMenuElement item : list) {
>+				menuModel.getChildren().remove(item);
>+			}
>+		}
>+	}
> }
>#P org.eclipse.platform
>Index: LegacyIDE.e4xmi
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.platform/Attic/LegacyIDE.e4xmi,v
>retrieving revision 1.1.2.18
>diff -u -r1.1.2.18 LegacyIDE.e4xmi
>--- LegacyIDE.e4xmi	11 Jun 2010 13:08:00 -0000	1.1.2.18
>+++ LegacyIDE.e4xmi	25 Jun 2010 20:05:22 -0000
>@@ -1,8 +1,6 @@
> <?xml version="1.0" encoding="ASCII"?>
> <application:Application xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:application="http://www.eclipse.org/ui/2010/UIModel/application" xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic" xmlns:menu="http://www.eclipse.org/ui/2010/UIModel/application/ui/menu" xsi:schemaLocation="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic http://www.eclipse.org/ui/2010/UIModel/application#//ui/basic http://www.eclipse.org/ui/2010/UIModel/application/ui/menu http://www.eclipse.org/ui/2010/UIModel/application#//ui/menu" xmi:id="org.eclipse.e4.legacy.ide.application" elementId="org.eclipse.e4.legacy.ide.application">
>   <children xsi:type="basic:TrimmedWindow" xmi:id="IDEWindow" elementId="IDEWindow" label="Eclipse SDK 4.0" width="1024" height="768">
>-    <mainMenu xmi:id="_UW9TUPr3Ed6gmo7caOxU9g" elementId="org.eclipse.ui.main.menu">
>-    </mainMenu>
>     <trimBars xmi:id="org.eclipse.ui.main.toolbar" elementId="org.eclipse.ui.main.toolbar">
>     </trimBars>
>   </children>
>#P org.eclipse.ui.workbench
>Index: Eclipse UI/org/eclipse/ui/internal/WorkbenchWindow.java
>===================================================================
>RCS file: /cvsroot/eclipse/e4/org.eclipse.e4.compatibility/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchWindow.java,v
>retrieving revision 1.36
>diff -u -r1.36 WorkbenchWindow.java
>--- Eclipse UI/org/eclipse/ui/internal/WorkbenchWindow.java	25 Jun 2010 11:43:56 -0000	1.36
>+++ Eclipse UI/org/eclipse/ui/internal/WorkbenchWindow.java	25 Jun 2010 20:05:23 -0000
>@@ -75,7 +75,6 @@
> import org.eclipse.e4.ui.workbench.modeling.ISaveHandler;
> import org.eclipse.e4.ui.workbench.modeling.IWindowCloseHandler;
> import org.eclipse.e4.ui.workbench.renderers.swt.TrimmedPartLayout;
>-import org.eclipse.e4.ui.workbench.swt.modeling.MenuServiceFilter;
> import org.eclipse.jface.action.AbstractGroupMarker;
> import org.eclipse.jface.action.ActionContributionItem;
> import org.eclipse.jface.action.ContributionManager;
>@@ -479,21 +478,12 @@
> 			mainMenu = MenuFactoryImpl.eINSTANCE.createMenu();
> 			mainMenu.setElementId("org.eclipse.ui.main.menu"); //$NON-NLS-1$
> 
>-			model.setMainMenu(mainMenu);
>-		}
>-
>-		if (mainMenu.getChildren().isEmpty()) {
> 			fill(mainMenu, menuManager);
>+			model.setMainMenu(mainMenu);
>+			Menu menu = (Menu) engine.createGui(mainMenu, model.getWidget());
>+			shell.setMenuBar(menu);
> 		}
> 
>-		Menu menu = (Menu) engine.createGui(mainMenu, model.getWidget());
>-		shell.setMenuBar(menu);
>-
>-		// this is a crazy fill and run
>-		IEclipseContext ctx = model.getContext();
>-		MenuServiceFilter filter = ctx.get(MenuServiceFilter.class);
>-		filter.showMenu(null, menu, mainMenu);
>-
> 		createProgressIndicator(shell);
> 		createHeapStatus(shell);
> 	}

Actions: View | Diff

Attachments on bug 316303: 171886 | 172005 | 172179 | 172665 | 172806 | 172855