Author: rob.stryker(a)jboss.com Date: 2012-02-10 09:41:48 -0500 (Fri, 10 Feb 2012) New Revision: 38601 Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java Log: More functionality (still ugly code) to pre-load combo 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-10 14:31:02 UTC (rev 38600) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java 2012-02-10 14:41:48 UTC (rev 38601) @@ -128,12 +128,31 @@ remoteText.setText(IOpenShiftWizardModel.NEW_PROJECT_REMOTE_NAME_DEFAULT); String n = ExpressServerUtils.getExpressUsername(server); + String[] appNames = null; + if( n == null ) { + // We're in a new server wizard + IUser user = UserModel.getDefault().getRecentUser(); + if( user == null && UserModel.getDefault().getUsers().length > 0 ) { + user = UserModel.getDefault().getUsers()[0]; + } + if( user != null ) + try { + n = user.getRhlogin(); + List<IApplication> allApps = user.getApplications(); + appNames = getAppNamesAsStrings(allApps); + } catch(Exception e) { /* ignore */ } + } String p = UserModel.getDefault().getPasswordFromSecureStorage(n); String remote = ExpressServerUtils.getExpressRemoteName(server); if( n != null ) userText.setText(n); if( p != null ) passText.setText(p); if( remote != null ) remoteText.setText(remote); + if( appNames != null ) { + appListNames = appNames; + appNameCombo.setItems(appListNames); + } + if( showVerify ) { verifyButton = new Button(composite, SWT.PUSH); verifyButton.setText("Verify...");