Apply activity filter for primary wizards to be shown in the New Wizard

dialog.

See #2809

Author: raghucssit

bundles/org.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/wizards/AbstractWizardRegistry.java

@@ -13,6 +13,9 @@
  *******************************************************************************/
 package org.eclipse.ui.internal.wizards;
 
+import java.util.HashSet;
+import java.util.Set;
+import org.eclipse.ui.activities.WorkbenchActivityHelper;
 import org.eclipse.ui.internal.dialogs.WizardCollectionElement;
 import org.eclipse.ui.internal.dialogs.WorkbenchWizardElement;
 import org.eclipse.ui.wizards.IWizardCategory;
@@ -32,6 +35,7 @@ public abstract class AbstractWizardRegistry implements IWizardRegistry {
 
 	private WizardCollectionElement wizardElements;
 
+	private static Set<WorkbenchWizardElement> filteredWizards = new HashSet<>();
 	/**
 	 * Create a new instance of this class.
 	 */
@@ -69,7 +73,15 @@ public IWizardDescriptor findWizard(String id) {
 	@Override
 	public IWizardDescriptor[] getPrimaryWizards() {
 		initialize();
-		return primaryWizards;
+
+		// Filter the wizards that are disabled by activity support. Issue 2809
+		filteredWizards.clear();
+		for (WorkbenchWizardElement wizardElement : primaryWizards) {
+			if (!WorkbenchActivityHelper.filterItem(wizardElement)) {
+				filteredWizards.add(wizardElement);
+			}
+		}
+		return filteredWizards.toArray(new WorkbenchWizardElement[filteredWizards.size()]);
 	}
 
 	@Override