|
|
| (57 intermediate revisions by 3 users not shown) |
| Line 1: |
Line 1: |
| − | {{EMF_Compare}}
| + | This page has moved to http://www.eclipse.org/emf/compare/documentation/latest/user/user-guide.html |
| | | | |
| − | == Getting Started ==
| + | [[Category:EMF Compare/Archive]] |
| − | | + | |
| − | === 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.
| + | |
| − | | + | |
| − | | + | |
| − | [[Image: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 :
| + | |
| − | {| border="1"
| + | |
| − | |-
| + | |
| − | ! 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
| + | |
| − | | style="text-align:center; background:green; color:white" | OK
| + | |
| − | |
| + | |
| − | |
| + | |
| − | |
| + | |
| − | |
| + | |
| − | |
| + | |
| − | |
| + | |
| − | |-
| + | |
| − | | 0.8
| + | |
| − | | style="text-align:center; background:red; color:white" | KO
| + | |
| − | | style="text-align:center; background:green; color:white" | OK
| + | |
| − | | style="text-align:center; background:green; color:white" | OK
| + | |
| − | |
| + | |
| − | |
| + | |
| − | |
| + | |
| − | |
| + | |
| − | |-
| + | |
| − | | 1.0
| + | |
| − | | style="text-align:center; background:red; color:white" | KO
| + | |
| − | | style="text-align:center; background:green; color:white" | OK
| + | |
| − | | style="text-align:center; background:green; color:white" | OK
| + | |
| − | | style="text-align:center; background:green; color:white" | OK
| + | |
| − | | style="text-align:center; background:green; color:white" | OK
| + | |
| − | |
| + | |
| − | |
| + | |
| − | |-
| + | |
| − | | 1.1
| + | |
| − | | style="text-align:center; background:red; color:white" | KO
| + | |
| − | | style="text-align:center; background:red; color:white" | KO
| + | |
| − | | style="text-align:center; background:green; color:white" | OK
| + | |
| − | | style="text-align:center; background:green; color:white" | OK
| + | |
| − | | style="text-align:center; background:green; color:white" | OK
| + | |
| − | | style="text-align:center; background:green; color:white" | OK
| + | |
| − | | style="text-align:center; background:green; color:white" | OK
| + | |
| − | |-
| + | |
| − | | 1.2
| + | |
| − | | style="text-align:center; background:red; color:white" | KO
| + | |
| − | | style="text-align:center; background:red; color:white" | KO
| + | |
| − | | style="text-align:center; background:green; color:white" | OK
| + | |
| − | | style="text-align:center; background:green; color:white" | OK
| + | |
| − | | style="text-align:center; background:green; color:white" | OK
| + | |
| − | | style="text-align:center; background:green; color:white" | OK
| + | |
| − | | style="text-align:center; background:green; color:white" | OK
| + | |
| − | |-
| + | |
| − | | 1.3
| + | |
| − | | style="text-align:center; background:red; color:white" | KO
| + | |
| − | | style="text-align:center; background:red; color:white" | KO
| + | |
| − | | style="text-align:center; background:red; color:white" | KO
| + | |
| − | | style="text-align:center; background:green; color:white" | OK
| + | |
| − | | style="text-align:center; background:green; color:white" | OK
| + | |
| − | | style="text-align:center; background:green; color:white" | OK
| + | |
| − | | style="text-align:center; background:green; color:white" | OK
| + | |
| − | |-
| + | |
| − | | bgcolor="#cccccc" | 2.0
| + | |
| − | | style="text-align:center; background:red; color:white" | KO
| + | |
| − | | style="text-align:center; background:red; color:white" | KO
| + | |
| − | | style="text-align:center; background:red; color:white" | KO
| + | |
| − | | style="text-align:center; background:green; color:white" |OK
| + | |
| − | | style="text-align:center; background:green; color:white" | OK
| + | |
| − | | style="text-align:center; background:green; color:white" | OK
| + | |
| − | | style="text-align:center; background:green; color:white" | 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 ===
| + | |
| − | | + | |
| − | <br>
| + | |
| − | | + | |
| − | == 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.<br>
| + | |
| − | | + | |
| − | <br>
| + | |
| − | | + | |
| − | === User Interface ===
| + | |
| − | | + | |
| − | 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>
| + | |
| − | | + | |
| − | === Handling Conflicts ===
| + | |
| − | | + | |
| − | === Grouping Differences ===
| + | |
| − | | + | |
| − | [http://www.eclipse.org/emf/compare/doc/features/videos/Groups/groups.htm [Demo : Grouping Differences]]
| + | |
| − | | + | |
| − | TBD
| + | |
| − | | + | |
| − | === Filtering Differences ===
| + | |
| − | | + | |
| − | [http://www.eclipse.org/emf/compare/doc/features/videos/Filters/filters.htm [Demo : Filtering Differences]]
| + | |
| − | | + | |
| − | TBD
| + | |
| − | | + | |
| − | === Text Attribute Comparison ===
| + | |
| − | | + | |
| − | [http://www.eclipse.org/emf/compare/doc/features/videos/Text%20compare/textCompare.htm [Demo : 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 :
| + | |
| − | | + | |
| − | [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]]
| + | |
| − | | + | |
| − | [[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 : 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 : Specific support to encapsulate profiles and stereotypes diffs]]
| + | |
| − | | + | |
| − | === SysML Specialization ===
| + | |
| − | | + | |
| − | === Exporting Differences ===
| + | |
| − | | + | |
| − | == 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>
| + | |
| − | | + | |
| − | [[Category:EMF Compare]]
| + | |
