Attachment #118946 for bug #212326

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

Lines 19-24 Link Here

(-)static_web_ui/org/eclipse/wst/web/ui/internal/wizards/DataModelFacetCreationWizardPage.java (+37 lines)
19	import java.util.SortedSet;	19	import java.util.SortedSet;
20		20
21	import org.eclipse.jface.dialogs.IDialogSettings;	21	import org.eclipse.jface.dialogs.IDialogSettings;
		22	import org.eclipse.jface.viewers.ISelection;
		23	import org.eclipse.jface.viewers.IStructuredSelection;
22	import org.eclipse.osgi.util.NLS;	24	import org.eclipse.osgi.util.NLS;
23	import org.eclipse.swt.SWT;	25	import org.eclipse.swt.SWT;
24	import org.eclipse.swt.events.SelectionAdapter;	26	import org.eclipse.swt.events.SelectionAdapter;
Lines 32-38 Link Here
32	import org.eclipse.swt.widgets.Display;	34	import org.eclipse.swt.widgets.Display;
33	import org.eclipse.swt.widgets.Group;	35	import org.eclipse.swt.widgets.Group;
34	import org.eclipse.swt.widgets.Shell;	36	import org.eclipse.swt.widgets.Shell;
		37	import org.eclipse.ui.IWorkingSet;
35	import org.eclipse.ui.PlatformUI;	38	import org.eclipse.ui.PlatformUI;
		39	import org.eclipse.ui.dialogs.WorkingSetConfigurationBlock;
		40	import org.eclipse.ui.dialogs.WorkingSetGroup;
36	import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;	41	import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
37	import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;	42	import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent;
38	import org.eclipse.wst.common.frameworks.datamodel.DataModelPropertyDescriptor;	43	import org.eclipse.wst.common.frameworks.datamodel.DataModelPropertyDescriptor;
Lines 67-75 Link Here
67	private static final String NULL_RUNTIME = "NULL_RUNTIME"; //$NON-NLS-1$	72	private static final String NULL_RUNTIME = "NULL_RUNTIME"; //$NON-NLS-1$
68	private static final String MRU_RUNTIME_STORE = "MRU_RUNTIME_STORE"; //$NON-NLS-1$	73	private static final String MRU_RUNTIME_STORE = "MRU_RUNTIME_STORE"; //$NON-NLS-1$
69		74
		75	private static final String RESOURCE_WORKING_SET = "org.eclipse.ui.resourceWorkingSetPage"; //$NON-NLS-1$
		76	private static final String JAVA_WORKING_SET = "org.eclipse.jdt.ui.JavaWorkingSetPage"; //$NON-NLS-1$
		77
70	protected IProjectFacet primaryProjectFacet = null;	78	protected IProjectFacet primaryProjectFacet = null;
71	protected Combo primaryVersionCombo = null;	79	protected Combo primaryVersionCombo = null;
72		80
		81	protected WorkingSetGroup workingSetGroup;
		82
73	protected Set<IProjectFacetVersion> getFacetConfiguration( final IProjectFacetVersion primaryFacetVersion )	83	protected Set<IProjectFacetVersion> getFacetConfiguration( final IProjectFacetVersion primaryFacetVersion )
74	{	84	{
75	final Set<IProjectFacetVersion> config = new HashSet<IProjectFacetVersion>();	85	final Set<IProjectFacetVersion> config = new HashSet<IProjectFacetVersion>();
Lines 117-122 Link Here
117	createServerTargetComposite(top);	127	createServerTargetComposite(top);
118	createPrimaryFacetComposite(top);	128	createPrimaryFacetComposite(top);
119	createPresetPanel(top);	129	createPresetPanel(top);
		130	createWorkingSetGroupPanel(top);
120	return top;	131	return top;
121	}	132	}
122		133
Lines 629-632 Link Here
629	return null;	640	return null;
630	}	641	}
631		642
		643	protected WorkingSetGroup createWorkingSetGroup(Composite composite,
		644	IStructuredSelection selection, String[] supportedWorkingSetTypes) {
		645	if (workingSetGroup != null)
		646	return workingSetGroup;
		647	workingSetGroup = new WorkingSetGroup(composite, selection,
		648	supportedWorkingSetTypes);
		649	return workingSetGroup;
		650	}
		651
		652	protected WorkingSetGroup createWorkingSetGroupPanel(Composite composite) {
		653	IStructuredSelection structuredSelection = null;
		654	ISelection currentSelection = PlatformUI.getWorkbench()
		655	.getActiveWorkbenchWindow().getSelectionService()
		656	.getSelection();
		657	if (currentSelection instanceof IStructuredSelection) {
		658	structuredSelection = (IStructuredSelection) currentSelection;
		659	}
		660	WorkingSetGroup group = createWorkingSetGroup(composite, structuredSelection,
		661	new String[] { RESOURCE_WORKING_SET, JAVA_WORKING_SET });
		662	return group;
		663	}
		664
		665	public IWorkingSet[] getSelectedWorkingSets() {
		666	return workingSetGroup == null ? new IWorkingSet[0] : workingSetGroup
		667	.getSelectedWorkingSets();
		668	}
