Attachment #64730 for bug #183779

Lines 45-51 Link Here

(-)src/org/eclipse/pde/internal/ui/wizards/plugin/NewFragmentProjectWizard.java (-2 / +2 lines)
45	* @see org.eclipse.jface.wizard.Wizard#addPages()	45	* @see org.eclipse.jface.wizard.Wizard#addPages()
46	*/	46	*/
47	public void addPages() {	47	public void addPages() {
48	fMainPage = new NewProjectCreationPage("main", fFragmentData, true); //$NON-NLS-1$	48	fMainPage = new NewProjectCreationPage("main", fFragmentData, true, getSelection()); //$NON-NLS-1$
49	fMainPage.setTitle(PDEUIMessages.NewProjectWizard_MainPage_ftitle);	49	fMainPage.setTitle(PDEUIMessages.NewProjectWizard_MainPage_ftitle);
50	fMainPage.setDescription(PDEUIMessages.NewProjectWizard_MainPage_fdesc);	50	fMainPage.setDescription(PDEUIMessages.NewProjectWizard_MainPage_fdesc);
51	addPage(fMainPage);	51	addPage(fMainPage);
Lines 83-89 Link Here
83	fContentPage.updateData();	83	fContentPage.updateData();
84	BasicNewProjectResourceWizard.updatePerspective(fConfig);	84	BasicNewProjectResourceWizard.updatePerspective(fConfig);
85	getContainer().run(false, true,	85	getContainer().run(false, true,
86	new NewProjectCreationOperation(fFragmentData, fProjectProvider, null));	86	new NewProjectCreationOperation(fFragmentData, fMainPage.getSelectedWorkingSets(), fProjectProvider, null));
87	return true;	87	return true;
88	} catch (InvocationTargetException e) {	88	} catch (InvocationTargetException e) {
89	PDEPlugin.logException(e);	89	PDEPlugin.logException(e);




import org.eclipse.core.resources.IWorkspace;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.jdt.internal.ui.workingsets.WorkingSetConfigurationBlock;
import org.eclipse.jdt.ui.PreferenceConstants;
import org.eclipse.jface.dialogs.Dialog;
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;
import org.eclipse.pde.internal.ui.IHelpContextIds;
import org.eclipse.pde.internal.ui.PDEPlugin;
import org.eclipse.pde.internal.ui.PDEUIMessages;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;

import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.IWorkingSet;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.dialogs.WizardNewProjectCreationPage;


public class NewProjectCreationPage extends WizardNewProjectCreationPage {
	
	private static final String[] VALID_WORKING_SET_IDS= new String[] {"org.eclipse.jdt.ui.JavaWorkingSetPage", "org.eclipse.ui.resourceWorkingSetPage"};
	
	protected Button fJavaButton;
	protected boolean fFragment;
	private Label fSourceLabel;

	private Combo fTargetCombo;
	private Combo fOSGiCombo;
	private Button fOSGIButton;
	private final IStructuredSelection fSelection;
	private WorkingSetConfigurationBlock fWorkingSetConfigurationBlock;
	
	public NewProjectCreationPage(String pageName, AbstractFieldData data, boolean fragment, IStructuredSelection selection){
		super(pageName);
		fFragment = fragment;
		fData = data;
		fSelection= selection;
	}
	
	public IWorkingSet[] getSelectedWorkingSets() {
		return fWorkingSetConfigurationBlock.getSelectedWorkingSets();
	}
	
	public void createControl(Composite parent) {


		createProjectTypeGroup(control);
		createFormatGroup(control);
		createWorkingSetGroup(control);
		
		updateRuntimeDependency();


		
	}
	
	private void createWorkingSetGroup(Composite container) {		
		Group group = new Group(container, SWT.NONE);
		group.setText(PDEUIMessages.NewProjectCreationPage_workingSets);
		group.setLayout(new GridLayout());
		group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
		
		IWorkingSet[] workingSets= PlatformUI.getWorkbench().getWorkingSetManager().getWorkingSets();
		workingSets= WorkingSetConfigurationBlock.filter(workingSets, VALID_WORKING_SET_IDS);
		fWorkingSetConfigurationBlock= new WorkingSetConfigurationBlock(workingSets, PDEUIMessages.NewProjectCreationPage_addProjectToWorkingSets, PDEPlugin.getDefault().getDialogSettings());
		fWorkingSetConfigurationBlock.setDialogMessage(PDEUIMessages.NewProjectCreationPage_workingSetSelectionDialogMessage);
		fWorkingSetConfigurationBlock.setSelection(WorkingSetConfigurationBlock.filter(WorkingSetConfigurationBlock.getSelectedWorkingSet(fSelection), VALID_WORKING_SET_IDS));
		fWorkingSetConfigurationBlock.createContent(group);
	}
	
	private void updateRuntimeDependency() {
		boolean depends = fEclipseButton.getSelection();
		fTargetCombo.setEnabled(depends);

Lines 33-38 Link Here

(-)src/org/eclipse/pde/internal/ui/wizards/plugin/NewProjectCreationOperation.java (-1 / +8 lines)
33	import org.eclipse.jdt.core.IPackageFragmentRoot;	33	import org.eclipse.jdt.core.IPackageFragmentRoot;
34	import org.eclipse.jdt.core.JavaCore;	34	import org.eclipse.jdt.core.JavaCore;
35	import org.eclipse.jdt.core.JavaModelException;	35	import org.eclipse.jdt.core.JavaModelException;
		36	import org.eclipse.jdt.internal.ui.workingsets.WorkingSetConfigurationBlock;
36	import org.eclipse.jface.viewers.ISelection;	37	import org.eclipse.jface.viewers.ISelection;
37	import org.eclipse.jface.viewers.StructuredSelection;	38	import org.eclipse.jface.viewers.StructuredSelection;
38	import org.eclipse.osgi.service.resolver.VersionRange;	39	import org.eclipse.osgi.service.resolver.VersionRange;
Lines 70-75 Link Here
70	import org.eclipse.ui.IWorkbenchPage;	71	import org.eclipse.ui.IWorkbenchPage;
71	import org.eclipse.ui.IWorkbenchPart;	72	import org.eclipse.ui.IWorkbenchPart;
72	import org.eclipse.ui.IWorkbenchWindow;	73	import org.eclipse.ui.IWorkbenchWindow;
		74	import org.eclipse.ui.IWorkingSet;
73	import org.eclipse.ui.PartInitException;	75	import org.eclipse.ui.PartInitException;
74	import org.eclipse.ui.actions.WorkspaceModifyOperation;	76	import org.eclipse.ui.actions.WorkspaceModifyOperation;
75	import org.eclipse.ui.ide.IDE;	77	import org.eclipse.ui.ide.IDE;
Lines 90-98 Link Here
90		92
91	private boolean fResult;	93	private boolean fResult;
92		94
		95	private final IWorkingSet[] fWorkingSets;
		96
93	public NewProjectCreationOperation(IFieldData data,	97	public NewProjectCreationOperation(IFieldData data,
94	IProjectProvider provider, IPluginContentWizard contentWizard) {	98	IWorkingSet[] workingSets, IProjectProvider provider, IPluginContentWizard contentWizard) {
95	fData = data;	99	fData = data;
		100	fWorkingSets= workingSets;
96	fProjectProvider = provider;	101	fProjectProvider = provider;
97	fContentWizard = contentWizard;	102	fContentWizard = contentWizard;
98	}	103	}
Lines 345-350 Link Here
345	fModel.getPluginBase());	350	fModel.getPluginBase());
346	}	351	}
347		352
		353	WorkingSetConfigurationBlock.addToWorkingSets(project, fWorkingSets);
		354
