public interface IMerger2 extends IMerger
mergers
to define their own sub-set of "required" differences.
This set of differences is what will be used by the UI to highlight related differences, by the batch merger to determine whether the diff can be merged beforehand (one of the related being in conflict will prevent the merge as a whole), ...
The AbstractMerger
implements this and can be sub-classed instead when the default set of
requirements is enough.
IMerger.Registry, IMerger.Registry2, IMerger.RegistryImpl
Modifier and Type | Method and Description |
---|---|
Set<Diff> |
getDirectMergeDependencies(Diff diff,
boolean mergeRightToLeft)
Retrieves the set of directly required diffs needed in order to merge the current one.
|
Set<Diff> |
getDirectResultingMerges(Diff target,
boolean mergeRightToLeft)
Returns all differences that will be merged because of our merging the given
target
difference. |
Set<Diff> |
getDirectResultingRejections(Diff target,
boolean mergeRightToLeft)
Returns the set of all differences that need to be rejected if
target is merged in the
given direction. |
copyLeftToRight, copyRightToLeft, getRanking, getRegistry, isMergerFor, setRanking, setRegistry
Set<Diff> getDirectMergeDependencies(Diff diff, boolean mergeRightToLeft)
requirements
or any other diff that we need to merge
before the given one.diff
- The diff which direct requirements we need.mergeRightToLeft
- The direction in which we're considering a merge.Set<Diff> getDirectResultingMerges(Diff target, boolean mergeRightToLeft)
target
difference. This may include the diff's implications
, the diff's
equivalences
, the diff's refinements
or any
other diff that we need to merge together with the given diff.target
- The difference we're considering merging.mergeRightToLeft
- The direction in which we're considering a merge.target
.Set<Diff> getDirectResultingRejections(Diff target, boolean mergeRightToLeft)
target
is merged in the
given direction.target
- The difference we're considering merging.mergeRightToLeft
- The direction in which we're considering a merge.target
.
Copyright (c) 2006, 2015 Obeo and others. All rights reserved.