public class AdditiveConflictMerger extends ConflictMerger
AbstractMerger will be used to merge conflicts in an additive merge
context.IMerger.Registry, IMerger.Registry2, IMerger.RegistryImplmergeOptions, SUB_DIFF_AWARE_OPTION| Constructor and Description |
|---|
AdditiveConflictMerger()
The constructor specify the context where this merger can be used.
|
| Modifier and Type | Method and Description |
|---|---|
boolean |
apply(IMergeCriterion criterion)
Default implementation of apply for mergers that extends this class.
|
void |
copyRightToLeft(Diff target,
Monitor monitor)
Executes the copy from right to left.
|
copyLeftToRight, getMergerDelegate, isMergerForaccept, addAt, createCopy, getDirectMergeDependencies, getDirectResultingMerges, getDirectResultingRejections, getMergeOptions, getMergerDelegate, getRanking, getRegistry, handleEquivalences, handleImpliedBy, handleImplies, isAdd, mergeDiff, mergeRequiredBy, mergeRequires, reject, setMergeOptions, setRanking, setRegistrypublic AdditiveConflictMerger()
public boolean apply(IMergeCriterion criterion)
AbstractMergernull or
AdditiveMergeCriterion.INSTANCE.apply in interface IMergeCriterionAwareapply in class ConflictMergercriterion - The merge criteriontrue if the given criterion is null or is AdditiveMergeCriterion.INSTANCE.public void copyRightToLeft(Diff target, Monitor monitor)
ConflictMergercopyRightToLeft in interface IMergercopyRightToLeft in class ConflictMergertarget - The difference to handle.monitor - Monitor.IMerger.copyRightToLeft(org.eclipse.emf.compare.Diff,
org.eclipse.emf.common.util.Monitor)
Copyright (c) 2006, 2015 Obeo and others. All rights reserved.