| [EMF Compare] Duplicate move detection [message #622828] |
Thu, 06 May 2010 07:37 |
 Patrick Konemann
Messages: 116
Registered: July 2009 |
Senior Member |
|
|
In one of my comparisons I moved one element but EMF Compare produced two changes: A MoveModelElement (regular move) and a UpdateContainmentFeature (containment change), and both contain the very same properties!
Example scenario and proposed fix below.
Scenario:
Changing an association between two UML classes from unidirectional to directional.
Technically speaking: The first listing is the model with the unidirectional association, the second listing the model with the directional association.
<Class> A
<Class> B
- (feature ownedAttribute): <Property> dst : A
<Association> A_src_dst
- (feature ownedEnds): <Property> src : B
<Class> A
- (feature ownedAttribute): <Property> src : B
<Class> B
- (feature ownedAttribute): <Property> dst : A
<Association> A_src_dst
The two changes that EMF Compare detects are:
- <Property> src : X has been moved from <Class> Y to <Association> A_src_dst
- Containment reference has been changed from ownedAttribute to ownedEnd
As I understand it, there is a bug for the detection of containment reference changes: they should only be detected if it is not already a move. In other words, the containment reference changes should only be created if the container differs.
I checked the generic diff engine and saw that this check is done for Match3Elements but not for Match2Elements.
So I guess we just need to adjust the generic diff engine as follows (just one line added; untested):
protected void checkContainmentUpdate(DiffGroup current, Match2Elements matchElement) {
final EObject leftElement = matchElement.getLeftElement();
final EObject rightElement = matchElement.getRightElement();
if (leftElement.eContainmentFeature() != null && rightElement.eContainmentFeature() != null) {
if (!leftElement.eContainmentFeature().getName().equals(
rightElement.eContainmentFeature().getName())
&& getMatchedEObject(leftElement.eContainer()).equals(rightElem ent.eContainer() // this line is new
) {
createUpdateContainmentOperation(current, leftElement, rightElement);
}
}
}
Best regards
Patrick
|
|
|
Powered by
FUDForum. Page generated in 0.02549 seconds
] 
Search
Help
Register
Login
Home
