Notice: This Wiki is now read only and edits are no longer possible. Please see: https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/wikis/Wiki-shutdown-plan for the plan.
Difference between revisions of "EMF Compare/Specifications/FeatureMap"
(→Progression) |
(→Progression) |
||
Line 97: | Line 97: | ||
| align="left" | KEY CHANGE | | align="left" | KEY CHANGE | ||
| bgcolor="#46a546" | | | bgcolor="#46a546" | | ||
− | | bgcolor="# | + | | bgcolor="#cccccc" | |
|- | |- | ||
| align="left" | MOVE in same container | | align="left" | MOVE in same container | ||
Line 111: | Line 111: | ||
| bgcolor="#9d261d" | | | bgcolor="#9d261d" | | ||
|} | |} | ||
+ | |||
{| border="1" | {| border="1" | ||
|- | |- | ||
! align="center" | 3-way | ! align="center" | 3-way | ||
+ | ! align="center" | Containment | ||
+ | ! align="center" | Non containment | ||
+ | |- | ||
+ | | align="left" | ADD | ||
+ | | bgcolor="#46a546" | | ||
+ | | bgcolor="#46a546" | | ||
+ | |- | ||
+ | | align="left" | DELETE | ||
+ | | bgcolor="#46a546" | | ||
+ | | bgcolor="#46a546" | | ||
+ | |- | ||
+ | | align="left" | KEY CHANGE | ||
+ | | bgcolor="#46a546" | | ||
+ | | bgcolor="#9d261d" | | ||
+ | |- | ||
+ | | align="left" | MOVE in same container | ||
+ | | bgcolor="#9d261d" | | ||
+ | | bgcolor="#9d261d" | | ||
+ | |- | ||
+ | | align="left" | MOVE in different container | ||
+ | | bgcolor="#46a546" | | ||
+ | | bgcolor="#9d261d" | | ||
+ | |- | ||
+ | | align="left" | MOVE in diff container + KEY CHANGE | ||
+ | | bgcolor="#9d261d" | | ||
+ | | bgcolor="#9d261d" | | ||
+ | |} | ||
+ | |||
+ | {| border="1" | ||
+ | |- | ||
+ | ! align="center" | Conflicts | ||
! align="center" | Containment | ! align="center" | Containment | ||
! align="center" | Non containment | ! align="center" | Non containment | ||
Line 126: | Line 158: | ||
|- | |- | ||
| align="left" | KEY CHANGE | | align="left" | KEY CHANGE | ||
− | | bgcolor="# | + | | bgcolor="#9d261d" | |
+ | | bgcolor="#9d261d" | | ||
+ | |- | ||
+ | | align="left" | MOVE in same container | ||
+ | | bgcolor="#9d261d" | | ||
+ | | bgcolor="#9d261d" | | ||
+ | |- | ||
+ | | align="left" | MOVE in different container | ||
+ | | bgcolor="#9d261d" | | ||
+ | | bgcolor="#9d261d" | | ||
+ | |- | ||
+ | | align="left" | MOVE in diff container + KEY CHANGE | ||
+ | | bgcolor="#9d261d" | | ||
+ | | bgcolor="#9d261d" | | ||
+ | |} | ||
+ | |||
+ | {| border="1" | ||
+ | |- | ||
+ | ! align="center" | Pseudo-Conflicts | ||
+ | ! align="center" | Containment | ||
+ | ! align="center" | Non containment | ||
+ | |- | ||
+ | | align="left" | ADD | ||
+ | | bgcolor="#9d261d" | | ||
+ | | bgcolor="#9d261d" | | ||
+ | |- | ||
+ | | align="left" | DELETE | ||
+ | | bgcolor="#9d261d" | | ||
+ | | bgcolor="#9d261d" | | ||
+ | |- | ||
+ | | align="left" | KEY CHANGE | ||
+ | | bgcolor="#9d261d" | | ||
| bgcolor="#9d261d" | | | bgcolor="#9d261d" | | ||
|- | |- |
Revision as of 04:07, 11 June 2014
Contents
Evolution Specification: FeatureMaps in EMF Compare
Current status is DRAFT
Preamble
Summary: Define how to represent feature maps changes.
Introduction
The following metamodel will be use for the specification.
Detailed Specification
Addition/deletion of a value for a given key
Solution 1: 2 differences
In the core:
- 1 difference on the orders : EFeatureMapEntry attribute
- 1 difference on the standardOrders/priorityOrders reference (derived, transient, volatile)
- the merge of a diff implies the merge of the other diff (equivalence relation)
- if the changes are too heavy in the code, add a new type of Diff: FeatureMapChange
In the structure merge viewer:
- 1 difference on the orders : EFeatureMapEntry attribute
- 1 difference on the standardOrders/priorityOrders reference
- a new FeatureMap filter (that hides the orders : EFeatureMapEntry difference
- when select a diff, the other diff is higlighted in green
In the content merge viewer:
- For the difference on the orders : EFeatureMapEntry attribute: table merge viewer
- For the standardOrders/priorityOrders reference: tree merge viewer
Solution 2: 1 difference
In the core:
- 1 new type of difference: FeatureMapChange
In the structure merge viewer:
- 1 difference on the standardOrders/priorityOrders reference
In the content merge viewer:
- For the standardOrders/priorityOrders reference: tree merge viewer
Key change for a given value
Solution 1: table merge viewer
In the core:
- 1 new type of difference on the the standardOrders/priorityOrders references: FeatureMapKeyChange
In the structure merge viewer:
- 1 new type of difference on the the standardOrders/priorityOrders references: FeatureMapKeyChange
In the content merge viewer:
- table merge viewer
Solution 2: new merge viewer
In the core:
- 1 new type of difference on the the standardOrders/priorityOrders references: FeatureMapKeyChange
- new table merge viewer : FeatureMapKeyContentMergeViewer
In the structure merge viewer:
- 1 new type of difference on the the standardOrders/priorityOrders references: FeatureMapKeyChange
In the content merge viewer:
- new merge viewer: FeatureMapKeyContentMergeViewer (modified TableMergeViewer)
Progression
2-way | Containment | Non containment |
---|---|---|
ADD | ||
DELETE | ||
KEY CHANGE | ||
MOVE in same container | ||
MOVE in different container | ||
MOVE in diff container + KEY CHANGE |
3-way | Containment | Non containment |
---|---|---|
ADD | ||
DELETE | ||
KEY CHANGE | ||
MOVE in same container | ||
MOVE in different container | ||
MOVE in diff container + KEY CHANGE |
Conflicts | Containment | Non containment |
---|---|---|
ADD | ||
DELETE | ||
KEY CHANGE | ||
MOVE in same container | ||
MOVE in different container | ||
MOVE in diff container + KEY CHANGE |
Pseudo-Conflicts | Containment | Non containment |
---|---|---|
ADD | ||
DELETE | ||
KEY CHANGE | ||
MOVE in same container | ||
MOVE in different container | ||
MOVE in diff container + KEY CHANGE |