[jbosstools-commits] JBoss Tools SVN: r39385 - branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.

[jbosstools-commits at lists.jboss.org]

Author: xcoulon
Date: 2012-03-08 15:44:38 -0500 (Thu, 08 Mar 2012)
New Revision: 39385

Modified:
   branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java
Log:
Fixed - JBIDE-11214
Import wizard: import wizard may not be completed when run from Server wizard and having user whit pw not stored to secure storage

Modified: branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java
===================================================================
--- branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java	2012-03-08 20:39:20 UTC (rev 39384)
+++ branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java	2012-03-08 20:44:38 UTC (rev 39385)
@@ -27,7 +27,6 @@
 import org.eclipse.jface.dialogs.ErrorDialog;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.IWizardPage;
 import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.jgit.api.errors.JGitInternalException;
 import org.eclipse.jgit.errors.TransportException;
@@ -134,19 +133,22 @@
 
 	@Override
 	public void addPages() {
-		if( getWizardModel().getUser() == null)
+		if( getWizardModel().getUser() == null) {
 			getWizardModel().setUser(initialUser);
-		addPage(new CredentialsWizardPage(this, getWizardModel()));
+		}
+		if(initialUser == null) {
+			addPage(new CredentialsWizardPage(this, getWizardModel()));
+		}
 		addPage(new ApplicationConfigurationWizardPage(this, getWizardModel()));
 		addPage(new ProjectAndServerAdapterSettingsWizardPage(this, getWizardModel()));
 		addPage(new GitCloningSettingsWizardPage(this, getWizardModel()));
 	}
 
-	@Override
+	/*@Override
 	public IWizardPage getStartingPage() {
 		IWizardPage[] pages = getPages();
 		return initialUser == null ? pages[0] : pages[1];
-	}
+	}*/
 
 	public void setInitialUser(UserDelegate user) {
 		this.initialUser = user;