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

Class MoveMoveConflictStrategy

java.lang.Object

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

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

All Implemented Interfaces:

ConflictStrategy

public class MoveMoveConflictStrategy
extends ConflictStrategyImpl

this class handles the following conflicts Move-Move

Constructor Summary

Constructors

Constructor and Description
MoveMoveConflictStrategy()

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 java.util.List	getAncestors(org.eclipse.emf.ecore.EObject object)

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

MoveMoveConflictStrategy

public MoveMoveConflictStrategy()

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

getAncestors

protected java.util.List getAncestors(org.eclipse.emf.ecore.EObject object)