Attachment 77303 Details for Bug 183779 – New patch with $NON-NLS-N$ tags.

[patch] New patch with $NON-NLS-N$ tags.

org.eclipse.pde.ui-bug183779-plugin-project-working-set-patch.txt (text/plain), 6.84 KB, created by Remy Suen

on 2007-08-29 17:14:29 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Remy Suen

Created: 2007-08-29 17:14:29 EDT

Size: 6.84 KB

patch

obsolete

>Index: src/org/eclipse/pde/internal/ui/wizards/plugin/NewProjectCreationPage.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewProjectCreationPage.java,v
>retrieving revision 1.37
>diff -u -r1.37 NewProjectCreationPage.java
>--- src/org/eclipse/pde/internal/ui/wizards/plugin/NewProjectCreationPage.java	8 May 2007 18:18:38 -0000	1.37
>+++ src/org/eclipse/pde/internal/ui/wizards/plugin/NewProjectCreationPage.java	29 Aug 2007 21:16:14 -0000
>@@ -19,6 +19,7 @@
> 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;
>@@ -57,8 +58,9 @@
> 	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){
>-		super(pageName);
>+	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;
> 	}
>@@ -219,6 +221,7 @@
> 		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() {
>Index: src/org/eclipse/pde/internal/ui/wizards/plugin/NewFragmentProjectWizard.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewFragmentProjectWizard.java,v
>retrieving revision 1.17
>diff -u -r1.17 NewFragmentProjectWizard.java
>--- src/org/eclipse/pde/internal/ui/wizards/plugin/NewFragmentProjectWizard.java	3 Apr 2006 19:47:27 -0000	1.17
>+++ src/org/eclipse/pde/internal/ui/wizards/plugin/NewFragmentProjectWizard.java	29 Aug 2007 21:16:10 -0000
>@@ -23,6 +23,7 @@
> import org.eclipse.pde.internal.ui.PDEUIMessages;
> import org.eclipse.pde.internal.ui.wizards.IProjectProvider;
> import org.eclipse.pde.internal.ui.wizards.NewWizard;
>+import org.eclipse.ui.IWorkingSet;
> import org.eclipse.ui.wizards.newresource.BasicNewProjectResourceWizard;
> 
> public class NewFragmentProjectWizard extends NewWizard implements IExecutableExtension {
>@@ -45,7 +46,7 @@
> 	 * @see org.eclipse.jface.wizard.Wizard#addPages()
> 	 */
> 	public void addPages() {
>-		fMainPage = new NewProjectCreationPage("main", fFragmentData, true); //$NON-NLS-1$
>+		fMainPage = new NewProjectCreationPage("main", fFragmentData, true, getSelection()); //$NON-NLS-1$
> 		fMainPage.setTitle(PDEUIMessages.NewProjectWizard_MainPage_ftitle); 
> 		fMainPage.setDescription(PDEUIMessages.NewProjectWizard_MainPage_fdesc); 
> 		addPage(fMainPage);
>@@ -84,6 +85,11 @@
> 			BasicNewProjectResourceWizard.updatePerspective(fConfig);
> 			getContainer().run(false, true,
> 					new NewProjectCreationOperation(fFragmentData, fProjectProvider, null));
>+			
>+			IWorkingSet[] workingSets = fMainPage.getSelectedWorkingSets();
>+			getWorkbench().getWorkingSetManager().addToWorkingSets(fProjectProvider.getProject(),
>+					workingSets);
>+
> 			return true;
> 		} catch (InvocationTargetException e) {
> 			PDEPlugin.logException(e);
>Index: src/org/eclipse/pde/internal/ui/wizards/plugin/NewPluginProjectWizard.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewPluginProjectWizard.java,v
>retrieving revision 1.30
>diff -u -r1.30 NewPluginProjectWizard.java
>--- src/org/eclipse/pde/internal/ui/wizards/plugin/NewPluginProjectWizard.java	26 Apr 2007 17:50:55 -0000	1.30
>+++ src/org/eclipse/pde/internal/ui/wizards/plugin/NewPluginProjectWizard.java	29 Aug 2007 21:16:11 -0000
>@@ -33,6 +33,7 @@
> import org.eclipse.pde.internal.ui.wizards.WizardElement;
> import org.eclipse.pde.ui.IPluginContentWizard;
> import org.eclipse.swt.graphics.Image;
>+import org.eclipse.ui.IWorkingSet;
> import org.eclipse.ui.wizards.newresource.BasicNewProjectResourceWizard;
> 
> public class NewPluginProjectWizard extends NewWizard implements IExecutableExtension {
>@@ -67,7 +68,7 @@
> 	 * @see org.eclipse.jface.wizard.Wizard#addPages()
> 	 */
> 	public void addPages() {
>-		fMainPage = new NewProjectCreationPage("main", fPluginData, fPureOSGi); //$NON-NLS-1$
>+		fMainPage = new NewProjectCreationPage("main", fPluginData, fPureOSGi, getSelection()); //$NON-NLS-1$
> 		fMainPage.setTitle(PDEUIMessages.NewProjectWizard_MainPage_title); 
> 		fMainPage.setDescription(PDEUIMessages.NewProjectWizard_MainPage_desc); 
> 		String pname = getDefaultValue(DEF_PROJECT_NAME);
>@@ -124,6 +125,11 @@
> 			IPluginContentWizard contentWizard = fWizardListPage.getSelectedWizard();
> 			getContainer().run(false, true,
> 					new NewProjectCreationOperation(fPluginData, fProjectProvider, contentWizard));
>+			
>+			IWorkingSet[] workingSets = fMainPage.getSelectedWorkingSets();
>+			getWorkbench().getWorkingSetManager().addToWorkingSets(fProjectProvider.getProject(),
>+					workingSets);
>+
> 			return true;
> 		} catch (InvocationTargetException e) {
> 			PDEPlugin.logException(e);
>Index: src/org/eclipse/pde/internal/ui/wizards/plugin/AbstractFieldData.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/AbstractFieldData.java,v
>retrieving revision 1.14
>diff -u -r1.14 AbstractFieldData.java
>--- src/org/eclipse/pde/internal/ui/wizards/plugin/AbstractFieldData.java	5 Oct 2005 05:57:59 -0000	1.14
>+++ src/org/eclipse/pde/internal/ui/wizards/plugin/AbstractFieldData.java	29 Aug 2007 21:16:10 -0000
>@@ -11,6 +11,7 @@
> 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 {
> 	
>@@ -26,6 +27,7 @@
> 	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()
>@@ -150,4 +152,12 @@
> 		fFramework = framework;
> 	}
> 	
>+	public IWorkingSet[] getWorkingSets() { 
>+		return fWorkingSets;
>+	}
>+	
>+	public void setWorkingSets(IWorkingSet[] workingSets) {
>+		fWorkingSets = workingSets;
>+	}
>+	
> }

Actions: View | Diff

Attachments on bug 183779: 64730 | 65062 | 77302 | 77303 | 77333