diff options
Diffstat (limited to 'sandbox/org.eclipse.papyrus.uml.compare.merge/src/org/eclipse/papyrus/uml/compare/merge/ITransactionalMerger.java')
| -rw-r--r-- | sandbox/org.eclipse.papyrus.uml.compare.merge/src/org/eclipse/papyrus/uml/compare/merge/ITransactionalMerger.java | 81 |
1 files changed, 0 insertions, 81 deletions
diff --git a/sandbox/org.eclipse.papyrus.uml.compare.merge/src/org/eclipse/papyrus/uml/compare/merge/ITransactionalMerger.java b/sandbox/org.eclipse.papyrus.uml.compare.merge/src/org/eclipse/papyrus/uml/compare/merge/ITransactionalMerger.java deleted file mode 100644 index 78e46baf985..00000000000 --- a/sandbox/org.eclipse.papyrus.uml.compare.merge/src/org/eclipse/papyrus/uml/compare/merge/ITransactionalMerger.java +++ /dev/null @@ -1,81 +0,0 @@ -/*****************************************************************************
- * Copyright (c) 2012 CEA LIST.
- *
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Vincent Lorenzo (CEA LIST) Vincent.Lorenzo@cea.fr - Initial API and implementation
- *
- *****************************************************************************/
-package org.eclipse.papyrus.uml.compare.merge;
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
- * TODO : rename into ITransactionalMerger
- */
-public interface ITransactionalMerger extends IMerger {
-
- /**
- * This command should have the same behavior as {@link DefaultMerger#applyInOrigin()}
- *
- * @return
- * 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);
-
-}
|