1 files changed, 111 insertions, 109 deletions
diff --git a/plugins/org.eclipse.emf.compare/model/compare.genmodel b/plugins/org.eclipse.emf.compare/model/compare.genmodel
index b8b596f66..ac14271a0 100644
--- a/plugins/org.eclipse.emf.compare/model/compare.genmodel
+++ b/plugins/org.eclipse.emf.compare/model/compare.genmodel
@@ -1,109 +1,111 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2012 Obeo.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;    Obeo - initial API and implementation"
-    modelDirectory="/org.eclipse.emf.compare/src-gen" editDirectory="/org.eclipse.emf.compare.edit/src-gen"
-    editorDirectory="/org.eclipse.emf.compare.editor/src-gen" modelPluginID="org.eclipse.emf.compare"
-    modelName="Compare" editPluginClass="org.eclipse.emf.compare.provider.EMFCompareEditPlugin"
-    editorPluginClass="org.eclipse.emf.compare.presentation.EMFCompareEditorPlugin"
-    nonNLSMarkers="true" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl"
-    codeFormatting="true" testsDirectory="/org.eclipse.emf.compare.tests/src-gen"
-    testSuiteClass="org.eclipse.emf.compare.tests.CompareAllTests" importerID="org.eclipse.emf.importer.ecore"
-    complianceLevel="5.0" colorProviders="true" fontProviders="true" runtimeVersion="2.5"
-    usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
-  <foreignModel>compare.ecore</foreignModel>
-  <genPackages prefix="Compare" basePackage="org.eclipse.emf" disposableProviderFactory="true"
-      ecorePackage="compare.ecore#/">
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="compare.ecore#//DifferenceKind">
-      <genEnumLiterals ecoreEnumLiteral="compare.ecore#//DifferenceKind/ADD"/>
-      <genEnumLiterals ecoreEnumLiteral="compare.ecore#//DifferenceKind/DELETE"/>
-      <genEnumLiterals ecoreEnumLiteral="compare.ecore#//DifferenceKind/CHANGE"/>
-      <genEnumLiterals ecoreEnumLiteral="compare.ecore#//DifferenceKind/MOVE"/>
-    </genEnums>
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="compare.ecore#//DifferenceSource">
-      <genEnumLiterals ecoreEnumLiteral="compare.ecore#//DifferenceSource/LEFT"/>
-      <genEnumLiterals ecoreEnumLiteral="compare.ecore#//DifferenceSource/RIGHT"/>
-    </genEnums>
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="compare.ecore#//DifferenceState">
-      <genEnumLiterals ecoreEnumLiteral="compare.ecore#//DifferenceState/UNRESOLVED"/>
-      <genEnumLiterals ecoreEnumLiteral="compare.ecore#//DifferenceState/MERGED"/>
-      <genEnumLiterals ecoreEnumLiteral="compare.ecore#//DifferenceState/DISCARDED"/>
-    </genEnums>
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="compare.ecore#//ConflictKind">
-      <genEnumLiterals ecoreEnumLiteral="compare.ecore#//ConflictKind/REAL"/>
-      <genEnumLiterals ecoreEnumLiteral="compare.ecore#//ConflictKind/PSEUDO"/>
-    </genEnums>
-    <genDataTypes ecoreDataType="compare.ecore#//EIterable">
-      <genTypeParameters ecoreTypeParameter="compare.ecore#//EIterable/T"/>
-    </genDataTypes>
-    <genDataTypes ecoreDataType="compare.ecore#//IEqualityHelper"/>
-    <genClasses ecoreClass="compare.ecore#//Comparison">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference compare.ecore#//Comparison/matchedResources"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference compare.ecore#//Comparison/matches"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference compare.ecore#//Comparison/conflicts"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference compare.ecore#//Comparison/equivalences"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute compare.ecore#//Comparison/threeWay"/>
-      <genOperations ecoreOperation="compare.ecore#//Comparison/getDifferences"/>
-      <genOperations ecoreOperation="compare.ecore#//Comparison/getDifferences.1">
-        <genParameters ecoreParameter="compare.ecore#//Comparison/getDifferences.1/element"/>
-      </genOperations>
-      <genOperations ecoreOperation="compare.ecore#//Comparison/getMatch">
-        <genParameters ecoreParameter="compare.ecore#//Comparison/getMatch/element"/>
-      </genOperations>
-      <genOperations ecoreOperation="compare.ecore#//Comparison/getEqualityHelper"/>
-    </genClasses>
-    <genClasses ecoreClass="compare.ecore#//MatchResource">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute compare.ecore#//MatchResource/leftURI"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute compare.ecore#//MatchResource/rightURI"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute compare.ecore#//MatchResource/originURI"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute compare.ecore#//MatchResource/left"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute compare.ecore#//MatchResource/right"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute compare.ecore#//MatchResource/origin"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference compare.ecore#//MatchResource/comparison"/>
-    </genClasses>
-    <genClasses ecoreClass="compare.ecore#//Match">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference compare.ecore#//Match/submatches"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference compare.ecore#//Match/differences"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference compare.ecore#//Match/left"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference compare.ecore#//Match/right"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference compare.ecore#//Match/origin"/>
-      <genOperations ecoreOperation="compare.ecore#//Match/getComparison"/>
-      <genOperations ecoreOperation="compare.ecore#//Match/getAllSubmatches"/>
-      <genOperations ecoreOperation="compare.ecore#//Match/getAllDifferences"/>
-    </genClasses>
-    <genClasses ecoreClass="compare.ecore#//Diff">
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference compare.ecore#//Diff/match"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference compare.ecore#//Diff/requires"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference compare.ecore#//Diff/requiredBy"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference compare.ecore#//Diff/refines"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference compare.ecore#//Diff/refinedBy"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute compare.ecore#//Diff/kind"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute compare.ecore#//Diff/source"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute compare.ecore#//Diff/state"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference compare.ecore#//Diff/equivalence"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference compare.ecore#//Diff/conflict"/>
-      <genOperations ecoreOperation="compare.ecore#//Diff/copyRightToLeft"/>
-      <genOperations ecoreOperation="compare.ecore#//Diff/copyLeftToRight"/>
-      <genOperations ecoreOperation="compare.ecore#//Diff/discard"/>
-    </genClasses>
-    <genClasses ecoreClass="compare.ecore#//ResourceAttachmentChange">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute compare.ecore#//ResourceAttachmentChange/resourceURI"/>
-    </genClasses>
-    <genClasses ecoreClass="compare.ecore#//ReferenceChange">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference compare.ecore#//ReferenceChange/reference"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference compare.ecore#//ReferenceChange/value"/>
-    </genClasses>
-    <genClasses ecoreClass="compare.ecore#//AttributeChange">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference compare.ecore#//AttributeChange/attribute"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute compare.ecore#//AttributeChange/value"/>
-    </genClasses>
-    <genClasses ecoreClass="compare.ecore#//Conflict">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute compare.ecore#//Conflict/kind"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference compare.ecore#//Conflict/differences"/>
-      <genOperations ecoreOperation="compare.ecore#//Conflict/getLeftDifferences"/>
-      <genOperations ecoreOperation="compare.ecore#//Conflict/getRightDifferences"/>
-    </genClasses>
-    <genClasses ecoreClass="compare.ecore#//Equivalence">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference compare.ecore#//Equivalence/differences"/>
-    </genClasses>
-  </genPackages>
-</genmodel:GenModel>
+<?xml version="1.0" encoding="UTF-8"?>
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2012 Obeo.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;    Obeo - initial API and implementation"
+    modelDirectory="/org.eclipse.emf.compare/src-gen" editDirectory="/org.eclipse.emf.compare.edit/src-gen"
+    editorDirectory="/org.eclipse.emf.compare.editor/src-gen" modelPluginID="org.eclipse.emf.compare"
+    modelName="Compare" editPluginClass="org.eclipse.emf.compare.provider.EMFCompareEditPlugin"
+    editorPluginClass="org.eclipse.emf.compare.presentation.EMFCompareEditorPlugin"
+    nonNLSMarkers="true" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl"
+    codeFormatting="true" testsDirectory="/org.eclipse.emf.compare.tests/src-gen"
+    testSuiteClass="org.eclipse.emf.compare.tests.CompareAllTests" importerID="org.eclipse.emf.importer.ecore"
+    complianceLevel="5.0" colorProviders="true" fontProviders="true" runtimeVersion="2.5"
+    usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
+  <foreignModel>compare.ecore</foreignModel>
+  <genPackages prefix="Compare" basePackage="org.eclipse.emf" disposableProviderFactory="true"
+      ecorePackage="compare.ecore#/">
+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="compare.ecore#//DifferenceKind">
+      <genEnumLiterals ecoreEnumLiteral="compare.ecore#//DifferenceKind/ADD"/>
+      <genEnumLiterals ecoreEnumLiteral="compare.ecore#//DifferenceKind/DELETE"/>
+      <genEnumLiterals ecoreEnumLiteral="compare.ecore#//DifferenceKind/CHANGE"/>
+      <genEnumLiterals ecoreEnumLiteral="compare.ecore#//DifferenceKind/MOVE"/>
+    </genEnums>
+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="compare.ecore#//DifferenceSource">
+      <genEnumLiterals ecoreEnumLiteral="compare.ecore#//DifferenceSource/LEFT"/>
+      <genEnumLiterals ecoreEnumLiteral="compare.ecore#//DifferenceSource/RIGHT"/>
+    </genEnums>
+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="compare.ecore#//DifferenceState">
+      <genEnumLiterals ecoreEnumLiteral="compare.ecore#//DifferenceState/UNRESOLVED"/>
+      <genEnumLiterals ecoreEnumLiteral="compare.ecore#//DifferenceState/MERGED"/>
+      <genEnumLiterals ecoreEnumLiteral="compare.ecore#//DifferenceState/DISCARDED"/>
+    </genEnums>
+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="compare.ecore#//ConflictKind">
+      <genEnumLiterals ecoreEnumLiteral="compare.ecore#//ConflictKind/REAL"/>
+      <genEnumLiterals ecoreEnumLiteral="compare.ecore#//ConflictKind/PSEUDO"/>
+    </genEnums>
+    <genDataTypes ecoreDataType="compare.ecore#//EIterable">
+      <genTypeParameters ecoreTypeParameter="compare.ecore#//EIterable/T"/>
+    </genDataTypes>
+    <genDataTypes ecoreDataType="compare.ecore#//IEqualityHelper"/>
+    <genClasses ecoreClass="compare.ecore#//Comparison">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference compare.ecore#//Comparison/matchedResources"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference compare.ecore#//Comparison/matches"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference compare.ecore#//Comparison/conflicts"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference compare.ecore#//Comparison/equivalences"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute compare.ecore#//Comparison/threeWay"/>
+      <genOperations ecoreOperation="compare.ecore#//Comparison/getDifferences"/>
+      <genOperations ecoreOperation="compare.ecore#//Comparison/getDifferences.1">
+        <genParameters ecoreParameter="compare.ecore#//Comparison/getDifferences.1/element"/>
+      </genOperations>
+      <genOperations ecoreOperation="compare.ecore#//Comparison/getMatch">
+        <genParameters ecoreParameter="compare.ecore#//Comparison/getMatch/element"/>
+      </genOperations>
+      <genOperations ecoreOperation="compare.ecore#//Comparison/getEqualityHelper"/>
+    </genClasses>
+    <genClasses ecoreClass="compare.ecore#//MatchResource">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute compare.ecore#//MatchResource/leftURI"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute compare.ecore#//MatchResource/rightURI"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute compare.ecore#//MatchResource/originURI"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute compare.ecore#//MatchResource/left"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute compare.ecore#//MatchResource/right"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute compare.ecore#//MatchResource/origin"/>
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference compare.ecore#//MatchResource/comparison"/>
+    </genClasses>
+    <genClasses ecoreClass="compare.ecore#//Match">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference compare.ecore#//Match/submatches"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference compare.ecore#//Match/differences"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference compare.ecore#//Match/left"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference compare.ecore#//Match/right"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference compare.ecore#//Match/origin"/>
+      <genOperations ecoreOperation="compare.ecore#//Match/getComparison"/>
+      <genOperations ecoreOperation="compare.ecore#//Match/getAllSubmatches"/>
+      <genOperations ecoreOperation="compare.ecore#//Match/getAllDifferences"/>
+    </genClasses>
+    <genClasses ecoreClass="compare.ecore#//Diff">
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference compare.ecore#//Diff/match"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference compare.ecore#//Diff/requires"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference compare.ecore#//Diff/requiredBy"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference compare.ecore#//Diff/implies"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference compare.ecore#//Diff/impliedBy"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference compare.ecore#//Diff/refines"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference compare.ecore#//Diff/refinedBy"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute compare.ecore#//Diff/kind"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute compare.ecore#//Diff/source"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute compare.ecore#//Diff/state"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference compare.ecore#//Diff/equivalence"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference compare.ecore#//Diff/conflict"/>
+      <genOperations ecoreOperation="compare.ecore#//Diff/copyRightToLeft"/>
+      <genOperations ecoreOperation="compare.ecore#//Diff/copyLeftToRight"/>
+      <genOperations ecoreOperation="compare.ecore#//Diff/discard"/>
+    </genClasses>
+    <genClasses ecoreClass="compare.ecore#//ResourceAttachmentChange">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute compare.ecore#//ResourceAttachmentChange/resourceURI"/>
+    </genClasses>
+    <genClasses ecoreClass="compare.ecore#//ReferenceChange">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference compare.ecore#//ReferenceChange/reference"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference compare.ecore#//ReferenceChange/value"/>
+    </genClasses>
+    <genClasses ecoreClass="compare.ecore#//AttributeChange">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference compare.ecore#//AttributeChange/attribute"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute compare.ecore#//AttributeChange/value"/>
+    </genClasses>
+    <genClasses ecoreClass="compare.ecore#//Conflict">
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute compare.ecore#//Conflict/kind"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference compare.ecore#//Conflict/differences"/>
+      <genOperations ecoreOperation="compare.ecore#//Conflict/getLeftDifferences"/>
+      <genOperations ecoreOperation="compare.ecore#//Conflict/getRightDifferences"/>
+    </genClasses>
+    <genClasses ecoreClass="compare.ecore#//Equivalence">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference compare.ecore#//Equivalence/differences"/>
+    </genClasses>
+  </genPackages>
+</genmodel:GenModel>