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

Class ConflictStrategyImpl

java.lang.Object

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

All Implemented Interfaces:

ConflictStrategy

Direct Known Subclasses:

AddAddConflictStrategy, AddChangeConflictStrategy, AddDeleteConflictStrategy, ChangeChangeConflictStrategy, ChangeDeleteConflictStrategy, ChangeMoveConflictStrategy, DeleteDeleteConflictStrategy, JoinDeleteConflictStrategy, JoinJoinConflictStrategy, MorphConflictStrategy, MoveDeleteConflictStrategy, MoveMoveConflictStrategy, SeparationDeleteConflictStrategy, SeparationSeparationConflictStrategy

public abstract class ConflictStrategyImpl
extends java.lang.Object
implements ConflictStrategy

Constructor Summary

Constructors

Constructor and Description
ConflictStrategyImpl()

Method Summary

Modifier and Type	Method and Description
abstract boolean	analyze(com.ibm.xtools.comparemerge.emf.delta.deltagenerator.matcher.Matcher matcher, ConflictContainer conflictContainer, DeltaContainer deltaContainer1, DeltaContainer deltaContainer2)
protected boolean	canCreateChangeChangeConflict(ChangeDelta c1, ChangeDelta c2)
protected DeleteDelta	checkIfDeleted(com.ibm.xtools.comparemerge.emf.delta.deltagenerator.matcher.Matcher matcher, org.eclipse.emf.ecore.EObject object, DeltaContainer otherDeltaContainer) check if a specific element is deleted directly of indirectly
protected Conflict	createConflict(ConflictContainer conflictContainer, Delta delta1, Delta delta2)
static Delta	getDeltaByLocationId(DeltaContainer deltaContainer, DeltaType type, java.lang.String locationId)
static Delta	getDeltaByObjectId(DeltaContainer deltaContainer, DeltaType type, java.lang.String objectId)
protected Delta	getNonSystemDelta(Delta delta) Returns first non-system delta unrelated to DynamicEObject sharing the same composite with given delta

Methods inherited from class java.lang.Object

clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait

Constructor Detail

ConflictStrategyImpl

public ConflictStrategyImpl()

Method Detail

analyze

public abstract boolean analyze(com.ibm.xtools.comparemerge.emf.delta.deltagenerator.matcher.Matcher matcher,
                                ConflictContainer conflictContainer,
                                DeltaContainer deltaContainer1,
                                DeltaContainer deltaContainer2)

Specified by:

analyze in interface ConflictStrategy

checkIfDeleted

protected DeleteDelta checkIfDeleted(com.ibm.xtools.comparemerge.emf.delta.deltagenerator.matcher.Matcher matcher,
                                     org.eclipse.emf.ecore.EObject object,
                                     DeltaContainer otherDeltaContainer)

check if a specific element is deleted directly of indirectly

Parameters:

matcher - a matcher

object - an object

otherDeltaContainer - the other contributor resource

Returns:

the first delete delta if found any

getDeltaByObjectId

public static Delta getDeltaByObjectId(DeltaContainer deltaContainer,
                                       DeltaType type,
                                       java.lang.String objectId)

getDeltaByLocationId

public static Delta getDeltaByLocationId(DeltaContainer deltaContainer,
                                         DeltaType type,
                                         java.lang.String locationId)

canCreateChangeChangeConflict

protected boolean canCreateChangeChangeConflict(ChangeDelta c1,
                                                ChangeDelta c2)

createConflict

protected Conflict createConflict(ConflictContainer conflictContainer,
                                  Delta delta1,
                                  Delta delta2)

getNonSystemDelta

protected Delta getNonSystemDelta(Delta delta)

Returns first non-system delta unrelated to DynamicEObject sharing the same composite with given delta

Parameters:

delta -