public abstract class AbstractMergeRunnable extends Object
| Constructor and Description |
|---|
AbstractMergeRunnable(boolean isLeftEditable,
boolean isRightEditable,
MergeMode mergeMode)
Default constructor.
|
| Modifier and Type | Method and Description |
|---|---|
protected void |
addOrUpdateMergeData(Collection<Diff> differences,
MergeMode mode)
Updates the IMergeData adapter for all of the given diffs.
|
protected MergeMode |
getMergeMode() |
protected boolean |
isLeftEditable() |
protected boolean |
isRightEditable() |
protected void |
markAllAsMerged(Collection<? extends Diff> diffToMarkAsMerged,
MergeMode mode,
IMerger.Registry mergerRegistry)
Marks all of the given diffs as merged, keeping track of the merged mode used for the operation.
|
protected void |
markAsMerged(Diff diff,
MergeMode mode,
boolean mergeRightToLeft,
IMerger.Registry mergerRegistry)
Marks a single diff as merged, keeping track of the merged mode used for the operation.
|
public AbstractMergeRunnable(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.protected boolean isLeftEditable()
protected boolean isRightEditable()
protected MergeMode getMergeMode()
protected void markAllAsMerged(Collection<? extends Diff> diffToMarkAsMerged, MergeMode mode, IMerger.Registry mergerRegistry)
diffToMarkAsMerged - List of Diffs that are to be marked as merged.mode - Mode with which these diffs have been merged.mergerRegistry - Current registry of mergers.protected void markAsMerged(Diff diff, MergeMode mode, boolean mergeRightToLeft, IMerger.Registry mergerRegistry)
diff - Diff to mark as merged.mode - Mode with which this Diff has been merged.mergeRightToLeft - Direction of the merge operation.mergerRegistry - Current registry of mergers.protected void addOrUpdateMergeData(Collection<Diff> differences, MergeMode mode)
differences - The differences for which to set or update the IMergeData adapter.mode - Merge mode we wish to keep track of.
Copyright (c) 2006, 2015 Obeo and others. All rights reserved.