348	fModel.save();	355	fModel.save();
349	openFile((IFile) fModel.getUnderlyingResource());	356	openFile((IFile) fModel.getUnderlyingResource());
350	monitor.worked(1);	357	monitor.worked(1);

Lines 58-63 Link Here

(-)src/org/eclipse/pde/internal/ui/wizards/plugin/NewLibraryPluginCreationOperation.java (-1 / +2 lines)
58	import org.eclipse.pde.internal.ui.wizards.IProjectProvider;	58	import org.eclipse.pde.internal.ui.wizards.IProjectProvider;
59	import org.eclipse.pde.ui.IFieldData;	59	import org.eclipse.pde.ui.IFieldData;
60	import org.eclipse.pde.ui.IPluginContentWizard;	60	import org.eclipse.pde.ui.IPluginContentWizard;
		61	import org.eclipse.ui.IWorkingSet;
61	import org.eclipse.ui.dialogs.IOverwriteQuery;	62	import org.eclipse.ui.dialogs.IOverwriteQuery;
62	import org.eclipse.ui.wizards.datatransfer.ImportOperation;	63	import org.eclipse.ui.wizards.datatransfer.ImportOperation;
63	import org.eclipse.ui.wizards.datatransfer.ZipFileStructureProvider;	64	import org.eclipse.ui.wizards.datatransfer.ZipFileStructureProvider;
Lines 71-77 Link Here
71		72
72	public NewLibraryPluginCreationOperation(LibraryPluginFieldData data,	73	public NewLibraryPluginCreationOperation(LibraryPluginFieldData data,
73	IProjectProvider provider, IPluginContentWizard contentWizard) {	74	IProjectProvider provider, IPluginContentWizard contentWizard) {
74	super(data, provider, contentWizard);	75	super(data, new IWorkingSet[0], provider, contentWizard);
75	fData = data;	76	fData = data;
76	}	77	}
77		78




