Skip to main content
Jump to: navigation, search

Difference between revisions of "EMF Compare/User Guide"

 
(71 intermediate revisions by 4 users not shown)
Line 1: Line 1:
== Getting Started  ==
+
This page has moved to http://www.eclipse.org/emf/compare/documentation/latest/user/user-guide.html
  
=== Installing EMF Compare  ===
+
[[Category:EMF Compare/Archive]]
 
+
==== 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:
+
 
+
<br>
+
<pre>http://download.eclipse.org/releases/indigo</pre><pre>http://download.eclipse.org/releases/helios</pre><pre>http://download.eclipse.org/releases/galileo</pre> <blockquote>Please note that the component has at least a'''2 years&nbsp;compatibility''', meaning the indigo release is also compatible with helios, and galileo.<br></blockquote>
+
=== 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-&gt;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  ==
+
 
+
== Usage<font class="Apple-style-span" size="4"></font><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>
+
 
+
The following areas are highlighted in the picture
+
 
+
[[Image:CompareUI.png|center|EMF Compare's basic user interface]]<br>
+
 
+
#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
+
 
+
<br>
+
 
+
=== Conflicts  ===
+
 
+
===  ===
+
 
+
=== Exporting Differences  ===
+
 
+
=== Grouping Differences  ===
+
 
+
[http://www.eclipse.org/emf/compare/doc/features/videos/Groups/groups.htm [Demo&nbsp;: Grouping Differences]]
+
 
+
TBD
+
 
+
=== Filtering Differences  ===
+
 
+
[http://www.eclipse.org/emf/compare/doc/features/videos/Filters/filters.htm [Demo&nbsp;: Filtering Differences]]
+
 
+
TBD
+
 
+
=== Text Attribute Comparison  ===
+
 
+
[http://www.eclipse.org/emf/compare/doc/features/videos/Text%20compare/textCompare.htm [Demo&nbsp;: Comparing Textual Attribute]]<br>
+
 
+
<br>
+
 
+
[[Image:Compare text fieldaction.png]]
+
 
+
<br>
+
 
+
<br>
+
 
+
[[Image:Compare text field.png]]<br>
+
 
+
<br>
+
 
+
=== 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&nbsp;:
+
 
+
[http://www.eclipse.org/emf/compare/doc/features/videos/EcoreTools-v2/EMFCompareEcoreTools.html [Demo&nbsp;: Comparing Ecore files with diagrams]]
+
 
+
<br>
+
 
+
[[Image:Diag comp diff.png]]
+
 
+
<br>
+
 
+
=== 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.
+
 
+
[http://www.eclipse.org/emf/compare/doc/features/videos/LogicalModels/LogicalModels.html [Demo &nbsp;: keeping model consistency on Workspace operation]]
+
 
+
<br>
+
 
+
[[Image:EGit_logical_Selection.png]]
+
 
+
=== UML Specialization  ===
+
 
+
[http://www.eclipse.org/emf/compare/doc/features/videos/UML%20comparison/compareUml.htm [Demo&nbsp;: Specific support to encapsulate profiles and stereotypes diffs]]
+
 
+
=== SysML Specialization  ===
+
 
+
== Other Materials  ==
+
 
+
*[http://www.eclipse.org/emf/compare/doc/features/videos/index.html Videos of 2011 new features]
+
*[[EMF Compare/CompareUMLPapyrusAPI|Specification and Documentation about the comparison of UML diagrams]]<br>
+

Latest revision as of 11:53, 5 March 2014

This page has moved to http://www.eclipse.org/emf/compare/documentation/latest/user/user-guide.html

Back to the top