diff options
Diffstat (limited to 'sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/merger/provider/CDiffGroupMerger.java')
| -rw-r--r-- | sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/merger/provider/CDiffGroupMerger.java | 25 |
1 files changed, 25 insertions, 0 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 new file mode 100644 index 00000000000..0cf94702413 --- /dev/null +++ b/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/merger/provider/CDiffGroupMerger.java @@ -0,0 +1,25 @@ +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();
+ }
+ }
+}
|