Attachment #121991 for bug #254127

View | Details | Raw Unified | Return to bug 254127
Collapse All | Expand All

Lines 27-32 Link Here

(-)src/org/eclipse/datatools/connectivity/internal/ui/ConnectionProfileManagerUI.java (-2 / +31 lines)
27	import org.eclipse.datatools.connectivity.internal.ui.wizards.WizardCategoryProvider;	27	import org.eclipse.datatools.connectivity.internal.ui.wizards.WizardCategoryProvider;
28	import org.eclipse.datatools.connectivity.ui.wizards.IWizardCategoryProvider;	28	import org.eclipse.datatools.connectivity.ui.wizards.IWizardCategoryProvider;
29	import org.eclipse.jface.wizard.IWizard;	29	import org.eclipse.jface.wizard.IWizard;
		30	import org.eclipse.ui.IPluginContribution;
		31	import org.eclipse.ui.PlatformUI;
		32	import org.eclipse.ui.activities.ActivityManagerEvent;
		33	import org.eclipse.ui.activities.IActivityManagerListener;
		34	import org.eclipse.ui.activities.WorkbenchActivityHelper;
30		35
31	public class ConnectionProfileManagerUI {	36	public class ConnectionProfileManagerUI {
32		37
Lines 34-39 Link Here
34		39
35	private Map mNewWizards = null;	40	private Map mNewWizards = null;
36	private Map mWizardCategories = null;	41	private Map mWizardCategories = null;
		42
		43	private IActivityManagerListener activityListener = null;
37		44
38	public static ConnectionProfileManagerUI getInstance() {	45	public static ConnectionProfileManagerUI getInstance() {
39	return sInstance;	46	return sInstance;
Lines 53-60 Link Here
53	}	60	}
54		61
55	public Map getNewWizards() {	62	public Map getNewWizards() {
56	if (mNewWizards == null)	63	if (mNewWizards == null) {
57	processExtensions();	64	processExtensions();
		65	activityListener = new IActivityManagerListener () {
		66	public void activityManagerChanged(
		67	ActivityManagerEvent activityManagerEvent) {
		68	processExtensions();
		69	}
		70	};
		71	PlatformUI.getWorkbench().getActivitySupport().getActivityManager().addActivityManagerListener(activityListener);
		72	}
58	return mNewWizards;	73	return mNewWizards;
59	}	74	}
60		75
Lines 69-80 Link Here
69	return ((ProfileWizardProvider) getNewWizards().get(id)).getWizard();	84	return ((ProfileWizardProvider) getNewWizards().get(id)).getWizard();
70	}	85	}
71		86
72	private void processNewWizard(IConfigurationElement element) {	87	private void processNewWizard(final IConfigurationElement element) {
73	ProfileWizardProvider c = new ProfileWizardProvider(element);	88	ProfileWizardProvider c = new ProfileWizardProvider(element);
74	Assert.isTrue(!mNewWizards.containsKey(c.getId()), ConnectivityPlugin	89	Assert.isTrue(!mNewWizards.containsKey(c.getId()), ConnectivityPlugin
75	.getDefault().getResourceString(	90	.getDefault().getResourceString(
76	"assert.invalid.profile", new Object[] { element //$NON-NLS-1$	91	"assert.invalid.profile", new Object[] { element //$NON-NLS-1$
77	.toString()}));	92	.toString()}));
		93	IPluginContribution pc = new IPluginContribution() {
		94
		95	public String getLocalId() {
		96	return "";
		97	}
		98
		99	public String getPluginId() {
		100	// TODO Auto-generated method stub
		101	return element.getContributor().getName();
		102	}
		103
		104	};
		105	if (WorkbenchActivityHelper.filterItem(pc))
		106	return;
78	mNewWizards.put(c.getId(), c);	107	mNewWizards.put(c.getId(), c);
79	}	108	}
80		109




								DriverValidator validator = new DriverValidator(
										template, ps);
								DriverListCombo.this.mErrorMessage = null;
								if (!validator.isValid(false)) {
									DriverListCombo.this.mErrorMessage = validator
											.getMessage();
								}

								DriverValidator validator = new DriverValidator(
										template, ps);
								DriverListCombo.this.mErrorMessage = null;
								if (!validator.isValid(false)) {
									DriverListCombo.this.mErrorMessage = validator
											.getMessage();
								}

									DriverValidator validator = new DriverValidator(
											template, temp);
									DriverListCombo.this.mErrorMessage = null;
									if (!validator.isValid(false)) {
										DriverListCombo.this.mErrorMessage = validator
												.getMessage();
									}

									DriverValidator validator = new DriverValidator(
											template, temp);
									DriverListCombo.this.mErrorMessage = null;
									if (!validator.isValid(false)) {
										DriverListCombo.this.mErrorMessage = validator
										.getMessage();
									}

									DriverValidator validator = new DriverValidator(
											template, temp);
									DriverListCombo.this.mErrorMessage = null;
									if (!validator.isValid(false)) {
										DriverListCombo.this.mErrorMessage = validator
												.getMessage();
									}

