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

Class DeleteDeleteConflictStrategy

java.lang.Object

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

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

All Implemented Interfaces:

ConflictStrategy

public class DeleteDeleteConflictStrategy
extends ConflictStrategyImpl

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

Constructor Summary

Constructors

Constructor and Description
DeleteDeleteConflictStrategy()

Method Summary

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, boolean handleSameChangeConflicts) this function will try to find any conflicts between the passed collections of deltas and the passed contributor deltas, the boolean flag at the end indicates if we need to check for same delta conflicts like Change-Change ; Delete-Delete ....
protected boolean	isStereotypeContext(Delta delta)

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

DeleteDeleteConflictStrategy

public DeleteDeleteConflictStrategy()

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,
                             boolean handleSameChangeConflicts)

this function will try to find any conflicts between the passed collections of deltas and the passed contributor deltas, the boolean flag at the end indicates if we need to check for same delta conflicts like Change-Change ; Delete-Delete .... or no; becuase sometimes these conflicts were already handled and we do not want to generate duplicate conflicts

Parameters:

matcher - a matcher

conflictContainer - a conflict container

deltaContainer - one delta container

otherDeltaContainer - the other delta container

handleSameChangeConflicts - flag indicating whether or not to detect symmetrical conflicts

isStereotypeContext

protected boolean isStereotypeContext(Delta delta)