[jbosstools-commits] JBoss Tools SVN: r41450 - in trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui: serverviewer/actionDelegate and 1 other directory.

[jbosstools-commits at lists.jboss.org]

Author: xcoulon
Date: 2012-05-25 17:50:12 -0400 (Fri, 25 May 2012)
New Revision: 41450

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/serverviewer/actionDelegate/AbstractServerViewerActionProvider.java
Log:
Fixed - JBIDE-12014
Credentials page appears twice when creating new application and user is not connected

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-05-25 21:26:12 UTC (rev 41449)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateApplicationAction.java	2012-05-25 21:50:12 UTC (rev 41450)
@@ -43,6 +43,7 @@
 			Object sel = ((ITreeSelection) selection).getFirstElement();
 			if (sel instanceof UserDelegate) {
 				final UserDelegate user = (UserDelegate) sel;
+				user.checkForPassword();
 				final OpenShiftExpressApplicationWizard wizard = new NewOpenShiftExpressApplicationWizard(user);
 				final WizardDialog wizardDialog = new WizardDialog(new Shell(), wizard);
 				wizardDialog.open();

Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/serverviewer/actionDelegate/AbstractServerViewerActionProvider.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/serverviewer/actionDelegate/AbstractServerViewerActionProvider.java	2012-05-25 21:26:12 UTC (rev 41449)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/serverviewer/actionDelegate/AbstractServerViewerActionProvider.java	2012-05-25 21:50:12 UTC (rev 41450)
@@ -76,7 +76,7 @@
 				return (MenuManager) item;
 			}
 		}
-		MenuManager openshiftMenu = new MenuManager("Openshift...",
+		MenuManager openshiftMenu = new MenuManager("OpenShift",
 				OPENSHIFT_SERVER_ADAPTER_MENU);
 		menu.add(openshiftMenu);
 		menu.insertBefore(ServerActionProvider.TOP_SECTION_END_SEPARATOR, openshiftMenu);