### Eclipse Workspace Patch 1.0 #P org.eclipse.pde.ui Index: src/org/eclipse/pde/internal/ui/wizards/plugin/NewLibraryPluginCreationPage.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewLibraryPluginCreationPage.java,v retrieving revision 1.24 diff -u -r1.24 NewLibraryPluginCreationPage.java --- src/org/eclipse/pde/internal/ui/wizards/plugin/NewLibraryPluginCreationPage.java 8 Jun 2007 16:37:10 -0000 1.24 +++ src/org/eclipse/pde/internal/ui/wizards/plugin/NewLibraryPluginCreationPage.java 21 Sep 2007 18:53:06 -0000 @@ -12,6 +12,7 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.jface.dialogs.Dialog; +import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.wizard.IWizardPage; import org.eclipse.pde.internal.core.ICoreConstants; import org.eclipse.pde.internal.core.TargetPlatformHelper; @@ -73,8 +74,9 @@ private Combo fTargetCombo; protected Button fJarredCheck; protected Button fFindDependencies; + private IStructuredSelection fSelection; - public NewLibraryPluginCreationPage(String pageName, LibraryPluginFieldData data) { + public NewLibraryPluginCreationPage(String pageName, LibraryPluginFieldData data, IStructuredSelection fSelection) { super(pageName); fData = data; setTitle(PDEUIMessages.NewLibraryPluginCreationPage_title); @@ -92,6 +94,11 @@ createFormatGroup(control); + createWorkingSetGroup(control, fSelection, new String[] { + "org.eclipse.jdt.ui.JavaWorkingSetPage", //$NON-NLS-1$ + "org.eclipse.pde.ui.pluginWorkingSet", //$NON-NLS-1$ + "org.eclipse.ui.resourceWorkingSetPage" }); //$NON-NLS-1$ + updateRuntimeDependency(); Dialog.applyDialogFont(control); @@ -215,6 +222,7 @@ fData.setUnzipLibraries(fJarredCheck.isEnabled() && fJarredCheck.getSelection()); fData.setFindDependencies(fFindDependencies.getSelection()); + fData.setWorkingSets(getSelectedWorkingSets()); PluginFieldData data = fData; data.setClassname(null); Index: src/org/eclipse/pde/internal/ui/wizards/plugin/NewLibraryPluginProjectWizard.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewLibraryPluginProjectWizard.java,v retrieving revision 1.6 diff -u -r1.6 NewLibraryPluginProjectWizard.java --- src/org/eclipse/pde/internal/ui/wizards/plugin/NewLibraryPluginProjectWizard.java 3 Apr 2006 19:47:27 -0000 1.6 +++ src/org/eclipse/pde/internal/ui/wizards/plugin/NewLibraryPluginProjectWizard.java 21 Sep 2007 18:53:06 -0000 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2006 IBM Corporation and others. + * Copyright (c) 2000, 2007 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -24,6 +24,7 @@ import org.eclipse.pde.internal.ui.wizards.NewWizard; import org.eclipse.pde.internal.ui.wizards.WizardElement; import org.eclipse.swt.graphics.Image; +import org.eclipse.ui.IWorkingSet; import org.eclipse.ui.wizards.newresource.BasicNewProjectResourceWizard; public class NewLibraryPluginProjectWizard extends NewWizard implements @@ -63,7 +64,7 @@ public void addPages() { fJarsPage = new LibraryPluginJarsPage("jars", fPluginData); //$NON-NLS-1$ addPage(fJarsPage); - fMainPage = new NewLibraryPluginCreationPage("main", fPluginData); //$NON-NLS-1$ + fMainPage = new NewLibraryPluginCreationPage("main", fPluginData, getSelection()); //$NON-NLS-1$ String pname = getDefaultValue(DEF_PROJECT_NAME); if (pname != null) fMainPage.setInitialProjectName(pname); @@ -127,6 +128,9 @@ true, new NewLibraryPluginCreationOperation(fPluginData, fProjectProvider, null)); + IWorkingSet[] workingSets = fMainPage.getSelectedWorkingSets(); + getWorkbench().getWorkingSetManager().addToWorkingSets(fProjectProvider.getProject(), + workingSets); return true; } catch (InvocationTargetException e) { PDEPlugin.logException(e);