NewProjectCreationOperation_setClasspath = Setting the classpath...
NewProjectCreationOperation_manifestFile = the manifest file
NewProjectCreationPage_pPureOSGi=&an OSGi framework:
NewProjectCreationPage_workingSets=Working Sets
NewProjectCreationPage_standard=standard
NewProjectCreationPage_target=Target Platform
NewProjectCreationPage_ftarget=This fragment is targeted to run with:

NewProjectCreationPage_pDependsOnRuntime=&Eclipse version:
NewProjectCreationPage_invalidProjectName=Project name cannot contain %
NewProjectCreationPage_invalidLocationPath=Location path cannot contain %
NewProjectCreationPage_addProjectToWorkingSets=Add project to working sets
NewProjectCreationOperation_buildPropertiesFile = the build.properties file
NewProjectCreationPage_workingSetSelectionDialogMessage=The new project will be added to the selected working sets:
NewProjectCreationOperation_copyingJar = Copying "{0}" JAR ...
NewProjectCreationOperation_errorImportingJar = Error importing jar "{0}"


Lines 69-74 Link Here

(-)src/org/eclipse/pde/internal/ui/PDEUIMessages.java (+6 lines)
69		69
70	public static String JavaArgumentsTab_appendLauncherIni;	70	public static String JavaArgumentsTab_appendLauncherIni;
71		71
		72	public static String NewProjectCreationPage_addProjectToWorkingSets;
		73
		74	public static String NewProjectCreationPage_workingSets;
		75
		76	public static String NewProjectCreationPage_workingSetSelectionDialogMessage;
		77
72	public static String PDEWizardNewFileCreationPage_errorMsgStartsWithDot;	78	public static String PDEWizardNewFileCreationPage_errorMsgStartsWithDot;
73		79
74	public static String CommandComposerPart_formTitle;	80	public static String CommandComposerPart_formTitle;

Return to bug 183779

Lines 15-27 Link Here

(-)src/org/eclipse/pde/internal/ui/wizards/plugin/NewProjectCreationPage.java (-1 / +30 lines)
15	import org.eclipse.core.resources.IWorkspace;	15	import org.eclipse.core.resources.IWorkspace;
16	import org.eclipse.core.resources.ResourcesPlugin;	16	import org.eclipse.core.resources.ResourcesPlugin;
17	import org.eclipse.core.runtime.IStatus;	17	import org.eclipse.core.runtime.IStatus;
		18	import org.eclipse.jdt.internal.ui.workingsets.WorkingSetConfigurationBlock;
