com.ibm.xtools.comparemerge.emf.delta.conflictanalyzer

Class ChangeDeleteConflictStrategy

java.lang.Object

com.ibm.xtools.comparemerge.emf.delta.conflictanalyzer.ConflictStrategyImpl

com.ibm.xtools.comparemerge.emf.delta.conflictanalyzer.ChangeDeleteConflictStrategy

All Implemented Interfaces:

ConflictStrategy

public class ChangeDeleteConflictStrategy
extends ConflictStrategyImpl

this class handles the following conflicts Change-Delete (direct or indirect)

Constructor Summary

Constructors

Constructor and Description
ChangeDeleteConflictStrategy()

Method Summary

Modifier and Type	Method and Description
protected Delta	adjustConflictingDelta(Delta delta)
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 change deltas and the other deltas.

Methods inherited from class com.ibm.xtools.comparemerge.emf.delta.conflictanalyzer.ConflictStrategyImpl

canCreateChangeChangeConflict, checkIfDeleted, createConflict, getDeltaByLocationId, getDeltaByObjectId, getNonSystemDelta

Methods inherited from class java.lang.Object

clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait

Constructor Detail

ChangeDeleteConflictStrategy

public ChangeDeleteConflictStrategy()

Method Detail

analyze

public boolean analyze(com.ibm.xtools.comparemerge.emf.delta.deltagenerator.matcher.Matcher matcher,
                       ConflictContainer conflictContainer,
                       DeltaContainer deltaContainer1,
                       DeltaContainer deltaContainer2)

Specified by:

analyze in interface ConflictStrategy

Specified by:

analyze in class ConflictStrategyImpl

findConflicts

protected void findConflicts(com.ibm.xtools.comparemerge.emf.delta.deltagenerator.matcher.Matcher matcher,
                             ConflictContainer conflictContainer,
                             DeltaContainer deltaContainer,
                             DeltaContainer otherDeltaContainer)

Finds conflicts between the change deltas and the other deltas.

Parameters:

matcher - a matcher

conflictContainer - a conflict container

deltaContainer - one delta container

otherDeltaContainer - the other delta container

adjustConflictingDelta

protected Delta adjustConflictingDelta(Delta delta)