From 73a51f015f64c2fe3156adf4db9f39624d60dfcc Mon Sep 17 00:00:00 2001 From: Thomas Mayer Date: Fri, 25 Aug 2023 10:27:07 +0200 Subject: [PATCH 1/2] let HierarichalID extend EObjectImpl so it can be serialized --- .../src/tools/vitruv/change/atomic/hid/HierarchicalId.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bundles/tools.vitruv.change.atomic/src/tools/vitruv/change/atomic/hid/HierarchicalId.java b/bundles/tools.vitruv.change.atomic/src/tools/vitruv/change/atomic/hid/HierarchicalId.java index 910c6f5a..bf1f8229 100644 --- a/bundles/tools.vitruv.change.atomic/src/tools/vitruv/change/atomic/hid/HierarchicalId.java +++ b/bundles/tools.vitruv.change.atomic/src/tools/vitruv/change/atomic/hid/HierarchicalId.java @@ -1,12 +1,14 @@ package tools.vitruv.change.atomic.hid; +import org.eclipse.emf.ecore.impl.EObjectImpl; + /** * A hierarchical id is a volatile identifier which identifies an element based * on its hierarchical location in a resource. A hierarchical id is not bound to * a resource set, i.e. two elements at the same location in identical resources * of different resource sets will have the same hierarchical id. */ -public final class HierarchicalId implements Comparable { +public final class HierarchicalId extends EObjectImpl implements Comparable { private String id; public HierarchicalId(String id) { From 9567f818d5c18cc654ac41a2e5dc50ed6098cb27 Mon Sep 17 00:00:00 2001 From: Thomas Mayer Date: Fri, 25 Aug 2023 10:30:50 +0200 Subject: [PATCH 2/2] set user interactions from transformed change to interactions of source change --- .../description/impl/AbstractVitruviusChangeResolver.java | 1 + 1 file changed, 1 insertion(+) diff --git a/bundles/tools.vitruv.change.composite/src/tools/vitruv/change/composite/description/impl/AbstractVitruviusChangeResolver.java b/bundles/tools.vitruv.change.composite/src/tools/vitruv/change/composite/description/impl/AbstractVitruviusChangeResolver.java index ff9fa804..4dbc5e13 100644 --- a/bundles/tools.vitruv.change.composite/src/tools/vitruv/change/composite/description/impl/AbstractVitruviusChangeResolver.java +++ b/bundles/tools.vitruv.change.composite/src/tools/vitruv/change/composite/description/impl/AbstractVitruviusChangeResolver.java @@ -37,6 +37,7 @@ protected VitruviusChange transformVitruviusChange(Vitr List> resolvedChanges = transactionalChange.getEChanges().stream().map(changeHandler::apply) .toList(); TransactionalChange result = new TransactionalChangeImpl<>(resolvedChanges); + result.setUserInteractions(change.getUserInteractions()); onTransactionEnd.accept(result); return result; }