org.gecko.emf.osgi.compare.api

Interface ModelObjectMerger

public interface ModelObjectMerger

Interface to compare and merge model objects

Since:

20.10.2017

Method Summary

Modifier and Type	Method and Description
ModelCompareResultType	compare(Resource resourceNew, Resource resourceOld) Compares the two resources and returns the changes
ModelCompareResultType	compare(Resource resourceNew, Resource resourceOld, java.util.List<EStructuralFeature> ignoreFeatures) Compares the two resources and returns the changes
ModelCompareResultType	compareAndMerge(Resource resourceNew, Resource resourceOld) Compares the two resources and merges them into the right, the old object
ModelCompareResultType	compareAndMerge(Resource resourceNew, Resource resourceOld, java.util.List<EStructuralFeature> ignoreFeatures) Compares the two resources and merges them into the right, the old object
Comparison	compareRaw(Resource resourceNew, Resource resourceOld, java.util.List<EStructuralFeature> ignoreFeatures) Compares the two resources and returns the changes
void	fireVisitorChanges(Resource resource) Fires finished visiting call to all visitors.
boolean	merge(java.util.List<Diff> differences) Merges differences

Method Detail

compareAndMerge

ModelCompareResultType compareAndMerge(Resource resourceNew,
                                       Resource resourceOld)

Compares the two resources and merges them into the right, the old object

Parameters:

resourceNew - the resource with the new object version

resourceOld - the resource with the old, current object version

Returns:

the ModelCompareResultType as result identifier

compareAndMerge

ModelCompareResultType compareAndMerge(Resource resourceNew,
                                       Resource resourceOld,
                                       java.util.List<EStructuralFeature> ignoreFeatures)

Compares the two resources and merges them into the right, the old object

Parameters:

resourceNew - the resource with the new object version

resourceOld - the resource with the old, current object version

ignoreFeatures - a list of EStructuralFeature to be ignored during compare

Returns:

the ModelCompareResultType as result identifier

compare

ModelCompareResultType compare(Resource resourceNew,
                               Resource resourceOld)

Compares the two resources and returns the changes

Parameters:

resourceNew - the resource with the new object version

resourceOld - the resource with the old, current object version

Returns:

the ModelCompareResultType as result identifier

compare

ModelCompareResultType compare(Resource resourceNew,
                               Resource resourceOld,
                               java.util.List<EStructuralFeature> ignoreFeatures)

Compares the two resources and returns the changes

Parameters:

resourceNew - the resource with the new object version

resourceOld - the resource with the old, current object version

ignoreFeatures - a list of EStructuralFeature to be ignored during compare

Returns:

the ModelCompareResultType as result identifier

compareRaw

Comparison compareRaw(Resource resourceNew,
                      Resource resourceOld,
                      java.util.List<EStructuralFeature> ignoreFeatures)

Compares the two resources and returns the changes

Parameters:

resourceNew - the resource with the new object version

resourceOld - the resource with the old, current object version

ignoreFeatures - a list of EStructuralFeature to be ignored during compare, can be null

Returns:

the comparison containing all differences

merge

boolean merge(java.util.List<Diff> differences)

Merges differences

Parameters:

differences - the compare differences to merge

Returns:

true, if merge was successful, otherwise false

fireVisitorChanges

void fireVisitorChanges(Resource resource)

Fires finished visiting call to all visitors.

Parameters:

resource - the changed, merged resource