Merge pull request #576 from eclipse/cd_rsf

made code of resource storage facade more consistent
This commit is contained in:
Christian Dietrich 2017-12-12 20:11:36 +01:00 committed by GitHub
commit 5fc81ba327
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions

View file

@ -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 extends ENamedElement> T readEcoreElement(ObjectInput in) throws IOException {
val uri = in.readURI

View file

@ -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);
}

View file

@ -26,7 +26,7 @@ import org.eclipse.xtext.xbase.lib.Exceptions;
* @since 2.8
*/
@SuppressWarnings("all")
class SerializationExtensions {
public class SerializationExtensions {
public static <T extends ENamedElement> T readEcoreElement(final ObjectInput in) throws IOException {
final URI uri = SerializationExtensions.readURI(in);
final EPackage ePackage = EPackage.Registry.INSTANCE.getEPackage(uri.trimFragment().toString());