diff options
Diffstat (limited to 'plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/merge/IMergeData.java')
-rw-r--r-- | plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/merge/IMergeData.java | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/merge/IMergeData.java b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/merge/IMergeData.java index eae86500e..69722ed46 100644 --- a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/merge/IMergeData.java +++ b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/merge/IMergeData.java @@ -11,7 +11,6 @@ package org.eclipse.emf.compare.internal.merge; import org.eclipse.emf.common.notify.Adapter; -import org.eclipse.emf.compare.DifferenceSource; /** * Interface implemented by {@link org.eclipse.emf.compare.internal.merge.MergeDataImpl}. It helps to know the @@ -22,28 +21,6 @@ import org.eclipse.emf.compare.DifferenceSource; public interface IMergeData extends Adapter { /** - * Returns the merge mode the {@link #getTarget() associated} diff has been merged with. - * - * @return the merge mode the {@link #getTarget() associated} diff has been merged with. - */ - MergeMode getMergeMode(); - - /** - * Set the merge mode the {@link #getTarget() associated} diff has been merged with. - * - * @param mergeMode - * the merge mode the {@link #getTarget() associated} diff has been merged with. - */ - void setMergeMode(MergeMode mergeMode); - - /** - * Returns the target side of the merge. - * - * @return the target side of the merge. - */ - DifferenceSource getMergeTarget(); - - /** * Returns whether the left side of the comparison is editable. * * @return true if the left side of the comparison is editable, false otherwise. |