|
|||||||||
PREV CLASS NEXT CLASS | FRAMES NO FRAMES | ||||||||
SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD |
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.ReferenceConflict
public class ReferenceConflict
Container for MultiReferenceConflict
and SingleReferenceConflict
.
Constructor Summary | |
---|---|
ReferenceConflict(MultiReferenceOperation leftMultiRef,
MultiReferenceOperation rightMultiRef,
ConflictBucket conflictBucket,
DecisionManager decisionManager)
Constructor for a reference conflict where two MultiReferenceOperation conflict with each other. |
|
ReferenceConflict(MultiReferenceOperation leftMultiRef,
SingleReferenceOperation rightSingleRef,
ConflictBucket conflictBucket,
DecisionManager decisionManager)
Constructor for a reference conflict where a MultiReferenceOperation conflicts with a
SingleReferenceOperation . |
|
ReferenceConflict(SingleReferenceOperation leftSingleRef,
MultiReferenceOperation rightMultiRef,
ConflictBucket conflictBucket,
DecisionManager decisionManager)
Constructor for a reference conflict where a SingleReferenceOperation conflicts with a
MultiReferenceOperation . |
|
ReferenceConflict(SingleReferenceOperation leftSingleRef,
SingleReferenceOperation rightSingleRef,
ConflictBucket conflictBucket,
DecisionManager decisionManager)
Constructor for a reference conflict where two SingleReferenceOperation conflict with each other. |
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 |
---|
public ReferenceConflict(SingleReferenceOperation leftSingleRef, SingleReferenceOperation rightSingleRef, ConflictBucket conflictBucket, DecisionManager decisionManager)
SingleReferenceOperation
conflict with each other. This
may be the case, if:
CompositeOperation
sCompositeOperation
s while the right operation is a stand-alone SingleReferenceOperation
CompositeOperation
s while the left operation is a stand-alone SingleReferenceOperation
leftSingleRef
- a SingleReferenceOperation
rightSingleRef
- the SingleReferenceOperation
conflicting with leftSingleRef
conflictBucket
- the conflict bucketdecisionManager
- the decision managerpublic ReferenceConflict(MultiReferenceOperation leftMultiRef, MultiReferenceOperation rightMultiRef, ConflictBucket conflictBucket, DecisionManager decisionManager)
MultiReferenceOperation
conflict with each other. This
may be the case, if:
CompositeOperation
sCompositeOperation
s while the right operation is a stand-alone MultiReferenceOperation
CompositeOperation
s while the left operation is a stand-alone MultiReferenceOperation
leftMultiRef
- a MultiReferenceOperation
rightMultiRef
- the MultiReferenceOperation
conflicting with leftMultiRef
conflictBucket
- the conflict bucketdecisionManager
- the decision managerpublic ReferenceConflict(MultiReferenceOperation leftMultiRef, SingleReferenceOperation rightSingleRef, ConflictBucket conflictBucket, DecisionManager decisionManager)
MultiReferenceOperation
conflicts with a
SingleReferenceOperation
. This may be the case, if:
CompositeOperation
sCompositeOperation
s while the right operation is a stand-alone SingleReferenceOperation
CompositeOperation
s while the left operation is a stand-alone MultiReferenceOperation
leftMultiRef
- a SingleReferenceOperation
rightSingleRef
- the SingleReferenceOperation
conflicting with leftSingleRef
conflictBucket
- the conflict bucketdecisionManager
- the decision managerpublic ReferenceConflict(SingleReferenceOperation leftSingleRef, MultiReferenceOperation rightMultiRef, ConflictBucket conflictBucket, DecisionManager decisionManager)
SingleReferenceOperation
conflicts with a
MultiReferenceOperation
. This may be the case, if:
CompositeOperation
sCompositeOperation
s while the left operation is a stand-alone SingleReferenceOperation
CompositeOperation
s while the right operation is a stand-alone MultiReferenceOperation
leftSingleRef
- a SingleReferenceOperation
rightMultiRef
- the SingleReferenceOperation
conflicting with leftSingleRef
conflictBucket
- the conflict bucketdecisionManager
- the decision manager
|
|||||||||
PREV CLASS NEXT CLASS | FRAMES NO FRAMES | ||||||||
SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD |