public class MatchBasedConflictDetector extends Object implements IConflictDetector
Diff
s in the same Match
as the current
Diff
, as well as among ReferenceChange
s 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.
Constructor and Description |
---|
MatchBasedConflictDetector() |
Modifier and Type | Method and Description |
---|---|
void |
detect(Comparison comparison,
Monitor monitor)
This is the entry point of the conflict detection process.
|
public void detect(Comparison comparison, Monitor monitor)
It is expected to complete the input comparison
by iterating over the
differences
it contain, filling in all conflicts it can detect
between those Diffs.
detect
in interface IConflictDetector
comparison
- The comparison this engine is expected to complete.monitor
- The monitor to report progress or to check for cancellationIConflictDetector.detect(org.eclipse.emf.compare.Comparison,
org.eclipse.emf.common.util.Monitor)
Copyright (c) 2006, 2015 Obeo and others. All rights reserved.