org.eclipse.emf.emfstore.internal.client.model.changeTracking.merging.conflict

Interface CustomConflictOptionFactory

public interface CustomConflictOptionFactory

Interface for extension point. This is used to register new options for a merge decision.

Author:

wesendon

Method Summary

Modifier and Type	Method and Description
CustomConflictOption	createCustomConflictOption(VisualConflict conflict) Creates the custom option.
boolean	isApplicableConflict(VisualConflict conflict) Check whether custom option is applicable for given conflict.

Method Detail

isApplicableConflict

boolean isApplicableConflict(VisualConflict conflict)

Check whether custom option is applicable for given conflict.

Parameters:

conflict - to check

Returns:

true if applicable

createCustomConflictOption

CustomConflictOption createCustomConflictOption(VisualConflict conflict)

Creates the custom option. This method is called if isApplicableConflict(VisualConflict) has returned true and only then.

Parameters:

conflict - parent conflict

Returns:

custom option