Package | Description |
---|---|
org.eclipse.emf.compare.merge |
Modifier and Type | Interface and Description |
---|---|
interface |
IMerger2
This adds the ability for
mergers to define their own sub-set of "required" differences. |
Modifier and Type | Class and Description |
---|---|
class |
AbstractMerger
Abstract implementation of an
IMerger . |
class |
AttributeChangeMerger
This specific implementation of
AbstractMerger will be used to merge attribute changes. |
class |
ConflictMerger
This specific implementation of
AbstractMerger will be used to merge real conflicts. |
class |
FeatureMapChangeMerger
This specific implementation of
AbstractMerger will be used to merge attribute changes. |
class |
PseudoConflictMerger
A simple merger for pseudo conflict.
|
class |
ReferenceChangeMerger
This specific implementation of
AbstractMerger will be used to merge reference changes. |
class |
ResourceAttachmentChangeMerger
This specific implementation of
AbstractMerger will be used to merge resource attachment changes. |
class |
ResourceLocationChangeMerger
This specific implementation of
AbstractMerger will be used to merge resource location changes. |
Modifier and Type | Method and Description |
---|---|
IMerger |
IMerger.Registry.add(IMerger merger)
Adds a merger to the registry.
|
IMerger |
IMerger.RegistryImpl.add(IMerger merger)
Adds a merger to the registry.
|
IMerger |
IMerger.Registry.getHighestRankingMerger(Diff target)
Returns the merger, for the given target, owning the highest ranking.
|
IMerger |
IMerger.RegistryImpl.getHighestRankingMerger(Diff target)
Returns the merger, for the given target, owning the highest ranking.
|
IMerger |
IMerger.Registry.remove(String className)
Removes a merger from the registry, from its class name.
|
IMerger |
IMerger.RegistryImpl.remove(String className)
Removes a merger from the registry, from its class name.
|
Modifier and Type | Method and Description |
---|---|
Collection<IMerger> |
IMerger.Registry.getMergers(Diff target)
Returns the list of the candidate mergers for the given difference.
|
Collection<IMerger> |
IMerger.RegistryImpl.getMergers(Diff target)
Returns the list of the candidate mergers for the given difference.
|
Modifier and Type | Method and Description |
---|---|
IMerger |
IMerger.Registry.add(IMerger merger)
Adds a merger to the registry.
|
IMerger |
IMerger.RegistryImpl.add(IMerger merger)
Adds a merger to the registry.
|
Copyright (c) 2006, 2015 Obeo and others. All rights reserved.