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

Class CompositeConflict

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

public class CompositeConflict
extends VisualConflict

Conflict CompositeOperation involved.

Author:

wesendon

Constructor Summary

Constructors

Constructor and Description
CompositeConflict(ConflictBucket conflictBucket, DecisionManager decisionManager, boolean meCausing) 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

CompositeConflict

public CompositeConflict(ConflictBucket conflictBucket,
                         DecisionManager decisionManager,
                         boolean meCausing)

Default constructor.

Parameters:

conflictBucket - the conflict

decisionManager - DecisionManager

meCausing - true, if composite caused by merging user