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/dialogs/NewWizard.java

@@ -13,11 +13,14 @@
  *******************************************************************************/
 package org.eclipse.ui.internal.dialogs;
 
+import java.util.HashSet;
+import java.util.Set;
 import java.util.StringTokenizer;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.wizard.IWizard;
 import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.activities.WorkbenchActivityHelper;
 import org.eclipse.ui.internal.IWorkbenchGraphicConstants;
 import org.eclipse.ui.internal.WorkbenchImages;
 import org.eclipse.ui.internal.WorkbenchMessages;
@@ -42,6 +45,7 @@ public class NewWizard extends Wizard {
 	private IStructuredSelection selection;
 
 	private IWorkbench workbench;
+	private static Set<IWizardDescriptor> filteredWizards = new HashSet<>();
 
 	/**
 	 * Create the wizard pages
@@ -51,6 +55,14 @@ public void addPages() {
 		IWizardCategory root = WorkbenchPlugin.getDefault().getNewWizardRegistry().getRootCategory();
 		IWizardDescriptor[] primary = WorkbenchPlugin.getDefault().getNewWizardRegistry().getPrimaryWizards();
 
+		// Filter the wizards that are disabled by activity support. Issue 2809
+		filteredWizards.clear();
+		for (IWizardDescriptor wizardElement : primary) {
+			if (!WorkbenchActivityHelper.filterItem(wizardElement)) {
+				filteredWizards.add(wizardElement);
+			}
+		}
+
 		if (categoryId != null) {
 			IWizardCategory categories = root;
 			StringTokenizer familyTokenizer = new StringTokenizer(categoryId, CATEGORY_SEPARATOR);
@@ -65,7 +77,8 @@ public void addPages() {
 			}
 		}
 
-		mainPage = new NewWizardSelectionPage(workbench, selection, root, primary, projectsOnly);
+		mainPage = new NewWizardSelectionPage(workbench, selection, root,
+				filteredWizards.toArray(new IWizardDescriptor[filteredWizards.size()]), projectsOnly);
 		addPage(mainPage);
 	}