org.eclipse.emf.emfstore.internal.client.model.changeTracking.merging.conflict.conflicts

Class MultiReferenceSingleConflict

java.lang.Object

java.util.Observable

org.eclipse.emf.emfstore.internal.client.model.changeTracking.merging.conflict.VisualConflict

org.eclipse.emf.emfstore.internal.client.model.changeTracking.merging.conflict.conflicts.MultiReferenceSingleConflict

public class MultiReferenceSingleConflict
extends VisualConflict

Author:

wesendon

Constructor Summary

Constructors

Constructor and Description
MultiReferenceSingleConflict(ConflictBucket conflictBucket, DecisionManager decisionManager, boolean multiLeft) Default constructor.
MultiReferenceSingleConflict(MultiReferenceOperation multiReferenceOp, SingleReferenceOperation singleReferenceOp, ConflictBucket conflictBucket, DecisionManager decisionManager) Constructor.

Method Summary

Methods inherited from class org.eclipse.emf.emfstore.internal.client.model.changeTracking.merging.conflict.VisualConflict

getAcceptedMine, getConflictContext, getConflictDescription, getDecisionManager, getLeftOperation, getLeftOperations, getMyOperation, getMyOperation, getMyOperations, getOptionOfType, getOptions, getRejectedTheirs, getRightOperation, getRightOperations, getSolution, getTheirOperation, getTheirOperation, getTheirOperations, hasDetails, isLeftMy, isResolved, resolve, setLeftIsMy, setSolution

Methods inherited from class java.util.Observable

addObserver, countObservers, deleteObserver, deleteObservers, hasChanged, notifyObservers, notifyObservers

Methods inherited from class java.lang.Object

equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait

Constructor Detail

MultiReferenceSingleConflict

public MultiReferenceSingleConflict(ConflictBucket conflictBucket,
                                    DecisionManager decisionManager,
                                    boolean multiLeft)

Default constructor.

Parameters:

conflictBucket - the conflict

decisionManager - decision manager

multiLeft - multi is left

MultiReferenceSingleConflict

public MultiReferenceSingleConflict(MultiReferenceOperation multiReferenceOp,
                                    SingleReferenceOperation singleReferenceOp,
                                    ConflictBucket conflictBucket,
                                    DecisionManager decisionManager)

Constructor.

Parameters:

multiReferenceOp - a MultiReferenceOperation

singleReferenceOp - a conflicting SingleReferenceOperation

conflictBucket - the conflict bucket

decisionManager - the decision manager