public class ConflictMerger extends AbstractMerger
AbstractMerger
will be used to merge real conflicts.IMerger.Registry, IMerger.RegistryImpl
Constructor and Description |
---|
ConflictMerger() |
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, createCopy, getRanking, getRegistry, handleEquivalences, handleImpliedBy, handleImplies, mergeDiff, mergeRequiredBy, mergeRequires, reject, setRanking, setRegistry
public 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 IMerger
copyLeftToRight
in class AbstractMerger
target
- 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 IMerger
copyRightToLeft
in class AbstractMerger
target
- The difference to handle.monitor
- Monitor.IMerger.copyRightToLeft(org.eclipse.emf.compare.Diff,
org.eclipse.emf.common.util.Monitor)
Copyright (c) 2006, 2014 Obeo and others. All rights reserved.