Attachment #84346 for bug #210164

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

Lines 83-89 Link Here

(-)src/org/eclipse/team/internal/ui/synchronize/ForwardingChangesSection.java (-2 / +2 lines)
83		83
84	protected Composite getEmptyChangesComposite(Composite parent) {	84	protected Composite getEmptyChangesComposite(Composite parent) {
85	Composite composite = new Composite(parent, SWT.NONE);	85	Composite composite = new Composite(parent, SWT.NONE);
86	composite.setBackground(getBackgroundColor());	86	composite.setBackground(getBackgroundColor2());
87	GridLayout layout = new GridLayout();	87	GridLayout layout = new GridLayout();
88	layout.numColumns = 2;	88	layout.numColumns = 2;
89	composite.setLayout(layout);	89	composite.setLayout(layout);
Lines 140-146 Link Here
140	data.widthHint = 100;	140	data.widthHint = 100;
141	description.setLayoutData(data);	141	description.setLayoutData(data);
142	description.setText(text);	142	description.setText(text);
143	description.setBackground(getBackgroundColor());	143	description.setBackground(getBackgroundColor2());
144	return description;	144	return description;
145	}	145	}
146		146




	
	private Composite getErrorComposite(Composite parent) {
		Composite composite = new Composite(parent, SWT.NONE);
		composite.setBackground(getBackgroundColor2());
		GridLayout layout = new GridLayout();
		layout.numColumns = 2;
		composite.setLayout(layout);

				showErrors();
			}
		});
		link.setBackground(getBackgroundColor2());
		link.setUnderlined(true);
		
		link = new Hyperlink(composite, SWT.WRAP);

				getPage().reset();
			}
		});
		link.setBackground(getBackgroundColor2());
		link.setUnderlined(true);
		
		createDescriptionLabel(composite, NLS.bind(TeamUIMessages.ChangesSection_10, new String[] { Utils.shortenText(SynchronizeView.MAX_NAME_LENGTH, getConfiguration().getParticipant().getName()) })); 




		setLayoutData(data);
		
		forms = new FormToolkit(parent.getDisplay());
		forms.setBackground(getBackgroundColor2());
		HyperlinkGroup group = forms.getHyperlinkGroup();
		group.setBackground(getBackgroundColor2());
		
		changesSectionContainer = new PageBook(this, SWT.NONE);
		data = new GridData(GridData.FILL_BOTH);

		changesSectionContainer.setLayoutData(data);
	}
	
	/* Renamed from getBackgroundColor */
	protected Color getBackgroundColor2() {
		return getShell().getDisplay().getSystemColor(SWT.COLOR_LIST_BACKGROUND);
	}
	

Lines 1-6 Link Here

(-).settings/org.eclipse.jdt.ui.prefs (-2 / +1 lines)
1	#Wed Mar 15 17:11:22 EST 2006	1	#Thu Nov 29 00:33:17 PST 2007
2	eclipse.preferences.version=1	2	eclipse.preferences.version=1
3	internal.default.compliance=user
4	org.eclipse.jdt.ui.ignorelowercasenames=true	3	org.eclipse.jdt.ui.ignorelowercasenames=true
5	org.eclipse.jdt.ui.importorder=java;javax;org;com;	4	org.eclipse.jdt.ui.importorder=java;javax;org;com;
6	org.eclipse.jdt.ui.ondemandthreshold=3	5	org.eclipse.jdt.ui.ondemandthreshold=3

Lines 1-4 Link Here

(-).settings/org.eclipse.jdt.core.prefs (-1 / +1 lines)
1	#Mon Mar 19 14:34:03 EDT 2007	1	#Thu Nov 29 00:33:17 PST 2007
2	eclipse.preferences.version=1	2	eclipse.preferences.version=1
3	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled	3	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
4	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2	4	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2

Lines 53-59 Link Here

(-)src/org/eclipse/team/internal/ui/wizards/ConfigureProjectWizardMainPage.java (-3 / +37 lines)
53	private String description;	53	private String description;
54		54
55	private IConfigurationWizard selectedWizard;	55	private IConfigurationWizard selectedWizard;
56		56	private String selectedWizardId;
		57
