[xbase][guice] Added workspace root to DefaultXbaseUIModule

Also some NPE safety in ResourceStorageWritable

Change-Id: I725c7bde72ff77a18b2deb1bfd215997ef2ec7a6
This commit is contained in:
Sebastian Zarnekow 2015-02-05 13:23:31 +01:00
parent ef1dd4949b
commit 6aa2e61f8f

View file

@ -117,7 +117,7 @@ import org.eclipse.xtext.nodemodel.serialization.SerializationConversionContext
def protected void convertExternalURIsToPortableURIs(SerializableResourceDescription description, StorageAwareResource resource) {
for (ref : description.referenceDescriptions) {
if (ref.targetEObjectUri.trimFragment != resource.URI) {
(ref as SerializableReferenceDescription).targetEObjectUri = resource.portableURIs.toPortableURI(resource, ref.targetEObjectUri)
(ref as SerializableReferenceDescription).targetEObjectUri = resource.portableURIs.toPortableURI(resource, ref.targetEObjectUri) ?: ref.targetEObjectUri
}
}
}