Skip to main content

Notice: this Wiki will be going read only early in 2024 and edits will no longer be possible. Please see: https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/wikis/Wiki-shutdown-plan for the plan.

Jump to: navigation, search

Difference between revisions of "EMF DiffMerge/Changes"

(From 0.2.x to 0.3.0)
Line 8: Line 8:
 
* IComparisonSpecificationFactory => IComparisonMethodFactory, where createComparisonSpecification(...) => createComparisonMethod(...)
 
* IComparisonSpecificationFactory => IComparisonMethodFactory, where createComparisonSpecification(...) => createComparisonMethod(...)
 
* IScopeSpecification => IModelScopeDefinition
 
* IScopeSpecification => IModelScopeDefinition
 +
* IMatchPolicy: '''Comparable<?>''' getMatch'''Id'''(...) => '''Object''' getMatch'''ID'''(...)
 +
* IMergePolicy: copyFeature(EStructuralFeature) => copyFeature(EStructuralFeature, '''IFeaturedModelScope''')
 +
  
 
Main implementations of the API:
 
Main implementations of the API:
Line 19: Line 22:
  
 
* ModelComparisonDiffNode => EMFDiffNode
 
* ModelComparisonDiffNode => EMFDiffNode
 
* IMatchPolicy: '''Comparable<?>''' getMatch'''Id'''(...) => '''Object''' getMatch'''ID'''(...)
 
  
 
* UI extension point: comparisonScope => scopeDefinition, scopeFactory => factory, comparisonSpecification => comparisonMethod, specificationFactory => factory
 
* UI extension point: comparisonScope => scopeDefinition, scopeFactory => factory, comparisonSpecification => comparisonMethod, specificationFactory => factory

Revision as of 08:49, 7 March 2014

From 0.2.x to 0.3.0

A refactoring has been made between versions 0.2.x and version 0.3.0. The most significant changes are listed below.

Main API changes - essentially renaming, for the sake of clarity:

  • IComparisonSpecification => IComparisonMethod
  • IComparisonSpecificationFactory => IComparisonMethodFactory, where createComparisonSpecification(...) => createComparisonMethod(...)
  • IScopeSpecification => IModelScopeDefinition
  • IMatchPolicy: Comparable<?> getMatchId(...) => Object getMatchID(...)
  • IMergePolicy: copyFeature(EStructuralFeature) => copyFeature(EStructuralFeature, IFeaturedModelScope)


Main implementations of the API:

  • GMFComparisonSpecification => GMFComparisonMethod
  • GMFComparisonFactory => GMFComparisonMethodFactory
  • FileScopeSpecification => URIScopeDefinition, with constructors taking different parameters and new methods: createScopeOnEditingDomain(...), createScopeOnResourceSet(...)
  • FileScopeSpecificationFactory => URIScopeDefinitionFactory, where createScopeSpecificationFromUri(...) => createScopeDefinitionFromURI(...)

Others:

  • ModelComparisonDiffNode => EMFDiffNode
  • UI extension point: comparisonScope => scopeDefinition, scopeFactory => factory, comparisonSpecification => comparisonMethod, specificationFactory => factory

Back to the top