public class CanonicalViewConflictStrategy
extends java.lang.Object
Constructor and Description |
---|
CanonicalViewConflictStrategy() |
Modifier and Type | Method and Description |
---|---|
boolean |
analyze(Matcher matcher,
ConflictContainer conflictContainer,
DeltaContainer deltaContainer1,
DeltaContainer deltaContainer2)
Finds canonical view conflicts from the given deltaContainers.
|
public boolean analyze(Matcher matcher, ConflictContainer conflictContainer, DeltaContainer deltaContainer1, DeltaContainer deltaContainer2)
matcher
- Given matcherconflictContainer
- Given conflictContainer to deposite the found conflicts.deltaContainer1
- Given deltaContainer associated with contributor1deltaContainer2
- Given deltaContainer associated with contributor2com.ibm.xtools.comparemerge.emf.delta.conflictanalyzer.ConflictStrategy#analyze(com.ibm.xtools.comparemerge.emf.delta.deltagenerator.matcher.Matcher,
com.ibm.xtools.comparemerge.emf.delta.conflictanalyzer.ConflictContainer,
com.ibm.xtools.comparemerge.emf.delta.DeltaContainer,
com.ibm.xtools.comparemerge.emf.delta.DeltaContainer)