Attachment #129437 for bug #269417

Lines 13-18 Link Here

(-)src/org/eclipse/pde/internal/ui/wizards/feature/AbstractFeatureSpecPage.java (+3 lines)
13		13
14	import org.eclipse.core.runtime.IStatus;	14	import org.eclipse.core.runtime.IStatus;
15	import org.eclipse.jface.dialogs.Dialog;	15	import org.eclipse.jface.dialogs.Dialog;
		16	import org.eclipse.jface.dialogs.IDialogSettings;
16	import org.eclipse.pde.internal.core.ifeature.IFeatureModel;	17	import org.eclipse.pde.internal.core.ifeature.IFeatureModel;
17	import org.eclipse.pde.internal.core.util.IdUtil;	18	import org.eclipse.pde.internal.core.util.IdUtil;
18	import org.eclipse.pde.internal.core.util.VersionUtil;	19	import org.eclipse.pde.internal.core.util.VersionUtil;
Lines 61-66 Link Here
61		62
62	protected abstract String getHelpId();	63	protected abstract String getHelpId();
63		64
		65	protected abstract void saveSettings(IDialogSettings settings);
		66
64	protected void createCommonInput(Composite common) {	67	protected void createCommonInput(Composite common) {
65	Label label = new Label(common, SWT.NULL);	68	Label label = new Label(common, SWT.NULL);
66	label.setText(PDEUIMessages.NewFeatureWizard_SpecPage_name);	69	label.setText(PDEUIMessages.NewFeatureWizard_SpecPage_name);





package org.eclipse.pde.internal.ui.wizards.feature;

import org.eclipse.jface.dialogs.IDialogSettings;
import org.eclipse.jface.dialogs.IMessageProvider;
import org.eclipse.jface.window.Window;
import org.eclipse.jface.wizard.IWizardPage;

import org.eclipse.pde.internal.ui.PDEUIMessages;
import org.eclipse.pde.internal.ui.dialogs.FeatureSelectionDialog;
import org.eclipse.pde.internal.ui.util.SWTUtil;
import org.eclipse.pde.internal.ui.wizards.BundleProviderUtil;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.*;
import org.eclipse.swt.layout.GridData;


public class PatchSpecPage extends AbstractFeatureSpecPage {

	private Combo fPatchProviderCombo;
	private Button fBrowseButton;
	private Text fPatchIdText;
	private Text fPatchNameText;

	}

	private String getPatchProvider() {
		if (fPatchProviderCombo == null)
			return ""; //$NON-NLS-1$
		return fPatchProviderCombo.getText();
	}

	public FeatureData getFeatureData() {


		label = new Label(patchGroup, SWT.NULL);
		label.setText(PDEUIMessages.NewFeaturePatch_SpecPage_provider);
		fPatchProviderCombo = new Combo(patchGroup, SWT.BORDER | SWT.DROP_DOWN);
		fPatchProviderCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
		BundleProviderUtil.loadHistory(fPatchProviderCombo, getDialogSettings());

		createInstallHandlerText(patchGroup);
	}

	protected void attachListeners(ModifyListener listener) {
		fPatchIdText.addModifyListener(listener);
		fPatchNameText.addModifyListener(listener);
		fPatchProviderCombo.addModifyListener(listener);
		fFeatureIdText.addModifyListener(listener);
	}


		String id = IdUtil.getValidId(getProjectName());
		fPatchIdText.setText(id);
		fPatchNameText.setText(IdUtil.getValidName(id));
		if (0 == fPatchProviderCombo.getText().length()) {
			fPatchProviderCombo.setText(IdUtil.getValidProvider(id));
		}
		fSelfModification = false;
	}

	protected void saveSettings(IDialogSettings settings) {
		BundleProviderUtil.saveHistory(fPatchProviderCombo, settings);
	}
}

Lines 105-110 Link Here

