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 |
---|---|
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 |
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 merged 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 |
MergeRunnableImpl.merge(List<? extends Diff> differences,
boolean leftToRight,
IMerger.Registry mergerRegistry) |
void |
MergeNonConflictingRunnable.merge(List<? extends Diff> differences,
boolean leftToRight,
IMerger.Registry mergerRegistry)
Execute the merge operation.
|
Constructor and Description |
---|
MergeAction(ICompareEditingDomain editingDomain,
IMerger.Registry mergerRegistry,
MergeMode mode,
boolean isLeftEditable,
boolean isRightEditable,
org.eclipse.compare.INavigatable navigatable)
Constructor.
|
MergeAction(ICompareEditingDomain editingDomain,
IMerger.Registry mergerRegistry,
MergeMode mode,
boolean isLeftEditable,
boolean isRightEditable,
org.eclipse.compare.INavigatable navigatable,
org.eclipse.jface.viewers.IStructuredSelection selection) |
MergeAllNonConflictingAction(ICompareEditingDomain editingDomain,
Comparison comparison,
IMerger.Registry mergerRegistry,
MergeMode mode,
boolean isLeftEditable,
boolean isRightEditable)
Constructor.
|
MergeContainedNonConflictingAction(ICompareEditingDomain editingDomain,
IMerger.Registry mergerRegistry,
MergeMode mode,
boolean isLeftEditable,
boolean isRightEditable,
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 | Method and Description |
---|---|
static Set<Diff> |
MergeDependenciesUtil.getAllResultingMerges(Diff diff,
IMerger.Registry mergerRegistry,
boolean mergeRightToLeft)
Retrieves the set of all diffs related to the given
diff when merging in the given
direction. |
static Set<Diff> |
MergeDependenciesUtil.getAllResultingRejections(Diff diff,
IMerger.Registry mergerRegistry,
boolean mergeRightToLeft)
Retrieves the set of all diffs that will be rejected if the given
diff is merged, either
because of unresolveable conflicts or because of unreachable requirements. |
static Graph<Diff> |
MergeDependenciesUtil.mapDifferences(Collection<Diff> differences,
IMerger.Registry mergerRegistry,
boolean mergeRightToLeft,
MergeMode mergeMode)
This will map the given differences in a dependency graph, enabling EMF Compare to differentiate what
can be safely merged from what cannot.
|
static Graph<Diff> |
MergeDependenciesUtil.mapDifferences(Comparison comparison,
IMerger.Registry mergerRegistry,
boolean mergeRightToLeft,
MergeMode mergeMode)
This will map all the differences from the given comparison in a dependency graph, enabling EMF Compare
to differentiate what can be safely merged from what cannot.
|
Modifier and Type | Class and Description |
---|---|
static class |
IMerger.RegistryImpl
A default implementation of an
IMerger.Registry . |
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 |
IMerger.getRegistry()
Get the registry.
|
IMerger.Registry |
AbstractMerger.getRegistry()
Get the registry.
|
Modifier and Type | Method and Description |
---|---|
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.
|
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.