plugins/org.eclipse.emf.compare.doc/doc/user/Features.html - emfcompare/org.eclipse.emf.compare - Git at Google

 <?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 	<head>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 		<title>Features</title>
 		<link type="text/css" rel="stylesheet" href="/help/topic/org.eclipse.emf.compare.doc/doc/resources/bootstrap.css"/>
 		<link type="text/css" rel="stylesheet" href="/help/topic/org.eclipse.emf.compare.doc/doc/resources/custom.css"/>
 	</head>
 	<body>
 		<h1 id="Features">Features</h1>
 		<h2 id="Handling_Conflicts">Handling Conflicts</h2>
 		<p>PENDING</p>
 		<h2 id="Grouping_Differences">Grouping Differences</h2>
 		<p>This feature allows you to group differences together in the structural view according to a set predicate. By default, EMF Compare provides three distinct grouping strategies :</p>
 		<p>
 			<img border="0" src="./../images/EMF_Compare_Groups_Choice.png"/>
 		</p>
 		<dl>
 			<dt>Default</dt>
 			<dd>Do not try and group differences together, display them as they were detected.</dd>
 		</dl>
 		<p>
 			<img border="0" src="./../images/EMF_Compare_Groups_Default.png"/>
 		</p>
 		<dl>
 			<dt>By Kind</dt>
 			<dd>Group differences by their kind (
 				<i>additions</i>,
 				<i>deletions</i>,
 				<i>moves</i>,
 				<i>changes</i>).
 			</dd>
 		</dl>
 		<p>
 			<img border="0" src="./../images/EMF_Compare_Groups_Kind.png"/>
 		</p>
 		<dl>
 			<dt>By Side</dt>
 			<dd>Group differences according to their side: left or right and a special group regrouping differences in conflicts with other differences together.</dd>
 		</dl>
 		<p>
 			<img border="0" src="./../images/EMF_Compare_Groups_Side.png"/>
 		</p>
 		<p>PENDING UPDATE, this is a demo displaying EMF Compare 1.3

 			<a href="http://www.eclipse.org/emf/compare/doc/features/videos/Groups/groups.htm">Demo</a>
 		</p>
 		<p>PENDING : New grouping strategies can be provided to EMF Compare through extension points.</p>
 		<h2 id="Filtering_Differences">Filtering Differences</h2>
 		<p>This features allows you to filter differences out of the structural view according to a set predicate. By default, EMF Compare provides five distinct filters :</p>
 		<p>
 			<img border="0" src="./../images/EMF_Compare_Filters_Choice.png"/>
 		</p>
 		<dl>
 			<dt>Pseudo conflicts differences</dt>
 			<dd>Filter out all pseudo conflicts differences(only in 3-way comparison). Enabled by default.</dd>
 			<dt>Identical elements</dt>
 			<dd>Filter out all identical elements (elements with no differences). Enabled by default.</dd>
 			<dt>Empty Resource Mappings</dt>
 			<dd>Filter out all resource mappings with no differences from the view. Enabled by default.</dd>
 			<dt>Cascading differences</dt>
 			<dd>Filter out all differences that are contained under differences (except when in conflict). Enabled by default.</dd>
 		</dl>
 		<p>PENDING UPDATE, this is a demo displaying EMF Compare 1.3

 			<a href="http://www.eclipse.org/emf/compare/doc/features/videos/Filters/filters.htm">Demo</a>
 		</p>
 		<p>PENDING : New filters can be provided to EMF Compare through extension points.</p>
 		<h2 id="Text_Attribute_Comparison">Text Attribute Comparison</h2>
 		<p>Differences made into
 			<i>String</i>-typed attributes can be compared and merged directly as text from the compare interface through a simple right-click on the difference.
 		</p>
 		<p>
 			<img border="0" src="./../images/EMF_Compare_Text_Compare.png"/>
 		</p>
 		<p>PENDING UPDATE, this demo displays EMF Compare 1.3

 			<a href="http://www.eclipse.org/emf/compare/doc/features/videos/Text%20compare/textCompare.htm">Demo</a>
 		</p>
 		<h2 id="Graphical_Comparison">Graphical Comparison</h2>
 		<p>PENDING UPDATE</p>
 		<p>Since the 1.2 release EMF compare provides the ability to compare models with graphical modelers. </p>
 		<p>Have a look on the following demos :</p>
 		<p>
 			<a href="http://www.eclipse.org/emf/compare/doc/features/videos/EcoreTools-v2/EMFCompareEcoreTools.html" title="http://www.eclipse.org/emf/compare/doc/features/videos/EcoreTools-v2/EMFCompareEcoreTools.html">Demo : Comparing Ecore files with diagrams</a>
 		</p>
 		<p>
 			<a href="http://www.eclipse.org/emf/compare/doc/features/videos/Papyrus/EMFComparePapyrus.html" title="http://www.eclipse.org/emf/compare/doc/features/videos/Papyrus/EMFComparePapyrus.html">Demo : Comparing UML files with diagrams</a>
 		</p>
 		<p>
 			<img border="0" src="./../images/Diag_comp_diff.png"/>
 		</p>
 		<h2 id="Logical_Model">Logical Model</h2>
 		<p>EMF Compare does not act simply on the selected files, but on their whole logical model (a given model can be split through multiple files through EMF
 			<i>control</i> action). Thanks to that, if you try and compare a model file that reference other model files, the comparison will still be able to take these "other" files into account. For example, if you try and compare a
 			<i>genmodel</i> file (that depends on its underlying
 			<i>ecore</i> file) :
 		</p>
 		<p>
 			<img border="0" src="./../images/EMF_Compare_Logical_Compare_Action.png"/>
 		</p>
 		<p>EMF Compare will actually consider both files when comparing :</p>
 		<p>
 			<img border="0" src="./../images/EMF_Compare_Logical_Compare_Result.png"/>
 		</p>
 		<p>PENDING UPDATE

 			<a href="http://www.eclipse.org/emf/compare/doc/features/videos/LogicalModels/LogicalModels.html">Demo</a>
 		</p>
 		<h2 id="UML_Specialization">UML Specialization</h2>
 		<p>PENDING</p>
 		<p>
 			<a href="http://www.eclipse.org/emf/compare/doc/features/videos/UML%20comparison/compareUml.htm" title="http://www.eclipse.org/emf/compare/doc/features/videos/UML%20comparison/compareUml.htm">Demo : Specific support to encapsulate profiles and stereotypes diffs</a>
 		</p>
 	</body>
 </html>
	<?xml version='1.0' encoding='utf-8' ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
	<html xmlns="http://www.w3.org/1999/xhtml">
	<head>
	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
	<title>Features</title>
	<link type="text/css" rel="stylesheet" href="/help/topic/org.eclipse.emf.compare.doc/doc/resources/bootstrap.css"/>
	<link type="text/css" rel="stylesheet" href="/help/topic/org.eclipse.emf.compare.doc/doc/resources/custom.css"/>
	</head>
	<body>
	<h1 id="Features">Features</h1>
	<h2 id="Handling_Conflicts">Handling Conflicts</h2>
	<p>PENDING</p>
	<h2 id="Grouping_Differences">Grouping Differences</h2>
	<p>This feature allows you to group differences together in the structural view according to a set predicate. By default, EMF Compare provides three distinct grouping strategies :</p>
	<p>
	<img border="0" src="./../images/EMF_Compare_Groups_Choice.png"/>
	</p>
	<dl>
	<dt>Default</dt>
	<dd>Do not try and group differences together, display them as they were detected.</dd>
	</dl>
	<p>
	<img border="0" src="./../images/EMF_Compare_Groups_Default.png"/>
	</p>
	<dl>
	<dt>By Kind</dt>
	<dd>Group differences by their kind (
	<i>additions</i>,
	<i>deletions</i>,
	<i>moves</i>,
	<i>changes</i>).
	</dd>
	</dl>
	<p>
	<img border="0" src="./../images/EMF_Compare_Groups_Kind.png"/>
	</p>
	<dl>
	<dt>By Side</dt>
	<dd>Group differences according to their side: left or right and a special group regrouping differences in conflicts with other differences together.</dd>
	</dl>
	<p>
	<img border="0" src="./../images/EMF_Compare_Groups_Side.png"/>
	</p>
	<p>PENDING UPDATE, this is a demo displaying EMF Compare 1.3

	<a href="http://www.eclipse.org/emf/compare/doc/features/videos/Groups/groups.htm">Demo</a>
	</p>
	<p>PENDING : New grouping strategies can be provided to EMF Compare through extension points.</p>
	<h2 id="Filtering_Differences">Filtering Differences</h2>
	<p>This features allows you to filter differences out of the structural view according to a set predicate. By default, EMF Compare provides five distinct filters :</p>
	<p>
	<img border="0" src="./../images/EMF_Compare_Filters_Choice.png"/>
	</p>
	<dl>
	<dt>Pseudo conflicts differences</dt>
	<dd>Filter out all pseudo conflicts differences(only in 3-way comparison). Enabled by default.</dd>
	<dt>Identical elements</dt>
	<dd>Filter out all identical elements (elements with no differences). Enabled by default.</dd>
	<dt>Empty Resource Mappings</dt>
	<dd>Filter out all resource mappings with no differences from the view. Enabled by default.</dd>
	<dt>Cascading differences</dt>
	<dd>Filter out all differences that are contained under differences (except when in conflict). Enabled by default.</dd>
	</dl>
	<p>PENDING UPDATE, this is a demo displaying EMF Compare 1.3

	<a href="http://www.eclipse.org/emf/compare/doc/features/videos/Filters/filters.htm">Demo</a>
	</p>
	<p>PENDING : New filters can be provided to EMF Compare through extension points.</p>
	<h2 id="Text_Attribute_Comparison">Text Attribute Comparison</h2>
	<p>Differences made into
	<i>String</i>-typed attributes can be compared and merged directly as text from the compare interface through a simple right-click on the difference.
	</p>
	<p>
	<img border="0" src="./../images/EMF_Compare_Text_Compare.png"/>
	</p>
	<p>PENDING UPDATE, this demo displays EMF Compare 1.3

	<a href="http://www.eclipse.org/emf/compare/doc/features/videos/Text%20compare/textCompare.htm">Demo</a>
	</p>
	<h2 id="Graphical_Comparison">Graphical Comparison</h2>
	<p>PENDING UPDATE</p>
	<p>Since the 1.2 release EMF compare provides the ability to compare models with graphical modelers. </p>
	<p>Have a look on the following demos :</p>
	<p>
	<a href="http://www.eclipse.org/emf/compare/doc/features/videos/EcoreTools-v2/EMFCompareEcoreTools.html" title="http://www.eclipse.org/emf/compare/doc/features/videos/EcoreTools-v2/EMFCompareEcoreTools.html">Demo : Comparing Ecore files with diagrams</a>
	</p>
	<p>
	<a href="http://www.eclipse.org/emf/compare/doc/features/videos/Papyrus/EMFComparePapyrus.html" title="http://www.eclipse.org/emf/compare/doc/features/videos/Papyrus/EMFComparePapyrus.html">Demo : Comparing UML files with diagrams</a>
	</p>
	<p>
	<img border="0" src="./../images/Diag_comp_diff.png"/>
	</p>
	<h2 id="Logical_Model">Logical Model</h2>
	<p>EMF Compare does not act simply on the selected files, but on their whole logical model (a given model can be split through multiple files through EMF
	<i>control</i> action). Thanks to that, if you try and compare a model file that reference other model files, the comparison will still be able to take these "other" files into account. For example, if you try and compare a
	<i>genmodel</i> file (that depends on its underlying
	<i>ecore</i> file) :
	</p>
	<p>
	<img border="0" src="./../images/EMF_Compare_Logical_Compare_Action.png"/>
	</p>
	<p>EMF Compare will actually consider both files when comparing :</p>
	<p>
	<img border="0" src="./../images/EMF_Compare_Logical_Compare_Result.png"/>
	</p>
	<p>PENDING UPDATE

	<a href="http://www.eclipse.org/emf/compare/doc/features/videos/LogicalModels/LogicalModels.html">Demo</a>
	</p>
	<h2 id="UML_Specialization">UML Specialization</h2>
	<p>PENDING</p>
	<p>
	<a href="http://www.eclipse.org/emf/compare/doc/features/videos/UML%20comparison/compareUml.htm" title="http://www.eclipse.org/emf/compare/doc/features/videos/UML%20comparison/compareUml.htm">Demo : Specific support to encapsulate profiles and stereotypes diffs</a>
	</p>
	</body>
	</html>