Skip to main content
Jump to: navigation, search

EMF Compare/Specifications/ConflictsOnDiagramCoordinatesChange

< EMF Compare
Revision as of 11:00, 2 June 2015 by Axel.richard.obeo.fr (Talk | contribs)

(diff) ← Older revision | Latest revision (diff) | Newer revision → (diff)

Conflicts on Diagram Coordinates Changes

A Diagram Coordinates change is a specific GMF change introduced by the GMF support of EMF Compare.

It refines two ReferenceChanges, one a the 'x' coordinate of a shape, and one on the 'y' coordinate of a shape.

This specification is linked with the bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=458961

Current state

In case of a conflict on Diagram Coordinates changes, the conflict currently shows only one difference when the Diagram Refined elements filter is active. The conflict displays 3 unresolved differences (the refined one and both 'x' coordinates).

EMF Compare ConflictsOnUMLCoordinatesChange 01.png

When the Diagram Refined elements filter is off, the first conflict on 'x' coordinates displays 3 unresolved differences but shows 2. The second conflict on 'y' coordinates displays 2 unresolved conflicts and shows 2.

EMF Compare ConflictsOnUMLCoordinatesChange 02.png

Proposal of evolution

When the Diagram Refined elements filter is active, a conflict of coordinates should show two differences. One from the left side and one from the right side. The conflict should display 2 unresolved differences (the refined ones).

EMF Compare ConflictsOnUMLCoordinatesChange 03.png

When the Diagram Refined elements filter is off, the first conflict on 'x' coordinates should display 2 unresolved differences and show 2. The second conflict on 'y' coordinates should display 2 unresolved conflicts and show 2.

EMF Compare ConflictsOnUMLCoordinatesChange 04.png

Copyright © Eclipse Foundation, Inc. All Rights Reserved.