57	/**	58	/**
58	* Create a new ConfigureProjectWizardMainPage	59	* Create a new ConfigureProjectWizardMainPage
59	*	60	*
Lines 83-89 Link Here
83	this.disabledWizards = disabledWizards;	84	this.disabledWizards = disabledWizards;
84	this.description = description;	85	this.description = description;
85	}	86	}
86		87
		88	void setInitialWizardId(String id) {
		89	this.selectedWizardId = id;
		90	}
		91
		92	String getSelectedWizardId() {
		93	return selectedWizardId;
		94	}
		95
87	public IConfigurationWizard getSelectedWizard() {	96	public IConfigurationWizard getSelectedWizard() {
88	return selectedWizard;	97	return selectedWizard;
89	}	98	}
Lines 125-141 Link Here
125	ISelection selection = event.getSelection();	134	ISelection selection = event.getSelection();
126	if (selection == null \|\| !(selection instanceof IStructuredSelection)) {	135	if (selection == null \|\| !(selection instanceof IStructuredSelection)) {
127	selectedWizard = null;	136	selectedWizard = null;
		137	selectedWizardId = null;
128	setPageComplete(false);	138	setPageComplete(false);
129	return;	139	return;
130	}	140	}
131	IStructuredSelection ss = (IStructuredSelection)selection;	141	IStructuredSelection ss = (IStructuredSelection)selection;
132	if (ss.size() != 1) {	142	if (ss.size() != 1) {
133	selectedWizard = null;	143	selectedWizard = null;
		144	selectedWizardId = null;
134	setPageComplete(false);	145	setPageComplete(false);
135	return;	146	return;
136	}	147	}
137	ConfigurationWizardElement selectedElement = (ConfigurationWizardElement)ss.getFirstElement();	148	ConfigurationWizardElement selectedElement = (ConfigurationWizardElement)ss.getFirstElement();
138	try {	149	try {
		150	selectedWizardId = selectedElement.getID();
139	selectedWizard = (IConfigurationWizard)selectedElement.createExecutableExtension();	151	selectedWizard = (IConfigurationWizard)selectedElement.createExecutableExtension();
140	selectedWizard.init(workbench, project);	152	selectedWizard.init(workbench, project);
141	} catch (CoreException e) {	153	} catch (CoreException e) {
Lines 176-182 Link Here
176	}	188	}
177	});	189	});
178	}	190	}
179		191
180	if(wizards.size() == 0 && showAllToggle != null) {	192	if(wizards.size() == 0 && showAllToggle != null) {
181	showAllToggle.setSelection(true);	193	showAllToggle.setSelection(true);
182	ArrayList all = new ArrayList(Arrays.asList(wizards.getChildren()));	194	ArrayList all = new ArrayList(Arrays.asList(wizards.getChildren()));
Lines 185-192 Link Here
185	} else {	197	} else {
186	viewer.setInput(wizards);	198	viewer.setInput(wizards);
187	}	199	}
		200
		201	ConfigurationWizardElement e = findWizardById(((AdaptableList) viewer.getInput()).getChildren(), selectedWizardId);
		202	if (e != null) {
		203	viewer.setSelection(new StructuredSelection(e));
		204	}
188	Dialog.applyDialogFont(parent);	205	Dialog.applyDialogFont(parent);
189	}	206	}
		207
		208	private ConfigurationWizardElement findWizardById(Object[] children, String wizardId) {
		209	if (children == null) {
		210	return null;
		211	}
		212	for (int i = 0; i < children.length; i++) {
		213	try {
		214	ConfigurationWizardElement e = (ConfigurationWizardElement)children[i];
		215	if (e.getID().equals(wizardId)) {
		216	return e;
		217	}
		218	} catch(ClassCastException e) {
		219	}
		220	}
		221	return null;
		222	}
		223
190	/**	224	/**
191	* The <code>WizardSelectionPage</code> implementation of	225	* The <code>WizardSelectionPage</code> implementation of
192	* this <code>IWizardPage</code> method returns the first page	226	* this <code>IWizardPage</code> method returns the first page

Lines 22-27 Link Here

(-)src/org/eclipse/team/internal/ui/wizards/ConfigureProjectWizard.java (+9 lines)
22	import org.eclipse.ui.activities.IActivityManager;	22	import org.eclipse.ui.activities.IActivityManager;
23	import org.eclipse.ui.activities.IIdentifier;	23	import org.eclipse.ui.activities.IIdentifier;
24	import org.eclipse.ui.model.AdaptableList;	24	import org.eclipse.ui.model.AdaptableList;
		25	import org.osgi.service.prefs.Preferences;
25		26
26	/**	27	/**
27	* The wizard for associating projects with team providers	28	* The wizard for associating projects with team providers
Lines 41-46 Link Here
41	protected final static String ATT_CLASS = "class"; //$NON-NLS-1$	42	protected final static String ATT_CLASS = "class"; //$NON-NLS-1$
42	protected final static String ATT_ICON = "icon"; //$NON-NLS-1$	43	protected final static String ATT_ICON = "icon"; //$NON-NLS-1$
43	protected final static String ATT_ID = "id"; //$NON-NLS-1$	44	protected final static String ATT_ID = "id"; //$NON-NLS-1$
		45	protected final static String PREF_LAST_WIZARD_ID = "asdf"; //$NON-NLS-1$
		46
44		47
45	public ConfigureProjectWizard() {	48	public ConfigureProjectWizard() {
46	setNeedsProgressMonitor(true);	49	setNeedsProgressMonitor(true);
Lines 94-99 Link Here
94	mainPage.setDescription(getWizardDescription());	97	mainPage.setDescription(getWizardDescription());
95	mainPage.setProject(project);	98	mainPage.setProject(project);
96	mainPage.setWorkbench(workbench);	99	mainPage.setWorkbench(workbench);
		100	Preferences preferences = TeamUIPlugin.getPlugin().getInstancePreferences();
		101	String initialWizardId = preferences.get(PREF_LAST_WIZARD_ID, null);
		102	mainPage.setInitialWizardId(initialWizardId);
97	addPage(mainPage);	103	addPage(mainPage);
98	}	104	}
99	public IWizardPage getNextPage(IWizardPage page) {	105	public IWizardPage getNextPage(IWizardPage page) {
Lines 113-118 Link Here
113	if (wizard != null) {	119	if (wizard != null) {
114	return wizard.canFinish();	120	return wizard.canFinish();
115	}	121	}
		122
116	return super.canFinish();	123	return super.canFinish();
117	}	124	}
118	/*	125	/*
Lines 123-128 Link Here
123	if (wizard != null) {	130	if (wizard != null) {
124	return wizard.performFinish();	131	return wizard.performFinish();
125	}	132	}
		133	Preferences preferences = TeamUIPlugin.getPlugin().getInstancePreferences();
		134	preferences.put(PREF_LAST_WIZARD_ID, mainPage.getSelectedWizardId());
126	// If we are on the first page and the selected wizard has no pages then	135	// If we are on the first page and the selected wizard has no pages then
127	// allow it to finish.	136	// allow it to finish.
128	if (getContainer().getCurrentPage() == mainPage) {	137	if (getContainer().getCurrentPage() == mainPage) {





	private Composite createEnableParticipantModelProvidersPane(Composite parent) {
		Composite composite = new Composite(parent, SWT.NONE);
		composite.setBackground(getBackgroundColor2());
		GridLayout layout = new GridLayout();
		layout.numColumns = 2;
		composite.setLayout(layout);


	private Composite getInitializationPane(Composite parent) {
		Composite composite = new Composite(parent, SWT.NONE);
		composite.setBackground(getBackgroundColor2());
		GridLayout layout = new GridLayout();
		layout.numColumns = 2;
		composite.setLayout(layout);


	private Composite getInitializingMessagePane(Composite parent) {
		Composite composite = new Composite(parent, SWT.NONE);
		composite.setBackground(getBackgroundColor2());
		GridLayout layout = new GridLayout();
		layout.numColumns = 2;
		composite.setLayout(layout);


	private Composite getPointerToModel(Composite parent, final ModelProvider provider, String oldId) {
		Composite composite = new Composite(parent, SWT.NONE);
		composite.setBackground(getBackgroundColor2());
		GridLayout layout = new GridLayout();
		layout.numColumns = 2;
		composite.setLayout(layout);

	
	private Composite getErrorComposite(Composite parent) {
		Composite composite = new Composite(parent, SWT.NONE);
		composite.setBackground(getBackgroundColor2());
		GridLayout layout = new GridLayout();
		layout.numColumns = 2;
		composite.setLayout(layout);

Return to bug 210164

Lines 291-297 Link Here

(-)src/org/eclipse/team/internal/ui/mapping/DiffTreeChangesSection.java (-5 / +5 lines)
291		291
292	private Composite createEnableParticipantModelProvidersPane(Composite parent) {	292	private Composite createEnableParticipantModelProvidersPane(Composite parent) {
293	Composite composite = new Composite(parent, SWT.NONE);	293	Composite composite = new Composite(parent, SWT.NONE);
294	composite.setBackground(getBackgroundColor());	294	composite.setBackground(getBackgroundColor2());
295	GridLayout layout = new GridLayout();	295	GridLayout layout = new GridLayout();
296	layout.numColumns = 2;	296	layout.numColumns = 2;
297	composite.setLayout(layout);	297	composite.setLayout(layout);
Lines 358-364 Link Here
358		358
359	private Composite getInitializationPane(Composite parent) {	359	private Composite getInitializationPane(Composite parent) {
360	Composite composite = new Composite(parent, SWT.NONE);	360	Composite composite = new Composite(parent, SWT.NONE);
361	composite.setBackground(getBackgroundColor());	361	composite.setBackground(getBackgroundColor2());
362	GridLayout layout = new GridLayout();	362	GridLayout layout = new GridLayout();
363	layout.numColumns = 2;	363	layout.numColumns = 2;
364	composite.setLayout(layout);	364	composite.setLayout(layout);
Lines 417-423 Link Here
417		417
418	private Composite getInitializingMessagePane(Composite parent) {	418	private Composite getInitializingMessagePane(Composite parent) {
419	Composite composite = new Composite(parent, SWT.NONE);	419	Composite composite = new Composite(parent, SWT.NONE);
420	composite.setBackground(getBackgroundColor());	420	composite.setBackground(getBackgroundColor2());
421	GridLayout layout = new GridLayout();	421	GridLayout layout = new GridLayout();
422	layout.numColumns = 2;	422	layout.numColumns = 2;
423	composite.setLayout(layout);	423	composite.setLayout(layout);
Lines 442-448 Link Here
442		442
443	private Composite getPointerToModel(Composite parent, final ModelProvider provider, String oldId) {	443	private Composite getPointerToModel(Composite parent, final ModelProvider provider, String oldId) {
444	Composite composite = new Composite(parent, SWT.NONE);	444	Composite composite = new Composite(parent, SWT.NONE);
445	composite.setBackground(getBackgroundColor());	445	composite.setBackground(getBackgroundColor2());
446	GridLayout layout = new GridLayout();	446	GridLayout layout = new GridLayout();
447	layout.numColumns = 2;	447	layout.numColumns = 2;
448	composite.setLayout(layout);	448	composite.setLayout(layout);
Lines 532-538 Link Here
532		532
533	private Composite getErrorComposite(Composite parent) {	533	private Composite getErrorComposite(Composite parent) {
534	Composite composite = new Composite(parent, SWT.NONE);	534	Composite composite = new Composite(parent, SWT.NONE);
535	composite.setBackground(getBackgroundColor());	535	composite.setBackground(getBackgroundColor2());
536	GridLayout layout = new GridLayout();	536	GridLayout layout = new GridLayout();
537	layout.numColumns = 2;	537	layout.numColumns = 2;
538	composite.setLayout(layout);	538	composite.setLayout(layout);

Lines 68-76 Link Here

(-)src/org/eclipse/team/internal/ui/synchronize/ChangesSection.java (-3 / +4 lines)
68	setLayoutData(data);	68	setLayoutData(data);
69		69
70	forms = new FormToolkit(parent.getDisplay());	70	forms = new FormToolkit(parent.getDisplay());
71	forms.setBackground(getBackgroundColor());	71	forms.setBackground(getBackgroundColor2());
72	HyperlinkGroup group = forms.getHyperlinkGroup();	72	HyperlinkGroup group = forms.getHyperlinkGroup();
73	group.setBackground(getBackgroundColor());	73	group.setBackground(getBackgroundColor2());
74		74
75	changesSectionContainer = new PageBook(this, SWT.NONE);	75	changesSectionContainer = new PageBook(this, SWT.NONE);
76	data = new GridData(GridData.FILL_BOTH);	76	data = new GridData(GridData.FILL_BOTH);
Lines 79-85 Link Here
79	changesSectionContainer.setLayoutData(data);	79	changesSectionContainer.setLayoutData(data);
80	}	80	}
81		81
82	protected Color getBackgroundColor() {	82	/* Renamed from getBackgroundColor */
		83	protected Color getBackgroundColor2() {
83	return getShell().getDisplay().getSystemColor(SWT.COLOR_LIST_BACKGROUND);	84	return getShell().getDisplay().getSystemColor(SWT.COLOR_LIST_BACKGROUND);
84	}	85	}
85		86