[jbosstools-commits] JBoss Tools SVN: r40913 - trunk/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-05-10 09:39:10 -0400 (Thu, 10 May 2012)
New Revision: 40913

Modified:
   trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportOpenShiftExpressApplicationWizard.java
   trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java
Log:
Fixed - JBIDE-11222
 Don't force users to sign in again if they already have created their account in the OpenShift Express Console

Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportOpenShiftExpressApplicationWizard.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportOpenShiftExpressApplicationWizard.java	2012-05-10 13:37:51 UTC (rev 40912)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportOpenShiftExpressApplicationWizard.java	2012-05-10 13:39:10 UTC (rev 40913)
@@ -21,17 +21,13 @@
 		super(true, "Import OpenShift Application");
 	}
 
-	public ImportOpenShiftExpressApplicationWizard(UserDelegate user, IProject project, IApplication application) {
-		this(user, project, application, false);
-	}
-
 	/**
 	 * Constructor
 	 * @param user
 	 * @param project
 	 * @param application
 	 */
-	public ImportOpenShiftExpressApplicationWizard(UserDelegate user, IProject project, IApplication application, boolean skipCredentialsPage) {
-		super(user, project, application, true, skipCredentialsPage, "Import OpenShift Application");
+	public ImportOpenShiftExpressApplicationWizard(UserDelegate user, IProject project, IApplication application) {
+		super(user, project, application, true, "Import OpenShift Application");
 	}
 }

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-05-10 13:37:51 UTC (rev 40912)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java	2012-05-10 13:39:10 UTC (rev 40913)
@@ -55,28 +55,21 @@
  */
 public abstract class OpenShiftExpressApplicationWizard extends Wizard implements IImportWizard, INewWizard {
 
-	private boolean skipCredentialsPage;
+	private final boolean skipCredentialsPage;
 	
-	private OpenShiftExpressApplicationWizardModel wizardModel;
+	private final OpenShiftExpressApplicationWizardModel wizardModel;
 
-	public OpenShiftExpressApplicationWizard(boolean useExistingApplication, String wizardTitle) {
+	OpenShiftExpressApplicationWizard(final boolean useExistingApplication, final String wizardTitle) {
 		this(null, null, null, useExistingApplication, wizardTitle);
 	}
-	public OpenShiftExpressApplicationWizard(UserDelegate user, IProject project, IApplication application, boolean useExistingApplication, String wizardTitle) {
-		this(user, project, application, useExistingApplication, false, wizardTitle);
-	}
-
-	public OpenShiftExpressApplicationWizard(UserDelegate user, IProject project, IApplication application, boolean useExistingApplication, boolean skipCredentialsPage, String wizardTitle) {
-		setWizardModel(new OpenShiftExpressApplicationWizardModel(user, project, application, useExistingApplication));
+	
+	OpenShiftExpressApplicationWizard(UserDelegate user, IProject project, IApplication application, boolean useExistingApplication, String wizardTitle) {
 		setWindowTitle(wizardTitle);
 		setNeedsProgressMonitor(true);
-		this.skipCredentialsPage = skipCredentialsPage;
+		this.wizardModel = new OpenShiftExpressApplicationWizardModel(user, project, application, useExistingApplication);
+		this.skipCredentialsPage = (user != null);
 	}
 
-	void setWizardModel(OpenShiftExpressApplicationWizardModel wizardModel) {
-		this.wizardModel = wizardModel;
-	}
-
 	OpenShiftExpressApplicationWizardModel getWizardModel() {
 		return wizardModel;
 	}