public class MergeAllNonConflictingRunnable extends AbstractMergeRunnable implements IMergeAllNonConflictingRunnable
Constructor and Description |
---|
MergeAllNonConflictingRunnable(boolean isLeftEditable,
boolean isRightEditable,
MergeMode mergeMode)
Default constructor.
|
Modifier and Type | Method and Description |
---|---|
Iterable<Diff> |
merge(Comparison comparison,
boolean leftToRight,
IMerger.Registry mergerRegistry)
Merges all non-conflicting differences from the given comparison in either direction.
|
addOrUpdateMergeData, getMergeMode, isLeftEditable, isRightEditable, markAllAsMerged, markAsMerged
public MergeAllNonConflictingRunnable(boolean isLeftEditable, boolean isRightEditable, MergeMode mergeMode)
isLeftEditable
- Whether the left side of the comparison we're operating on is editable.isRightEditable
- Whether the right side of the comparison we're operating on is editable.mergeMode
- Merge mode for this operation.public Iterable<Diff> merge(Comparison comparison, boolean leftToRight, IMerger.Registry mergerRegistry)
merge
in interface IMergeAllNonConflictingRunnable
comparison
- The comparison which differences we are to merge.leftToRight
- Direction of the merge operation.mergerRegistry
- The registry to query for the appropriate merger for each difference.
Copyright (c) 2006, 2015 Obeo and others. All rights reserved.