public class MergeConflictingRunnable extends AbstractMergeRunnable implements IMergeRunnable
Constructor and Description |
---|
MergeConflictingRunnable(boolean isLeftEditable,
boolean isRightEditable,
MergeMode mergeMode,
IDiffRelationshipComputer diffRelationshipComputer)
Default constructor.
|
Modifier and Type | Method and Description |
---|---|
void |
merge(List<? extends Diff> differences,
boolean leftToRight,
IMerger.Registry mergerRegistry)
Execute the merge operation.
|
getDiffRelationshipComputer, getMergeMode, isLeftEditable, isRightEditable, markAllAsMerged, markAsMerged, mergeAll
public MergeConflictingRunnable(boolean isLeftEditable, boolean isRightEditable, MergeMode mergeMode, IDiffRelationshipComputer diffRelationshipComputer)
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.diffRelationshipComputer
- The diff relationship computer used to find resulting merges and rejections.public void merge(List<? extends Diff> differences, boolean leftToRight, IMerger.Registry mergerRegistry)
merge
in interface IMergeRunnable
differences
- the differences to merge.leftToRight
- whether the differences have to be merge from left to right or right to left.mergerRegistry
- the merger registry to query to get the appropriate mergers for each difference to be
merged.
Copyright (c) 2006, 2015 Obeo and others. All rights reserved.