Modifier and Type | Method and Description |
---|---|
MergeMode |
EMFCompareConfiguration.getMergePreviewMode() |
Modifier and Type | Method and Description |
---|---|
void |
EMFCompareConfiguration.setMergePreviewMode(MergeMode previewMergeMode) |
Modifier and Type | Method and Description |
---|---|
protected MergeMode |
AbstractMergeRunnable.getMergeMode() |
Modifier and Type | Method and Description |
---|---|
protected void |
AbstractMergeRunnable.addOrUpdateMergeData(Collection<Diff> differences,
MergeMode mode)
Updates the IMergeData adapter for all of the given diffs.
|
protected IMergeRunnable |
MergeAction.createMergeRunnable(MergeMode mode,
boolean isLeftEditable,
boolean isRightEditable) |
protected void |
MergeAction.initToolTipAndImage(MergeMode mode) |
protected void |
MergeAllNonConflictingAction.initToolTipAndImage(MergeMode mode) |
protected void |
AbstractMergeRunnable.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.
|
Constructor and Description |
---|
AbstractMergeRunnable(boolean isLeftEditable,
boolean isRightEditable,
MergeMode mergeMode)
Default constructor.
|
MergeAction(ICompareEditingDomain editingDomain,
IMerger.Registry mergerRegistry,
MergeMode mode,
boolean isLeftEditable,
boolean isRightEditable,
INavigatable navigatable)
Constructor.
|
MergeAction(ICompareEditingDomain editingDomain,
IMerger.Registry mergerRegistry,
MergeMode mode,
boolean isLeftEditable,
boolean isRightEditable,
INavigatable navigatable,
IStructuredSelection selection) |
MergeAllNonConflictingAction(ICompareEditingDomain editingDomain,
Comparison comparison,
IMerger.Registry mergerRegistry,
MergeMode mode,
boolean isLeftEditable,
boolean isRightEditable)
Constructor.
|
MergeAllNonConflictingRunnable(boolean isLeftEditable,
boolean isRightEditable,
MergeMode mergeMode)
Default constructor.
|
MergeRunnableImpl(boolean isLeftEditable,
boolean isRightEditable,
MergeMode mergeMode) |
Constructor and Description |
---|
DropDownMergeMenuAction(IEMFCompareConfiguration configuration,
EnumSet<MergeMode> previewModes)
Constructor.
|
Modifier and Type | Method and Description |
---|---|
MergeMode |
IMergeData.getMergeMode()
Returns the merge mode the
associated diff has been merged with. |
MergeMode |
MergeDataImpl.getMergeMode()
Returns the merge mode the
associated diff has been merged with. |
MergeMode |
MergeMode.inverse()
Returns the inverse of this enum.
|
static MergeMode |
MergeMode.valueOf(String name)
Returns the enum constant of this type with the specified name.
|
static MergeMode[] |
MergeMode.values()
Returns an array containing the constants of this enum type, in
the order they are declared.
|
Modifier and Type | Method and Description |
---|---|
void |
IMergeData.setMergeMode(MergeMode mergeMode)
Set the merge mode the
associated diff has been merged with. |
void |
MergeDataImpl.setMergeMode(MergeMode mergeMode)
Set the merge mode the
associated diff has been merged with. |
Constructor and Description |
---|
MergeDataImpl(MergeMode mergeMode,
boolean leftEditable,
boolean rightEditable)
Constructor.
|
Modifier and Type | Method and Description |
---|---|
MergeMode |
IEMFCompareConfiguration.getMergePreviewMode() |
MergeMode |
IMergePreviewModeChange.getNewValue() |
MergeMode |
IMergePreviewModeChange.getOldValue() |
Modifier and Type | Method and Description |
---|---|
void |
IEMFCompareConfiguration.setMergePreviewMode(MergeMode mergePreviewMode) |
Constructor and Description |
---|
MergePreviewModeChange(MergeMode oldValue,
MergeMode newValue) |
Copyright (c) 2006, 2014 Obeo and others. All rights reserved.