public class ConflictMerger extends AbstractMerger
AbstractMerger will be used to merge real conflicts.IMerger.Registry, IMerger.Registry2, IMerger.RegistryImplmergeOptions, SUB_DIFF_AWARE_OPTION| Constructor and Description |
|---|
ConflictMerger() |
| Modifier and Type | Method and Description |
|---|---|
boolean |
apply(IMergeCriterion criterion)
Default implementation of apply for mergers that extends this class.
|
void |
copyLeftToRight(Diff target,
Monitor monitor)
Executes the copy from left to right.
|
void |
copyRightToLeft(Diff target,
Monitor monitor)
Executes the copy from right to left.
|
protected DelegatingMerger |
getMergerDelegate(Diff diff)
Find the best merger for diff and wrap it in a delegate that will take the current merge criterion into
account.
|
boolean |
isMergerFor(Diff target)
Check if the merger is a good candidate to merge the given difference.
|
accept, addAt, createCopy, getDirectMergeDependencies, getDirectResultingMerges, getDirectResultingRejections, getMergeOptions, getMergerDelegate, getRanking, getRegistry, handleEquivalences, handleImpliedBy, handleImplies, isAdd, mergeDiff, mergeRequiredBy, mergeRequires, reject, setMergeOptions, setRanking, setRegistrypublic boolean isMergerFor(Diff target)
target - The given target difference.IMerger.isMergerFor(org.eclipse.emf.compare.Diff)public boolean apply(IMergeCriterion criterion)
AbstractMergernull or
AdditiveMergeCriterion.INSTANCE.apply in interface IMergeCriterionAwareapply in class AbstractMergercriterion - The merge criteriontrue if the given criterion is null or is AdditiveMergeCriterion.INSTANCE.public void copyLeftToRight(Diff target, Monitor monitor)
copyLeftToRight in interface IMergercopyLeftToRight in class AbstractMergertarget - The difference to handle.monitor - Monitor.IMerger.copyLeftToRight(org.eclipse.emf.compare.Diff,
org.eclipse.emf.common.util.Monitor)public void copyRightToLeft(Diff target, Monitor monitor)
copyRightToLeft in interface IMergercopyRightToLeft in class AbstractMergertarget - The difference to handle.monitor - Monitor.IMerger.copyRightToLeft(org.eclipse.emf.compare.Diff,
org.eclipse.emf.common.util.Monitor)protected DelegatingMerger getMergerDelegate(Diff diff)
AbstractMergergetMergerDelegate in class AbstractMergerdiff - The diff
Copyright (c) 2006, 2015 Obeo and others. All rights reserved.