Avoid NPE when eResource isn't initialized yet

diverse-project · Feb 5, 2015 · 153562d · 153562d
1 parent 660a901
commit 153562d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 14 deletions.
diff --git a/...nria.diverse.melange/src/main/java/fr/inria/diverse/melange/ast/MetamodelExtensions.xtend b/...nria.diverse.melange/src/main/java/fr/inria/diverse/melange/ast/MetamodelExtensions.xtend
@@ -343,8 +343,12 @@ class MetamodelExtensions
 	}
 
 	def IProject getProject(Metamodel mm) {
-		val platformString = mm.eResource.URI.toPlatformString(true)
-		return ResourcesPlugin.workspace.root.getFile(new Path(platformString)).project
+		val res = mm.eResource
+
+		return
+			if (res !== null)
+				ResourcesPlugin.workspace.root.getFile(new Path(res.URI.toPlatformString(true))).project
+			else null
 	}
 
 	def private void createEcore(Metamodel mm, String uri) {

diff --git a/...inria.diverse.melange/src/main/java/fr/inria/diverse/melange/utils/EPackageProvider.xtend b/...inria.diverse.melange/src/main/java/fr/inria/diverse/melange/utils/EPackageProvider.xtend
@@ -41,12 +41,13 @@ class EPackageProvider
 	def List<EPackage> getPackages(ModelingElement m) {
 		if (!packages.containsKey(m)) {
 			if (m instanceof Metamodel) {
-				try {
-					if (m.project.getFile(m.localEcorePath).exists)
-						m.ecoreUri = m.localEcoreUri
-					else if (m.project.getFile(m.externalEcorePath).exists)
-						m.ecoreUri = m.externalEcoreUri
-				} catch (IllegalStateException e) {}
+				if (m.project !== null)
+					try {
+						if (m.project.getFile(m.localEcorePath).exists)
+							m.ecoreUri = m.localEcoreUri
+						else if (m.project.getFile(m.externalEcorePath).exists)
+							m.ecoreUri = m.externalEcoreUri
+					} catch (IllegalStateException e) {}
 			}
 
 			switch (m) {
@@ -97,12 +98,13 @@ class EPackageProvider
 			if (mm.genmodelUris.size == 0 && mm.ecoreUri !== null)
 				mm.genmodelUris += mm.ecoreUri.substring(0, mm.ecoreUri.lastIndexOf(".")) + ".genmodel"
 			else {
-				try {
-					if (mm.project.getFile(mm.localGenmodelPath).exists)
-						mm.genmodelUris += mm.localGenmodelUri
-					else if (mm.project.getFile(mm.externalGenmodelPath).exists)
-						mm.genmodelUris += mm.externalGenmodelUri
-				} catch (IllegalStateException e) {}
+				if (mm.project !== null)
+					try {
+						if (mm.project.getFile(mm.localGenmodelPath).exists)
+							mm.genmodelUris += mm.localGenmodelUri
+						else if (mm.project.getFile(mm.externalGenmodelPath).exists)
+							mm.genmodelUris += mm.externalGenmodelUri
+					} catch (IllegalStateException e) {}
 			}
 			mm.genmodelUris.forEach[genmodels.put(mm, modelUtils.loadGenmodel(it))]
 		}