Package org.eclipse.emf.compare.merge
Class PseudoConflictMerger
java.lang.Object
org.eclipse.emf.compare.merge.AbstractMerger
org.eclipse.emf.compare.merge.PseudoConflictMerger
- All Implemented Interfaces:
IMergeCriterionAware,IMergeOptionAware,IMerger,IMerger2
A simple merger for pseudo conflict. It only marks the differences as merged without doing anything except
browsing the requirements and the equivalences.
-
Nested Class Summary
Nested classes/interfaces inherited from interface org.eclipse.emf.compare.merge.IMerger
IMerger.Registry, IMerger.Registry2, IMerger.RegistryImpl -
Field Summary
Fields inherited from class org.eclipse.emf.compare.merge.AbstractMerger
mergeOptions, SUB_DIFF_AWARE_OPTION -
Constructor Summary
Constructors -
Method Summary
Modifier and TypeMethodDescriptionvoidcopyLeftToRight(Diff target, Monitor monitor) Executes the copy from left to right.voidcopyRightToLeft(Diff target, Monitor monitor) Executes the copy from right to left.booleanisMergerFor(Diff target) Check if the merger is a good candidate to merge the given difference.Methods inherited from class org.eclipse.emf.compare.merge.AbstractMerger
accept, addAt, apply, copyDiff, createCopy, getDirectMergeDependencies, getDirectResultingMerges, getDirectResultingRejections, getImpliedMerges, getLogicallyResultingMerges, getMergeOptions, getMergerDelegate, getMergerDelegate, getRanking, getRegistry, isAccepting, isAdd, isInTerminalState, isSet, isUnset, mergeDiff, reject, setMergeOptions, setRanking, setRegistry
-
Constructor Details
-
PseudoConflictMerger
public PseudoConflictMerger()
-
-
Method Details
-
isMergerFor
Check if the merger is a good candidate to merge the given difference.- Parameters:
target- The given target difference.- Returns:
- True if it is the good candidate, false otherwise.
- See Also:
-
copyLeftToRight
Executes the copy from left to right.- Specified by:
copyLeftToRightin interfaceIMerger- Overrides:
copyLeftToRightin classAbstractMerger- Parameters:
target- The difference to handle.monitor- Monitor.- See Also:
-
copyRightToLeft
Executes the copy from right to left.- Specified by:
copyRightToLeftin interfaceIMerger- Overrides:
copyRightToLeftin classAbstractMerger- Parameters:
target- The difference to handle.monitor- Monitor.- See Also:
-