|
|||||||||
PREV CLASS NEXT CLASS | FRAMES NO FRAMES | ||||||||
SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD |
java.lang.Object org.eclipse.emf.emfstore.internal.server.conflictDetection.ConflictDetector
public class ConflictDetector
Detects conflicts between operation.
Constructor Summary | |
---|---|
ConflictDetector()
Constructor. |
Method Summary | |
---|---|
ChangeConflictSet |
calculateConflicts(List<ChangePackage> myChangePackages,
List<ChangePackage> theirChangePackages,
ModelElementIdToEObjectMapping idToEObjectMapping)
Calculates a ChangeConflictSet based on opposing ChangePackage s. |
ChangeConflictSet |
calculateConflicts(List<ChangePackage> myChangePackages,
List<ChangePackage> theirChangePackages,
Project project)
Calculates a ChangeConflictSet based on opposing ChangePackage s. |
Methods inherited from class java.lang.Object |
---|
equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait |
Constructor Detail |
---|
public ConflictDetector()
Method Detail |
---|
public ChangeConflictSet calculateConflicts(List<ChangePackage> myChangePackages, List<ChangePackage> theirChangePackages, Project project)
ChangeConflictSet
based on opposing ChangePackage
s.
myChangePackages
- a list of ChangePackage
stheirChangePackages
- a other list of ChangePackage
sproject
- the project for which calculate conflicts
ChangeConflictSet
public ChangeConflictSet calculateConflicts(List<ChangePackage> myChangePackages, List<ChangePackage> theirChangePackages, ModelElementIdToEObjectMapping idToEObjectMapping)
ChangeConflictSet
based on opposing ChangePackage
s.
myChangePackages
- a list of ChangePackage
stheirChangePackages
- a other list of ChangePackage
sidToEObjectMapping
- a mapping that is used to resolve model elements while calculating conflicts
ChangeConflictSet
|
|||||||||
PREV CLASS NEXT CLASS | FRAMES NO FRAMES | ||||||||
SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD |