Author: adietish Date: 2012-02-06 10:38:49 -0500 (Mon, 06 Feb 2012) New Revision: 38446 Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java Log: switched to latest client jar (replaced explicitly referenced configuration chain by the global configuration holder) Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java 2012-02-06 15:37:13 UTC (rev 38445) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java 2012-02-06 15:38:49 UTC (rev 38446) @@ -20,13 +20,10 @@ import com.openshift.express.client.NotFoundOpenShiftException; import com.openshift.express.client.OpenShiftException; import com.openshift.express.client.User; -import com.openshift.express.client.configuration.DefaultConfiguration; -import com.openshift.express.client.configuration.SystemConfiguration; -import com.openshift.express.client.configuration.SystemProperties; -import com.openshift.express.client.configuration.UserConfiguration; +import com.openshift.express.client.configuration.OpenShiftConfiguration; /** - * @author Andr� Dietisheim + * @author Andre Dietisheim * @author Xavier Coulon */ public class CredentialsWizardPageModel extends ObservableUIPojo { @@ -66,11 +63,7 @@ protected String getUserConfiguration() { String configuredUsername = null; try { - configuredUsername = - new SystemProperties( - new UserConfiguration( - new SystemConfiguration( - new DefaultConfiguration()))).getRhlogin(); + configuredUsername = new OpenShiftConfiguration().getRhlogin(); } catch (Exception e) { // do nothing } @@ -129,7 +122,7 @@ IStatus status = new Status(IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID, "Your credentails are not valid."); try { // reset without notifying - //this.credentialsValidity = null; + // this.credentialsValidity = null; this.user = new User(getRhLogin(), getPassword(), CLIENT_ID); if (user.isValid()) { status = Status.OK_STATUS; @@ -143,7 +136,7 @@ } catch (Exception e) { this.user = null; } - + setCredentialsStatus(status); return status; }