Package org.eclipse.emf.compare.conflict
Class MatchBasedConflictDetector
java.lang.Object
org.eclipse.emf.compare.conflict.MatchBasedConflictDetector
- All Implemented Interfaces:
IConflictDetector
This conflict detector searches for conflicting
Diffs in the same Match as the current
Diff, as well as among ReferenceChanges that reference the same EObject as the
current Diff, if it is a ReferenceChange.
This implementation of IConflictDetector is 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 -
Method Summary
Modifier and TypeMethodDescriptionvoiddetect(Comparison comparison, Monitor monitor) This is the entry point of the conflict detection process.
-
Constructor Details
-
MatchBasedConflictDetector
public MatchBasedConflictDetector()
-
-
Method Details
-
detect
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:
-