Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvlorenzo2012-04-30 05:12:37 -0400
committervlorenzo2012-04-30 05:12:37 -0400
commitff7922de32d05b0c0d8eebaa0b33e1a4da629fe4 (patch)
treef633477960f2ca15c7d2b98d33d8e15ac6cdd519 /sandbox/UMLCompareMergerExample
parent9e9f96c3ded021a4a89d683dcc67c4de5bb6bb1e (diff)
downloadorg.eclipse.papyrus-ff7922de32d05b0c0d8eebaa0b33e1a4da629fe4.tar.gz
org.eclipse.papyrus-ff7922de32d05b0c0d8eebaa0b33e1a4da629fe4.tar.xz
org.eclipse.papyrus-ff7922de32d05b0c0d8eebaa0b33e1a4da629fe4.zip
342163: [Usability] Papyrus merge should use the service edit of Papyrus
https://bugs.eclipse.org/bugs/show_bug.cgi?id=342163 A save of my work
Diffstat (limited to 'sandbox/UMLCompareMergerExample')
-rw-r--r--sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/merger/provider/ICommandMerger.java47
1 files changed, 44 insertions, 3 deletions
diff --git a/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/merger/provider/ICommandMerger.java b/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/merger/provider/ICommandMerger.java
index 2b83a4ebf1b..ce9c5d991b9 100644
--- a/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/merger/provider/ICommandMerger.java
+++ b/sandbox/UMLCompareMergerExample/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/merger/provider/ICommandMerger.java
@@ -14,28 +14,69 @@
package org.eclipse.papyrus.uml.merger.provider;
import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.compare.diff.merge.DefaultMerger;
import org.eclipse.emf.compare.diff.merge.IMerger;
import org.eclipse.emf.transaction.TransactionalEditingDomain;
-
+/**
+ *
+ * The mergers which implement this interface are able to provide commands for the merge actions
+ *
+ */
public interface ICommandMerger extends IMerger {
/**
+ * This command should have the same behavior as {@link DefaultMerger#applyInOrigin()}
*
* @return
- * the command to do the action ApplyInOrigin
+ * the command to do the action
*/
public Command getApplyInOriginCommand(final TransactionalEditingDomain domain);
-
+ /**
+ * This command should have the same behavior as {@link DefaultMerger#undoInTarget()}
+ *
+ * @param domain
+ * @return
+ * the command to do the action
+ */
public Command getUndoInTargetCommand(final TransactionalEditingDomain domain);
+ /**
+ * This command should have the same behavior as {@link DefaultMerger#doApplyInOrigin}
+ *
+ * @param domain
+ * @return
+ * the command to do the action
+ */
public Command getDoApplyInOriginCommand(final TransactionalEditingDomain domain);
+ /**
+ * This command should have the same behavior as {@link DefaultMerger#doUndoInTarget}
+ *
+ * @param domain
+ * @return
+ * the command to do the action
+ */
public Command getDoUndoInTargetCommand(final TransactionalEditingDomain domain);
+ /**
+ * This command should have the same behavior as {@link DefaultMerger#mergeRequiredDifferences}
+ *
+ * @param domain
+ * @param applyInOrigin
+ * @return
+ * the command to do the action
+ */
public Command getMergeRequiredDifferencesCommand(final TransactionalEditingDomain domain, final boolean applyInOrigin);
+ /**
+ * This command should have the same behavior as {@link DefaultMerger#postProcess}
+ *
+ * @param domain
+ * @return
+ * the command to do the action
+ */
public Command getPostProcessCommand(final TransactionalEditingDomain domain);
}

Back to the top