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

Class MultiReferenceSetConflict

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

public class MultiReferenceSetConflict
extends VisualConflict

Constructor Summary

Constructors

Constructor and Description
MultiReferenceSetConflict(ConflictBucket conf, DecisionManager decisionManager, boolean myMultiRef) 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

MultiReferenceSetConflict

public MultiReferenceSetConflict(ConflictBucket conf,
                                 DecisionManager decisionManager,
                                 boolean myMultiRef)

Default constructor.

Parameters:

decisionManager - DecisionManager

myMultiRef - is my multireference