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

Interface ConflictHandler

public interface ConflictHandler

Allows to hook in for custom conflict treatment. Conflicting changes are determined by the ConflictDetector, which can be exchanged as well.

Author:

wesendon

Field Summary

Fields

Modifier and Type	Field and Description
static String	EXTENSION_POINT_ID Constant for the extension point id of conflict handlers.

Method Summary

Modifier and Type	Method and Description
VisualConflict	handle(VisualConflict conflict, ModelElementIdToEObjectMapping idToEObjectMapping) Called after a conflict has been created and before it is added to list of all existing conflicts.

Field Detail

EXTENSION_POINT_ID

static final String EXTENSION_POINT_ID

Constant for the extension point id of conflict handlers.

See Also:

Constant Field Values

Method Detail

handle

VisualConflict handle(VisualConflict conflict,
                      ModelElementIdToEObjectMapping idToEObjectMapping)

Called after a conflict has been created and before it is added to list of all existing conflicts.

Parameters:

conflict - a VisualConflict instance that has been created by a DecisionManager

idToEObjectMapping - mapping from IDs to EObjects

Returns:

the possibly modified conflict instance that will be added to the list of conflicts