Author: rob.stryker(a)jboss.com Date: 2012-02-09 10:01:37 -0500 (Thu, 09 Feb 2012) New Revision: 38557 Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/OpenConnectionDialogActionDelegate.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java Log: Removing some delays from opening the import wizard Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/OpenConnectionDialogActionDelegate.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/OpenConnectionDialogActionDelegate.java 2012-02-09 14:25:09 UTC (rev 38556) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/OpenConnectionDialogActionDelegate.java 2012-02-09 15:01:37 UTC (rev 38557) @@ -11,13 +11,9 @@ import org.eclipse.ui.navigator.CommonNavigator; import org.jboss.tools.common.ui.WizardUtils; import org.jboss.tools.openshift.express.internal.core.console.UserModel; -import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; import org.jboss.tools.openshift.express.internal.ui.utils.Logger; import org.jboss.tools.openshift.express.internal.ui.viewer.ConnectToOpenShiftWizard; -import org.jboss.tools.openshift.express.internal.ui.viewer.OpenShiftExpressConsoleContentCategory; -import com.openshift.express.client.IUser; - public class OpenConnectionDialogActionDelegate implements IViewActionDelegate { private CommonNavigator view; Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-02-09 14:25:09 UTC (rev 38556) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-02-09 15:01:37 UTC (rev 38557) @@ -62,6 +62,7 @@ import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; @@ -622,6 +623,19 @@ @Override protected void onPageActivated(final DataBindingContext dbc) { + // This is needed for some strange freezing issues when + // launching the wizard from the console view. The UI seems to freeze + new Thread() { + public void run() { + Display.getDefault().asyncExec(new Runnable() { + public void run() { + onPageActivated2(dbc); + } + }); + } + }.start(); + } + protected void onPageActivated2(final DataBindingContext dbc) { try { WizardUtils.runInWizard(new Job("Loading existing applications...") { @Override Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java 2012-02-09 14:25:09 UTC (rev 38556) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java 2012-02-09 15:01:37 UTC (rev 38557) @@ -22,6 +22,7 @@ import org.eclipse.core.runtime.Status; import org.eclipse.jface.dialogs.ErrorDialog; import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.jface.wizard.IWizardPage; import org.eclipse.jgit.errors.TransportException; import org.eclipse.osgi.util.NLS; import org.eclipse.ui.IImportWizard; @@ -81,21 +82,19 @@ @Override public void addPages() { - final IUser user = initialUser; - try { - if (user == null || !user.isValid()) { - addPage(new CredentialsWizardPage(this)); - } - } catch (OpenShiftException e) { - // if the user's validity can't be checked, we may want to re-connect.. - addPage(new CredentialsWizardPage(this)); - } + addPage(new CredentialsWizardPage(this)); addPage(new ApplicationConfigurationWizardPage(this, getWizardModel())); addPage(new ProjectAndServerAdapterSettingsWizardPage(this, getWizardModel())); addPage(new GitCloningSettingsWizardPage(this, getWizardModel())); } @Override + public IWizardPage getStartingPage() { + IWizardPage[] pages = getPages(); + return initialUser == null ? pages[0] : pages[1]; + } + + @Override public boolean performFinish() { try { final DelegatingProgressMonitor delegatingMonitor = new DelegatingProgressMonitor();