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

Class AbstractConflictResolver

java.lang.Object

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

All Implemented Interfaces:

ConflictResolver

Direct Known Subclasses:

MergeProjectHandler

public abstract class AbstractConflictResolver
extends Object
implements ConflictResolver

Convenience super class for implementing ConflictResolver.

Author:

wesendon

Constructor Summary

Constructors

Constructor and Description
AbstractConflictResolver(boolean isBranchMerge) Default Constructor.

Method Summary

Modifier and Type	Method and Description
boolean	resolveConflicts(Project project, ChangeConflictSet changeConflict) Resolves all conflicts between the given change packages "theirs" and the given local operations.

Methods inherited from class java.lang.Object

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

Constructor Detail

AbstractConflictResolver

public AbstractConflictResolver(boolean isBranchMerge)

Default Constructor.

Parameters:

isBranchMerge - specifies whether two branches are merged oppossed to changes from the same branch.

Method Detail

resolveConflicts

public boolean resolveConflicts(Project project,
                                ChangeConflictSet changeConflict)

Resolves all conflicts between the given change packages "theirs" and the given local operations.

Specified by:

resolveConflicts in interface ConflictResolver

Parameters:

project - the project at the time were all local changes are already applied and their operations are NOT, in other words the base version plus local operations

changeConflict - the ChangeConflictSet that needs to be resolved

Returns:

true if the merge can proceed, false if it has to be cancelled

See Also:

ConflictResolver.resolveConflicts(org.eclipse.emf.emfstore.internal.common.model.Project, org.eclipse.emf.emfstore.internal.server.conflictDetection.ChangeConflictSet)