### Eclipse Workspace Patch 1.0 #P org.eclipse.datatools.connectivity.ui Index: src/org/eclipse/datatools/connectivity/internal/ui/ConnectionProfileManagerUI.java =================================================================== RCS file: /cvsroot/datatools/org.eclipse.datatools.connectivity/plugins/org.eclipse.datatools.connectivity.ui/src/org/eclipse/datatools/connectivity/internal/ui/ConnectionProfileManagerUI.java,v retrieving revision 1.1 diff -u -r1.1 ConnectionProfileManagerUI.java --- src/org/eclipse/datatools/connectivity/internal/ui/ConnectionProfileManagerUI.java 2 Jun 2006 17:15:06 -0000 1.1 +++ src/org/eclipse/datatools/connectivity/internal/ui/ConnectionProfileManagerUI.java 8 Jan 2009 17:56:52 -0000 @@ -27,6 +27,11 @@ import org.eclipse.datatools.connectivity.internal.ui.wizards.WizardCategoryProvider; import org.eclipse.datatools.connectivity.ui.wizards.IWizardCategoryProvider; import org.eclipse.jface.wizard.IWizard; +import org.eclipse.ui.IPluginContribution; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.activities.ActivityManagerEvent; +import org.eclipse.ui.activities.IActivityManagerListener; +import org.eclipse.ui.activities.WorkbenchActivityHelper; public class ConnectionProfileManagerUI { @@ -34,6 +39,8 @@ private Map mNewWizards = null; private Map mWizardCategories = null; + + private IActivityManagerListener activityListener = null; public static ConnectionProfileManagerUI getInstance() { return sInstance; @@ -53,8 +60,16 @@ } public Map getNewWizards() { - if (mNewWizards == null) + if (mNewWizards == null) { processExtensions(); + activityListener = new IActivityManagerListener () { + public void activityManagerChanged( + ActivityManagerEvent activityManagerEvent) { + processExtensions(); + } + }; + PlatformUI.getWorkbench().getActivitySupport().getActivityManager().addActivityManagerListener(activityListener); + } return mNewWizards; } @@ -69,12 +84,26 @@ return ((ProfileWizardProvider) getNewWizards().get(id)).getWizard(); } - private void processNewWizard(IConfigurationElement element) { + private void processNewWizard(final IConfigurationElement element) { ProfileWizardProvider c = new ProfileWizardProvider(element); Assert.isTrue(!mNewWizards.containsKey(c.getId()), ConnectivityPlugin .getDefault().getResourceString( "assert.invalid.profile", new Object[] { element //$NON-NLS-1$ .toString()})); + IPluginContribution pc = new IPluginContribution() { + + public String getLocalId() { + return ""; + } + + public String getPluginId() { + // TODO Auto-generated method stub + return element.getContributor().getName(); + } + + }; + if (WorkbenchActivityHelper.filterItem(pc)) + return; mNewWizards.put(c.getId(), c); } Index: src/org/eclipse/datatools/connectivity/internal/ui/DriverListCombo.java =================================================================== RCS file: /cvsroot/datatools/org.eclipse.datatools.connectivity/plugins/org.eclipse.datatools.connectivity.ui/src/org/eclipse/datatools/connectivity/internal/ui/DriverListCombo.java,v retrieving revision 1.19 diff -u -r1.19 DriverListCombo.java --- src/org/eclipse/datatools/connectivity/internal/ui/DriverListCombo.java 4 Jun 2008 17:32:16 -0000 1.19 +++ src/org/eclipse/datatools/connectivity/internal/ui/DriverListCombo.java 8 Jan 2009 17:56:52 -0000 @@ -690,7 +690,7 @@ DriverValidator validator = new DriverValidator( template, ps); DriverListCombo.this.mErrorMessage = null; - if (!validator.isValid()) { + if (!validator.isValid(false)) { DriverListCombo.this.mErrorMessage = validator .getMessage(); } @@ -735,7 +735,7 @@ DriverValidator validator = new DriverValidator( template, ps); DriverListCombo.this.mErrorMessage = null; - if (!validator.isValid()) { + if (!validator.isValid(false)) { DriverListCombo.this.mErrorMessage = validator .getMessage(); } @@ -820,7 +820,7 @@ DriverValidator validator = new DriverValidator( template, temp); DriverListCombo.this.mErrorMessage = null; - if (!validator.isValid()) { + if (!validator.isValid(false)) { DriverListCombo.this.mErrorMessage = validator .getMessage(); } @@ -910,7 +910,7 @@ DriverValidator validator = new DriverValidator( template, temp); DriverListCombo.this.mErrorMessage = null; - if (!validator.isValid()) { + if (!validator.isValid(false)) { DriverListCombo.this.mErrorMessage = validator .getMessage(); } @@ -1020,7 +1020,7 @@ DriverValidator validator = new DriverValidator( template, temp); DriverListCombo.this.mErrorMessage = null; - if (!validator.isValid()) { + if (!validator.isValid(false)) { DriverListCombo.this.mErrorMessage = validator .getMessage(); }