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

Class MultiReferenceSetSingleConflict

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.MultiReferenceSetSingleConflict

public class MultiReferenceSetSingleConflict
extends VisualConflict

Author:

wesendon

Constructor Summary

Constructors

Constructor and Description
MultiReferenceSetSingleConflict(ConflictBucket conflictBucket, DecisionManager decisionManager, boolean setLeft) Default 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

MultiReferenceSetSingleConflict

public MultiReferenceSetSingleConflict(ConflictBucket conflictBucket,
                                       DecisionManager decisionManager,
                                       boolean setLeft)

Default constructor.

Parameters:

conflictBucket - the conflict

decisionManager - DecisionManager

setLeft - multi set ref is left