632	}	669	}

Lines 17-22 Link Here

(-)static_web_ui/org/eclipse/wst/web/ui/internal/wizards/NewProjectDataModelFacetWizard.java (-2 / +20 lines)
17	import java.util.Set;	17	import java.util.Set;
18		18
19	import org.eclipse.core.commands.ExecutionException;	19	import org.eclipse.core.commands.ExecutionException;
		20	import org.eclipse.core.resources.IProject;
20	import org.eclipse.core.resources.ResourcesPlugin;	21	import org.eclipse.core.resources.ResourcesPlugin;
21	import org.eclipse.core.runtime.CoreException;	22	import org.eclipse.core.runtime.CoreException;
22	import org.eclipse.core.runtime.IAdaptable;	23	import org.eclipse.core.runtime.IAdaptable;
Lines 32-37 Link Here
32	import org.eclipse.swt.widgets.Composite;	33	import org.eclipse.swt.widgets.Composite;
33	import org.eclipse.ui.INewWizard;	34	import org.eclipse.ui.INewWizard;
34	import org.eclipse.ui.IWorkbench;	35	import org.eclipse.ui.IWorkbench;
		36	import org.eclipse.ui.IWorkingSet;
		37	import org.eclipse.ui.PlatformUI;
35	import org.eclipse.ui.wizards.newresource.BasicNewProjectResourceWizard;	38	import org.eclipse.ui.wizards.newresource.BasicNewProjectResourceWizard;
36	import org.eclipse.ui.wizards.newresource.BasicNewResourceWizard;	39	import org.eclipse.ui.wizards.newresource.BasicNewResourceWizard;
37	import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;	40	import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
Lines 385-390 Link Here
385	* @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizard#postPerformFinish()	388	* @see org.eclipse.wst.common.frameworks.internal.ui.wizard.WTPWizard#postPerformFinish()
386	*/	389	*/
387	protected void postPerformFinish() throws InvocationTargetException {	390	protected void postPerformFinish() throws InvocationTargetException {
		391	String projName = getProjectName();
		392	IProject newProject = ResourcesPlugin.getWorkspace().getRoot().getProject(projName);
		393	IWorkbench workbench = WSTWebUIPlugin.getDefault().getWorkbench();
		394
		395	// add to the selected working sets
		396	if (newProject != null &&
		397	beginingPages != null &&
		398	beginingPages.length > 0 &&
		399	beginingPages[0] instanceof DataModelFacetCreationWizardPage) {
		400	DataModelFacetCreationWizardPage mainPage = (DataModelFacetCreationWizardPage) beginingPages[0];
		401	IWorkingSet[] workingSets = mainPage.getSelectedWorkingSets();
		402	workbench.getWorkingSetManager().addToWorkingSets(newProject, workingSets);
		403	}
		404
		405	// open the "final" perspective
388	if (getFinalPerspectiveID() != null && getFinalPerspectiveID().length() > 0) {	406	if (getFinalPerspectiveID() != null && getFinalPerspectiveID().length() > 0) {
389	final IConfigurationElement element = new DelegateConfigurationElement(configurationElement) {	407	final IConfigurationElement element = new DelegateConfigurationElement(configurationElement) {
390	public String getAttribute(String aName) {	408	public String getAttribute(String aName) {
Lines 398-405 Link Here
398	} else	416	} else
399	BasicNewProjectResourceWizard.updatePerspective(configurationElement);	417	BasicNewProjectResourceWizard.updatePerspective(configurationElement);
400		418
401	String projName = getProjectName();	419	// select and reveal
402	BasicNewResourceWizard.selectAndReveal(ResourcesPlugin.getWorkspace().getRoot().getProject(projName), WSTWebUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow());	420	BasicNewResourceWizard.selectAndReveal(newProject, workbench.getActiveWorkbenchWindow());
403	}	421	}
404		422
405	protected IDataModelOperation getFacetProjectNotificationOperation() {	423	protected IDataModelOperation getFacetProjectNotificationOperation() {

Return to bug 212326