Skip to main content

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.

Jump to: navigation, search

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 28: Line 28:
 
* For the difference on the orders : EFeatureMapEntry reference: table merge viewer
 
* For the difference on the orders : EFeatureMapEntry reference: table merge viewer
 
* For the standardOrders/priorityOrders reference: tree merge viewer
 
* For the standardOrders/priorityOrders reference: tree merge viewer
 +
 +
[[file:EMFCompare_FeatureMap_1.png]] [[file:EMFCompare_FeatureMap_2.png]] [[file:EMFCompare_FeatureMap_3.png]]
  
 
'''Solution 2: 1 difference'''
 
'''Solution 2: 1 difference'''
Line 36: Line 38:
 
In the content merge viewer:
 
In the content merge viewer:
 
* For the standardOrders/priorityOrders reference: tree merge viewer
 
* For the standardOrders/priorityOrders reference: tree merge viewer
 +
 +
[[file:EMFCompare_FeatureMap_4.png]]
  
 
=== Key change for a given value ===
 
=== Key change for a given value ===

Revision as of 04:39, 15 April 2014

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.

EMFCompare FeatureMap MM.png

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

EMFCompare FeatureMap 1.png EMFCompare FeatureMap 2.png EMFCompare FeatureMap 3.png

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

EMFCompare FeatureMap 4.png

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

Back to the top