Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvlorenzo2012-04-13 05:37:10 -0400
committervlorenzo2012-04-13 05:37:10 -0400
commit460a48c314b71170bc7831292e0746426a280893 (patch)
treea3f1aec3e3cde040041d27645501cc32604b64e5 /sandbox/UMLCompareMergerExample
parent991e44d8216de92e3a104285cd51a5e890a1edad (diff)
downloadorg.eclipse.papyrus-460a48c314b71170bc7831292e0746426a280893.tar.gz
org.eclipse.papyrus-460a48c314b71170bc7831292e0746426a280893.tar.xz
org.eclipse.papyrus-460a48c314b71170bc7831292e0746426a280893.zip
342163: [Usability] Papyrus merge should use the service edit of Papyrus
https://bugs.eclipse.org/bugs/show_bug.cgi?id=342163
Diffstat (limited to 'sandbox/UMLCompareMergerExample')
-rw-r--r--sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/merger/provider/CDiffGroupMerger.java25
-rw-r--r--sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/merger/provider/PapyrusUMLMergeProvider.java2
2 files changed, 1 insertions, 26 deletions
diff --git a/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/merger/provider/CDiffGroupMerger.java b/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/merger/provider/CDiffGroupMerger.java
deleted file mode 100644
index 0cf94702413..00000000000
--- a/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/merger/provider/CDiffGroupMerger.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.eclipse.papyrus.uml.merger.provider;
-
-import org.eclipse.emf.compare.diff.internal.merge.impl.DiffGroupMerger;
-import org.eclipse.papyrus.uml.compare.merger.utils.MergerUtils;
-
-
-public class CDiffGroupMerger extends DiffGroupMerger {
- @Override
- public void doUndoInTarget() {
- if(MergerUtils.usePapyrusMerger()) {
- throw new UnsupportedOperationException();
- } else {
- super.doUndoInTarget();
- }
- }
-
- @Override
- public void doApplyInOrigin() {
- if(MergerUtils.usePapyrusMerger()) {
- throw new UnsupportedOperationException();
- } else {
- super.doApplyInOrigin();
- }
- }
-}
diff --git a/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/merger/provider/PapyrusUMLMergeProvider.java b/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/merger/provider/PapyrusUMLMergeProvider.java
index ca163de43a0..116cdea5e03 100644
--- a/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/merger/provider/PapyrusUMLMergeProvider.java
+++ b/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/merger/provider/PapyrusUMLMergeProvider.java
@@ -35,7 +35,7 @@ public class PapyrusUMLMergeProvider implements IMergerProvider{
public Map<Class<? extends DiffElement>, Class<? extends IMerger>> getMergers() {
if (mergerTypes == null) {
mergerTypes = new PapyrusMap<Class<? extends DiffElement>, Class<? extends IMerger>>();
- mergerTypes.put(DiffGroup.class, CDiffGroupMerger.class);
+// mergerTypes.put(DiffGroup.class, CDiffGroupMerger.class);//we needn't of the specific DiffGroup
mergerTypes.put(ModelElementChangeRightTarget.class, CModelElementChangeRightTargetMerger.class);
mergerTypes.put(ModelElementChangeLeftTarget.class, CModelElementChangeLeftTargetMerger.class);
mergerTypes.put(MoveModelElement.class, CMoveModelElementMerger.class);

Back to the top