Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAxel Richard2013-02-01 15:08:06 +0000
committerGerrit Code Review @ Eclipse.org2013-02-12 07:00:45 +0000
commit4ee5ece3d9292ea5a3f7703fbf060380e23b89cd (patch)
tree5516bb85e222c09263371976fb508fd946a8e6d5 /plugins/org.eclipse.emf.compare/model
parentf8e69e5b12046badbafc4da2b5ee6870bf0ac69d (diff)
downloadorg.eclipse.emf.compare-4ee5ece3d9292ea5a3f7703fbf060380e23b89cd.tar.gz
org.eclipse.emf.compare-4ee5ece3d9292ea5a3f7703fbf060380e23b89cd.tar.xz
org.eclipse.emf.compare-4ee5ece3d9292ea5a3f7703fbf060380e23b89cd.zip
[399456] Managed enhance readability of Resource Attachment Change
- The left and right content viewer parts are now displaying the content of the fragmented resource in case of the resource attachment change involved a fragmented resource. - The resource attachment changes are now displayed under their associated match resource. - The filter Resource Mappings is now filtering out only match resources which don't contain resource attachment changes. - Add a new eOpposite reference (opposite of matchedResources of Comparison) on the MatchResource eClass of the compare.ecore metamodel Change-Id: Ide411601025101b1f93b22855e0c5668b5b8b79b
Diffstat (limited to 'plugins/org.eclipse.emf.compare/model')
-rw-r--r--plugins/org.eclipse.emf.compare/model/compare.ecore4
-rw-r--r--plugins/org.eclipse.emf.compare/model/compare.genmodel5
2 files changed, 6 insertions, 3 deletions
diff --git a/plugins/org.eclipse.emf.compare/model/compare.ecore b/plugins/org.eclipse.emf.compare/model/compare.ecore
index a5af333a3..bcfbf848b 100644
--- a/plugins/org.eclipse.emf.compare/model/compare.ecore
+++ b/plugins/org.eclipse.emf.compare/model/compare.ecore
@@ -32,7 +32,7 @@
</eOperations>
<eOperations name="getEqualityHelper" eType="#//IEqualityHelper"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="matchedResources" upperBound="-1"
- eType="#//MatchResource" containment="true">
+ eType="#//MatchResource" containment="true" eOpposite="#//MatchResource/comparison">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="This contains the mappings for each compared Resource."/>
</eAnnotations>
@@ -96,6 +96,8 @@
<details key="documentation" value="Keeps a reference towards the origin Resource of this Match. Might be null if this is a Comparison we have re-loaded from its serialized form and the origin EResource could not be loaded."/>
</eAnnotations>
</eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="comparison" eType="#//Comparison"
+ eOpposite="#//Comparison/matchedResources"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Match">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
diff --git a/plugins/org.eclipse.emf.compare/model/compare.genmodel b/plugins/org.eclipse.emf.compare/model/compare.genmodel
index 03c388f04..b8b596f66 100644
--- a/plugins/org.eclipse.emf.compare/model/compare.genmodel
+++ b/plugins/org.eclipse.emf.compare/model/compare.genmodel
@@ -35,7 +35,7 @@
<genDataTypes ecoreDataType="compare.ecore#//EIterable">
<genTypeParameters ecoreTypeParameter="compare.ecore#//EIterable/T"/>
</genDataTypes>
- <genDataTypes ecoreDataType="compare.ecore#//CompareConfiguration"/>
+ <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"/>
@@ -49,7 +49,7 @@
<genOperations ecoreOperation="compare.ecore#//Comparison/getMatch">
<genParameters ecoreParameter="compare.ecore#//Comparison/getMatch/element"/>
</genOperations>
- <genOperations ecoreOperation="compare.ecore#//Comparison/getConfiguration"/>
+ <genOperations ecoreOperation="compare.ecore#//Comparison/getEqualityHelper"/>
</genClasses>
<genClasses ecoreClass="compare.ecore#//MatchResource">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute compare.ecore#//MatchResource/leftURI"/>
@@ -58,6 +58,7 @@
<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"/>

Back to the top