[jbosstools-commits] JBoss Tools SVN: r35708 - 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:31:40 -0400 (Mon, 17 Oct 2011)
New Revision: 35708

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:29:07 UTC (rev 35707)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java	2011-10-17 09:31:40 UTC (rev 35708)
@@ -232,7 +232,7 @@
 		if( b != null && b.booleanValue() ) {
 			try {
 				IServer server = createServerAdapter();
-				addModules(importedProjects, server);
+				addModules(getModules(importedProjects), server);
 			} catch(CoreException ce) {
 				OpenshiftUIActivator.getDefault().getLog().log(ce.getStatus());
 			} catch( OpenshiftException ose) {
@@ -255,19 +255,18 @@
 		return server;
 	}
 
-	private void addModules(List<IProject> importedProjects, IServer server) throws CoreException {
-		ArrayList<IModule> toAdd = getModules(importedProjects);
-		if (toAdd == null
-				|| toAdd.size() == 0) {
+	private void addModules(List<IModule> modules, IServer server) throws CoreException {
+		if (modules == null
+				|| modules.size() == 0) {
 			return;
 		}
 		IServerWorkingCopy wc = server.createWorkingCopy();
-		IModule[] add = toAdd.toArray(new IModule[toAdd.size()]);
+		IModule[] add = modules.toArray(new IModule[modules.size()]);
 		wc.modifyModules(add, new IModule[0], new NullProgressMonitor());
 		server = wc.save(true, new NullProgressMonitor());
 	}
 
-	private ArrayList<IModule> getModules(List<IProject> importedProjects) {
+	private List<IModule> getModules(List<IProject> importedProjects) {
 		Iterator<IProject> i = importedProjects.iterator();
 		ArrayList<IModule> toAdd = new ArrayList<IModule>();
 		while(i.hasNext()) {