[jbosstools-commits] JBoss Tools SVN: r35308 - trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.ui/src/org/jboss/ide/eclipse/as/openshift/ui/internal/wizard.

[jbosstools-commits at lists.jboss.org]

Author: adietish
Date: 2011-10-03 21:21:53 -0400 (Mon, 03 Oct 2011)
New Revision: 35308

Modified:
   trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.ui/src/org/jboss/ide/eclipse/as/openshift/ui/internal/wizard/NewDomainWizardPage.java
   trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.ui/src/org/jboss/ide/eclipse/as/openshift/ui/internal/wizard/ServerAdapterWizardModel.java
Log:
[JBIDE-9793] ServerWizardPage now requires the user to validate the credentials if he changes username/pw that were previously validated.

Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.ui/src/org/jboss/ide/eclipse/as/openshift/ui/internal/wizard/NewDomainWizardPage.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.ui/src/org/jboss/ide/eclipse/as/openshift/ui/internal/wizard/NewDomainWizardPage.java	2011-10-04 01:20:36 UTC (rev 35307)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.ui/src/org/jboss/ide/eclipse/as/openshift/ui/internal/wizard/NewDomainWizardPage.java	2011-10-04 01:21:53 UTC (rev 35308)
@@ -24,6 +24,8 @@
 import org.eclipse.jface.layout.GridDataFactory;
 import org.eclipse.jface.layout.GridLayoutFactory;
 import org.eclipse.jface.wizard.IWizard;
+import org.eclipse.jface.wizard.IWizardPage;
+import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
@@ -172,8 +174,10 @@
 						protected IStatus run(IProgressMonitor monitor) {
 							try {
 								model.loadDomain();
+								IWizardPage page = getNextPage();
+								((WizardDialog) getWizard().getContainer()).showPage(page);
 							} catch(NotFoundOpenshiftException e) {
-								e.printStackTrace();
+								// valid user without domain
 							} catch (OpenshiftException e) {
 								return new Status(IStatus.ERROR, OpenshiftUIActivator.PLUGIN_ID,
 										"Could not get domain name", e);

Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.ui/src/org/jboss/ide/eclipse/as/openshift/ui/internal/wizard/ServerAdapterWizardModel.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.ui/src/org/jboss/ide/eclipse/as/openshift/ui/internal/wizard/ServerAdapterWizardModel.java	2011-10-04 01:20:36 UTC (rev 35307)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.openshift.ui/src/org/jboss/ide/eclipse/as/openshift/ui/internal/wizard/ServerAdapterWizardModel.java	2011-10-04 01:21:53 UTC (rev 35308)
@@ -52,6 +52,7 @@
 		this.serverUrl = IOpenshiftService.BASE_URL;
 		this.rhLoginPreferenceValue = new StringPreferenceValue(RHLOGIN_PREFS_KEY, OpenshiftUIActivator.PLUGIN_ID);
 		this.rhLogin = initRhLogin();
+		resetCredentialsStatus();
 	}
 
 	protected String initRhLogin() {
@@ -86,8 +87,12 @@
 	}
 
 	public void setRhLogin(String rhLogin) {
-		rhLoginPreferenceValue.store(rhLogin);
-		firePropertyChange(PROPERTY_RHLOGIN, this.rhLogin, this.rhLogin = rhLogin);
+		if (rhLogin != null
+				&& !rhLogin.equals(this.rhLogin)) {
+			rhLoginPreferenceValue.store(rhLogin);
+			firePropertyChange(PROPERTY_RHLOGIN, this.rhLogin, this.rhLogin = rhLogin);
+			resetCredentialsStatus();
+		}
 	}
 
 	public String getPassword() {
@@ -95,9 +100,17 @@
 	}
 
 	public void setPassword(String password) {
-		firePropertyChange(PROPERTY_PASSWORD, this.password, this.password = password);
+		if (password != null
+				&& !password.equals(this.password)) {
+			firePropertyChange(PROPERTY_PASSWORD, this.password, this.password = password);
+			resetCredentialsStatus();
+		}
 	}
 
+	private void resetCredentialsStatus() {
+		setCredentialsStatus(null);
+	}
+
 	private void setCredentialsStatus(IStatus status) {
 		firePropertyChange(PROPERTY_CREDENTIALS_VALIDITY, this.credentialsValidity,
 				this.credentialsValidity = status);
@@ -117,7 +130,7 @@
 		} catch (NotFoundOpenshiftException e) {
 			// valid user without domain
 			status = Status.OK_STATUS;
-		} catch(OpenshiftException e) {
+		} catch (OpenshiftException e) {
 			this.user = null;
 		}
 		setCredentialsStatus(status);
@@ -147,7 +160,7 @@
 		// TODO Auto-generated method stub
 		return null;
 	}
-	
+
 	public void renameDomain() throws OpenshiftException {
 		IDomain domain = getUser().getDomain();
 		domain.setNamespace(namespace);
@@ -161,5 +174,4 @@
 		this.domain = getUser().getDomain();
 		setNamespace(domain.getNamespace());
 	}
-	
 }