Modifier and Type | Field and Description |
---|---|
protected IMerger.Registry |
AbstractCopyCommand.mergerRegistry
Merger registry.
|
Constructor and Description |
---|
AbstractCopyCommand(ChangeRecorder changeRecorder,
Collection<Notifier> notifiers,
List<? extends Diff> differences,
boolean leftToRight,
IMerger.Registry mergerRegistry)
Constructs an instance of this command given the list of differences that it needs to merge.
|
CopyCommand(ChangeRecorder changeRecorder,
Collection<Notifier> notifiers,
List<? extends Diff> differences,
boolean leftToRight,
IMerger.Registry mergerRegistry)
Deprecated.
Constructs an instance of this command given the list of differences that it needs to merge.
|
MergeAllNonConflictingCommand(ChangeRecorder changeRecorder,
Collection<Notifier> notifiers,
Comparison comparison,
boolean leftToRight,
IMerger.Registry mergerRegistry,
IMergeAllNonConflictingRunnable runnable)
Creates a new instance.
|
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 |
---|---|
Command |
ICompareEditingDomain.createCopyCommand(List<? extends Diff> differences,
boolean leftToRight,
IMerger.Registry mergerRegistry)
Deprecated.
|
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. |
void |
IMergeRunnable.merge(List<? extends Diff> differences,
boolean leftToRight,
IMerger.Registry mergerRegistry)
Execute the merge operation.
|
Modifier and Type | Method and Description |
---|---|
ICompareCopyCommand |
EMFCompareEditingDomain.createCopyAllNonConflictingCommand(Comparison comparison,
boolean leftToRight,
IMerger.Registry mergerRegistry,
IMergeAllNonConflictingRunnable runnable)
Creates a command that will merge all non-conflicting differences in the given direction.
|
Command |
EMFCompareEditingDomain.createCopyCommand(List<? extends Diff> differences,
boolean leftToRight,
IMerger.Registry mergerRegistry)
Creates a new command that will merge the given differences in from right to left or left to right by
using the mergers defined in the given merger registry.
|
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 | 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.
|
void |
DependencyData.updateDependencies(org.eclipse.jface.viewers.ISelection selection,
IMerger.Registry mergerRegistry) |
Modifier and Type | Field and Description |
---|---|
protected IMerger.Registry |
MergeAction.mergerRegistry |
Modifier and Type | Method and Description |
---|---|
protected void |
MergeNonConflictingRunnable.doMergeDiffWithConflicts(boolean leftToRight,
IMerger.Registry mergerRegistry,
List<Diff> affectedDiffs,
Monitor emfMonitor,
Diff diff) |
protected IDiffRelationshipComputer |
AbstractMergeRunnable.getDiffRelationshipComputer(IMerger.Registry mergerRegistry)
Returns the diff relationship computer instance from the compare configuration with the given merger
registry.
|
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.
|
protected void |
AbstractMergeRunnable.markAsMerged(Diff diff,
MergeMode mode,
boolean mergeRightToLeft,
IMerger.Registry mergerRegistry)
Marks a single diff as merged, keeping track of the merge mode used for the operation.
|
Iterable<Diff> |
MergeNonConflictingRunnable.merge(Comparison comparison,
boolean leftToRight,
IMerger.Registry mergerRegistry)
Merges all non-conflicting differences from the given comparison in either direction.
|
void |
MergeNonConflictingRunnable.merge(List<? extends Diff> differences,
boolean leftToRight,
IMerger.Registry mergerRegistry)
Execute the merge operation.
|
void |
MergeRunnableImpl.merge(List<? extends Diff> differences,
boolean leftToRight,
IMerger.Registry mergerRegistry) |
void |
MergeContainedRunnable.merge(List<? extends Diff> differences,
boolean leftToRight,
IMerger.Registry mergerRegistry) |
void |
MergeConflictingRunnable.merge(List<? extends Diff> differences,
boolean leftToRight,
IMerger.Registry mergerRegistry)
Execute the merge operation.
|
protected void |
AbstractMergeRunnable.mergeAll(Collection<? extends Diff> differences,
boolean leftToRight,
IMerger.Registry mergerRegistry) |
Constructor and Description |
---|
AbstractMergeContainedAction(IEMFCompareConfiguration compareConfiguration,
IMerger.Registry mergerRegistry,
MergeMode mode,
org.eclipse.compare.INavigatable navigatable) |
AbstractMergeContainedAction(IEMFCompareConfiguration compareConfiguration,
IMerger.Registry mergerRegistry,
MergeMode mode,
org.eclipse.compare.INavigatable navigatable,
org.eclipse.jface.viewers.IStructuredSelection selection) |
MergeAction(IEMFCompareConfiguration compareConfiguration,
IMerger.Registry mergerRegistry,
MergeMode mode,
org.eclipse.compare.INavigatable navigatable)
Constructor.
|
MergeAction(IEMFCompareConfiguration compareConfiguration,
IMerger.Registry mergerRegistry,
MergeMode mode,
org.eclipse.compare.INavigatable navigatable,
org.eclipse.jface.viewers.IStructuredSelection selection) |
MergeAllNonConflictingAction(IEMFCompareConfiguration compareConfiguration,
Comparison comparison,
IMerger.Registry mergerRegistry,
MergeMode mode)
Constructor.
|
MergeContainedAction(IEMFCompareConfiguration compareConfiguration,
IMerger.Registry mergerRegistry,
MergeMode mode,
org.eclipse.compare.INavigatable navigatable,
org.eclipse.jface.viewers.IStructuredSelection selection,
com.google.common.base.Predicate<TreeNode> isFiltered) |
MergeContainedConflictingAction(IEMFCompareConfiguration compareConfiguration,
IMerger.Registry mergerRegistry,
MergeMode mode,
org.eclipse.compare.INavigatable navigatable,
org.eclipse.jface.viewers.IStructuredSelection selection,
com.google.common.base.Predicate<TreeNode> isFiltered) |
MergeContainedNonConflictingAction(IEMFCompareConfiguration compareConfiguration,
IMerger.Registry mergerRegistry,
MergeMode mode,
org.eclipse.compare.INavigatable navigatable,
org.eclipse.jface.viewers.IStructuredSelection selection,
com.google.common.base.Predicate<TreeNode> isFiltered) |
Modifier and Type | Method and Description |
---|---|
Iterable<Diff> |
IMergeAllNonConflictingRunnable.merge(Comparison comparison,
boolean leftToRight,
IMerger.Registry mergerRegistry)
Merges all non-conflicting differences from the given comparison in either direction.
|
Modifier and Type | Interface and Description |
---|---|
static interface |
IMerger.Registry2
Registry that can provide its mergers sorted by rank descending.
|
Modifier and Type | Class and Description |
---|---|
static class |
IMerger.RegistryImpl
A default implementation of an
IMerger.Registry . |
Modifier and Type | Field and Description |
---|---|
protected IMerger.Registry |
DiffRelationshipComputer.registry
Merger registry used to retrieve the correct merger.
|
Modifier and Type | Method and Description |
---|---|
static IMerger.Registry |
IMerger.RegistryImpl.createStandaloneInstance()
Returns a registry filled with the default mergers provided by EMF Compare; namely
AttributeChangeMerger , ReferenceChangeMerger , FeatureMapChangeMerger ,
ResourceAttachmentChangeMerger , PseudoConflictMerger and ConflictMerger . |
IMerger.Registry |
IDiffRelationshipComputer.getMergerRegistry()
Returns the merger registry used for calculating the diff relationships.
|
IMerger.Registry |
DiffRelationshipComputer.getMergerRegistry() |
IMerger.Registry |
IMerger.getRegistry()
Get the registry.
|
IMerger.Registry |
AbstractMerger.getRegistry()
Get the registry.
|
Modifier and Type | Method and Description |
---|---|
void |
IDiffRelationshipComputer.setMergerRegistry(IMerger.Registry mergerRegistry)
Sets the merger registry used for calculating the diff relationships.
|
void |
DiffRelationshipComputer.setMergerRegistry(IMerger.Registry mergerRegistry) |
void |
CachingDiffRelationshipComputer.setMergerRegistry(IMerger.Registry mergerRegistry)
Sets the merger registry used for calculating the diff relationships.
|
void |
IMerger.setRegistry(IMerger.Registry registry)
Set the registry containing this merger.
|
void |
AbstractMerger.setRegistry(IMerger.Registry registry)
Set the registry containing this merger.
|
Constructor and Description |
---|
BatchMerger(IMerger.Registry registry)
Constructs our batch merger provided the registry from which to retrieve the delegate mergers.
|
BatchMerger(IMerger.Registry registry,
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.
|
CachingDiffRelationshipComputer(IMerger.Registry registry)
Creates a new computer with the given registry.
|
CachingDiffRelationshipComputer(IMerger.Registry registry,
IMergeCriterion criterion)
Creates a new computer with the given registry and merge criterion.
|
DiffRelationshipComputer(IMerger.Registry registry)
Creates a new relationship computer.
|
DiffRelationshipComputer(IMerger.Registry registry,
IMergeCriterion criterion)
Creates a new relationship computer.
|
Modifier and Type | Method and Description |
---|---|
IMerger.Registry |
EMFCompareRCPPlugin.getMergerRegistry()
Returns the merger registry to which extension will be registered.
|
Constructor and Description |
---|
MergerExtensionRegistryListener(String pluginID,
String extensionPointID,
org.eclipse.core.runtime.ILog log,
IMerger.Registry mergerRegistry)
Constructor.
|
Copyright (c) 2006, 2015 Obeo and others. All rights reserved.