Package | Description |
---|---|
org.eclipse.emf.compare.merge |
Modifier and Type | Class and Description |
---|---|
class |
AdditiveMergeCriterion
Merge Criterion that indicates we want to perform an 'Additive' merge.
|
Modifier and Type | Method and Description |
---|---|
IMergeCriterion |
DelegatingMerger.getCriterion() |
Modifier and Type | Method and Description |
---|---|
boolean |
AdditiveConflictMerger.apply(IMergeCriterion criterion) |
boolean |
ConflictMerger.apply(IMergeCriterion criterion) |
boolean |
AdditiveReferenceChangeMerger.apply(IMergeCriterion criterion) |
boolean |
AdditiveResourceAttachmentChangeMerger.apply(IMergeCriterion criterion) |
boolean |
IMergeCriterionAware.apply(IMergeCriterion criterion)
Indicate whether a merger supports a given criterion.
|
boolean |
AbstractMerger.apply(IMergeCriterion criterion)
Default implementation of apply for mergers that extends this class.
|
boolean |
ReferenceChangeMerger.apply(IMergeCriterion criterion) |
boolean |
ResourceAttachmentChangeMerger.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.
|
Constructor and Description |
---|
DelegatingMerger(IMerger merger,
IMergeCriterion criterion)
Constructor.
|
Copyright (c) 2006, 2015 Obeo and others. All rights reserved.