Attachment 84741 Details for Bug 210164 – Third patch

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

[patch] Third patch

patch_210164_20071207.txt (text/plain), 4.19 KB, created by Tomasz Zarna

on 2007-12-07 10:52:34 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Tomasz Zarna

Created: 2007-12-07 10:52:34 EST

Size: 4.19 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.team.ui
>Index: src/org/eclipse/team/internal/ui/wizards/ConfigureProjectWizard.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ConfigureProjectWizard.java,v
>retrieving revision 1.21
>diff -u -r1.21 ConfigureProjectWizard.java
>--- src/org/eclipse/team/internal/ui/wizards/ConfigureProjectWizard.java	30 Jul 2007 19:18:12 -0000	1.21
>+++ src/org/eclipse/team/internal/ui/wizards/ConfigureProjectWizard.java	7 Dec 2007 15:44:23 -0000
>@@ -74,6 +74,10 @@
> 	public boolean performFinish() {
> 		// If we are on the first page and the selected wizard has no pages then
> 		// allow it to finish.
>+		
>+		// save dialog settings
>+		mainPage.performFinish();
>+		
> 		if (getContainer().getCurrentPage() == mainPage) {
> 			IWizard noPageWizard = mainPage.getSelectedWizard();
> 			if (noPageWizard != null) {
>Index: src/org/eclipse/team/internal/ui/wizards/ConfigureProjectWizardMainPage.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/wizards/ConfigureProjectWizardMainPage.java,v
>retrieving revision 1.18
>diff -u -r1.18 ConfigureProjectWizardMainPage.java
>--- src/org/eclipse/team/internal/ui/wizards/ConfigureProjectWizardMainPage.java	30 Jul 2007 19:18:13 -0000	1.18
>+++ src/org/eclipse/team/internal/ui/wizards/ConfigureProjectWizardMainPage.java	7 Dec 2007 15:44:23 -0000
>@@ -18,6 +18,7 @@
> import org.eclipse.core.resources.IProject;
> import org.eclipse.core.runtime.CoreException;
> import org.eclipse.jface.dialogs.Dialog;
>+import org.eclipse.jface.dialogs.IDialogSettings;
> import org.eclipse.jface.resource.ImageDescriptor;
> import org.eclipse.jface.viewers.*;
> import org.eclipse.jface.wizard.*;
>@@ -51,6 +52,10 @@
> 	
> 	private IWizard selectedWizard;
> 	
>+	private IDialogSettings settings;
>+	private final static String SELECTED_WIZARD_ID = "selectedWizardId"; //$NON-NLS-1$
>+	private String selectedWizardId;
>+	
> 	/**
> 	 * Create a new ConfigureProjectWizardMainPage
> 	 * 
>@@ -122,18 +127,21 @@
> 				ISelection selection = event.getSelection();
> 				if (selection == null || !(selection instanceof IStructuredSelection)) {
> 					selectedWizard = null;
>+					selectedWizardId = null;
> 					setPageComplete(false);
> 					return;
> 				}
> 				IStructuredSelection ss = (IStructuredSelection)selection;
> 				if (ss.size() != 1) {
> 					selectedWizard = null;
>+					selectedWizardId = null;
> 					setPageComplete(false);
> 					return;
> 				}
> 				ConfigurationWizardElement selectedElement = (ConfigurationWizardElement)ss.getFirstElement();
> 				try {
> 					selectedWizard = (IWizard)selectedElement.createExecutableExtension(getUnsharedProjects());
>+					selectedWizardId = selectedElement.getID();
> 				} catch (CoreException e) {					
> 					return;
> 				}
>@@ -181,6 +189,7 @@
> 		} else {
> 			viewer.setInput(wizards);
> 		}
>+		initializeWizardSelection();
>         Dialog.applyDialogFont(parent);
> 	}
> 	
>@@ -223,4 +232,38 @@
> 			table.setFocus();
> 		}
> 	}
>+	
>+	private void initializeWizardSelection() {
>+		String selectedWizardId = null;
>+		
>+		IDialogSettings dialogSettings = TeamUIPlugin.getPlugin().getDialogSettings();
>+		this.settings = dialogSettings.getSection("ConfigureProjectWizard"); //$NON-NLS-1$
>+		if (this.settings == null) {
>+			this.settings = dialogSettings.addNewSection("ConfigureProjectWizard"); //$NON-NLS-1$
>+		}
>+		if (settings != null)
>+			selectedWizardId = settings.get(SELECTED_WIZARD_ID);
>+		
>+		if (selectedWizardId==null)
>+			return;
>+		
>+		// TODO: any checks here?
>+		Object[] children = ((AdaptableList) viewer.getInput()).getChildren();
>+		
>+		for (int i = 0; i < children.length; i++) {
>+			try {
>+				ConfigurationWizardElement element = (ConfigurationWizardElement)children[i];
>+				if (element.getID().equals(selectedWizardId)) {
>+					viewer.setSelection(new StructuredSelection(element));
>+					return;
>+				}
>+			} catch(ClassCastException e) {
>+				// ignore
>+			}
>+		}
>+	}
>+	
>+	/*package*/ void performFinish() {
>+		settings.put(SELECTED_WIZARD_ID, selectedWizardId);
>+	}
> }

Actions: View | Diff

Attachments on bug 210164: 84346 | 84610 | 84741 | 84742