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

Class ChangeMoveConflictStrategy

java.lang.Object

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

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

All Implemented Interfaces:

ConflictStrategy

public class ChangeMoveConflictStrategy
extends ConflictStrategyImpl

Constructor Summary

Constructors

Constructor and Description
ChangeMoveConflictStrategy()

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 boolean	findConflicts(com.ibm.xtools.comparemerge.emf.delta.deltagenerator.matcher.Matcher matcher, ConflictContainer conflictContainer, DeltaContainer deltaContainer, DeltaContainer otherDeltaContainer)

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

ChangeMoveConflictStrategy

public ChangeMoveConflictStrategy()

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 boolean findConflicts(com.ibm.xtools.comparemerge.emf.delta.deltagenerator.matcher.Matcher matcher,
                                ConflictContainer conflictContainer,
                                DeltaContainer deltaContainer,
                                DeltaContainer otherDeltaContainer)