18	import org.eclipse.jdt.ui.PreferenceConstants;	19	import org.eclipse.jdt.ui.PreferenceConstants;
19	import org.eclipse.jface.dialogs.Dialog;	20	import org.eclipse.jface.dialogs.Dialog;
20	import org.eclipse.jface.preference.IPreferenceStore;	21	import org.eclipse.jface.preference.IPreferenceStore;
		22	import org.eclipse.jface.viewers.IStructuredSelection;
21	import org.eclipse.pde.internal.core.ICoreConstants;	23	import org.eclipse.pde.internal.core.ICoreConstants;
22	import org.eclipse.pde.internal.core.PDECore;	24	import org.eclipse.pde.internal.core.PDECore;
23	import org.eclipse.pde.internal.core.TargetPlatformHelper;	25	import org.eclipse.pde.internal.core.TargetPlatformHelper;
24	import org.eclipse.pde.internal.ui.IHelpContextIds;	26	import org.eclipse.pde.internal.ui.IHelpContextIds;
		27	import org.eclipse.pde.internal.ui.PDEPlugin;
25	import org.eclipse.pde.internal.ui.PDEUIMessages;	28	import org.eclipse.pde.internal.ui.PDEUIMessages;
26	import org.eclipse.swt.SWT;	29	import org.eclipse.swt.SWT;
27	import org.eclipse.swt.events.ModifyEvent;	30	import org.eclipse.swt.events.ModifyEvent;
Lines 36-46 Link Here
36	import org.eclipse.swt.widgets.Group;	39	import org.eclipse.swt.widgets.Group;
37	import org.eclipse.swt.widgets.Label;	40	import org.eclipse.swt.widgets.Label;
38	import org.eclipse.swt.widgets.Text;	41	import org.eclipse.swt.widgets.Text;
		42	import org.eclipse.ui.IWorkingSet;
