Author: adietish Date: 2012-02-09 12:00:52 -0500 (Thu, 09 Feb 2012) New Revision: 38572 Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreateNewApplicationWizard.java Log: Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreateNewApplicationWizard.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreateNewApplicationWizard.java 2012-02-09 16:49:27 UTC (rev 38571) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreateNewApplicationWizard.java 2012-02-09 17:00:52 UTC (rev 38572) @@ -50,18 +50,16 @@ public void addPages() { final IUser user = OpenShiftUIActivator.getDefault().getUser(); try { - if (user == null + if (user == null || !user.isValid()) { addPage(new CredentialsWizardPage(this)); -// } else { -// getWizardModel().setUser(user); } } catch (OpenShiftException e) { // if the user's validity can't be checked, we may want to // re-connect.. addPage(new CredentialsWizardPage(this)); } - //addPage(new ApplicationConfigurationWizardPage(this, getWizardModel())); + addPage(new ApplicationConfigurationWizardPage(this, getWizardModel())); addPage(new ProjectAndServerAdapterSettingsWizardPage(this, getWizardModel())); addPage(new GitCloningSettingsWizardPage(this, getWizardModel())); } @@ -109,9 +107,11 @@ queue.offer(true); return Status.OK_STATUS; } catch (Exception e) { + // TODO: refresh user queue.offer(false); return OpenShiftUIActivator.createErrorStatus( - "Could not create application \"{0}\"", e, getWizardModel().getApplicationName()); + "Could not create application \"{0}\"", e, getWizardModel() + .getApplicationName()); } } @@ -136,7 +136,7 @@ List<IEmbeddableCartridge> selectedCartridges = getWizardModel().getSelectedEmbeddableCartridges(); final IApplication application = getWizardModel().getApplication(); - if (selectedCartridges != null + if (selectedCartridges != null && !selectedCartridges.isEmpty()) { application.addEmbbedCartridges(selectedCartridges); }