Uses of Class
org.eclipse.emf.emfstore.internal.server.conflictDetection.ChangeConflictSet

Packages that use ChangeConflictSet

org.eclipse.emf.emfstore.internal.client.model
org.eclipse.emf.emfstore.internal.client.model.changeTracking.merging
org.eclipse.emf.emfstore.internal.client.model.exceptions
org.eclipse.emf.emfstore.internal.client.model.impl
org.eclipse.emf.emfstore.internal.server.conflictDetection
org.eclipse.emf.emfstore.internal.server.impl.api

Uses of ChangeConflictSet in org.eclipse.emf.emfstore.internal.client.model

Methods in org.eclipse.emf.emfstore.internal.client.model with parameters of type ChangeConflictSet

ChangePackage

ProjectSpace.mergeResolvedConflicts(ChangeConflictSet conflictSet, List<ChangePackage> myChangePackages, List<ChangePackage> theirChangePackages) Merges the resolved conflict sets.

Uses of ChangeConflictSet in org.eclipse.emf.emfstore.internal.client.model.changeTracking.merging

Methods in org.eclipse.emf.emfstore.internal.client.model.changeTracking.merging with parameters of type ChangeConflictSet

boolean	AbstractConflictResolver.resolveConflicts(Project project, ChangeConflictSet changeConflict) Resolves all conflicts between the given change packages "theirs" and the given local operations.
boolean	ConflictResolver.resolveConflicts(Project project, ChangeConflictSet changeConflict) Resolves all conflicts between the given change packages "theirs" and the given local operations.

Constructors in org.eclipse.emf.emfstore.internal.client.model.changeTracking.merging with parameters of type ChangeConflictSet

DecisionManager(Project project, ChangeConflictSet changeConflict, boolean isBranchMerge)
Default constructor.

Uses of ChangeConflictSet in org.eclipse.emf.emfstore.internal.client.model.exceptions

Methods in org.eclipse.emf.emfstore.internal.client.model.exceptions that return ChangeConflictSet

ChangeConflictSet

ChangeConflictException.getChangeConflict() Returns the change conflict.

Constructors in org.eclipse.emf.emfstore.internal.client.model.exceptions with parameters of type ChangeConflictSet

ChangeConflictException(ChangeConflictSet changeConflict)
Constructor.

ChangeConflictException(String message, ChangeConflictSet conflictSet)
Constructor.

Uses of ChangeConflictSet in org.eclipse.emf.emfstore.internal.client.model.impl

Methods in org.eclipse.emf.emfstore.internal.client.model.impl with parameters of type ChangeConflictSet

ChangePackage

ProjectSpaceBase.mergeResolvedConflicts(ChangeConflictSet conflictSet, List<ChangePackage> myChangePackages, List<ChangePackage> theirChangePackages) Merges the resolved conflict sets.

Uses of ChangeConflictSet in org.eclipse.emf.emfstore.internal.server.conflictDetection

Methods in org.eclipse.emf.emfstore.internal.server.conflictDetection that return ChangeConflictSet

ChangeConflictSet	ConflictDetector.calculateConflicts(List<ChangePackage> myChangePackages, List<ChangePackage> theirChangePackages, ModelElementIdToEObjectMapping idToEObjectMapping) Calculates a ChangeConflictSet based on opposing ChangePackages.
ChangeConflictSet	ConflictDetector.calculateConflicts(List<ChangePackage> myChangePackages, List<ChangePackage> theirChangePackages, Project project) Calculates a ChangeConflictSet based on opposing ChangePackages.

Uses of ChangeConflictSet in org.eclipse.emf.emfstore.internal.server.impl.api

Methods in org.eclipse.emf.emfstore.internal.server.impl.api that return ChangeConflictSet

ChangeConflictSet

ESConflictSetImpl.toInternalAPI() Returns the internal interface of this class.

Constructors in org.eclipse.emf.emfstore.internal.server.impl.api with parameters of type ChangeConflictSet

ESConflictSetImpl(ChangeConflictSet changeConflict)
Constructor.