[jbosstools-commits] JBoss Tools SVN: r39372 - branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action.

[jbosstools-commits at lists.jboss.org]

Author: xcoulon
Date: 2012-03-08 09:01:06 -0500 (Thu, 08 Mar 2012)
New Revision: 39372

Modified:
   branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateServerAdapterAction.java
Log:
Fixed - JBIDE-11211
*Internal Error* when creating server adapter from *OpenShift console*

Modified: branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateServerAdapterAction.java
===================================================================
--- branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateServerAdapterAction.java	2012-03-08 13:52:13 UTC (rev 39371)
+++ branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateServerAdapterAction.java	2012-03-08 14:01:06 UTC (rev 39372)
@@ -16,12 +16,12 @@
 import org.eclipse.wst.server.ui.internal.wizard.fragment.TasksWizardFragment;
 import org.eclipse.wst.server.ui.wizard.WizardFragment;
 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 com.openshift.express.client.IApplication;
 import com.openshift.express.client.IUser;
-import com.openshift.express.client.OpenShiftException;
 
 public class CreateServerAdapterAction extends AbstractAction {
 
@@ -38,7 +38,7 @@
 			final IApplication application = (IApplication) treeSelection.getFirstElement();
 			IUser user = application.getUser();
 			NewServerWizard w = new NewServerWizard(ExpressServerUtils.OPENSHIFT_SERVER_TYPE);
-			w.getTaskModel().putObject(ExpressServerUtils.TASK_WIZARD_ATTR_USER, user);
+			w.getTaskModel().putObject(ExpressServerUtils.TASK_WIZARD_ATTR_USER, UserModel.getDefault().findUser(user.getRhlogin()));
 			w.getTaskModel().putObject(ExpressServerUtils.TASK_WIZARD_ATTR_SELECTED_APP, application);
 			WizardDialog dialog = new WizardDialog(Display.getCurrent().getActiveShell(), w);
 			dialog.open();