Return to bug 254127

Lines 690-696 Link Here

(-)src/org/eclipse/datatools/connectivity/internal/ui/DriverListCombo.java (-5 / +5 lines)
690	DriverValidator validator = new DriverValidator(	690	DriverValidator validator = new DriverValidator(
691	template, ps);	691	template, ps);
692	DriverListCombo.this.mErrorMessage = null;	692	DriverListCombo.this.mErrorMessage = null;
693	if (!validator.isValid()) {	693	if (!validator.isValid(false)) {
694	DriverListCombo.this.mErrorMessage = validator	694	DriverListCombo.this.mErrorMessage = validator
695	.getMessage();	695	.getMessage();
696	}	696	}
Lines 735-741 Link Here
735	DriverValidator validator = new DriverValidator(	735	DriverValidator validator = new DriverValidator(
736	template, ps);	736	template, ps);
737	DriverListCombo.this.mErrorMessage = null;	737	DriverListCombo.this.mErrorMessage = null;
738	if (!validator.isValid()) {	738	if (!validator.isValid(false)) {
739	DriverListCombo.this.mErrorMessage = validator	739	DriverListCombo.this.mErrorMessage = validator
740	.getMessage();	740	.getMessage();
741	}	741	}
Lines 820-826 Link Here
820	DriverValidator validator = new DriverValidator(	820	DriverValidator validator = new DriverValidator(
821	template, temp);	821	template, temp);
822	DriverListCombo.this.mErrorMessage = null;	822	DriverListCombo.this.mErrorMessage = null;
823	if (!validator.isValid()) {	823	if (!validator.isValid(false)) {
824	DriverListCombo.this.mErrorMessage = validator	824	DriverListCombo.this.mErrorMessage = validator
825	.getMessage();	825	.getMessage();
826	}	826	}
Lines 910-916 Link Here
910	DriverValidator validator = new DriverValidator(	910	DriverValidator validator = new DriverValidator(
911	template, temp);	911	template, temp);
912	DriverListCombo.this.mErrorMessage = null;	912	DriverListCombo.this.mErrorMessage = null;
913	if (!validator.isValid()) {	913	if (!validator.isValid(false)) {
914	DriverListCombo.this.mErrorMessage = validator	914	DriverListCombo.this.mErrorMessage = validator
915	.getMessage();	915	.getMessage();
916	}	916	}
Lines 1020-1026 Link Here
1020	DriverValidator validator = new DriverValidator(	1020	DriverValidator validator = new DriverValidator(
1021	template, temp);	1021	template, temp);
1022	DriverListCombo.this.mErrorMessage = null;	1022	DriverListCombo.this.mErrorMessage = null;
1023	if (!validator.isValid()) {	1023	if (!validator.isValid(false)) {
1024	DriverListCombo.this.mErrorMessage = validator	1024	DriverListCombo.this.mErrorMessage = validator
1025	.getMessage();	1025	.getMessage();
1026	}	1026	}