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

Interface ConflictStrategy

All Known Implementing Classes:

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

public interface ConflictStrategy

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)

Method Detail

analyze

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