Constructor and Description |
---|
MergeCommand(ChangeRecorder changeRecorder,
Collection<Notifier> notifiers,
List<? extends Diff> differences,
boolean leftToRight,
IMerger.Registry mergerRegistry,
IMergeRunnable runnable)
Creates a new instance.
|
Modifier and Type | Method and Description |
---|---|
ICompareCopyCommand |
ICompareEditingDomain.createCopyCommand(List<? extends Diff> differences,
boolean leftToRight,
IMerger.Registry mergerRegistry,
IMergeRunnable runnable)
Creates a new command that will execute the given
IMergeRunnable that is expected to merge the
given differences in from right to left or left to right by using the mergers defined in the given
merger registry. |
Modifier and Type | Method and Description |
---|---|
ICompareCopyCommand |
EMFCompareEditingDomain.createCopyCommand(List<? extends Diff> differences,
boolean leftToRight,
IMerger.Registry mergerRegistry,
IMergeRunnable runnable)
Creates a new command that will execute the given
IMergeRunnable that is expected to merge the
given differences in from right to left or left to right by using the mergers defined in the given
merger registry. |
Modifier and Type | Class and Description |
---|---|
class |
MergeConflictingRunnable
Implements the "merge all contained conflicting" action.
|
class |
MergeContainedRunnable
The runnable for the
MergeContainedAction . |
class |
MergeNonConflictingRunnable
Implements the "merge non-conflicting" and "merge all non-conflicting" action.
|
class |
MergeRunnableImpl |
Modifier and Type | Method and Description |
---|---|
protected IMergeRunnable |
MergeAction.createMergeRunnable(MergeMode mode,
boolean leftEditable,
boolean rightEditable,
IDiffRelationshipComputer relationshipComputer) |
protected IMergeRunnable |
MergeContainedNonConflictingAction.createMergeRunnable(MergeMode mode,
boolean isLeftEditable,
boolean isRightEditable,
IDiffRelationshipComputer relationshipComputer) |
protected IMergeRunnable |
MergeContainedConflictingAction.createMergeRunnable(MergeMode mode,
boolean isLeftEditable,
boolean isRightEditable,
IDiffRelationshipComputer relationshipComputer) |
protected IMergeRunnable |
MergeContainedAction.createMergeRunnable(MergeMode mode,
boolean isLeftEditable,
boolean isRightEditable,
IDiffRelationshipComputer relationshipComputer) |
Copyright (c) 2006, 2015 Obeo and others. All rights reserved.