Author: adietish Date: 2012-02-07 07:11:00 -0500 (Tue, 07 Feb 2012) New Revision: 38458 Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenShiftUIActivator.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreateNewApplicationWizardModel.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java Log: [JBIDE-9900] corrected behaviour timeout while logging in Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenShiftUIActivator.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenShiftUIActivator.java 2012-02-07 10:54:53 UTC (rev 38457) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenShiftUIActivator.java 2012-02-07 12:11:00 UTC (rev 38458) @@ -1,5 +1,6 @@ package org.jboss.tools.openshift.express.internal.ui; +import java.io.IOException; import java.net.URL; import org.eclipse.core.runtime.FileLocator; @@ -14,6 +15,8 @@ import org.osgi.framework.BundleContext; import com.openshift.express.client.IUser; +import com.openshift.express.client.OpenShiftException; +import com.openshift.express.client.User; /** * The activator class controls the plug-in life cycle @@ -93,10 +96,11 @@ } - public void setUser(IUser user) { - this.user = user; + public IUser createUser(String username, String password) throws OpenShiftException, IOException { + this.user = new User(username, password, PLUGIN_ID + " " + getBundle().getVersion()); + return user; } - + /** * @return the user */ Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java 2012-02-07 10:54:53 UTC (rev 38457) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java 2012-02-07 12:11:00 UTC (rev 38458) @@ -45,6 +45,7 @@ import org.jboss.ide.eclipse.as.ui.editor.ServerWorkingCopyPropertyCommand; import org.jboss.tools.openshift.egit.core.EGitUtils; import org.jboss.tools.openshift.express.internal.core.behaviour.ExpressServerUtils; +import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; import org.jboss.tools.openshift.express.internal.ui.wizard.CredentialsWizardPageModel; import org.jboss.tools.openshift.express.internal.ui.wizard.IOpenShiftWizardModel; @@ -343,9 +344,9 @@ System.out.println(deployProject); IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject(deployProject); try { - final List<IApplication> allApps = model.getUser().getApplications(); + fuser = OpenShiftUIActivator.getDefault().getUser(); + final List<IApplication> allApps = fuser.getApplications(); fapplication = findApplicationForProject(p, allApps); - fuser = model.getUser(); if( fapplication == null ) { error = "Application for project \"" + p.getName() + "\" not found"; @@ -368,7 +369,8 @@ // now check the app name and cartridge String[] appNames = new String[]{}; try { - final List<IApplication> allApps = model.getUser().getApplications(); + IUser user = OpenShiftUIActivator.getDefault().getUser(); + final List<IApplication> allApps = user.getApplications(); appNames = getAppNamesAsStrings(allApps); int index = Arrays.asList(appNames).indexOf(app); IApplication application = index == -1 ? null : allApps.get(index); @@ -379,7 +381,7 @@ // Fill with new data try { ExpressDetailsComposite.this.fapplication = application; - ExpressDetailsComposite.this.fuser = model.getUser(); + ExpressDetailsComposite.this.fuser = user; // update the values IServerWorkingCopy wc = callback.getServer(); Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreateNewApplicationWizardModel.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreateNewApplicationWizardModel.java 2012-02-07 10:54:53 UTC (rev 38457) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreateNewApplicationWizardModel.java 2012-02-07 12:11:00 UTC (rev 38458) @@ -20,7 +20,7 @@ /** * Timeout in seconds when trying to contact an application after it had been created. */ - private static final int APP_CREATION_TIMEOUT = 10; + private static final int APP_CREATION_TIMEOUT = 20; private static final String APPLICATION_NAME = "applicationName"; private static final String APPLICATION_CARTRIDGE = "applicationCartridge"; private static final String SELECTED_EMBEDDABLE_CARTRIDGES = "selectedEmbeddableCartridges"; 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-07 10:54:53 UTC (rev 38457) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java 2012-02-07 12:11:00 UTC (rev 38458) @@ -12,6 +12,7 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; +import org.eclipse.osgi.util.NLS; import org.jboss.tools.common.ui.databinding.ObservableUIPojo; import org.jboss.tools.common.ui.preferencevalue.StringPreferenceValue; import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; @@ -19,7 +20,6 @@ import com.openshift.express.client.IUser; import com.openshift.express.client.NotFoundOpenShiftException; import com.openshift.express.client.OpenShiftException; -import com.openshift.express.client.User; import com.openshift.express.client.configuration.OpenShiftConfiguration; /** @@ -28,9 +28,6 @@ */ public class CredentialsWizardPageModel extends ObservableUIPojo { - private static final String CLIENT_ID = OpenShiftUIActivator.PLUGIN_ID - + " " + OpenShiftUIActivator.getDefault().getBundle().getVersion(); - private static final String RHLOGIN_PREFS_KEY = "org.jboss.tools.openshift.express.internal.ui.wizard.CredentialsWizardModel_RHLOGIN"; public static final String PROPERTY_SERVER_URL = "serverUrl"; @@ -41,7 +38,6 @@ private String rhLogin; private String password; private IStatus credentialsStatus; - private IUser user; private StringPreferenceValue rhLoginPreferenceValue; public CredentialsWizardPageModel() { @@ -119,31 +115,22 @@ } public IStatus validateCredentials() { - IStatus status = new Status(IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID, "Your credentails are not valid."); + IStatus status = Status.OK_STATUS; try { // reset without notifying // this.credentialsValidity = null; - this.user = new User(getRhLogin(), getPassword(), CLIENT_ID); - if (user.isValid()) { - status = Status.OK_STATUS; - } + IUser user = OpenShiftUIActivator.getDefault().createUser(getRhLogin(), getPassword()); + user.isValid(); } catch (NotFoundOpenShiftException e) { // valid user without domain - status = Status.OK_STATUS; } catch (OpenShiftException e) { - this.user = null; + status = new Status(IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID, "Your credentails are not valid."); } catch (Exception e) { - this.user = null; + status = new Status(IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID, + NLS.bind("Could not check user credentials: {0}.", e.getMessage())); } - if (status.isOK()) { - OpenShiftUIActivator.getDefault().setUser(user); - } setCredentialsStatus(status); return status; } - - public IUser getUser() { - return user; - } }