Attachment #77303 for bug #183779




import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.IDialogSettings;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.pde.internal.core.ICoreConstants;
import org.eclipse.pde.internal.core.PDECore;
import org.eclipse.pde.internal.core.TargetPlatformHelper;

	private static final String S_OSGI_PROJECT = "osgiProject"; //$NON-NLS-1$
	private static final String S_TARGET_NAME = "targetName"; //$NON-NLS-1$
	
	public NewProjectCreationPage(String pageName, AbstractFieldData data, boolean fragment, IStructuredSelection selection){
		super(pageName, selection, new String[] {  "org.eclipse.jdt.ui.JavaWorkingSetPage", //$NON-NLS-1$
				"org.eclipse.pde.ui.pluginWorkingSet", "org.eclipse.ui.resourceWorkingSetPage" }); //$NON-NLS-1$ //$NON-NLS-2$
		fFragment = fragment;
		fData = data;
	}

		fData.setTargetVersion(fTargetCombo.getText());
		fData.setHasBundleStructure(fOSGIButton.getSelection() || Double.parseDouble(fTargetCombo.getText()) >= 3.1);	
		fData.setOSGiFramework(fOSGIButton.getSelection() ? fOSGiCombo.getText() : null);
		fData.setWorkingSets(getSelectedWorkingSets());
	}
	
    protected boolean validatePage() {

Lines 23-28 Link Here

(-)src/org/eclipse/pde/internal/ui/wizards/plugin/NewFragmentProjectWizard.java (-1 / +7 lines)
23	import org.eclipse.pde.internal.ui.PDEUIMessages;	23	import org.eclipse.pde.internal.ui.PDEUIMessages;
24	import org.eclipse.pde.internal.ui.wizards.IProjectProvider;	24	import org.eclipse.pde.internal.ui.wizards.IProjectProvider;
25	import org.eclipse.pde.internal.ui.wizards.NewWizard;	25	import org.eclipse.pde.internal.ui.wizards.NewWizard;
		26	import org.eclipse.ui.IWorkingSet;
26	import org.eclipse.ui.wizards.newresource.BasicNewProjectResourceWizard;	27	import org.eclipse.ui.wizards.newresource.BasicNewProjectResourceWizard;
27		28
28	public class NewFragmentProjectWizard extends NewWizard implements IExecutableExtension {	29	public class NewFragmentProjectWizard extends NewWizard implements IExecutableExtension {
Lines 45-51 Link Here
45	* @see org.eclipse.jface.wizard.Wizard#addPages()	46	* @see org.eclipse.jface.wizard.Wizard#addPages()
46	*/	47	*/
47	public void addPages() {	48	public void addPages() {
48	fMainPage = new NewProjectCreationPage("main", fFragmentData, true); //$NON-NLS-1$	49	fMainPage = new NewProjectCreationPage("main", fFragmentData, true, getSelection()); //$NON-NLS-1$
49	fMainPage.setTitle(PDEUIMessages.NewProjectWizard_MainPage_ftitle);	50	fMainPage.setTitle(PDEUIMessages.NewProjectWizard_MainPage_ftitle);
50	fMainPage.setDescription(PDEUIMessages.NewProjectWizard_MainPage_fdesc);	51	fMainPage.setDescription(PDEUIMessages.NewProjectWizard_MainPage_fdesc);
51	addPage(fMainPage);	52	addPage(fMainPage);
Lines 84-89 Link Here
84	BasicNewProjectResourceWizard.updatePerspective(fConfig);	85	BasicNewProjectResourceWizard.updatePerspective(fConfig);
85	getContainer().run(false, true,	86	getContainer().run(false, true,
86	new NewProjectCreationOperation(fFragmentData, fProjectProvider, null));	87	new NewProjectCreationOperation(fFragmentData, fProjectProvider, null));
		88
		89	IWorkingSet[] workingSets = fMainPage.getSelectedWorkingSets();
		90	getWorkbench().getWorkingSetManager().addToWorkingSets(fProjectProvider.getProject(),
		91	workingSets);
		92
87	return true;	93	return true;
88	} catch (InvocationTargetException e) {	94	} catch (InvocationTargetException e) {
89	PDEPlugin.logException(e);	95	PDEPlugin.logException(e);

Lines 33-38 Link Here

(-)src/org/eclipse/pde/internal/ui/wizards/plugin/NewPluginProjectWizard.java (-1 / +7 lines)
33	import org.eclipse.pde.internal.ui.wizards.WizardElement;	33	import org.eclipse.pde.internal.ui.wizards.WizardElement;
34	import org.eclipse.pde.ui.IPluginContentWizard;	34	import org.eclipse.pde.ui.IPluginContentWizard;
35	import org.eclipse.swt.graphics.Image;	35	import org.eclipse.swt.graphics.Image;
		36	import org.eclipse.ui.IWorkingSet;
36	import org.eclipse.ui.wizards.newresource.BasicNewProjectResourceWizard;	37	import org.eclipse.ui.wizards.newresource.BasicNewProjectResourceWizard;
37		38
38	public class NewPluginProjectWizard extends NewWizard implements IExecutableExtension {	39	public class NewPluginProjectWizard extends NewWizard implements IExecutableExtension {
Lines 67-73 Link Here
67	* @see org.eclipse.jface.wizard.Wizard#addPages()	68	* @see org.eclipse.jface.wizard.Wizard#addPages()
68	*/	69	*/
69	public void addPages() {	70	public void addPages() {
70	fMainPage = new NewProjectCreationPage("main", fPluginData, fPureOSGi); //$NON-NLS-1$	71	fMainPage = new NewProjectCreationPage("main", fPluginData, fPureOSGi, getSelection()); //$NON-NLS-1$
71	fMainPage.setTitle(PDEUIMessages.NewProjectWizard_MainPage_title);	72	fMainPage.setTitle(PDEUIMessages.NewProjectWizard_MainPage_title);
72	fMainPage.setDescription(PDEUIMessages.NewProjectWizard_MainPage_desc);	73	fMainPage.setDescription(PDEUIMessages.NewProjectWizard_MainPage_desc);
73	String pname = getDefaultValue(DEF_PROJECT_NAME);	74	String pname = getDefaultValue(DEF_PROJECT_NAME);
Lines 124-129 Link Here
124	IPluginContentWizard contentWizard = fWizardListPage.getSelectedWizard();	125	IPluginContentWizard contentWizard = fWizardListPage.getSelectedWizard();
125	getContainer().run(false, true,	126	getContainer().run(false, true,
126	new NewProjectCreationOperation(fPluginData, fProjectProvider, contentWizard));	127	new NewProjectCreationOperation(fPluginData, fProjectProvider, contentWizard));
		128
		129	IWorkingSet[] workingSets = fMainPage.getSelectedWorkingSets();
		130	getWorkbench().getWorkingSetManager().addToWorkingSets(fProjectProvider.getProject(),
		131	workingSets);
		132
127	return true;	133	return true;
128	} catch (InvocationTargetException e) {	134	} catch (InvocationTargetException e) {
129	PDEPlugin.logException(e);	135	PDEPlugin.logException(e);




package org.eclipse.pde.internal.ui.wizards.plugin;

import org.eclipse.pde.ui.IFieldData;
import org.eclipse.ui.IWorkingSet;

public abstract class AbstractFieldData implements IFieldData {
	

	private boolean fSimple;
	private String fTargetVersion = "3.1"; //$NON-NLS-1$
	private String fFramework;
	private IWorkingSet[] fWorkingSets;

	/* (non-Javadoc)
	 * @see org.eclipse.pde.ui.IFieldData2#getId()

		fFramework = framework;
	}
	
	public IWorkingSet[] getWorkingSets() { 
		return fWorkingSets;
	}
	
	public void setWorkingSets(IWorkingSet[] workingSets) {
		fWorkingSets = workingSets;
	}
	
}

Return to bug 183779

Lines 19-24 Link Here

(-)src/org/eclipse/pde/internal/ui/wizards/plugin/NewProjectCreationPage.java (-2 / +5 lines)
19	import org.eclipse.jface.dialogs.Dialog;	19	import org.eclipse.jface.dialogs.Dialog;
20	import org.eclipse.jface.dialogs.IDialogSettings;	20	import org.eclipse.jface.dialogs.IDialogSettings;
21	import org.eclipse.jface.preference.IPreferenceStore;	21	import org.eclipse.jface.preference.IPreferenceStore;
		22	import org.eclipse.jface.viewers.IStructuredSelection;
22	import org.eclipse.pde.internal.core.ICoreConstants;	23	import org.eclipse.pde.internal.core.ICoreConstants;
23	import org.eclipse.pde.internal.core.PDECore;	24	import org.eclipse.pde.internal.core.PDECore;
24	import org.eclipse.pde.internal.core.TargetPlatformHelper;	25	import org.eclipse.pde.internal.core.TargetPlatformHelper;
Lines 57-64 Link Here
57	private static final String S_OSGI_PROJECT = "osgiProject"; //$NON-NLS-1$	58	private static final String S_OSGI_PROJECT = "osgiProject"; //$NON-NLS-1$
58	private static final String S_TARGET_NAME = "targetName"; //$NON-NLS-1$	59	private static final String S_TARGET_NAME = "targetName"; //$NON-NLS-1$
59		60
60	public NewProjectCreationPage(String pageName, AbstractFieldData data, boolean fragment){	61	public NewProjectCreationPage(String pageName, AbstractFieldData data, boolean fragment, IStructuredSelection selection){
61	super(pageName);	62	super(pageName, selection, new String[] { "org.eclipse.jdt.ui.JavaWorkingSetPage", //$NON-NLS-1$
		63	"org.eclipse.pde.ui.pluginWorkingSet", "org.eclipse.ui.resourceWorkingSetPage" }); //$NON-NLS-1$ //$NON-NLS-2$
62	fFragment = fragment;	64	fFragment = fragment;
63	fData = data;	65	fData = data;
64	}	66	}
Lines 219-224 Link Here
219	fData.setTargetVersion(fTargetCombo.getText());	221	fData.setTargetVersion(fTargetCombo.getText());
220	fData.setHasBundleStructure(fOSGIButton.getSelection() \|\| Double.parseDouble(fTargetCombo.getText()) >= 3.1);	222	fData.setHasBundleStructure(fOSGIButton.getSelection() \|\| Double.parseDouble(fTargetCombo.getText()) >= 3.1);
221	fData.setOSGiFramework(fOSGIButton.getSelection() ? fOSGiCombo.getText() : null);	223	fData.setOSGiFramework(fOSGIButton.getSelection() ? fOSGiCombo.getText() : null);
		224	fData.setWorkingSets(getSelectedWorkingSets());
222	}	225	}
223		226
224	protected boolean validatePage() {	227	protected boolean validatePage() {

Lines 11-16 Link Here

(-)src/org/eclipse/pde/internal/ui/wizards/plugin/AbstractFieldData.java (+10 lines)
11	package org.eclipse.pde.internal.ui.wizards.plugin;	11	package org.eclipse.pde.internal.ui.wizards.plugin;
12		12
13	import org.eclipse.pde.ui.IFieldData;	13	import org.eclipse.pde.ui.IFieldData;
		14	import org.eclipse.ui.IWorkingSet;
14		15
15	public abstract class AbstractFieldData implements IFieldData {	16	public abstract class AbstractFieldData implements IFieldData {
16		17
Lines 26-31 Link Here
26	private boolean fSimple;	27	private boolean fSimple;
27	private String fTargetVersion = "3.1"; //$NON-NLS-1$	28	private String fTargetVersion = "3.1"; //$NON-NLS-1$
28	private String fFramework;	29	private String fFramework;
		30	private IWorkingSet[] fWorkingSets;
29		31
30	/* (non-Javadoc)	32	/* (non-Javadoc)
31	* @see org.eclipse.pde.ui.IFieldData2#getId()	33	* @see org.eclipse.pde.ui.IFieldData2#getId()
Lines 150-153 Link Here
150	fFramework = framework;	152	fFramework = framework;
151	}	153	}
152		154
		155	public IWorkingSet[] getWorkingSets() {
		156	return fWorkingSets;
		157	}
		158
		159	public void setWorkingSets(IWorkingSet[] workingSets) {
		160	fWorkingSets = workingSets;
		161	}
		162
153	}	163	}