Attachment 84610 Details for Bug 210164 – Patch rev 2 (against head)

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

[patch] Patch rev 2 (against head)

patch2.txt (text/plain), 11.07 KB, created by Robert Konigsberg

on 2007-12-06 04:03:05 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Robert Konigsberg

Created: 2007-12-06 04:03:05 EST

Size: 11.07 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.team.ui
>Index: src/org/eclipse/team/internal/ui/synchronize/ForwardingChangesSection.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ForwardingChangesSection.java,v
>retrieving revision 1.4
>diff -u -r1.4 ForwardingChangesSection.java
>--- src/org/eclipse/team/internal/ui/synchronize/ForwardingChangesSection.java	18 Apr 2006 15:16:02 -0000	1.4
>+++ src/org/eclipse/team/internal/ui/synchronize/ForwardingChangesSection.java	6 Dec 2007 07:42:33 -0000
>@@ -83,7 +83,7 @@
> 	
> 	protected Composite getEmptyChangesComposite(Composite parent) {
> 		Composite composite = new Composite(parent, SWT.NONE);
>-		composite.setBackground(getBackgroundColor());
>+		composite.setBackground(getBackgroundColor2());
> 		GridLayout layout = new GridLayout();
> 		layout.numColumns = 2;
> 		composite.setLayout(layout);
>@@ -140,7 +140,7 @@
> 		data.widthHint = 100;
> 		description.setLayoutData(data);
> 		description.setText(text);
>-		description.setBackground(getBackgroundColor());
>+		description.setBackground(getBackgroundColor2());
> 		return description;
> 	}
> 	
>Index: src/org/eclipse/team/internal/ui/synchronize/SyncInfoSetChangesSection.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SyncInfoSetChangesSection.java,v
>retrieving revision 1.4
>diff -u -r1.4 SyncInfoSetChangesSection.java
>--- src/org/eclipse/team/internal/ui/synchronize/SyncInfoSetChangesSection.java	17 Apr 2006 17:05:29 -0000	1.4
>+++ src/org/eclipse/team/internal/ui/synchronize/SyncInfoSetChangesSection.java	6 Dec 2007 07:42:34 -0000
>@@ -179,7 +179,7 @@
> 	
> 	private Composite getErrorComposite(Composite parent) {
> 		Composite composite = new Composite(parent, SWT.NONE);
>-		composite.setBackground(getBackgroundColor());
>+		composite.setBackground(getBackgroundColor2());
> 		GridLayout layout = new GridLayout();
> 		layout.numColumns = 2;
> 		composite.setLayout(layout);
>@@ -194,7 +194,7 @@
> 				showErrors();
> 			}
> 		});
>-		link.setBackground(getBackgroundColor());
>+		link.setBackground(getBackgroundColor2());
> 		link.setUnderlined(true);
> 		
> 		link = new Hyperlink(composite, SWT.WRAP);
>@@ -204,7 +204,7 @@
> 				getPage().reset();
> 			}
> 		});
>-		link.setBackground(getBackgroundColor());
>+		link.setBackground(getBackgroundColor2());
> 		link.setUnderlined(true);
> 		
> 		createDescriptionLabel(composite, NLS.bind(TeamUIMessages.ChangesSection_10, new String[] { Utils.shortenText(SynchronizeView.MAX_NAME_LENGTH, getConfiguration().getParticipant().getName()) })); 
>Index: src/org/eclipse/team/internal/ui/synchronize/ChangesSection.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangesSection.java,v
>retrieving revision 1.29
>diff -u -r1.29 ChangesSection.java
>--- src/org/eclipse/team/internal/ui/synchronize/ChangesSection.java	29 Mar 2006 17:14:56 -0000	1.29
>+++ src/org/eclipse/team/internal/ui/synchronize/ChangesSection.java	6 Dec 2007 07:42:33 -0000
>@@ -68,9 +68,9 @@
> 		setLayoutData(data);
> 		
> 		forms = new FormToolkit(parent.getDisplay());
>-		forms.setBackground(getBackgroundColor());
>+		forms.setBackground(getBackgroundColor2());
> 		HyperlinkGroup group = forms.getHyperlinkGroup();
>-		group.setBackground(getBackgroundColor());
>+		group.setBackground(getBackgroundColor2());
> 		
> 		changesSectionContainer = new PageBook(this, SWT.NONE);
> 		data = new GridData(GridData.FILL_BOTH);
>@@ -79,7 +79,7 @@
> 		changesSectionContainer.setLayoutData(data);
> 	}
> 	
>-	protected Color getBackgroundColor() {
>+	protected Color getBackgroundColor2() {
> 		return getShell().getDisplay().getSystemColor(SWT.COLOR_LIST_BACKGROUND);
> 	}
> 	
>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	6 Dec 2007 07:42:34 -0000
>@@ -51,6 +51,8 @@
> 	
> 	private IWizard selectedWizard;
> 	
>+	private String selectedWizardId;
>+	
> 	/**
> 	 * Create a new ConfigureProjectWizardMainPage
> 	 * 
>@@ -80,7 +82,15 @@
> 		this.disabledWizards = disabledWizards;
> 		this.description = description;
> 	}
>-	
>+
>+	void setInitialWizardId(String id) {
>+		this.selectedWizardId = id;
>+	}
>+
>+	String getSelectedWizardId() {
>+		return selectedWizardId;
>+	}
>+
> 	public IWizard getSelectedWizard() {
> 		return selectedWizard;
> 	}
>@@ -122,18 +132,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,9 +194,29 @@
> 		} else {
> 			viewer.setInput(wizards);
> 		}
>+		ConfigurationWizardElement e = findWizardById(((AdaptableList) viewer.getInput()).getChildren(), selectedWizardId);
>+		if (e != null) {
>+		    viewer.setSelection(new StructuredSelection(e));
>+		}
>         Dialog.applyDialogFont(parent);
> 	}
>-	
>+
>+	private ConfigurationWizardElement findWizardById(Object[] children, String wizardId) {
>+		if (children == null) {
>+			return null;
>+		}
>+		for (int i = 0; i < children.length; i++) {
>+			try {
>+				ConfigurationWizardElement e = (ConfigurationWizardElement)children[i];
>+				if (e.getID().equals(wizardId)) {
>+					return e;
>+				}
>+			} catch(ClassCastException e) {
>+			}
>+		}
>+		return null;
>+	}
>+
> 	/* package */ IProject[] getUnsharedProjects() {
> 		java.util.List unshared = new ArrayList();
> 		for (int i = 0; i < projects.length; i++) {
>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	6 Dec 2007 07:42:34 -0000
>@@ -20,6 +20,7 @@
> import org.eclipse.ui.activities.IActivityManager;
> import org.eclipse.ui.activities.IIdentifier;
> import org.eclipse.ui.model.AdaptableList;
>+import org.osgi.service.prefs.Preferences;
> 
> /**
>  * The wizard for associating projects with team providers
>@@ -35,7 +36,8 @@
> 	protected final static String ATT_CLASS = "class"; //$NON-NLS-1$
> 	protected final static String ATT_ICON = "icon"; //$NON-NLS-1$
> 	protected final static String ATT_ID = "id"; //$NON-NLS-1$
>-	
>+	protected final static String PREF_LAST_WIZARD_ID = "lastWizardId"; //$NON-NLS-1$
>+
> 	private ConfigureProjectWizard(IProject[] projects) {
> 		this.projects = projects;
> 		setNeedsProgressMonitor(true);
>@@ -51,6 +53,9 @@
> 		mainPage = new ConfigureProjectWizardMainPage("configurePage1", TeamUIMessages.ConfigureProjectWizard_configureProject, TeamUIPlugin.getImageDescriptor(ITeamUIImages.IMG_WIZBAN_SHARE), wizards, disabledWizards); //$NON-NLS-1$
> 		mainPage.setDescription(TeamUIMessages.ConfigureProjectWizard_description);
> 		mainPage.setProjects(projects);
>+		Preferences preferences = TeamUIPlugin.getPlugin().getInstancePreferences();
>+		String initialWizardId = preferences.get(PREF_LAST_WIZARD_ID, null);
>+		mainPage.setInitialWizardId(initialWizardId);
> 		addPage(mainPage);
> 	}
> 
>@@ -79,10 +84,15 @@
> 			if (noPageWizard != null) {
> 				if (noPageWizard.canFinish()) 
> 				{
>+					Preferences preferences = TeamUIPlugin.getPlugin().getInstancePreferences();
>+					preferences.put(PREF_LAST_WIZARD_ID, mainPage.getSelectedWizardId());
> 					return noPageWizard.performFinish();
> 				}
> 			}
>-		}		
>+		}
>+		Preferences preferences = TeamUIPlugin.getPlugin().getInstancePreferences();
>+		preferences.put(PREF_LAST_WIZARD_ID, mainPage.getSelectedWizardId());
>+
> 		// If the wizard has pages and there are several
> 		// wizards registered then the registered wizard
> 		// will call it's own performFinish().		
>Index: src/org/eclipse/team/internal/ui/mapping/DiffTreeChangesSection.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/DiffTreeChangesSection.java,v
>retrieving revision 1.27
>diff -u -r1.27 DiffTreeChangesSection.java
>--- src/org/eclipse/team/internal/ui/mapping/DiffTreeChangesSection.java	13 Oct 2006 15:32:11 -0000	1.27
>+++ src/org/eclipse/team/internal/ui/mapping/DiffTreeChangesSection.java	6 Dec 2007 07:42:33 -0000
>@@ -291,7 +291,7 @@
> 
> 	private Composite createEnableParticipantModelProvidersPane(Composite parent) {
> 		Composite composite = new Composite(parent, SWT.NONE);
>-		composite.setBackground(getBackgroundColor());
>+		composite.setBackground(getBackgroundColor2());
> 		GridLayout layout = new GridLayout();
> 		layout.numColumns = 2;
> 		composite.setLayout(layout);
>@@ -358,7 +358,7 @@
> 
> 	private Composite getInitializationPane(Composite parent) {
> 		Composite composite = new Composite(parent, SWT.NONE);
>-		composite.setBackground(getBackgroundColor());
>+		composite.setBackground(getBackgroundColor2());
> 		GridLayout layout = new GridLayout();
> 		layout.numColumns = 2;
> 		composite.setLayout(layout);
>@@ -417,7 +417,7 @@
> 
> 	private Composite getInitializingMessagePane(Composite parent) {
> 		Composite composite = new Composite(parent, SWT.NONE);
>-		composite.setBackground(getBackgroundColor());
>+		composite.setBackground(getBackgroundColor2());
> 		GridLayout layout = new GridLayout();
> 		layout.numColumns = 2;
> 		composite.setLayout(layout);
>@@ -442,7 +442,7 @@
> 
> 	private Composite getPointerToModel(Composite parent, final ModelProvider provider, String oldId) {
> 		Composite composite = new Composite(parent, SWT.NONE);
>-		composite.setBackground(getBackgroundColor());
>+		composite.setBackground(getBackgroundColor2());
> 		GridLayout layout = new GridLayout();
> 		layout.numColumns = 2;
> 		composite.setLayout(layout);
>@@ -532,7 +532,7 @@
> 	
> 	private Composite getErrorComposite(Composite parent) {
> 		Composite composite = new Composite(parent, SWT.NONE);
>-		composite.setBackground(getBackgroundColor());
>+		composite.setBackground(getBackgroundColor2());
> 		GridLayout layout = new GridLayout();
> 		layout.numColumns = 2;
> 		composite.setLayout(layout);

Actions: View | Diff

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