Jump to: navigation, search

Difference between revisions of "EMF Compare/User Guide"

(Getting Started)
(Getting Started)
Line 97: Line 97:
 
|}
 
|}
  
An empty cell indicates that the compatibility hasn't been tested for a particular combination.  
+
An empty cell indicates that the compatibility hasn't been tested for a particular combination.
 
+
=== Preference settings  ===
+
 
+
You have to specify for which Model File Types the EMF Compare framework should be used instead of the "normal" eclipse text compare facility. Therefore, please open the preference page "General/Content Types" in your eclipse preferences ("Menu: Window->Preferences...").
+
 
+
[[Image:CompareConfigContentTypes.png]]
+
 
+
Press "Add..." to add an new File association.
+
 
+
[[Image:CompareConfigNewFileType.png]]
+
 
+
Enter a pattern of you Model files and click OK. Close the eclipse preferences by clicking OK.
+
 
+
Now you can use EMF compare for your specific model files.
+
 
+
<br>
+
<div></div>
+
  
 
== Concepts  ==
 
== Concepts  ==

Revision as of 06:33, 18 October 2012


EMF Compare
Website
Download
Community
Mailing List
Forums
Bugzilla
Open
Create New
Contribute
Browse Source


Getting Started

Installing EMF Compare

Marketplace Client

Using the bundled Eclipse marketplace client you can install EMF Compare in one click. Just type "emf compare", click on search, and then on install.


Marketplace.png

Update Site

EMF has been part of the Eclipse release train since Galileo, you can install it using the following update sites, depending on your platform. Note that the following are not meant to be visited in your internet browser; they must be pasted in the Help > Install New Software dialog of your Eclipse, as p2 repositories.

 http://download.eclipse.org/releases/galileo
 http://download.eclipse.org/releases/helios
 http://download.eclipse.org/releases/indigo
 http://download.eclipse.org/releases/juno

Please note that the EMF Compare development team does its best to maintain downward compatibility towards Galileo (Eclipse 3.5). Following is the compatibility chart :

EMF Compare Eclipse 3.2 - EMF 2.2 Eclipse 3.3 - EMF 2.3 Eclipse 3.4 - EMF 2.4 Eclipse 3.5 - EMF 2.5 Eclipse 3.6 - EMF 2.6 Eclipse 3.7 - EMF 2.7 Eclipse 3.8 - EMF 2.8
0.7 OK
0.8 KO OK OK
1.0 KO OK OK OK OK
1.1 KO KO OK OK OK OK OK
1.2 KO KO OK OK OK OK OK
1.3 KO KO KO OK OK OK OK
2.0 KO KO KO OK OK OK OK

An empty cell indicates that the compatibility hasn't been tested for a particular combination.

Concepts

Model, Fragments and Scope

ID Based Matching

Fingerprints Based Matching


Usage

Once activated you can compare your file (locally or from any Configuration Management System supported by the Team API) using the compare with menu.


User Interface

The following areas are highlighted in the picture

EMF Compare's basic user interface

  1. the differences found on the models
  2. the version 1 model
  3. the version 2 model
  4. the "export difference" button
  5. Move to next/Move to previous difference
  6. Merge the current difference (left to right, or right to left)
  7. Merge all non conflicting differences (left to right, or right to left)
  8. Display properties differences


Handling Conflicts

Grouping Differences

[Demo : Grouping Differences]

TBD

Filtering Differences

[Demo : Filtering Differences]

TBD

Text Attribute Comparison

[Demo : Comparing Textual Attribute]


Compare text fieldaction.png



Compare text field.png


Graphical Comparison

Since the 1.2 release EMF compare provides the ability to compare models with graphical modelers.

Have a look on the following demos :

[Demo : Comparing Ecore files with diagrams]

[Demo : Comparing UML files with diagrams]

Diag comp diff.png


Logical Model

The Eclipse Platform logical model API allows to hook in all the workspace and team operations to adapt the user request. It enables, for instance, to add in a commit request new files which are required to keep model consistency.

[Demo  : keeping model consistency on Workspace operation]


EGit logical Selection.png

UML Specialization

[Demo : Specific support to encapsulate profiles and stereotypes diffs]

SysML Specialization

Exporting Differences

Other Materials