org.eclipse.emf.emfstore.client.observer

Interface ESMergeObserver

All Superinterfaces:

ESObserver

public interface ESMergeObserver
extends ESObserver

Callback that is called during the merge process.
The life-cycle of the merging process can be divided into three steps:

1. first all local changes are reverted
2. then the remote changes are applied
3. finally, the local changes are re-applied

The changes being applied in the 2nd and 3rd steps are filtered by means of a conflict resolver.

Author:

emueller

Method Summary

Modifier and Type	Method and Description
void	postApplyMergedChanges(ESLocalProject project, ESChangePackage changePackage) Called after the merge result has been re-applied, i.e.
void	postApplyTheirChanges(ESLocalProject project, List<ESChangePackage> theirChangePackages) Called after incoming changes have been applied upon the ESLocalProject and before our changes are re-applied.
void	postRevertMyChanges(ESLocalProject project) Called after local changes have been reverted and before incoming changes are applied.
void	preRevertMyChanges(ESLocalProject project, ESChangePackage changePackage) Called before all local changes are reverted.

Method Detail

preRevertMyChanges

void preRevertMyChanges(ESLocalProject project,
                        ESChangePackage changePackage)

Called before all local changes are reverted.

Parameters:

project - the ESLocalProject upon which local changes have been reverted

changePackage - the ESChangePackage containing the operations being reverted

postRevertMyChanges

void postRevertMyChanges(ESLocalProject project)

Called after local changes have been reverted and before incoming changes are applied.

Parameters:

project - the ESLocalProject upon which local changes have been reverted

postApplyTheirChanges

void postApplyTheirChanges(ESLocalProject project,
                           List<ESChangePackage> theirChangePackages)

Called after incoming changes have been applied upon the ESLocalProject and before our changes are re-applied.

Parameters:

project - the ESLocalProject upon which local changes have been reverted

theirChangePackages - a list of ESChangePackages containing the changes that have been applied upon the project

postApplyMergedChanges

void postApplyMergedChanges(ESLocalProject project,
                            ESChangePackage changePackage)

Called after the merge result has been re-applied, i.e. after the incoming changes from other parties have been applied upon the given project.

Parameters:

project - the ESLocalProject upon which changes should have been re-applied

changePackage - the ESChangePackage containing the changes to be applied upon the project