39	import org.eclipse.ui.PlatformUI;	43	import org.eclipse.ui.PlatformUI;
40	import org.eclipse.ui.dialogs.WizardNewProjectCreationPage;	44	import org.eclipse.ui.dialogs.WizardNewProjectCreationPage;
41		45
42		46
43	public class NewProjectCreationPage extends WizardNewProjectCreationPage {	47	public class NewProjectCreationPage extends WizardNewProjectCreationPage {
		48
		49	private static final String[] VALID_WORKING_SET_IDS= new String[] {"org.eclipse.jdt.ui.JavaWorkingSetPage", "org.eclipse.ui.resourceWorkingSetPage"};
		50
44	protected Button fJavaButton;	51	protected Button fJavaButton;
45	protected boolean fFragment;	52	protected boolean fFragment;
46	private Label fSourceLabel;	53	private Label fSourceLabel;
Lines 52-62 Link Here
52	private Combo fTargetCombo;	59	private Combo fTargetCombo;
53	private Combo fOSGiCombo;	60	private Combo fOSGiCombo;
54	private Button fOSGIButton;	61	private Button fOSGIButton;
		62	private final IStructuredSelection fSelection;
		63	private WorkingSetConfigurationBlock fWorkingSetConfigurationBlock;
55		64
56	public NewProjectCreationPage(String pageName, AbstractFieldData data, boolean fragment){	65	public NewProjectCreationPage(String pageName, AbstractFieldData data, boolean fragment, IStructuredSelection selection){
57	super(pageName);	66	super(pageName);
58	fFragment = fragment;	67	fFragment = fragment;
59	fData = data;	68	fData = data;
		69	fSelection= selection;
		70	}
		71
		72	public IWorkingSet[] getSelectedWorkingSets() {
		73	return fWorkingSetConfigurationBlock.getSelectedWorkingSets();
60	}	74	}
61		75
62	public void createControl(Composite parent) {	76	public void createControl(Composite parent) {
Lines 67-72 Link Here
67		81
68	createProjectTypeGroup(control);	82	createProjectTypeGroup(control);
69	createFormatGroup(control);	83	createFormatGroup(control);
		84	createWorkingSetGroup(control);
70		85
71	updateRuntimeDependency();	86	updateRuntimeDependency();
72		87
Lines 150-155 Link Here
150		165
151	}	166	}
152		167
		168	private void createWorkingSetGroup(Composite container) {
		169	Group group = new Group(container, SWT.NONE);
		170	group.setText(PDEUIMessages.NewProjectCreationPage_workingSets);
		171	group.setLayout(new GridLayout());
		172	group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
		173
		174	IWorkingSet[] workingSets= PlatformUI.getWorkbench().getWorkingSetManager().getWorkingSets();
		175	workingSets= WorkingSetConfigurationBlock.filter(workingSets, VALID_WORKING_SET_IDS);
		176	fWorkingSetConfigurationBlock= new WorkingSetConfigurationBlock(workingSets, PDEUIMessages.NewProjectCreationPage_addProjectToWorkingSets, PDEPlugin.getDefault().getDialogSettings());
		177	fWorkingSetConfigurationBlock.setDialogMessage(PDEUIMessages.NewProjectCreationPage_workingSetSelectionDialogMessage);
		178	fWorkingSetConfigurationBlock.setSelection(WorkingSetConfigurationBlock.filter(WorkingSetConfigurationBlock.getSelectedWorkingSet(fSelection), VALID_WORKING_SET_IDS));
		179	fWorkingSetConfigurationBlock.createContent(group);
		180	}
		181
153	private void updateRuntimeDependency() {	182	private void updateRuntimeDependency() {
154	boolean depends = fEclipseButton.getSelection();	183	boolean depends = fEclipseButton.getSelection();
155	fTargetCombo.setEnabled(depends);	184	fTargetCombo.setEnabled(depends);

Lines 746-751 Link Here

(-)src/org/eclipse/pde/internal/ui/pderesources.properties (+3 lines)
746	NewProjectCreationOperation_setClasspath = Setting the classpath...	746	NewProjectCreationOperation_setClasspath = Setting the classpath...
747	NewProjectCreationOperation_manifestFile = the manifest file	747	NewProjectCreationOperation_manifestFile = the manifest file
748	NewProjectCreationPage_pPureOSGi=&an OSGi framework:	748	NewProjectCreationPage_pPureOSGi=&an OSGi framework:
		749	NewProjectCreationPage_workingSets=Working Sets
749	NewProjectCreationPage_standard=standard	750	NewProjectCreationPage_standard=standard
750	NewProjectCreationPage_target=Target Platform	751	NewProjectCreationPage_target=Target Platform
751	NewProjectCreationPage_ftarget=This fragment is targeted to run with:	752	NewProjectCreationPage_ftarget=This fragment is targeted to run with:
Lines 753-759 Link Here
753	NewProjectCreationPage_pDependsOnRuntime=&Eclipse version:	754	NewProjectCreationPage_pDependsOnRuntime=&Eclipse version:
754	NewProjectCreationPage_invalidProjectName=Project name cannot contain %	755	NewProjectCreationPage_invalidProjectName=Project name cannot contain %
755	NewProjectCreationPage_invalidLocationPath=Location path cannot contain %	756	NewProjectCreationPage_invalidLocationPath=Location path cannot contain %
		757	NewProjectCreationPage_addProjectToWorkingSets=Add project to working sets
756	NewProjectCreationOperation_buildPropertiesFile = the build.properties file	758	NewProjectCreationOperation_buildPropertiesFile = the build.properties file
		759	NewProjectCreationPage_workingSetSelectionDialogMessage=The new project will be added to the selected working sets:
757	NewProjectCreationOperation_copyingJar = Copying "{0}" JAR ...	760	NewProjectCreationOperation_copyingJar = Copying "{0}" JAR ...
758	NewProjectCreationOperation_errorImportingJar = Error importing jar "{0}"	761	NewProjectCreationOperation_errorImportingJar = Error importing jar "{0}"
759		762