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

Class ReferenceConflict

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

public class ReferenceConflict
extends VisualConflict

Container for MultiReferenceConflict and SingleReferenceConflict.

Author:

wesendon

Constructor Summary

Constructors

Constructor and Description
ReferenceConflict(MultiReferenceOperation leftMultiRef, MultiReferenceOperation rightMultiRef, ConflictBucket conflictBucket, DecisionManager decisionManager) Constructor for a reference conflict where two MultiReferenceOperation conflict with each other.
ReferenceConflict(MultiReferenceOperation leftMultiRef, SingleReferenceOperation rightSingleRef, ConflictBucket conflictBucket, DecisionManager decisionManager) Constructor for a reference conflict where a MultiReferenceOperation conflicts with a SingleReferenceOperation.
ReferenceConflict(SingleReferenceOperation leftSingleRef, MultiReferenceOperation rightMultiRef, ConflictBucket conflictBucket, DecisionManager decisionManager) Constructor for a reference conflict where a SingleReferenceOperation conflicts with a MultiReferenceOperation.
ReferenceConflict(SingleReferenceOperation leftSingleRef, SingleReferenceOperation rightSingleRef, ConflictBucket conflictBucket, DecisionManager decisionManager) Constructor for a reference conflict where two SingleReferenceOperation conflict with each other.

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

ReferenceConflict

public ReferenceConflict(SingleReferenceOperation leftSingleRef,
                         SingleReferenceOperation rightSingleRef,
                         ConflictBucket conflictBucket,
                         DecisionManager decisionManager)

Constructor for a reference conflict where two SingleReferenceOperation conflict with each other. This may be the case, if:

• the left and rights operations are main operations of conflicting CompositeOperations
• the left operation is the main operation of a conflicting CompositeOperations while the right operation is a stand-alone SingleReferenceOperation
• the right operation is the main operation of a conflicting CompositeOperations while the left operation is a stand-alone SingleReferenceOperation

Parameters:

leftSingleRef - a SingleReferenceOperation

rightSingleRef - the SingleReferenceOperation conflicting with leftSingleRef

conflictBucket - the conflict bucket

decisionManager - the decision manager

ReferenceConflict

public ReferenceConflict(MultiReferenceOperation leftMultiRef,
                         MultiReferenceOperation rightMultiRef,
                         ConflictBucket conflictBucket,
                         DecisionManager decisionManager)

Constructor for a reference conflict where two MultiReferenceOperation conflict with each other. This may be the case, if:

• the left and rights operations are main operations of conflicting CompositeOperations
• the left operation is the main operation of a conflicting CompositeOperations while the right operation is a stand-alone MultiReferenceOperation
• the right operation is the main operation of a conflicting CompositeOperations while the left operation is a stand-alone MultiReferenceOperation

Parameters:

leftMultiRef - a MultiReferenceOperation

rightMultiRef - the MultiReferenceOperation conflicting with leftMultiRef

conflictBucket - the conflict bucket

decisionManager - the decision manager

ReferenceConflict

public ReferenceConflict(MultiReferenceOperation leftMultiRef,
                         SingleReferenceOperation rightSingleRef,
                         ConflictBucket conflictBucket,
                         DecisionManager decisionManager)

Constructor for a reference conflict where a MultiReferenceOperation conflicts with a SingleReferenceOperation. This may be the case, if:

• the left and rights operations are main operations of conflicting CompositeOperations
• the left operation is the main operation of a conflicting CompositeOperations while the right operation is a stand-alone SingleReferenceOperation
• the right operation is the main operation of a conflicting CompositeOperations while the left operation is a stand-alone MultiReferenceOperation

Parameters:

leftMultiRef - a SingleReferenceOperation

rightSingleRef - the SingleReferenceOperation conflicting with leftSingleRef

conflictBucket - the conflict bucket

decisionManager - the decision manager

ReferenceConflict

public ReferenceConflict(SingleReferenceOperation leftSingleRef,
                         MultiReferenceOperation rightMultiRef,
                         ConflictBucket conflictBucket,
                         DecisionManager decisionManager)

Constructor for a reference conflict where a SingleReferenceOperation conflicts with a MultiReferenceOperation. This may be the case, if:

• the left and rights operations are main operations of conflicting CompositeOperations
• the right operation is the main operation of a conflicting CompositeOperations while the left operation is a stand-alone SingleReferenceOperation
• the left operation is the main operation of a conflicting CompositeOperations while the right operation is a stand-alone MultiReferenceOperation

Parameters:

leftSingleRef - a SingleReferenceOperation

rightMultiRef - the SingleReferenceOperation conflicting with leftSingleRef

conflictBucket - the conflict bucket

decisionManager - the decision manager