[jbosstools-commits] JBoss Tools SVN: r35706 - 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:27:27 -0400 (Mon, 17 Oct 2011)
New Revision: 35706

Modified:
   trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java
   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/AdapterWizardPage.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java	2011-10-17 09:11:24 UTC (rev 35705)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AdapterWizardPage.java	2011-10-17 09:27:27 UTC (rev 35706)
@@ -18,8 +18,6 @@
 import org.eclipse.core.databinding.DataBindingContext;
 import org.eclipse.core.databinding.UpdateValueStrategy;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
-import org.eclipse.core.databinding.observable.value.IValueChangeListener;
-import org.eclipse.core.databinding.observable.value.ValueChangeEvent;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;

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:11:24 UTC (rev 35705)
+++ 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)
@@ -171,7 +171,9 @@
 	private void connectToGitRepo(List<IProject> projects, File gitFolder, IProgressMonitor monitor)
 			throws CoreException {
 		for (IProject project : projects) {
-			connectToGitRepo(project, gitFolder, monitor);
+			if (project != null) {
+				connectToGitRepo(project, gitFolder, monitor);
+			}
 		}
 	}
 
@@ -237,21 +239,7 @@
 				ExpressServerUtils.fillServerWithOpenshiftDetails(server, getApplication().getApplicationUrl(), 
 						getUser().getRhlogin(), getUser().getPassword(), 
 						getUser().getDomain().getRhcDomain(), getApplication().getName(), mode);
-				
-				// Now add the projects
-				Iterator<IProject> i = importedProjects.iterator();
-				ArrayList<IModule> toAdd = new ArrayList<IModule>();
-				while(i.hasNext()) {
-					IProject p = i.next();
-					IModule[] m = ServerUtil.getModules(p);
-					if( m != null && m.length > 0 ) {
-						toAdd.addAll(Arrays.asList(m));
-					}
-				}
-				IServerWorkingCopy wc = server.createWorkingCopy();
-				IModule[] add = toAdd.toArray(new IModule[toAdd.size()]);
-				wc.modifyModules(add, new IModule[0], new NullProgressMonitor());
-				server = wc.save(true, new NullProgressMonitor());
+				addModules(importedProjects, server);
 			} catch(CoreException ce) {
 				OpenshiftUIActivator.getDefault().getLog().log(ce.getStatus());
 			} catch( OpenshiftException ose) {
@@ -260,4 +248,29 @@
 			}
 		}
 	}
+
+	private void addModules(List<IProject> importedProjects, IServer server) throws CoreException {
+		ArrayList<IModule> toAdd = getModules(importedProjects);
+		if (toAdd == null
+				|| toAdd.size() == 0) {
+			return;
+		}
+		IServerWorkingCopy wc = server.createWorkingCopy();
+		IModule[] add = toAdd.toArray(new IModule[toAdd.size()]);
+		wc.modifyModules(add, new IModule[0], new NullProgressMonitor());
+		server = wc.save(true, new NullProgressMonitor());
+	}
+
+	private ArrayList<IModule> getModules(List<IProject> importedProjects) {
+		Iterator<IProject> i = importedProjects.iterator();
+		ArrayList<IModule> toAdd = new ArrayList<IModule>();
+		while(i.hasNext()) {
+			IProject p = i.next();
+			IModule[] m = ServerUtil.getModules(p);
+			if( m != null && m.length > 0 ) {
+				toAdd.addAll(Arrays.asList(m));
+			}
+		}
+		return toAdd;
+	}
 }