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

[jbosstools-commits at lists.jboss.org]

Author: adietish
Date: 2011-10-17 05:11:24 -0400 (Mon, 17 Oct 2011)
New Revision: 35705

Modified:
   trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/projectimport/MavenProjectImportOperation.java
Log:
[JBIDE-9889] "null"-maven project (maven import returns null-project) shall not be added to the import results

Modified: trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/projectimport/MavenProjectImportOperation.java
===================================================================
--- trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/projectimport/MavenProjectImportOperation.java	2011-10-17 08:54:48 UTC (rev 35704)
+++ trunk/as/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/projectimport/MavenProjectImportOperation.java	2011-10-17 09:11:24 UTC (rev 35705)
@@ -43,8 +43,7 @@
 		IProjectConfigurationManager configurationManager = mavenPlugin.getProjectConfigurationManager();
 		MavenModelManager modelManager = mavenPlugin.getMavenModelManager();
 		List<MavenProjectInfo> projectInfos = getMavenProjects(getProjectDirectory(), modelManager, monitor);
-		ProjectImportConfiguration projectImportConfiguration =
-				new ProjectImportConfiguration();
+		ProjectImportConfiguration projectImportConfiguration = new ProjectImportConfiguration();
 		List<IMavenProjectImportResult> importResults =
 				configurationManager.importProjects(projectInfos, projectImportConfiguration, monitor);
 		return toProjects(importResults);
@@ -53,7 +52,10 @@
 	private List<IProject> toProjects(List<IMavenProjectImportResult> importResults) {
 		List<IProject> projects = new ArrayList<IProject>();
 		for (IMavenProjectImportResult importResult : importResults) {
-			projects.add(importResult.getProject());
+			IProject project = importResult.getProject();
+			if (project != null) {
+				projects.add(importResult.getProject());
+			}
 		}
 		return projects;
 	}