From 92029f6241a7a1a0e7e6584690ec43a746938fd6 Mon Sep 17 00:00:00 2001
From: Stefan Dirix
Date: Fri, 27 Feb 2015 14:16:32 +0100
Subject: [457652] Give xmi:ids higher priority than attribute ids

The IdentifierEObjectMatcher will now give xmi:ids priority over
attribute ids to prevent models with duplicate xmi:ids.

Includes testcases.

Bug: 457652
Signed-off-by: Stefan Dirix <sdirix@eclipsesource.com>
Change-Id: Ia3ba4222837ecc7f6a17bccc3973ecaee334fad0
---
 .../eclipse/emf/compare/tests/diff/data/featuremapmove/left.nodes   | 6 +++---
 .../eclipse/emf/compare/tests/diff/data/featuremapmove/right.nodes  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff')

diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/data/featuremapmove/left.nodes b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/data/featuremapmove/left.nodes
index ec5f2a5ac..5c5bb4d0d 100644
--- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/data/featuremapmove/left.nodes
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/data/featuremapmove/left.nodes
@@ -6,8 +6,8 @@
     xmlns:nodes="http://www.eclipse.org/emf/compare/tests/nodes"
     xmi:id="_root"
     name="Root">
-    <containmentRef1 xsi:type="nodes:NodeFeatureMapContainment2" name="n1">
-      <single name="a"/>
-      <multiple name="b"/>
+    <containmentRef1 xsi:type="nodes:NodeFeatureMapContainment2" name="n1" xmi:id="_n1">
+      <single name="a" xmi:id="_a"/>
+      <multiple name="b" xmi:id="_b"/>
     </containmentRef1>
 </nodes:Node>
\ No newline at end of file
diff --git a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/data/featuremapmove/right.nodes b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/data/featuremapmove/right.nodes
index 54602874f..b755f54e0 100644
--- a/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/data/featuremapmove/right.nodes
+++ b/plugins/org.eclipse.emf.compare.tests/src/org/eclipse/emf/compare/tests/diff/data/featuremapmove/right.nodes
@@ -6,8 +6,8 @@
     xmlns:nodes="http://www.eclipse.org/emf/compare/tests/nodes"
     xmi:id="_root"
     name="Root">
-    <containmentRef1 xsi:type="nodes:NodeFeatureMapContainment2" name="n2">
-      <multiple name="b"/>
-      <single name="a"/>
+    <containmentRef1 xsi:type="nodes:NodeFeatureMapContainment2" name="n2" xmi:id="_n2">
+      <multiple name="b" xmi:id="_b"/>
+      <single name="a" xmi:id="_a"/>
     </containmentRef1>
 </nodes:Node>
\ No newline at end of file
-- 
cgit v1.2.3