[jbosstools-commits] JBoss Tools SVN: r35707 - 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-17 05:29:07 -0400 (Mon, 17 Oct 2011)
New Revision: 35707

Modified:
   trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java
Log:
[JBIDE-9889] avoid exception if no project was imported

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-17 09:27:27 UTC (rev 35706)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java	2011-10-17 09:29:07 UTC (rev 35707)
@@ -230,15 +230,8 @@
 	private void createServerAdapterIfRequired(List<IProject> importedProjects) {
 		Boolean b = (Boolean)getProperty(AdapterWizardPageModel.CREATE_SERVER);
 		if( b != null && b.booleanValue() ) {
-			IServerType type = (IServerType)getProperty(AdapterWizardPageModel.SERVER_TYPE);
-			IRuntime rt = (IRuntime)getProperty(AdapterWizardPageModel.RUNTIME_DELEGATE);
-			String mode = (String)getProperty(AdapterWizardPageModel.MODE);
-			
 			try {
-				IServer server = ExpressServerUtils.createServer(rt, type, "Openshift Server1");
-				ExpressServerUtils.fillServerWithOpenshiftDetails(server, getApplication().getApplicationUrl(), 
-						getUser().getRhlogin(), getUser().getPassword(), 
-						getUser().getDomain().getRhcDomain(), getApplication().getName(), mode);
+				IServer server = createServerAdapter();
 				addModules(importedProjects, server);
 			} catch(CoreException ce) {
 				OpenshiftUIActivator.getDefault().getLog().log(ce.getStatus());
@@ -249,6 +242,19 @@
 		}
 	}
 
+	private IServer createServerAdapter() throws CoreException,
+			OpenshiftException {
+		IServerType type = (IServerType)getProperty(AdapterWizardPageModel.SERVER_TYPE);
+		IRuntime rt = (IRuntime)getProperty(AdapterWizardPageModel.RUNTIME_DELEGATE);
+		String mode = (String)getProperty(AdapterWizardPageModel.MODE);
+
+		IServer server = ExpressServerUtils.createServer(rt, type, "Openshift Server1");
+		ExpressServerUtils.fillServerWithOpenshiftDetails(server, getApplication().getApplicationUrl(), 
+				getUser().getRhlogin(), getUser().getPassword(), 
+				getUser().getDomain().getRhcDomain(), getApplication().getName(), mode);
+		return server;
+	}
+
 	private void addModules(List<IProject> importedProjects, IServer server) throws CoreException {
 		ArrayList<IModule> toAdd = getModules(importedProjects);
 		if (toAdd == null