[jbosstools-commits] JBoss Tools SVN: r35800 - trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.

[jbosstools-commits at lists.jboss.org]

Author: adietish
Date: 2011-10-19 07:56:19 -0400 (Wed, 19 Oct 2011)
New Revision: 35800

Modified:
   trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPage.java
   trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java
   trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationDialog.java
   trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizardPageModel.java
Log:
[JBIDE-9939] selecting freshly created app now

Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPage.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPage.java	2011-10-19 11:35:48 UTC (rev 35799)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPage.java	2011-10-19 11:56:19 UTC (rev 35800)
@@ -129,7 +129,6 @@
 		this.viewer = createTable(tableContainer);
 		GridDataFactory.fillDefaults().span(3, 1).align(SWT.FILL, SWT.FILL).grab(true, true).applyTo(tableContainer);
 		viewer.addDoubleClickListener(onApplicationDoubleClick());
-
 		Binding selectedApplicationBinding = dbc.bindValue(
 				ViewerProperties.singleSelection().observe(viewer),
 				BeanProperties.value(ApplicationWizardPageModel.PROPERTY_SELECTED_APPLICATION).observe(model),
@@ -318,9 +317,10 @@
 			@Override
 			public void widgetSelected(SelectionEvent e) {
 				Shell shell = getContainer().getShell();
-				if (WizardUtils.openWizardDialog(
-						new NewApplicationDialog(model.getUser()), shell) == Dialog.OK) {
+				NewApplicationDialog applicationDialog = new NewApplicationDialog(model.getUser());
+				if (WizardUtils.openWizardDialog(applicationDialog, shell) == Dialog.OK) {
 					viewer.refresh();
+					model.setSelectedApplication(applicationDialog.getApplication());
 				}
 			}
 		};

Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java	2011-10-19 11:35:48 UTC (rev 35799)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java	2011-10-19 11:56:19 UTC (rev 35800)
@@ -41,7 +41,6 @@
 import org.eclipse.wst.server.core.IServer;
 import org.eclipse.wst.server.core.IServerType;
 import org.eclipse.wst.server.core.IServerWorkingCopy;
-import org.eclipse.wst.server.core.ServerCore;
 import org.eclipse.wst.server.core.ServerUtil;
 import org.jboss.ide.eclipse.as.core.util.FileUtil;
 import org.jboss.tools.common.ui.databinding.ObservableUIPojo;

Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationDialog.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationDialog.java	2011-10-19 11:35:48 UTC (rev 35799)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationDialog.java	2011-10-19 11:56:19 UTC (rev 35800)
@@ -11,6 +11,7 @@
 package org.jboss.tools.openshift.express.internal.ui.wizard;
 
 import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.TimeUnit;
 
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
@@ -19,6 +20,7 @@
 import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.osgi.util.NLS;
 import org.jboss.tools.common.ui.WizardUtils;
+import org.jboss.tools.openshift.express.client.IApplication;
 import org.jboss.tools.openshift.express.client.IUser;
 import org.jboss.tools.openshift.express.client.OpenShiftException;
 import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
@@ -54,14 +56,18 @@
 					return Status.OK_STATUS;
 				}
 			}, getContainer());
+			return queue.poll(10, TimeUnit.SECONDS);
 		} catch (Exception e) {
-			// ignore
+			return false;
 		}
-		return queue.poll();
 	}
 
 	@Override
 	public void addPages() {
 		addPage(new NewApplicationWizardPage(newApplicationModel, this));
 	}
+	
+	public IApplication getApplication() {
+		return newApplicationModel.getApplication();
+	}
 }

Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizardPageModel.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizardPageModel.java	2011-10-19 11:35:48 UTC (rev 35799)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizardPageModel.java	2011-10-19 11:56:19 UTC (rev 35800)
@@ -15,6 +15,7 @@
 
 import org.jboss.tools.common.ui.databinding.ObservableUIPojo;
 import org.jboss.tools.common.ui.preferencevalue.StringPreferenceValue;
+import org.jboss.tools.openshift.express.client.IApplication;
 import org.jboss.tools.openshift.express.client.ICartridge;
 import org.jboss.tools.openshift.express.client.IUser;
 import org.jboss.tools.openshift.express.client.OpenShiftException;
@@ -25,12 +26,14 @@
  */
 public class NewApplicationWizardPageModel extends ObservableUIPojo {
 
+	public static final String PROPERTY_APPLICATION = "application";
 	public static final String PROPERTY_NAME = "name";
 	public static final String PROPERTY_CARTRIDGES = "cartridges";
 	public static final String PROPERTY_SELECTED_CARTRIDGE = "selectedCartridge";
 
 	private IUser user;
 	private String name;
+	private IApplication application;
 
 	private List<ICartridge> cartridges = new ArrayList<ICartridge>();
 	private ICartridge selectedCartridge;
@@ -104,9 +107,18 @@
 	}
 
 	public void createApplication() throws OpenShiftException {
-		user.createApplication(name, selectedCartridge);
+		IApplication application = user.createApplication(name, selectedCartridge);
+		setApplication(application);
 	}
 
+	public void setApplication(IApplication application) {
+		firePropertyChange(PROPERTY_APPLICATION, this.application, this.application = application);
+	}
+	
+	public IApplication getApplication() {
+		return application;
+	}
+
 	public boolean hasApplication(String name) {
 		try {
 			return user.getApplicationByName(name) != null;