| Package | Description | 
|---|---|
| org.eclipse.emf.compare.merge | 
| Modifier and Type | Interface and Description | 
|---|---|
| interface  | IMerger2This adds the ability for  mergersto define their own sub-set of "required" differences. | 
| Modifier and Type | Class and Description | 
|---|---|
| class  | AbstractMergerAbstract implementation of an  IMerger. | 
| class  | AttributeChangeMergerThis specific implementation of  AbstractMergerwill be used to merge attribute changes. | 
| class  | ConflictMergerThis specific implementation of  AbstractMergerwill be used to merge real conflicts. | 
| class  | FeatureMapChangeMergerThis specific implementation of  AbstractMergerwill be used to merge attribute changes. | 
| class  | PseudoConflictMergerA simple merger for pseudo conflict. | 
| class  | ReferenceChangeMergerThis specific implementation of  AbstractMergerwill be used to merge reference changes. | 
| class  | ResourceAttachmentChangeMergerThis specific implementation of  AbstractMergerwill be used to merge resource attachment changes. | 
| class  | ResourceLocationChangeMergerDeprecated. 
 ResourceLocationChanges have been replaced byResourceAttachmentChanges of kind Move. | 
| 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.