Add activities support to DynamicMenuContributionItem

The PR #2768
was not complete. Dynamic **menus** are not filtered with that PR but
will be filtered with the provided change.

See #2217

Author: iloveeclipse

bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/Workbench.java

@@ -457,7 +457,6 @@ public void serviceChanged(ServiceEvent event) {
 	 *                specializes this workbench instance
 	 * @since 3.0
 	 */
-	@SuppressWarnings("restriction")
 	private Workbench(Display display, final WorkbenchAdvisor advisor, MApplication app, IEclipseContext appContext) {
 		this.advisor = Objects.requireNonNull(advisor);
 		this.display = Objects.requireNonNull(display);

bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/WorkbenchContributionFactory.java

@@ -25,7 +25,6 @@
  * from the {@link Workbench} services.
  *
  */
-@SuppressWarnings("restriction")
 class WorkbenchContributionFactory implements IContributionFactory {
 
 	private static final String BUNDLE_CLASS_PREFIX = "bundleclass://"; //$NON-NLS-1$
@@ -58,8 +57,11 @@ public Bundle getBundle(String uriString) {
 
 	@Override
 	public boolean isEnabled(String uriString) {
-		if (uriString != null && uriString.startsWith(BUNDLE_CLASS_PREFIX)) {
-			String identifierId = uriString.substring(BUNDLE_CLASS_PREFIX.length());
+		if (uriString != null) {
+			String identifierId = uriString;
+			if (uriString.startsWith(BUNDLE_CLASS_PREFIX)) {
+				identifierId = uriString.substring(BUNDLE_CLASS_PREFIX.length());
+			}
 			if (activitySupport == null) {
 				activitySupport = context.get(IWorkbenchActivitySupport.class);
 			}

bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/menus/DynamicMenuContributionItem.java

@@ -17,6 +17,7 @@
 
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.ILog;
+import org.eclipse.e4.core.services.contributions.IContributionFactory;
 import org.eclipse.jface.action.ContributionItem;
 import org.eclipse.jface.action.IContributionItem;
 import org.eclipse.jface.action.IContributionManager;
@@ -45,6 +46,7 @@ public class DynamicMenuContributionItem extends ContributionItem {
 	private final IServiceLocator locator;
 	private boolean alreadyFailed;
 	private ContributionItem loadedDynamicContribution;
+	private IContributionFactory factory;
 
 	/**
 	 * Creates a DynamicMenuContributionItem
@@ -58,6 +60,7 @@ public DynamicMenuContributionItem(String id, IServiceLocator locator, IConfigur
 
 		this.locator = locator;
 		this.dynamicAddition = dynamicAddition;
+		this.factory = locator.getService(IContributionFactory.class);
 	}
 
 	@Override
@@ -129,6 +132,9 @@ public boolean isVisible() {
 				reportErrorForContribution(loadedDynamicContribution, e);
 			}
 		}
+		if (factory != null && !factory.isEnabled(getId())) {
+			return false;
+		}
 		return super.isVisible();
 	}