public class MergeNonConflictingRunnable extends AbstractMergeRunnable implements IMergeAllNonConflictingRunnable, IMergeRunnable
| Constructor and Description |
|---|
MergeNonConflictingRunnable(boolean isLeftEditable,
boolean isRightEditable,
MergeMode mergeMode)
Default constructor.
|
| Modifier and Type | Method and Description |
|---|---|
protected void |
doMergeDiffWithConflicts(boolean leftToRight,
IMerger.Registry mergerRegistry,
List<Diff> affectedDiffs,
Monitor emfMonitor,
Diff diff) |
Iterable<Diff> |
merge(Comparison comparison,
boolean leftToRight,
IMerger.Registry mergerRegistry)
Merges all non-conflicting differences from the given comparison in either direction.
|
void |
merge(List<? extends Diff> differences,
boolean leftToRight,
IMerger.Registry mergerRegistry)
Execute the merge operation.
|
getMergeMode, isLeftEditable, isRightEditable, markAllAsMerged, markAsMergedpublic MergeNonConflictingRunnable(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 IMergeAllNonConflictingRunnablecomparison - 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.public void merge(List<? extends Diff> differences, boolean leftToRight, IMerger.Registry mergerRegistry)
Differences that are conflicting or that depend on conflicting differences will be left out.
Non-conflicting differences that are implied or required by the given differences will be merged, also
if they are not explicitly included in the given list of differences.
merge in interface IMergeRunnabledifferences - 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.protected void doMergeDiffWithConflicts(boolean leftToRight,
IMerger.Registry mergerRegistry,
List<Diff> affectedDiffs,
Monitor emfMonitor,
Diff diff)
Copyright (c) 2006, 2015 Obeo and others. All rights reserved.