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
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 |
CompositeConflict
public CompositeConflict(ConflictBucket conflictBucket,
DecisionManager decisionManager,
boolean meCausing)
- Default constructor.
- Parameters:
conflictBucket
- the conflictdecisionManager
- DecisionManager
meCausing
- true, if composite caused by merging user
Copyright © 2015. All Rights Reserved.