Modifier and Type | Method and Description |
---|---|
IDiffRelationshipComputer |
EMFCompareConfiguration.getDiffRelationshipComputer() |
Modifier and Type | Method and Description |
---|---|
void |
EMFCompareConfiguration.setDiffRelationshipComputer(IDiffRelationshipComputer diffRelationshipComputer) |
Modifier and Type | Method and Description |
---|---|
protected void |
EMFResourceMappingMerger.doMergeForDiff(Monitor emfMonitor,
Set<URI> conflictingURIs,
Diff diff,
IDiffRelationshipComputer relationshipComputer) |
Modifier and Type | Method and Description |
---|---|
protected IDiffRelationshipComputer |
DependencyData.getDiffRelationshipComputer(IMerger.Registry mergerRegistry)
Returns the diff relationship computer instance from the compare configuration with the given merger
registry.
|
Modifier and Type | Method and Description |
---|---|
protected IDiffRelationshipComputer |
MergeAction.getDiffRelationshipComputer() |
protected IDiffRelationshipComputer |
AbstractMergeRunnable.getDiffRelationshipComputer(IMerger.Registry mergerRegistry)
Returns the diff relationship computer instance from the compare configuration with the given merger
registry.
|
Modifier and Type | Method and Description |
---|---|
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) |
protected MergeNonConflictingRunnable |
MergeAllNonConflictingAction.createMergeRunnable(MergeMode mode,
boolean isLeftEditable,
boolean isRightEditable,
IDiffRelationshipComputer relationshipComputer) |
protected IMergeRunnable |
MergeAction.createMergeRunnable(MergeMode mode,
boolean leftEditable,
boolean rightEditable,
IDiffRelationshipComputer relationshipComputer) |
Constructor and Description |
---|
AbstractMergeRunnable(boolean isLeftEditable,
boolean isRightEditable,
MergeMode mergeMode,
IDiffRelationshipComputer diffRelationshipComputer)
Default constructor.
|
MergeConflictingRunnable(boolean isLeftEditable,
boolean isRightEditable,
MergeMode mergeMode,
IDiffRelationshipComputer diffRelationshipComputer)
Default constructor.
|
MergeContainedRunnable(boolean isLeftEditable,
boolean isRightEditable,
MergeMode mergeMode,
IDiffRelationshipComputer diffRelationshipComputer) |
MergeNonConflictingRunnable(boolean isLeftEditable,
boolean isRightEditable,
MergeMode mergeMode,
IDiffRelationshipComputer diffRelationshipComputer)
Default constructor.
|
MergeRunnableImpl(boolean isLeftEditable,
boolean isRightEditable,
MergeMode mergeMode,
IDiffRelationshipComputer diffRelationshipComputer) |
Modifier and Type | Class and Description |
---|---|
class |
CachingDiffRelationshipComputer
A computer implementation to cache the relationship of diffs.
|
class |
DiffRelationshipComputer
A computer implementation to calculate the relationship of differences in EMF Compare.
|
Constructor and Description |
---|
BatchMerger(IDiffRelationshipComputer relationshipComputer)
Constructs our batch merger provided the registry from which to retrieve the delegate mergers.
|
BatchMerger(IDiffRelationshipComputer relationshipComputer,
com.google.common.base.Predicate<? super Diff> filter)
Constructs our batch merger provided the registry from which to retrieve the delegate mergers, and a
filter if you only wish to merge specific differences.
|
ComputeDiffsToMerge(boolean rightToLeft,
IDiffRelationshipComputer relationshipComputer)
Constructor.
|
Modifier and Type | Method and Description |
---|---|
IDiffRelationshipComputer |
IEMFCompareConfiguration.getDiffRelationshipComputer() |
IDiffRelationshipComputer |
IDiffRelationshipComputerChange.getNewValue()
New value of the
IDiffRelationshipComputer . |
IDiffRelationshipComputer |
IDiffRelationshipComputerChange.getOldValue()
Previous value of the
IDiffRelationshipComputer . |
Modifier and Type | Method and Description |
---|---|
void |
IEMFCompareConfiguration.setDiffRelationshipComputer(IDiffRelationshipComputer diffRelationshipComputer) |
Constructor and Description |
---|
DiffRelationshipComputerChange(IDiffRelationshipComputer oldValue,
IDiffRelationshipComputer newValue) |
Copyright (c) 2006, 2015 Obeo and others. All rights reserved.