public class PseudoConflictMerger extends AbstractMerger
IMerger.Registry, IMerger.Registry2, IMerger.RegistryImplmergeOptions, SUB_DIFF_AWARE_OPTION| Constructor and Description | 
|---|
| PseudoConflictMerger() | 
| Modifier and Type | Method and Description | 
|---|---|
| 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. | 
| boolean | isMergerFor(Diff target)Check if the merger is a good candidate to merge the given difference. | 
accept, addAt, apply, copyDiff, createCopy, getDirectMergeDependencies, getDirectResultingMerges, getDirectResultingRejections, getImpliedMerges, getLogicallyResultingMerges, getMergeOptions, getMergerDelegate, getMergerDelegate, getRanking, getRegistry, isAccepting, isAdd, isInTerminalState, isSet, isUnset, mergeDiff, reject, setMergeOptions, setRanking, setRegistrypublic boolean isMergerFor(Diff target)
target - The given target difference.IMerger.isMergerFor(org.eclipse.emf.compare.Diff)public void copyLeftToRight(Diff target, Monitor monitor)
copyLeftToRight in interface IMergercopyLeftToRight in class AbstractMergertarget - The difference to handle.monitor - Monitor.AbstractMerger.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.AbstractMerger.copyRightToLeft(org.eclipse.emf.compare.Diff,
      org.eclipse.emf.common.util.Monitor)
Copyright (c) 2006, 2015 Obeo and others. All rights reserved.