Package org.eclipse.emf.compare.conflict
Class MatchBasedConflictDetector
- java.lang.Object
-
- org.eclipse.emf.compare.conflict.MatchBasedConflictDetector
-
- All Implemented Interfaces:
IConflictDetector
public class MatchBasedConflictDetector extends Object implements IConflictDetector
This conflict detector searches for conflictingDiffs in the sameMatchas the currentDiff, as well as amongReferenceChanges that reference the sameEObjectas the currentDiff, if it is aReferenceChange.This implementation of
IConflictDetectoris a generic as the default one but scales better since it is not O(n²) but rather O(n) or O(n log(n)), n being the number of differences in the comparison.- Since:
- 3.3
-
-
Constructor Summary
Constructors Constructor Description MatchBasedConflictDetector()
-
Method Summary
All Methods Instance Methods Concrete Methods Modifier and Type Method Description voiddetect(Comparison comparison, Monitor monitor)This is the entry point of the conflict detection process.
-
-
-
Method Detail
-
detect
public void detect(Comparison comparison, Monitor monitor)
This is the entry point of the conflict detection process.It is expected to complete the input
comparisonby iterating over thedifferencesit contain, filling in all conflicts it can detect between those Diffs.- Specified by:
detectin interfaceIConflictDetector- Parameters:
comparison- The comparison this engine is expected to complete.monitor- The monitor to report progress or to check for cancellation- See Also:
IConflictDetector.detect(org.eclipse.emf.compare.Comparison, org.eclipse.emf.common.util.Monitor)
-
-