[455677] Fixes insertion index of opaque element body values additions06/38506/2
commit5da79abd27094cb3b12757ba5f82e4378c9e9f3d
authorPhilip Langer <planger@eclipsesource.com>
Thu, 18 Dec 2014 17:53:29 +0000 (18 18:53 +0100)
committerAxel RICHARD <axel.richard@obeo.fr>
Fri, 19 Dec 2014 14:54:58 +0000 (19 09:54 -0500)
tree471a5fb0d12edc0b5c67d68b34466ab22c2fbbd4
parent0c9a457cb9dfe7167b96e4bb109af8f6be5b4612
[455677] Fixes insertion index of opaque element body values additions

Instead of relying on the DiffUtil.findInsertionIndex, which finds the
insertion index on a best effort basis and does not know about the
connection between language and body values, we now ensure that we
always merge the language value first and then select the insertion
index for the body value based on the index of the already merged
language value.

Bug: 455677
Change-Id: Icf3ff278e9ec55f2fc9440f537459d73d7267bb6
Signed-off-by: Philip Langer <planger@eclipsesource.com>
plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/opaque/OpaqueElementBodyChangeMergeTest.java
plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/merge/OpaqueElementBodyChangeMerger.java
plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/extension/UMLOpaqueElementBodyChangeFactory.java
plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/util/UMLCompareUtil.java