Class | Description |
---|---|
AbstractMergeContainedAction |
Abstract
MergeAction for merging all diffs contained in the selection. |
AbstractMergeRunnable |
Provides inheritable default behavior for the merge runnables.
|
CollapseAllModelAction | |
DropDownMergeMenuAction |
Action that manages the dropdown menu that allows to show the consequences of an accept or a reject.
|
ExpandAllModelAction | |
ExpandAllModelAction.TimeboxedExpandItemsRunnable | |
MergeAction |
Abstract Action that manages a merge of a difference in case of both sides of the comparison are editable.
|
MergeAllNonConflictingAction |
Action that manages a merge of a all non-conflicting difference.
|
MergeConflictingRunnable |
Implements the "merge all contained conflicting" action.
|
MergeContainedAction |
This action will merge all differences contained in the selection, regardless of conflicts or originating
side.
|
MergeContainedConflictingAction |
Action that manages a merge of a contained conflicting differences in case the selection is a resource
match or a model element match.
|
MergeContainedNonConflictingAction |
Action that manages a merge of a contained non-conflicting difference in case the selection is a resource
match or a model element match.
|
MergeContainedRunnable |
The runnable for the
MergeContainedAction . |
MergeNonConflictingRunnable |
Implements the "merge non-conflicting" and "merge all non-conflicting" action.
|
MergeRunnableImpl | |
RevealConflictingDiffsAction |
This action will reveal in the StructureMergeViewer all other differences conflicting with the currently
selected one.
|
SaveComparisonModelAction |
Action that manages the save of the comparison model.
|
SelectDiffAction |
Action that manages the selection of a difference.
|
Copyright (c) 2006, 2015 Obeo and others. All rights reserved.