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

Class SingleReferenceConflict

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

public class SingleReferenceConflict
extends VisualConflict

Conflict for two SingleReferenceOperation.

Author:

wesendon

Constructor Summary

Constructors

Constructor and Description
SingleReferenceConflict(ConflictBucket conflictBucket, DecisionManager decisionManager) Default constructor.
SingleReferenceConflict(ConflictBucket conflictBucket, SingleReferenceOperation leftOperation, SingleReferenceOperation rightOperation, DecisionManager decisionManager) Construct conflict from designated left and right operation.

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

SingleReferenceConflict

public SingleReferenceConflict(ConflictBucket conflictBucket,
                               DecisionManager decisionManager)

Default constructor.

Parameters:

conflictBucket - the conflict

decisionManager - DecisionManager

SingleReferenceConflict

public SingleReferenceConflict(ConflictBucket conflictBucket,
                               SingleReferenceOperation leftOperation,
                               SingleReferenceOperation rightOperation,
                               DecisionManager decisionManager)

Construct conflict from designated left and right operation.

Parameters:

conflictBucket - the conflict

leftOperation - the left operation

rightOperation - the right operation

decisionManager - decisionmanager