Filter e4 view contributions in "Show View -> Other" via activities

Activities filtering for e4 is possible since
04f719b, see
org.eclipse.e4.core.services.contributions.IContributionFactory

Allow "Show View -> Other" to filter e4 contributed views.

This is the one part of the fix for PDE activities not covering SWT
tooling. Second part is to extend PDE activity patterns.

See eclipse-platform/eclipse.platform#1869

Author: iloveeclipse

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

@@ -28,6 +28,7 @@
 class WorkbenchContributionFactory implements IContributionFactory {
 
 	private static final String BUNDLE_CLASS_PREFIX = "bundleclass://"; //$NON-NLS-1$
+	private static final String PLATFORM_PLUGIN_PREFIX = "platform:/plugin/"; //$NON-NLS-1$
 
 	private final IContributionFactory delegate;
 
@@ -61,6 +62,8 @@ public boolean isEnabled(String uriString) {
 			String identifierId = uriString;
 			if (uriString.startsWith(BUNDLE_CLASS_PREFIX)) {
 				identifierId = uriString.substring(BUNDLE_CLASS_PREFIX.length());
+			} else if (uriString.startsWith(PLATFORM_PLUGIN_PREFIX)) {
+				identifierId = uriString.substring(PLATFORM_PLUGIN_PREFIX.length());
 			}
 			if (activitySupport == null) {
 				activitySupport = context.get(IWorkbenchActivitySupport.class);

bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/dialogs/ViewContentProvider.java

@@ -19,6 +19,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import org.eclipse.e4.core.services.contributions.IContributionFactory;
 import org.eclipse.e4.ui.model.application.MApplication;
 import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptor;
 import org.eclipse.jface.viewers.ITreeContentProvider;
@@ -173,13 +174,28 @@ private boolean isView(MPartDescriptor descriptor) {
 	private boolean isFilteredByActivity(MPartDescriptor descriptor) {
 		IViewDescriptor view = viewRegistry.find(descriptor.getElementId());
 
-		// viewRegistry.find(...) already applies a filtering for views disabled via core expressions
+		// viewRegistry.find(...) already applies a filtering for views disabled via
+		// core expressions
 		boolean isFiltered = (view == null) || WorkbenchActivityHelper.filterItem(view);
 
 		// E3 views can be detected by checking whether they use the compatibility layer
 		boolean isE3View = CompatibilityPart.COMPATIBILITY_VIEW_URI.equals(descriptor.getContributionURI());
 
-		// filtering can only be applied to E3 views, as activities don't exist in the Eclipse 4.
-		return isE3View && isFiltered;
+		if (isE3View) {
+			// filtering for E3 contributions is easy
+			return isFiltered;
+		}
+		// Extra checks for filtering of e4 contributions
+		if (view == null) {
+			IContributionFactory contributionFactory = application.getContext().get(IContributionFactory.class);
+			if (contributionFactory != null) {
+				String uriToCheck = descriptor.getContributionURI();
+				if (uriToCheck == null) {
+					uriToCheck = descriptor.getContributorURI();
+				}
+				return !contributionFactory.isEnabled(uriToCheck);
+			}
+		}
+		return false;
 	}
 }