Description Mikaël Barbero 2011-07-25 05:09:13 EDT

Created attachment 200258 [details]
The new fixtures as patch to the tests plug-in

The UML2DiffEngine#applyManagedTypes(DiffElement) method has to be changed with the following which handles Conflicting elements gracefully:

void applyManagedTypes(DiffElement element) {
	for (IDiffExtensionFactory factory : uml2ExtensionFactories) {
		if (factory.handles(element)) {
			AbstractDiffExtension extension = factory.create(element);
			DiffElement diffParent = factory.getParentDiff(element);
			if (element.isConflicting()) {
				ConflictingDiffElement conflictingDiffElement = null;
				if (element.eContainer() != null
						&& element.eContainer() instanceof ConflictingDiffElement) {
					conflictingDiffElement = (ConflictingDiffElement)element.eContainer();
				} else {
					conflictingDiffElement = DiffFactory.eINSTANCE.createConflictingDiffElement();
				}
				conflictingDiffElement.getSubDiffElements().add((DiffElement)extension);
				diffParent.getSubDiffElements().add((DiffElement)conflictingDiffElement);
			} else {
				diffParent.getSubDiffElements().add((DiffElement)extension);
			}
		}
	}
}

Find attached also a bunch of unittests for this behavior.