Notice: this Wiki will be going read only early in 2024 and edits will no longer be possible. Please see: https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/wikis/Wiki-shutdown-plan for the plan.
Difference between revisions of "EMF Compare/Specifications/ConflictsOnDiagramCoordinatesChange"
(Created page with "= 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 ReferenceChang...") |
(→Conflicts on Diagram Coordinates Changes) |
||
| Line 2: | Line 2: | ||
A Diagram Coordinates change is a specific GMF change introduced by the GMF support of EMF Compare. | 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. | ||
== Current state == | == Current state == | ||
| Line 23: | Line 23: | ||
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. | 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. | ||
| + | |||
| + | [[File:EMF_Compare_ConflictsOnUMLCoordinatesChange_04.png]] | ||
[[Category:EMF Compare]] | [[Category:EMF Compare]] | ||
[[Category:EMF Compare/Specification]] | [[Category:EMF Compare/Specification]] | ||
Revision as of 10:56, 2 June 2015
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.
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).
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.
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).
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.
