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

Class MultiReferenceConflict

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

public class MultiReferenceConflict
extends VisualConflict

Conflict between two MultiReferenceConflict.

Author:

wesendon

Constructor Summary

Constructors

Constructor and Description
MultiReferenceConflict(ConflictBucket conflictBucket, DecisionManager decisionManager, boolean meAdding) Default constructor.
MultiReferenceConflict(ConflictBucket conflictBucket, MultiReferenceOperation leftOperation, MultiReferenceOperation rightOperation, DecisionManager decisionManager, boolean meAdding) 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

MultiReferenceConflict

public MultiReferenceConflict(ConflictBucket conflictBucket,
                              DecisionManager decisionManager,
                              boolean meAdding)

Default constructor.

Parameters:

conflictBucket - the conflict bucket

decisionManager - the decision manager

meAdding - true, if merging user has adding multiref

MultiReferenceConflict

public MultiReferenceConflict(ConflictBucket conflictBucket,
                              MultiReferenceOperation leftOperation,
                              MultiReferenceOperation rightOperation,
                              DecisionManager decisionManager,
                              boolean meAdding)

Construct conflict from designated left and right operation.

Parameters:

conflictBucket - the conflict

leftOperation - the left operation

rightOperation - the right operation

decisionManager - decisionmanager

meAdding - true, if merging user has adding multiref