383880: [UML Compare] Profile and stereotyped element management

https://bugs.eclipse.org/bugs/show_bug.cgi?id=383880

1 files changed, 20 insertions, 0 deletions

diff --git a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/src/org/eclipse/papyrus/uml/compare/diff/internal/provider/UMLTransactionalMergerProvider.java b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/src/org/eclipse/papyrus/uml/compare/diff/internal/provider/UMLTransactionalMergerProvider.java
index 03cf4c943de..02c4f85c7cf 100644
--- a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/src/org/eclipse/papyrus/uml/compare/diff/internal/provider/UMLTransactionalMergerProvider.java
+++ b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/src/org/eclipse/papyrus/uml/compare/diff/internal/provider/UMLTransactionalMergerProvider.java
@@ -22,6 +22,14 @@ import org.eclipse.emf.compare.uml2diff.impl.UMLProfileApplicationAdditionImpl;
 import org.eclipse.emf.compare.uml2diff.impl.UMLProfileApplicationRemovalImpl;

 import org.eclipse.emf.compare.uml2diff.impl.UMLStereotypeApplicationAdditionImpl;

 import org.eclipse.emf.compare.uml2diff.impl.UMLStereotypeApplicationRemovalImpl;

+import org.eclipse.emf.compare.uml2diff.impl.UMLStereotypeAttributeChangeLeftTargetImpl;

+import org.eclipse.emf.compare.uml2diff.impl.UMLStereotypeAttributeChangeRightTargetImpl;

+import org.eclipse.emf.compare.uml2diff.impl.UMLStereotypeReferenceChangeLeftTargetImpl;

+import org.eclipse.emf.compare.uml2diff.impl.UMLStereotypeReferenceChangeRightTargetImpl;

+import org.eclipse.emf.compare.uml2diff.impl.UMLStereotypeReferenceOrderChangeImpl;

+import org.eclipse.emf.compare.uml2diff.impl.UMLStereotypeUpdateAttributeImpl;

+import org.eclipse.emf.compare.uml2diff.impl.UMLStereotypeUpdateReferenceImpl;

+import org.eclipse.papyrus.infra.emf.compare.diff.internal.merger.DefaultExtensionTransactionalMerger;

 import org.eclipse.papyrus.infra.emf.compare.diff.internal.util.PapyrusCompareMap;

 import org.eclipse.papyrus.infra.emf.compare.diff.merge.ITransactionalMerger;

 import org.eclipse.papyrus.infra.emf.compare.diff.provider.ITransactionalMergerProvider;

@@ -64,6 +72,18 @@ public class UMLTransactionalMergerProvider implements ITransactionalMergerProvi
 			mergerTypes.put(UMLProfileApplicationRemovalImpl.class, UMLProfileApplicationRemovalMerger.class);

 			mergerTypes.put(UMLStereotypeApplicationAdditionImpl.class, UMLStereotypeApplicationAdditionMerger.class);

 			mergerTypes.put(UMLStereotypeApplicationRemovalImpl.class, UMLStereotypeApplicationRemovalMerger.class);

+

+			//the mergers for UMLStereotype

+			mergerTypes.put(UMLStereotypeApplicationAdditionImpl.class, DefaultExtensionTransactionalMerger.class);

+			mergerTypes.put(UMLStereotypeApplicationRemovalImpl.class, DefaultExtensionTransactionalMerger.class);

+			mergerTypes.put(UMLStereotypeAttributeChangeLeftTargetImpl.class, DefaultExtensionTransactionalMerger.class);

+			mergerTypes.put(UMLStereotypeAttributeChangeRightTargetImpl.class, DefaultExtensionTransactionalMerger.class);

+			mergerTypes.put(UMLStereotypeReferenceChangeLeftTargetImpl.class, DefaultExtensionTransactionalMerger.class);

+			mergerTypes.put(UMLStereotypeReferenceChangeRightTargetImpl.class, DefaultExtensionTransactionalMerger.class);

+			mergerTypes.put(UMLStereotypeReferenceOrderChangeImpl.class, DefaultExtensionTransactionalMerger.class);

+			mergerTypes.put(UMLStereotypeUpdateAttributeImpl.class, DefaultExtensionTransactionalMerger.class);

+			mergerTypes.put(UMLStereotypeUpdateReferenceImpl.class, DefaultExtensionTransactionalMerger.class);

+

 		}

 		return mergerTypes;

 	}