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/User Guide"
Line 18: | Line 18: | ||
<pre>http://download.eclipse.org/releases/indigo | <pre>http://download.eclipse.org/releases/indigo | ||
http://download.eclipse.org/releases/helios | http://download.eclipse.org/releases/helios | ||
− | http://download.eclipse.org/releases/galileo</pre> <blockquote>Please note that the component has at least a'''2 years compatibility''', meaning the indigo release is also compatible with helios, and galileo.<br></blockquote><blockquote></blockquote><blockquote></blockquote> | + | http://download.eclipse.org/releases/galileo</pre> <blockquote>Please note that the component has at least a '''2 years compatibility''', meaning the indigo release is also compatible with helios, and galileo.<br></blockquote><blockquote></blockquote><blockquote></blockquote> |
{| width="800" border="1" cellpadding="1" cellspacing="1" align="center" | {| width="800" border="1" cellpadding="1" cellspacing="1" align="center" | ||
|- | |- | ||
Line 84: | Line 84: | ||
| OK | | OK | ||
|- | |- | ||
− | |align="center" | 2.0 | + | | align="center" | 2.0 |
| KO | | KO | ||
| KO | | KO | ||
Line 112: | Line 112: | ||
== Concepts == | == Concepts == | ||
+ | === Model, Fragments and Scope === | ||
+ | === ID Based Matching === | ||
− | === | + | === Fingerprints Based Matching === |
− | + | <br> | |
− | + | ||
− | + | ||
− | + | ||
− | + | ||
− | + | ||
− | + | ||
− | + | ||
− | <br> | + | |
== Usage<font class="Apple-style-span" size="4"></font><br> == | == Usage<font class="Apple-style-span" size="4"></font><br> == | ||
Line 130: | Line 124: | ||
Once activated you can compare your file (locally or from any Configuration Management System supported by the Team API) using the '''compare with''' menu.<br> | Once activated you can compare your file (locally or from any Configuration Management System supported by the Team API) using the '''compare with''' menu.<br> | ||
− | + | <br> | |
=== User Interface === | === User Interface === | ||
− | |||
− | |||
The following areas are highlighted in the picture | The following areas are highlighted in the picture | ||
Line 153: | Line 145: | ||
=== Handling Conflicts === | === Handling Conflicts === | ||
− | + | === Grouping Differences === | |
− | + | ||
− | === Grouping Differences === | + | |
[http://www.eclipse.org/emf/compare/doc/features/videos/Groups/groups.htm [Demo : Grouping Differences]] | [http://www.eclipse.org/emf/compare/doc/features/videos/Groups/groups.htm [Demo : Grouping Differences]] | ||
Line 191: | Line 181: | ||
[http://www.eclipse.org/emf/compare/doc/features/videos/EcoreTools-v2/EMFCompareEcoreTools.html [Demo : Comparing Ecore files with diagrams]] | [http://www.eclipse.org/emf/compare/doc/features/videos/EcoreTools-v2/EMFCompareEcoreTools.html [Demo : Comparing Ecore files with diagrams]] | ||
− | [[http://www.eclipse.org/emf/compare/doc/features/videos/Papyrus/EMFComparePapyrus.html Demo : Comparing UML files with diagrams]] | + | [[http://www.eclipse.org/emf/compare/doc/features/videos/Papyrus/EMFComparePapyrus.html Demo : Comparing UML files with diagrams]] |
[[Image:Diag comp diff.png]] | [[Image:Diag comp diff.png]] | ||
− | <br> | + | <br> |
=== Logical Model === | === Logical Model === | ||
Line 213: | Line 203: | ||
=== SysML Specialization === | === SysML Specialization === | ||
− | + | === Exporting Differences === | |
− | + | ||
− | === Exporting Differences === | + | |
== Other Materials == | == Other Materials == |
Revision as of 08:22, 3 March 2012
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.
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:
http://download.eclipse.org/releases/indigo http://download.eclipse.org/releases/helios http://download.eclipse.org/releases/galileo
Please note that the component has at least a 2 years compatibility, meaning the indigo release is also compatible with helios, and galileo.
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 | KO | OK | OK | OK | OK |
1.3 | KO | KO | KO | OK | OK | OK | OK |
2.0 | KO | KO | KO | KO | OK | OK | OK |
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...").
Press "Add..." to add an new File association.
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.
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
- the differences found on the models
- the version 1 model
- the version 2 model
- the "export difference" button
- Move to next/Move to previous difference
- Merge the current difference (left to right, or right to left)
- Merge all non conflicting differences (left to right, or right to left)
- Display properties differences
Handling Conflicts
Grouping Differences
TBD
Filtering Differences
[Demo : Filtering Differences]
TBD
Text Attribute Comparison
[Demo : Comparing Textual Attribute]
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]
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]
UML Specialization
[Demo : Specific support to encapsulate profiles and stereotypes diffs]