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

Class AddDeleteConflictStrategy

java.lang.Object

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

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

All Implemented Interfaces:

ConflictStrategy

public class AddDeleteConflictStrategy
extends ConflictStrategyImpl

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

Constructor Summary

Constructors

Constructor and Description
AddDeleteConflictStrategy()

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) Finds conflicts between the add 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

AddDeleteConflictStrategy

public AddDeleteConflictStrategy()

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 add deltas and the other deltas.

Parameters:

matcher - a matcher

conflictContainer - a conflict container

deltaContainer - one deltaContainer

otherDeltaContainer - the other delta container