From 1894da8a38b7ccdddf857eadee6c2b7e1906c9cd Mon Sep 17 00:00:00 2001 From: Christian Dietrich Date: Tue, 12 Dec 2017 16:17:45 +0100 Subject: [PATCH] made code of resource storage facade more consistent Signed-off-by: Christian Dietrich --- .../persistence/SerializableResourceDescription.xtend | 4 ++-- .../resource/persistence/SerializableEObjectDescription.java | 2 +- .../xtext/resource/persistence/SerializationExtensions.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/org.eclipse.xtext/src/org/eclipse/xtext/resource/persistence/SerializableResourceDescription.xtend b/org.eclipse.xtext/src/org/eclipse/xtext/resource/persistence/SerializableResourceDescription.xtend index bf3aefa6d..c7a416dd8 100644 --- a/org.eclipse.xtext/src/org/eclipse/xtext/resource/persistence/SerializableResourceDescription.xtend +++ b/org.eclipse.xtext/src/org/eclipse/xtext/resource/persistence/SerializableResourceDescription.xtend @@ -188,7 +188,7 @@ interface SerializableEObjectDescriptionProvider { override writeExternal(ObjectOutput out) throws IOException { out.writeURI(eObjectURI) - out.writeURI(EcoreUtil.getURI(eClass)) + out.writeEcoreElement(eClass) out.writeQualifiedName(qualifiedName) out.writeObject(userData) } @@ -238,7 +238,7 @@ interface SerializableEObjectDescriptionProvider { /** * @since 2.8 */ -package class SerializationExtensions { +class SerializationExtensions { def static T readEcoreElement(ObjectInput in) throws IOException { val uri = in.readURI diff --git a/org.eclipse.xtext/xtend-gen/org/eclipse/xtext/resource/persistence/SerializableEObjectDescription.java b/org.eclipse.xtext/xtend-gen/org/eclipse/xtext/resource/persistence/SerializableEObjectDescription.java index 9acc1ce8c..a3caa2de8 100644 --- a/org.eclipse.xtext/xtend-gen/org/eclipse/xtext/resource/persistence/SerializableEObjectDescription.java +++ b/org.eclipse.xtext/xtend-gen/org/eclipse/xtext/resource/persistence/SerializableEObjectDescription.java @@ -83,7 +83,7 @@ public class SerializableEObjectDescription implements IEObjectDescription, Exte @Override public void writeExternal(final ObjectOutput out) throws IOException { SerializationExtensions.writeURI(out, this.eObjectURI); - SerializationExtensions.writeURI(out, EcoreUtil.getURI(this.eClass)); + SerializationExtensions.writeEcoreElement(out, this.eClass); SerializationExtensions.writeQualifiedName(out, this.qualifiedName); out.writeObject(this.userData); } diff --git a/org.eclipse.xtext/xtend-gen/org/eclipse/xtext/resource/persistence/SerializationExtensions.java b/org.eclipse.xtext/xtend-gen/org/eclipse/xtext/resource/persistence/SerializationExtensions.java index 8622a87fb..648adfc16 100644 --- a/org.eclipse.xtext/xtend-gen/org/eclipse/xtext/resource/persistence/SerializationExtensions.java +++ b/org.eclipse.xtext/xtend-gen/org/eclipse/xtext/resource/persistence/SerializationExtensions.java @@ -26,7 +26,7 @@ import org.eclipse.xtext.xbase.lib.Exceptions; * @since 2.8 */ @SuppressWarnings("all") -class SerializationExtensions { +public class SerializationExtensions { public static T readEcoreElement(final ObjectInput in) throws IOException { final URI uri = SerializationExtensions.readURI(in); final EPackage ePackage = EPackage.Registry.INSTANCE.getEPackage(uri.trimFragment().toString());