Author: rob.stryker(a)jboss.com Date: 2012-02-09 09:02:40 -0500 (Thu, 09 Feb 2012) New Revision: 38551 Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateApplicationAction.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java Log: Ensuring credential page is only skipped if selection is an IUser or one is explicitly provided Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateApplicationAction.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateApplicationAction.java 2012-02-09 13:57:45 UTC (rev 38550) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateApplicationAction.java 2012-02-09 14:02:40 UTC (rev 38551) @@ -1,10 +1,14 @@ package org.jboss.tools.openshift.express.internal.ui.action; import org.eclipse.jface.viewers.ITreeSelection; +import org.eclipse.jface.wizard.IWizard; +import org.eclipse.jface.wizard.WizardDialog; +import org.eclipse.swt.widgets.Shell; import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages; +import org.jboss.tools.openshift.express.internal.ui.wizard.OpenShiftExpressApplicationWizard; -import com.openshift.express.client.IApplication; +import com.openshift.express.client.IUser; public class CreateApplicationAction extends AbstractAction { @@ -21,10 +25,14 @@ * created, otherwise, it is displayed. {@inheritDoc} */ @Override - public void run() { - if (selection != null && selection instanceof ITreeSelection && ((ITreeSelection)selection).getFirstElement() instanceof IApplication) { - final IApplication application = (IApplication) ((ITreeSelection)selection).getFirstElement(); - + public void run() { + if (selection != null && selection instanceof ITreeSelection ) { + Object sel = ((ITreeSelection)selection).getFirstElement(); + if( sel instanceof IUser) { + OpenShiftExpressApplicationWizard wizard = new OpenShiftExpressApplicationWizard(); + wizard.setInitialUser((IUser)sel); + new WizardDialog(new Shell(), wizard).open(); + } } } 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 13:57:45 UTC (rev 38550) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java 2012-02-09 14:02:40 UTC (rev 38551) @@ -45,6 +45,7 @@ public class OpenShiftExpressApplicationWizard extends AbstractOpenShiftApplicationWizard<OpenShiftExpressApplicationWizardModel> implements IImportWizard, INewWizard { + private IUser initialUser; public OpenShiftExpressApplicationWizard() { super(); setWizardModel(new OpenShiftExpressApplicationWizardModel()); @@ -68,12 +69,19 @@ public void init(IWorkbench workbench, IStructuredSelection selection) { setWindowTitle("OpenShift Application Wizard"); setNeedsProgressMonitor(true); + Object o = selection.getFirstElement(); + if( o instanceof IUser ) { + this.initialUser = (IUser)o; + } } + public void setInitialUser(IUser user) { + this.initialUser = user; + } @Override public void addPages() { - final IUser user = OpenShiftUIActivator.getDefault().getUser(); + final IUser user = initialUser; try { if (user == null || !user.isValid()) { addPage(new CredentialsWizardPage(this));