| Package | Description | 
|---|---|
| org.eclipse.emf.compare.merge | 
| Modifier and Type | Class and Description | 
|---|---|
| class  | AdditiveMergeCriterionMerge Criterion that indicates we want to perform an 'Additive' merge. | 
| Modifier and Type | Field and Description | 
|---|---|
| protected IMergeCriterion | DiffRelationshipComputer. criterionMerge criterion used to retrieve the correct merger. | 
| static IMergeCriterion | IMergeCriterion. NONEDefault criterion that means that no special criterion is set. | 
| Modifier and Type | Method and Description | 
|---|---|
| IMergeCriterion | DelegatingMerger. getCriterion() | 
| IMergeCriterion | IDiffRelationshipComputer. getMergeCriterion()Returns the merge criterion considered for calculating the diff relationships. | 
| IMergeCriterion | DiffRelationshipComputer. getMergeCriterion() | 
| IMergeCriterion | CachingDiffRelationshipComputer. getMergeCriterion() | 
| Modifier and Type | Method and Description | 
|---|---|
| boolean | IMergeCriterionAware. apply(IMergeCriterion criterion)Indicate whether a merger supports a given criterion. | 
| boolean | ConflictMerger. apply(IMergeCriterion criterion) | 
| boolean | AdditiveResourceAttachmentChangeMerger. apply(IMergeCriterion criterion) | 
| boolean | AdditiveReferenceChangeMerger. apply(IMergeCriterion criterion) | 
| boolean | AdditiveConflictMerger. apply(IMergeCriterion criterion) | 
| boolean | AbstractMerger. apply(IMergeCriterion criterion)Default implementation of apply for mergers that extends this class. | 
| boolean | ResourceAttachmentChangeMerger. apply(IMergeCriterion criterion) | 
| boolean | ReferenceChangeMerger. apply(IMergeCriterion criterion) | 
| static DelegatingMerger | AbstractMerger. getMergerDelegate(Diff diff,
                 IMerger.Registry2 registry,
                 IMergeCriterion criterion)Find the best merger for diff and wrap it in a delegate that will take the given merge criterion into
 account. | 
| Iterator<IMerger> | IMerger.Registry2. getMergersByRankDescending(Diff diff,
                          IMergeCriterion criterion)Provide the merger with the highest ranking among those that:
 
 Are compatible with the given diff;
 Match the given non-null criterion. | 
| Iterator<IMerger> | IMerger.RegistryImpl. getMergersByRankDescending(Diff diff,
                          IMergeCriterion criterion)Provide the mergers sorted by rank descending. | 
| void | IDiffRelationshipComputer. setMergeCriterion(IMergeCriterion mergeCriterion)Sets the merge criterion considered for calculating the diff relationships. | 
| void | DiffRelationshipComputer. setMergeCriterion(IMergeCriterion mergeCriterion) | 
| void | CachingDiffRelationshipComputer. setMergeCriterion(IMergeCriterion mergeCriterion)Sets the merge criterion considered for calculating the diff relationships. | 
| Constructor and Description | 
|---|
| CachingDiffRelationshipComputer(IMerger.Registry registry,
                               IMergeCriterion criterion)Creates a new computer with the given registry and merge criterion. | 
| ComputeDiffsToMerge(boolean rightToLeft,
                   IMerger.Registry2 registry,
                   IMergeCriterion criterion)Constructor. | 
| DelegatingMerger(IMerger merger,
                IMergeCriterion criterion)Constructor. | 
| DiffRelationshipComputer(IMerger.Registry registry,
                        IMergeCriterion criterion)Creates a new relationship computer. | 
Copyright (c) 2006, 2015 Obeo and others. All rights reserved.