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/FeatureMap"
(→Evolution Specification: handling of FetaureMaps in EMF Compare) |
(→Evolution Specification: handling of FetaureMaps in EMF Compare) |
||
| Line 16: | Line 16: | ||
=== Addition/deletion of a value for a given key === | === Addition/deletion of a value for a given key === | ||
| − | ''Solution 1: 2 differences, 1 refinement'' | + | '''Solution 1: 2 differences, 1 refinement''' |
In the structure merge viewer: | In the structure merge viewer: | ||
| Line 28: | Line 28: | ||
* For the standardOrders/priorityOrders reference: tree merge viewer | * For the standardOrders/priorityOrders reference: tree merge viewer | ||
| − | ''Solution 2: 1 difference'' | + | '''Solution 2: 1 difference''' |
In the structure merge viewer: | In the structure merge viewer: | ||
| Line 38: | Line 38: | ||
=== Key change for a given value === | === Key change for a given value === | ||
| − | ''Solution 1: table merge viewer'' | + | '''Solution 1: table merge viewer''' |
In the structure merge viewer: | In the structure merge viewer: | ||
| Line 46: | Line 46: | ||
* table merge viewer | * table merge viewer | ||
| − | ''Solution 2: new merge viewer'' | + | '''Solution 2: new merge viewer''' |
In the structure merge viewer: | In the structure merge viewer: | ||
Revision as of 03:58, 15 April 2014
Contents
Evolution Specification: handling of FetaureMaps in EMF Compare
Current status is DRAFT
Preamble
Summary: Define how to graphically 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, 1 refinement
In the structure merge viewer:
- 1 difference on the orders : EFeatureMapEntry attribute
- 1 difference on the standardOrders/priorityOrders reference
- 1 refinement of the previous differences (the reference change is the prime refining), with a new FeatureMap filter
- the merge of a diff implies the merge of the other diff.
In the content merge viewer:
- For the difference on the orders : EFeatureMapEntry reference: table merge viewer
- For the standardOrders/priorityOrders reference: tree merge viewer
Solution 2: 1 difference
In the structure merge viewer:
- 1 new type of difference: FeatureMapChange
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 structure merge viewer:
- 1 new type of difference on the the standardOrders/priorityOrders references: FeatureMapChange
In the content merge viewer:
- table merge viewer
Solution 2: new merge viewer
In the structure merge viewer:
- 1 new type of difference on the the standardOrders/priorityOrders references: FeatureMapChange
In the content merge viewer:
- new merge viewer: FeatureMapMergeViewer