(-)src/org/eclipse/pde/internal/ui/wizards/feature/AbstractNewFeatureWizard.java (+1 lines)
105	public boolean performFinish() {	105	public boolean performFinish() {
106	try {	106	try {
107	IDialogSettings settings = getDialogSettings();	107	IDialogSettings settings = getDialogSettings();
		108	fSpecPage.saveSettings(settings);
108	if (settings != null && fSecondPage != null)	109	if (settings != null && fSecondPage != null)
109	fSecondPage.saveSettings(settings);	110	fSecondPage.saveSettings(settings);
110		111





package org.eclipse.pde.internal.ui.wizards.feature;

import org.eclipse.jface.dialogs.IDialogSettings;
import org.eclipse.pde.internal.core.util.IdUtil;
import org.eclipse.pde.internal.ui.IHelpContextIds;
import org.eclipse.pde.internal.ui.PDEUIMessages;
import org.eclipse.pde.internal.ui.wizards.BundleProviderUtil;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.layout.GridData;


public class FeatureSpecPage extends AbstractFeatureSpecPage {

	private Combo fFeatureProviderCombo;
	private Text fFeatureIdText;

	public FeatureSpecPage() {

		FeatureData data = new FeatureData();
		data.id = fFeatureIdText.getText();
		data.version = fFeatureVersionText.getText();
		data.provider = fFeatureProviderCombo.getText();
		data.name = fFeatureNameText.getText();
		data.library = getInstallHandlerLibrary();
		return data;


		label = new Label(group, SWT.NULL);
		label.setText(PDEUIMessages.NewFeatureWizard_SpecPage_provider);
		fFeatureProviderCombo = new Combo(group, SWT.BORDER | SWT.DROP_DOWN);
		fFeatureProviderCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
		BundleProviderUtil.loadHistory(fFeatureProviderCombo, getDialogSettings());

		createInstallHandlerText(group);
	}

	protected void attachListeners(ModifyListener listener) {
		fFeatureProviderCombo.addModifyListener(listener);
		fFeatureIdText.addModifyListener(listener);
	}


		String id = IdUtil.getValidId(getProjectName());
		fFeatureIdText.setText(id);
		fFeatureNameText.setText(IdUtil.getValidName(id));
		if (0 == fFeatureProviderCombo.getText().length()) {
			fFeatureProviderCombo.setText(IdUtil.getValidProvider(id));
		}
		fSelfModification = false;
	}

	protected void saveSettings(IDialogSettings settings) {
		BundleProviderUtil.saveHistory(fFeatureProviderCombo, settings);
	}
}




package org.eclipse.pde.internal.ui.wizards.plugin;

import org.eclipse.core.runtime.IStatus;
import org.eclipse.jface.dialogs.IDialogSettings;
import org.eclipse.jface.wizard.IWizardPage;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.pde.internal.core.PDECoreMessages;

import org.eclipse.pde.internal.core.util.VersionUtil;
import org.eclipse.pde.internal.ui.PDEUIMessages;
import org.eclipse.pde.internal.ui.util.PDELabelUtility;
import org.eclipse.pde.internal.ui.wizards.BundleProviderUtil;
import org.eclipse.pde.internal.ui.wizards.IProjectProvider;
import org.eclipse.pde.ui.IFieldData;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.*;
import org.eclipse.swt.widgets.Text;

public abstract class ContentPage extends WizardPage {


	protected Text fIdText;
	protected Text fVersionText;
	protected Text fNameText;
	protected Combo fProviderCombo;

	protected NewProjectCreationPage fMainPage;
	protected AbstractFieldData fData;

		return text;
	}

	protected Combo createProviderCombo(Composite parent, ModifyListener listener, int horizSpan) {
		Combo combo = new Combo(parent, SWT.BORDER | SWT.DROP_DOWN);
		GridData data = new GridData(GridData.FILL_HORIZONTAL);
		data.horizontalSpan = horizSpan;
		combo.setLayoutData(data);
		BundleProviderUtil.loadHistory(combo, getDialogSettings());
		// Add listener only now, otherwise combo.select(0) would trigger it
		// and cause a NPE during validation.
		combo.addModifyListener(listener);
		return combo;
	}

	protected abstract void validatePage();

	protected String validateProperties() {

				fIdText.setText(id);
				fVersionText.setText("1.0.0"); //$NON-NLS-1$
				fNameText.setText(IdUtil.getValidName(id));
				if (0 == fProviderCombo.getText().length()) {
					fProviderCombo.setText(IdUtil.getValidProvider(id));
				}
				fChangedGroups = oldfChanged;
			}
			if (fInitialized)

		return IdUtil.getValidId(fProjectProvider.getProjectName());
	}

	public void saveSettings(IDialogSettings settings) {
		BundleProviderUtil.saveHistory(fProviderCombo, settings);
	}

	public void updateData() {
		fData.setId(fIdText.getText().trim());
		fData.setVersion(fVersionText.getText().trim());
		fData.setName(fNameText.getText().trim());
		fData.setProvider(fProviderCombo.getText().trim());
	}

	public IFieldData getData() {

Lines 107-113 Link Here

(-)src/org/eclipse/pde/internal/ui/wizards/plugin/FragmentContentPage.java (-1 / +1 lines)
107		107
108	label = new Label(propertiesGroup, SWT.NONE);	108	label = new Label(propertiesGroup, SWT.NONE);
109	label.setText(PDEUIMessages.ContentPage_fprovider);	109	label.setText(PDEUIMessages.ContentPage_fprovider);
110	fProviderText = createText(propertiesGroup, propertiesListener, 2);	110	fProviderCombo = createProviderCombo(propertiesGroup, propertiesListener, 2);
111		111
112	createExecutionEnvironmentControls(propertiesGroup);	112	createExecutionEnvironmentControls(propertiesGroup);
113	}	113	}

Lines 13-18 Link Here

(-)src/org/eclipse/pde/internal/ui/wizards/plugin/NewFragmentProjectWizard.java (+7 lines)
13	import java.lang.reflect.InvocationTargetException;	13	import java.lang.reflect.InvocationTargetException;
14	import org.eclipse.core.resources.IProject;	14	import org.eclipse.core.resources.IProject;
15	import org.eclipse.core.runtime.*;	15	import org.eclipse.core.runtime.*;
		16	import org.eclipse.jface.dialogs.IDialogSettings;
16	import org.eclipse.jface.wizard.IWizardPage;	17	import org.eclipse.jface.wizard.IWizardPage;
17	import org.eclipse.pde.internal.ui.*;	18	import org.eclipse.pde.internal.ui.*;
18	import org.eclipse.pde.internal.ui.wizards.IProjectProvider;	19	import org.eclipse.pde.internal.ui.wizards.IProjectProvider;
Lines 79-84 Link Here
79	try {	80	try {
80	fMainPage.updateData();	81	fMainPage.updateData();
81	fContentPage.updateData();	82	fContentPage.updateData();
		83	IDialogSettings settings = getDialogSettings();
		84	if (settings != null) {
		85	fMainPage.saveSettings(settings);
		86	fContentPage.saveSettings(settings);
		87	}
		88
82	BasicNewProjectResourceWizard.updatePerspective(fConfig);	89	BasicNewProjectResourceWizard.updatePerspective(fConfig);
83	getContainer().run(false, true, new NewProjectCreationOperation(fFragmentData, fProjectProvider, null));	90	getContainer().run(false, true, new NewProjectCreationOperation(fFragmentData, fProjectProvider, null));
84		91

Lines 125-131 Link Here

(-)src/org/eclipse/pde/internal/ui/wizards/plugin/PluginContentPage.java (-1 / +2 lines)
125		125
126	label = new Label(propertiesGroup, SWT.NONE);	126	label = new Label(propertiesGroup, SWT.NONE);
127	label.setText(PDEUIMessages.ContentPage_pprovider);	127	label.setText(PDEUIMessages.ContentPage_pprovider);
128	fProviderText = createText(propertiesGroup, propertiesListener, 2);	128	fProviderCombo = createProviderCombo(propertiesGroup, propertiesListener, 2);
129		129
130	createExecutionEnvironmentControls(propertiesGroup);	130	createExecutionEnvironmentControls(propertiesGroup);
131	}	131	}
Lines 371-376 Link Here
371	* @param settings	371	* @param settings
372	*/	372	*/
373	public void saveSettings(IDialogSettings settings) {	373	public void saveSettings(IDialogSettings settings) {
		374	super.saveSettings(settings);
374	settings.put(S_GENERATE_ACTIVATOR, !fGenerateActivator.getSelection());	375	settings.put(S_GENERATE_ACTIVATOR, !fGenerateActivator.getSelection());
375	if (fUIPlugin.isEnabled()) {	376	if (fUIPlugin.isEnabled()) {
376	settings.put(S_UI_PLUGIN, !fUIPlugin.getSelection());	377	settings.put(S_UI_PLUGIN, !fUIPlugin.getSelection());

Lines 689-698 Link Here

(-)src/org/eclipse/pde/internal/ui/pderesources.properties (-4 / +4 lines)
689	ContentSection_selectedOnly=Include only plug-ins designated below	689	ContentSection_selectedOnly=Include only plug-ins designated below
690	ContentSection_targetContent=Target Content	690	ContentSection_targetContent=Target Content
691	ContentPage_pClassGroup = Plug-in Options	691	ContentPage_pClassGroup = Plug-in Options
692	ContentPage_pid = Plug-in &ID:	692	ContentPage_pid = &ID:
693	ContentPage_pversion = Plug-in &Version:	693	ContentPage_pversion = &Version:
694	ContentPage_pname = Plug-in N&ame:	694	ContentPage_pname = N&ame:
695	ContentPage_pprovider = Plug-in Provi&der:	695	ContentPage_pprovider = Provi&der:
696	ContentPage_fid = Fragment &ID:	696	ContentPage_fid = Fragment &ID:
697	ContentPage_fversion = Fragment &Version:	697	ContentPage_fversion = Fragment &Version:
698	ContentPage_fname = Fragment N&ame:	698	ContentPage_fname = Fragment N&ame:




/*******************************************************************************
 * Copyright (c) 2005, 2009 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
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.pde.internal.ui.wizards;

import org.eclipse.jface.dialogs.IDialogSettings;
import org.eclipse.swt.widgets.Combo;

/**
 * Provides helper methods to load and save provider names from and to combo boxes.
 * 
 * @author <a href="mailto:phil.kursawe@gmail.com">Philipp Kursawe</a>
 *
 */
public class BundleProviderUtil {
	/**
	 * Dialog settings constants
	 */
	private final static String S_PROVIDERS = "providers"; //$NON-NLS-1$

	/**
	 * Loads the history of providers from the given settings.
	 * <h2>Note</h2>
	 * <p>
	 * This method also selects the first entry of the history into
	 * the given combo. This might trigger a <code>SWT.Modify</code> event.
	 * </p> 
	 */
	public static void loadHistory(Combo combo, IDialogSettings settings) {
		if (null == combo || null == settings) {
			return;
		}
		String providers[] = settings.getArray(S_PROVIDERS);
		if (null != providers) {
			for (int i = 0; i < providers.length; ++i) {
				combo.add(providers[i]);
			}
			combo.select(0);
		}
	}

	/**
	 * Saves the items of the given combo to the given settings.
	 * 
	 * <p>
	 * If the combo text is not in the list of history items yet, it will be
	 * added. The combo text will be the most recent history value (saved first).
	 * </p>
	 * @param combo
	 * @param settings
	 */
	public static void saveHistory(Combo combo, IDialogSettings settings) {
		if (null == combo) {
			return;
		}
		// Save all providers from the combo list + the newly entered
		String text = combo.getText();
		if (0 == text.length()) {
			return;
		}
		int indexOfText = combo.indexOf(text);
		// If the item was already in the list, remove it now 
		if (indexOfText != -1) {
			combo.remove(indexOfText);
		}
		// And always add the entered text as the most recent one to the top of 
		// the list
		combo.add(text, 0);
		String[] items = combo.getItems();
		if (items != null && items.length > 0) {
			settings.put(S_PROVIDERS, items);
		}
	}
}

Return to bug 269417

Lines 11-16 Link Here

(-)src/org/eclipse/pde/internal/ui/wizards/feature/PatchSpecPage.java (-7 / +16 lines)
11		11
12	package org.eclipse.pde.internal.ui.wizards.feature;	12	package org.eclipse.pde.internal.ui.wizards.feature;
13		13
		14	import org.eclipse.jface.dialogs.IDialogSettings;
14	import org.eclipse.jface.dialogs.IMessageProvider;	15	import org.eclipse.jface.dialogs.IMessageProvider;
15	import org.eclipse.jface.window.Window;	16	import org.eclipse.jface.window.Window;
16	import org.eclipse.jface.wizard.IWizardPage;	17	import org.eclipse.jface.wizard.IWizardPage;
Lines 22-27 Link Here
22	import org.eclipse.pde.internal.ui.PDEUIMessages;	23	import org.eclipse.pde.internal.ui.PDEUIMessages;
23	import org.eclipse.pde.internal.ui.dialogs.FeatureSelectionDialog;	24	import org.eclipse.pde.internal.ui.dialogs.FeatureSelectionDialog;
24	import org.eclipse.pde.internal.ui.util.SWTUtil;	25	import org.eclipse.pde.internal.ui.util.SWTUtil;
		26	import org.eclipse.pde.internal.ui.wizards.BundleProviderUtil;
25	import org.eclipse.swt.SWT;	27	import org.eclipse.swt.SWT;
26	import org.eclipse.swt.events.*;	28	import org.eclipse.swt.events.*;
27	import org.eclipse.swt.layout.GridData;	29	import org.eclipse.swt.layout.GridData;
Lines 30-36 Link Here
30		32
31	public class PatchSpecPage extends AbstractFeatureSpecPage {	33	public class PatchSpecPage extends AbstractFeatureSpecPage {
32		34
33	private Text fPatchProviderText;	35	private Combo fPatchProviderCombo;
34	private Button fBrowseButton;	36	private Button fBrowseButton;
35	private Text fPatchIdText;	37	private Text fPatchIdText;
36	private Text fPatchNameText;	38	private Text fPatchNameText;
Lines 85-93 Link Here
85	}	87	}
86		88
87	private String getPatchProvider() {	89	private String getPatchProvider() {
88	if (fPatchProviderText == null)	90	if (fPatchProviderCombo == null)
89	return ""; //$NON-NLS-1$	91	return ""; //$NON-NLS-1$
90	return fPatchProviderText.getText();	92	return fPatchProviderCombo.getText();
91	}	93	}
92		94
93	public FeatureData getFeatureData() {	95	public FeatureData getFeatureData() {
Lines 136-143 Link Here
136		138
137	label = new Label(patchGroup, SWT.NULL);	139	label = new Label(patchGroup, SWT.NULL);
138	label.setText(PDEUIMessages.NewFeaturePatch_SpecPage_provider);	140	label.setText(PDEUIMessages.NewFeaturePatch_SpecPage_provider);
139	fPatchProviderText = new Text(patchGroup, SWT.BORDER);	141	fPatchProviderCombo = new Combo(patchGroup, SWT.BORDER \| SWT.DROP_DOWN);
140	fPatchProviderText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));	142	fPatchProviderCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
		143	BundleProviderUtil.loadHistory(fPatchProviderCombo, getDialogSettings());
141		144
142	createInstallHandlerText(patchGroup);	145	createInstallHandlerText(patchGroup);
143	}	146	}
Lines 197-203 Link Here
197	protected void attachListeners(ModifyListener listener) {	200	protected void attachListeners(ModifyListener listener) {
198	fPatchIdText.addModifyListener(listener);	201	fPatchIdText.addModifyListener(listener);
199	fPatchNameText.addModifyListener(listener);	202	fPatchNameText.addModifyListener(listener);
200	fPatchProviderText.addModifyListener(listener);	203	fPatchProviderCombo.addModifyListener(listener);
201	fFeatureIdText.addModifyListener(listener);	204	fFeatureIdText.addModifyListener(listener);
202	}	205	}
203		206
Lines 212-218 Link Here
212	String id = IdUtil.getValidId(getProjectName());	215	String id = IdUtil.getValidId(getProjectName());
213	fPatchIdText.setText(id);	216	fPatchIdText.setText(id);
214	fPatchNameText.setText(IdUtil.getValidName(id));	217	fPatchNameText.setText(IdUtil.getValidName(id));
215	fPatchProviderText.setText(IdUtil.getValidProvider(id));	218	if (0 == fPatchProviderCombo.getText().length()) {
		219	fPatchProviderCombo.setText(IdUtil.getValidProvider(id));
		220	}
216	fSelfModification = false;	221	fSelfModification = false;
217	}	222	}
		223
		224	protected void saveSettings(IDialogSettings settings) {
		225	BundleProviderUtil.saveHistory(fPatchProviderCombo, settings);
		226	}
218	}	227	}

