Author: adietish Date: 2012-02-13 18:55:39 -0500 (Mon, 13 Feb 2012) New Revision: 38671 Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/UserModel.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateApplicationAction.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/ImportApplicationAction.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationSelectionDialogModel.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationSelectionWizardPageModel.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPage.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/IOpenShiftWizardModel.java 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/OpenShiftExpressApplicationWizardModel.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ServerAdapterFactory.java Log: [JBIDE-10893] fixing credentials issue Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/UserModel.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/UserModel.java 2012-02-13 23:02:47 UTC (rev 38670) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/UserModel.java 2012-02-13 23:55:39 UTC (rev 38671) @@ -31,6 +31,8 @@ import com.openshift.express.client.configuration.OpenShiftConfiguration; public class UserModel { + private static final String USER_ID = OpenShiftUIActivator.PLUGIN_ID + " " + + OpenShiftUIActivator.getDefault().getBundle().getVersion(); private static UserModel model; public static UserModel getDefault() { if( model == null ) @@ -65,8 +67,7 @@ * @throws IOException */ public IUser createUser(String username, String password) throws OpenShiftException, IOException { - IUser u = new User(username, password, OpenShiftUIActivator.PLUGIN_ID + " " + - OpenShiftUIActivator.getDefault().getBundle().getVersion()); + IUser u = new User(username, password, USER_ID); return u; } @@ -205,7 +206,7 @@ } return rhLogin; } - + /* * Return true if the value is updated, false otherwise */ Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateApplicationAction.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateApplicationAction.java 2012-02-13 23:02:47 UTC (rev 38670) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateApplicationAction.java 2012-02-13 23:55:39 UTC (rev 38671) @@ -1,7 +1,6 @@ package org.jboss.tools.openshift.express.internal.ui.action; import org.eclipse.jface.viewers.ITreeSelection; -import org.eclipse.jface.wizard.IWizard; import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.swt.widgets.Shell; import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; @@ -29,8 +28,8 @@ if (selection != null && selection instanceof ITreeSelection ) { Object sel = ((ITreeSelection)selection).getFirstElement(); if( sel instanceof IUser) { - OpenShiftExpressApplicationWizard wizard = new OpenShiftExpressApplicationWizard(); - wizard.setInitialUser((IUser)sel); + IUser user = (IUser) sel; + OpenShiftExpressApplicationWizard wizard = new OpenShiftExpressApplicationWizard(user); new WizardDialog(new Shell(), wizard).open(); } } Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/ImportApplicationAction.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/ImportApplicationAction.java 2012-02-13 23:02:47 UTC (rev 38670) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/ImportApplicationAction.java 2012-02-13 23:55:39 UTC (rev 38671) @@ -39,19 +39,9 @@ if (selection instanceof ITreeSelection && treeSelection.getFirstElement() instanceof IApplication) { final IApplication application = (IApplication) treeSelection.getFirstElement(); - //final IUser user = OpenShiftUIActivator.getDefault().getUser(); - OpenShiftExpressApplicationWizard wizard = new OpenShiftExpressApplicationWizard(); - TreePath[] paths = treeSelection.getPaths(); - if( paths != null && paths.length == 1 ) { - Object user = paths[0].getParentPath().getLastSegment(); - if( user instanceof IUser ) - wizard.setInitialUser((IUser)user); - } - wizard.setSelectedApplication(application); + final IUser user = getUser(treeSelection.getPaths()); final IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(application.getName()); - if(project.exists()) { - wizard.setSelectedProject(project); - } + OpenShiftExpressApplicationWizard wizard = new OpenShiftExpressApplicationWizard(user, project, application); WizardDialog dialog = new WizardDialog(Display.getCurrent().getActiveShell(), wizard); dialog.create(); dialog.open(); @@ -59,5 +49,16 @@ } } + private IUser getUser(TreePath[] paths) { + IUser user = null; + if( paths != null + && paths.length == 1 ) { + Object selection = paths[0].getParentPath().getLastSegment(); + if( selection instanceof IUser ) + user = (IUser) selection; + } + return user; + } + } Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java 2012-02-13 23:02:47 UTC (rev 38670) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java 2012-02-13 23:55:39 UTC (rev 38671) @@ -69,8 +69,8 @@ } public IUser getUser() { - // return wizardModel.getUser(); - return OpenShiftUIActivator.getDefault().getUser(); + return wizardModel.getUser(); +// return OpenShiftUIActivator.getDefault().getUser(); } public List<IApplication> getApplications() throws OpenShiftException { @@ -138,8 +138,8 @@ } public void loadCartridges() throws OpenShiftException { - // setCartridges(wizardModel.getUser().getCartridges()); - setCartridges(OpenShiftUIActivator.getDefault().getUser().getCartridges()); + setCartridges(getUser().getCartridges()); + //setCartridges(OpenShiftUIActivator.getDefault().getUser().getCartridges()); } public void setCartridges(List<ICartridge> cartridges) { @@ -160,7 +160,8 @@ } public List<IEmbeddableCartridge> loadEmbeddableCartridges() throws OpenShiftException { - List<IEmbeddableCartridge> cartridges = OpenShiftUIActivator.getDefault().getUser().getEmbeddableCartridges(); +// List<IEmbeddableCartridge> cartridges = OpenShiftUIActivator.getDefault().getUser().getEmbeddableCartridges(); + List<IEmbeddableCartridge> cartridges = getUser().getEmbeddableCartridges(); setEmbeddableCartridges(cartridges); return cartridges; } Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationSelectionDialogModel.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationSelectionDialogModel.java 2012-02-13 23:02:47 UTC (rev 38670) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationSelectionDialogModel.java 2012-02-13 23:55:39 UTC (rev 38671) @@ -13,6 +13,7 @@ import java.util.Collections; import java.util.List; +import org.eclipse.debug.internal.ui.importexport.launchconfigurations.WizardMessages; import org.jboss.tools.common.ui.databinding.ObservableUIPojo; import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; import org.jboss.tools.openshift.express.internal.ui.utils.Logger; @@ -32,7 +33,10 @@ private IApplication selectedApplication; + private IOpenShiftWizardModel wizardModel; + public ApplicationSelectionDialogModel(IOpenShiftWizardModel wizardModel) { + this.wizardModel = wizardModel; this.selectedApplication = wizardModel.getApplication(); } @@ -59,7 +63,8 @@ } public IUser getUser() { - return OpenShiftUIActivator.getDefault().getUser(); +// return OpenShiftUIActivator.getDefault().getUser(); + return wizardModel.getUser(); } } Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationSelectionWizardPageModel.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationSelectionWizardPageModel.java 2012-02-13 23:02:47 UTC (rev 38670) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationSelectionWizardPageModel.java 2012-02-13 23:55:39 UTC (rev 38671) @@ -61,7 +61,8 @@ } public IUser getUser() { - return OpenShiftUIActivator.getDefault().getUser(); +// return OpenShiftUIActivator.getDefault().getUser(); + return wizardModel.getUser(); } public boolean getUseExistingApplication() { Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPage.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPage.java 2012-02-13 23:02:47 UTC (rev 38670) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPage.java 2012-02-13 23:55:39 UTC (rev 38671) @@ -11,8 +11,6 @@ package org.jboss.tools.openshift.express.internal.ui.wizard; import java.lang.reflect.InvocationTargetException; -import java.util.concurrent.ArrayBlockingQueue; -import java.util.concurrent.TimeUnit; import org.eclipse.core.databinding.DataBindingContext; import org.eclipse.core.databinding.beans.BeanProperties; @@ -169,17 +167,14 @@ public boolean performAuthentication() { try { - final ArrayBlockingQueue<IStatus> queue = new ArrayBlockingQueue<IStatus>(1); WizardUtils.runInWizard(new Job("Verifying user credentials...") { @Override protected IStatus run(IProgressMonitor monitor) { - IStatus status = pageModel.validateCredentials(); - queue.offer(status); + pageModel.validateCredentials(); monitor.done(); return Status.OK_STATUS; } }, new DelegatingProgressMonitor(), getContainer(), getDatabindingContext()); - queue.poll(10, TimeUnit.SECONDS); } catch (InterruptedException e) { Logger.error("Failed to authenticate on OpenShift", e); return false; @@ -187,7 +182,8 @@ Logger.error("Failed to authenticate on OpenShift", e); return false; } - return pageModel.areCredentialsValid(); + boolean valid = pageModel.areCredentialsValid(); + return valid; } class CredentialsInputValidator extends MultiValidator { Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/IOpenShiftWizardModel.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/IOpenShiftWizardModel.java 2012-02-13 23:02:47 UTC (rev 38670) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/IOpenShiftWizardModel.java 2012-02-13 23:55:39 UTC (rev 38671) @@ -15,6 +15,7 @@ import java.lang.reflect.InvocationTargetException; import java.net.URISyntaxException; +import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.wst.server.core.IRuntime; @@ -24,6 +25,7 @@ import com.openshift.express.client.IApplication; import com.openshift.express.client.ICartridge; +import com.openshift.express.client.IUser; import com.openshift.express.client.OpenShiftException; /** @@ -160,6 +162,8 @@ public String setProjectName(String projectName); + public IProject setProject(IProject project); + public boolean isGitSharedProject(); public Boolean setCreateServerAdapter(Boolean createServerAdapter); @@ -183,5 +187,9 @@ public boolean isExistingApplication(); public void setUseExistingApplication(boolean useExistingApplication); + + public IUser getUser(); + public IUser setUser(IUser user); + } \ No newline at end of file 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-02-13 23:02:47 UTC (rev 38670) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java 2012-02-13 23:55:39 UTC (rev 38671) @@ -53,22 +53,28 @@ private IUser initialUser; + /** + * @see #getUser which calls UserModel#getRecentUser if no user present at + * construction time + */ public OpenShiftExpressApplicationWizard() { - setWizardModel(new OpenShiftExpressApplicationWizardModel()); + this(null, null, null); } + public OpenShiftExpressApplicationWizard(IUser user) { + this(user, null, null); + } + + public OpenShiftExpressApplicationWizard(IUser user, IProject project, IApplication application) { + setWizardModel(new OpenShiftExpressApplicationWizardModel(user, project, application)); + } + public void setSelectedApplication(IApplication application) { getWizardModel().setApplication(application); } public void setSelectedProject(IProject project) { - if (project != null && project.exists()) { - getWizardModel().setExistingProject(false); - getWizardModel().setProjectName(project.getName()); - } else { - getWizardModel().setExistingProject(true); - getWizardModel().setProjectName(null); - } + getWizardModel().setProject(project); } @Override @@ -77,12 +83,12 @@ setNeedsProgressMonitor(true); Object o = selection.getFirstElement(); if (o instanceof IUser) { - setInitialUser((IUser) o); + setUser((IUser) o); } } - public void setInitialUser(IUser user) { - this.initialUser = user; + protected void setUser(IUser user) { + getWizardModel().setUser(user); } @Override Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java 2012-02-13 23:02:47 UTC (rev 38670) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java 2012-02-13 23:55:39 UTC (rev 38671) @@ -21,6 +21,7 @@ import org.jboss.tools.common.ui.databinding.ObservableUIPojo; 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.core.console.UserModel; import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages; import org.jboss.tools.openshift.express.internal.ui.wizard.appimport.ConfigureGitSharedProject; @@ -43,9 +44,15 @@ private static final String KEY_SELECTED_EMBEDDABLE_CARTRIDGES = "selectedEmbeddableCartridges"; public OpenShiftExpressApplicationWizardModel() { - super(); + this(OpenShiftUIActivator.getDefault().getUser(), null, null); + } + + public OpenShiftExpressApplicationWizardModel(IUser user, IProject project, IApplication application) { // default value(s) + setUser(user); + setProject(project); setNewProject(true); + setApplication(application); setCreateServerAdapter(true); setRepositoryPath(DEFAULT_REPOSITORY_PATH); setRemoteName(NEW_PROJECT_REMOTE_NAME_DEFAULT); @@ -150,8 +157,7 @@ getProjectName() , getApplication() , getRemoteName() - // , getUser()) - , OpenShiftUIActivator.getDefault().getUser()) + , getUser()) .execute(monitor); createServerAdapter(monitor, importedProjects); } @@ -255,6 +261,18 @@ public String setProjectName(String projectName) { return (String) setProperty(PROJECT_NAME, projectName); } + + @Override + public IProject setProject(IProject project) { + if (project != null && project.exists()) { + setExistingProject(false); + setProjectName(project.getName()); + } else { + setExistingProject(true); + setProjectName(null); + } + return project; + } @Override public boolean isGitSharedProject() { @@ -336,7 +354,7 @@ IApplication createApplication(String name, ICartridge cartridge, IProgressMonitor monitor) throws OpenShiftApplicationNotAvailableException, OpenShiftException { - IUser user = OpenShiftUIActivator.getDefault().getUser(); + IUser user = getUser(); if (user == null) { throw new OpenShiftException("Could not create application, have no valid user credentials"); } @@ -399,4 +417,24 @@ public String getApplicationName() { return (String) dataModel.get(APPLICATION_NAME); } + + /** + * Returns the user that was stored in this model or the recent user from UserModel + * + * @see OpenShiftExpressApplicationWizardModel(IUser) + * @see OpenShiftExpressApplicationWizardModel() + */ + public IUser getUser() { + IUser user = (IUser) dataModel.get(USER); + if (user == null) { + user = UserModel.getDefault().getRecentUser(); + } + return user; + } + + public IUser setUser(IUser user) { + dataModel.put(USER, user); + return user; + } + } \ No newline at end of file Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ServerAdapterFactory.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ServerAdapterFactory.java 2012-02-13 23:02:47 UTC (rev 38670) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ServerAdapterFactory.java 2012-02-13 23:55:39 UTC (rev 38671) @@ -51,7 +51,7 @@ public void create(IProject project, IOpenShiftWizardModel wizardModel, IProgressMonitor monitor) throws OpenShiftException { createServerAdapter(project, wizardModel.getServerType(), wizardModel.getRuntime(), wizardModel.getMode(), - wizardModel.getApplication(), OpenShiftUIActivator.getDefault().getUser(), wizardModel.getRemoteName(), monitor); + wizardModel.getApplication(), wizardModel.getUser(), wizardModel.getRemoteName(), monitor); } public void create(IProject project, IServerType serverType, IRuntime runtime, String mode,