Skip to content

Commit

Permalink
[2222] Last comparison parameters not taken into account
Browse files Browse the repository at this point in the history
Bug: 2222
Change-Id: I50b8bb407251f3aa81a26a58ce5264b53510fe45
Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
  • Loading branch information
oconstant committed Oct 11, 2018
1 parent a0e66ba commit 70a6021
Showing 1 changed file with 4 additions and 4 deletions.
Expand Up @@ -87,7 +87,6 @@ public CapellaComparisonMethod(IModelScopeDefinition leftScopeDef,
IModelScopeDefinition rightScopeDef, IModelScopeDefinition ancestorScopeDef,
IComparisonMethodFactory factory) {
super(leftScopeDef, rightScopeDef, ancestorScopeDef, factory);
initializeConfiguration();
}

/**
Expand Down Expand Up @@ -156,10 +155,11 @@ protected ILabelProvider getCustomLabelProvider() {
}

/**
* Set the initial configuration of the comparison method
* @see org.eclipse.emf.diffmerge.ui.specification.ext.ConfigurableComparisonMethod#getDefaultConfigurator()
*/
protected void initializeConfiguration() {
CONFIGURATOR_CAPELLA_DEFAULT.apply(this);
@Override
public IComparisonConfigurator getDefaultConfigurator() {
return CONFIGURATOR_CAPELLA_DEFAULT;
}

}

0 comments on commit 70a6021

Please sign in to comment.