public class MoveDeleteConflictStrategy extends ConflictStrategyImpl
Constructor and Description |
---|
MoveDeleteConflictStrategy() |
Modifier and Type | Method and Description |
---|---|
boolean |
analyze(com.ibm.xtools.comparemerge.emf.delta.deltagenerator.matcher.Matcher matcher,
ConflictContainer conflictContainer,
DeltaContainer deltaContainer1,
DeltaContainer deltaContainer2) |
protected void |
findConflicts(com.ibm.xtools.comparemerge.emf.delta.deltagenerator.matcher.Matcher matcher,
ConflictContainer conflictContainer,
DeltaContainer deltaContainer,
DeltaContainer otherDeltaContainer)
Finds conflicts between the move deltas and the other deltas.
|
canCreateChangeChangeConflict, checkIfDeleted, createConflict, getDeltaByLocationId, getDeltaByObjectId, getNonSystemDelta
public boolean analyze(com.ibm.xtools.comparemerge.emf.delta.deltagenerator.matcher.Matcher matcher, ConflictContainer conflictContainer, DeltaContainer deltaContainer1, DeltaContainer deltaContainer2)
analyze
in interface ConflictStrategy
analyze
in class ConflictStrategyImpl
protected void findConflicts(com.ibm.xtools.comparemerge.emf.delta.deltagenerator.matcher.Matcher matcher, ConflictContainer conflictContainer, DeltaContainer deltaContainer, DeltaContainer otherDeltaContainer)
matcher
- a matcherconflictContainer
- a conflict containerdeltaContainer
- one delta containerotherDeltaContainer
- the other delta container