Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Vitruv remote adaptions #79

Merged
merged 3 commits into from
Sep 5, 2023
Merged

Vitruv remote adaptions #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
73a51f0
let HierarichalID extend EObjectImpl so it can be serialized
thomyxx Aug 25, 2023
9567f81
set user interactions from transformed change to interactions of sour…
thomyxx Aug 25, 2023
3500fcb
Merge pull request #78 from thomyxx/vitruv-remote
TomWerm Sep 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion bundles/tools.vitruv.change.atomic/src/tools/vitruv/change/atomic/hid/HierarchicalId.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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<HierarchicalId> {
public final class HierarchicalId extends EObjectImpl implements Comparable<HierarchicalId> {
private String id;

public HierarchicalId(String id) {
Expand Down
1 change: 1 addition & 0 deletions ...e/src/tools/vitruv/change/composite/description/impl/AbstractVitruviusChangeResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ protected <Source, Target> VitruviusChange<Target> transformVitruviusChange(Vitr
List<EChange<Target>> resolvedChanges = transactionalChange.getEChanges().stream().map(changeHandler::apply)
.toList();
TransactionalChange<Target> result = new TransactionalChangeImpl<>(resolvedChanges);
result.setUserInteractions(change.getUserInteractions());
onTransactionEnd.accept(result);
return result;
}
Expand Down
Loading