Skip to main content
Jump to: navigation, search

Difference between revisions of "EMF Compare/User Guide"

Line 12: Line 12:
  
 
<br>  
 
<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. </blockquote> <div></div>  
+
<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>  
=== EMF Compare Configuration  ===
+
=== Preference settings  ===
 
+
== 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...").  
 
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...").  
Line 33: Line 31:
 
== Concepts  ==
 
== Concepts  ==
  
== User Interface Tour ==
+
== 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>
 +
 
 +
 
 +
 
 +
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
  
=== Graphical Comparison ===
+
=== Graphical Comparison ===
  
 
== Other Materials  ==
 
== Other Materials  ==

Revision as of 05:03, 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 a2 years compatibility, meaning the indigo release is also compatible with helios, and galileo.

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...").

CompareConfigContentTypes.png

Press "Add..." to add an new File association.

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.


Concepts

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.


The following areas are highlighted in the picture


  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

Graphical Comparison

Other Materials

Copyright © Eclipse Foundation, Inc. All Rights Reserved.