org.eclipse.emf.emfstore.internal.client.model.changeTracking.merging.conflict.conflicts
Class SingleReferenceConflict
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.SingleReferenceConflict
public class SingleReferenceConflict
- extends VisualConflict
Conflict for two SingleReferenceOperation
.
- 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 |
SingleReferenceConflict
public SingleReferenceConflict(ConflictBucket conflictBucket,
DecisionManager decisionManager)
- Default constructor.
- Parameters:
conflictBucket
- the conflictdecisionManager
- DecisionManager
SingleReferenceConflict
public SingleReferenceConflict(ConflictBucket conflictBucket,
SingleReferenceOperation leftOperation,
SingleReferenceOperation rightOperation,
DecisionManager decisionManager)
- Construct conflict from designated left and right operation.
- Parameters:
conflictBucket
- the conflictleftOperation
- the left operationrightOperation
- the right operationdecisionManager
- decisionmanager
Copyright © 2015. All Rights Reserved.