diff options
Diffstat (limited to 'plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/merge/MergeDataImpl.java')
-rw-r--r-- | plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/merge/MergeDataImpl.java | 35 |
1 files changed, 1 insertions, 34 deletions
diff --git a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/merge/MergeDataImpl.java b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/merge/MergeDataImpl.java index 305280bbb..2a9c666b0 100644 --- a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/merge/MergeDataImpl.java +++ b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/internal/merge/MergeDataImpl.java @@ -11,7 +11,6 @@ package org.eclipse.emf.compare.internal.merge; import org.eclipse.emf.common.notify.impl.AdapterImpl; -import org.eclipse.emf.compare.DifferenceSource; /** * Adapter that help to know the way of merge and the editable sides of a difference. @@ -27,21 +26,15 @@ public class MergeDataImpl extends AdapterImpl implements IMergeData { /** Right side is editable. */ private boolean rightEditable; - /** The merge mode used to merge the associated diff. */ - private MergeMode mergeMode; - /** * Constructor. * - * @param mergeMode - * The merge mode. * @param leftEditable * Left side editable. * @param rightEditable * Right side editable. */ - public MergeDataImpl(MergeMode mergeMode, boolean leftEditable, boolean rightEditable) { - this.mergeMode = mergeMode; + public MergeDataImpl(boolean leftEditable, boolean rightEditable) { this.leftEditable = leftEditable; this.rightEditable = rightEditable; } @@ -49,24 +42,6 @@ public class MergeDataImpl extends AdapterImpl implements IMergeData { /** * {@inheritDoc} * - * @see org.eclipse.emf.compare.internal.merge.IMergeData#getMergeMode() - */ - public MergeMode getMergeMode() { - return mergeMode; - } - - /** - * {@inheritDoc} - * - * @see org.eclipse.emf.compare.internal.merge.IMergeData#getMergeTarget() - */ - public DifferenceSource getMergeTarget() { - return mergeMode.getMergeTarget(leftEditable, rightEditable); - } - - /** - * {@inheritDoc} - * * @see org.eclipse.emf.compare.internal.merge.IMergeData#isLeftEditable() */ public boolean isLeftEditable() { @@ -105,12 +80,4 @@ public class MergeDataImpl extends AdapterImpl implements IMergeData { this.rightEditable = rightEditable; } - /** - * {@inheritDoc} - * - * @see org.eclipse.emf.compare.internal.merge.IMergeData#setMergeMode(org.eclipse.emf.compare.internal.merge.MergeMode) - */ - public void setMergeMode(MergeMode mergeMode) { - this.mergeMode = mergeMode; - } } |