org.eclipse.emf.emfstore.internal.server.conflictDetection

Class ConflictDetector

java.lang.Object

org.eclipse.emf.emfstore.internal.server.conflictDetection.ConflictDetector

public class ConflictDetector
extends Object

Detects conflicts between operation.

Author:

koegel

Constructor Summary

Constructors

Constructor and Description
ConflictDetector() Constructor.

Method Summary

Modifier and Type	Method and Description
ChangeConflictSet	calculateConflicts(List<AbstractChangePackage> myChangePackages, List<AbstractChangePackage> theirChangePackages, ModelElementIdToEObjectMapping idToEObjectMapping) Calculates a ChangeConflictSet based on opposing ChangePackages.
ChangeConflictSet	calculateConflicts(List<AbstractChangePackage> myChangePackages, List<AbstractChangePackage> theirChangePackages, Project project) Calculates a ChangeConflictSet based on opposing ChangePackages.

Methods inherited from class java.lang.Object

equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait

Constructor Detail

ConflictDetector

public ConflictDetector()

Constructor.

Method Detail

calculateConflicts

public ChangeConflictSet calculateConflicts(List<AbstractChangePackage> myChangePackages,
                                            List<AbstractChangePackage> theirChangePackages,
                                            Project project)

Calculates a ChangeConflictSet based on opposing ChangePackages.

Parameters:

myChangePackages - a list of ChangePackages

theirChangePackages - a other list of ChangePackages

project - the project for which calculate conflicts

Returns:

a ChangeConflictSet

calculateConflicts

public ChangeConflictSet calculateConflicts(List<AbstractChangePackage> myChangePackages,
                                            List<AbstractChangePackage> theirChangePackages,
                                            ModelElementIdToEObjectMapping idToEObjectMapping)

Calculates a ChangeConflictSet based on opposing ChangePackages.

Parameters:

myChangePackages - a list of ChangePackages

theirChangePackages - a other list of ChangePackages

idToEObjectMapping - a mapping that is used to resolve model elements while calculating conflicts

Returns:

a ChangeConflictSet