Added Link Here

(-)src/org/eclipse/pde/internal/ui/wizards/BundleProviderUtil.java (+81 lines)
1	/*******************************************************************************
2	* Copyright (c) 2005, 2009 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* IBM Corporation - initial API and implementation
10	*******************************************************************************/
11	package org.eclipse.pde.internal.ui.wizards;
12
13	import org.eclipse.jface.dialogs.IDialogSettings;
14	import org.eclipse.swt.widgets.Combo;
15
16	/**
17	* Provides helper methods to load and save provider names from and to combo boxes.
18	*
19	* @author <a href="mailto:phil.kursawe@gmail.com">Philipp Kursawe</a>
20	*
21	*/
22	public class BundleProviderUtil {
23	/**
24	* Dialog settings constants
25	*/
26	private final static String S_PROVIDERS = "providers"; //$NON-NLS-1$
27
28	/**
29	* Loads the history of providers from the given settings.
30	* <h2>Note</h2>
31	* <p>
32	* This method also selects the first entry of the history into
33	* the given combo. This might trigger a <code>SWT.Modify</code> event.
34	* </p>
35	*/
36	public static void loadHistory(Combo combo, IDialogSettings settings) {
37	if (null == combo \|\| null == settings) {
38	return;
39	}
40	String providers[] = settings.getArray(S_PROVIDERS);
41	if (null != providers) {
42	for (int i = 0; i < providers.length; ++i) {
43	combo.add(providers[i]);
44	}
45	combo.select(0);
46	}
47	}
48
49	/**
50	* Saves the items of the given combo to the given settings.
51	*
52	* <p>
53	* If the combo text is not in the list of history items yet, it will be
54	* added. The combo text will be the most recent history value (saved first).
55	* </p>
56	* @param combo
57	* @param settings
58	*/
59	public static void saveHistory(Combo combo, IDialogSettings settings) {
60	if (null == combo) {
61	return;
62	}
63	// Save all providers from the combo list + the newly entered
64	String text = combo.getText();
65	if (0 == text.length()) {
66	return;
67	}
68	int indexOfText = combo.indexOf(text);
69	// If the item was already in the list, remove it now
70	if (indexOfText != -1) {
71	combo.remove(indexOfText);
72	}
73	// And always add the entered text as the most recent one to the top of
74	// the list
75	combo.add(text, 0);
76	String[] items = combo.getItems();
77	if (items != null && items.length > 0) {
78	settings.put(S_PROVIDERS, items);
79	}
80	}
81	}