| Package | Description | 
|---|---|
| org.eclipse.emf.compare | |
| org.eclipse.emf.compare.conflict | |
| org.eclipse.emf.compare.rcp | 
| Modifier and Type | Field and Description | 
|---|---|
| protected IConflictDetector | EMFCompare.Builder. conflictDetectorThe IConflictDetector to use to compute conflicts. | 
| Modifier and Type | Method and Description | 
|---|---|
| EMFCompare.Builder | EMFCompare.Builder. setConflictDetector(IConflictDetector cd)Sets the IEquiEngine to be used to compute conflicts between Diff. | 
| Constructor and Description | 
|---|
| EMFCompare(IMatchEngine.Factory.Registry matchEngineFactoryRegistry,
          IDiffEngine diffEngine,
          IReqEngine reqEngine,
          IEquiEngine equiEngine,
          IConflictDetector conflictDetector,
          IPostProcessor.Descriptor.Registry<?> postProcessorFactoryRegistry)Creates a new EMFCompare object able to compare Notifier with the help of given engines. | 
| Modifier and Type | Class and Description | 
|---|---|
| class  | DefaultConflictDetectorThe conflict detector is in charge of refining the Comparison model with all detected Conflict between its
 differences. | 
| class  | MatchBasedConflictDetectorThis conflict detector searches for conflicting  Diffs in the sameMatchas the currentDiff, as well as amongReferenceChanges that reference the sameEObjectas the
 currentDiff, if it is aReferenceChange. | 
| Modifier and Type | Method and Description | 
|---|---|
| IItemRegistry<IConflictDetector> | EMFCompareRCPPlugin. getConflictDetectorDescriptorRegistry()Returns the registry of Conflict detector. | 
Copyright (c) 2006, 2015 Obeo and others. All rights reserved.