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

Class JoinDeleteConflictStrategy

java.lang.Object

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

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

All Implemented Interfaces:

ConflictStrategy

public class JoinDeleteConflictStrategy
extends ConflictStrategyImpl

Constructor Summary

Constructors

Constructor and Description
JoinDeleteConflictStrategy()

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	isParent(org.eclipse.emf.ecore.EObject parent, org.eclipse.emf.ecore.EObject child)

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

JoinDeleteConflictStrategy

public JoinDeleteConflictStrategy()

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

isParent

protected boolean isParent(org.eclipse.emf.ecore.EObject parent,
                           org.eclipse.emf.ecore.EObject child)