Skip navigation links

oracle.jdeveloper.merge
Class MergeEngine

java.lang.Object
oracle.jdeveloper.merge.MergeEngine

public class MergeEngine

extends java.lang.Object

Facade/utility class for performing a merge operation and contructing a CompareModel instance from the result.

Since:

11.1.1.0.0

Constructor Summary

MergeEngine()

Method Summary

void	cancel()
CompareModel	executeMerge() Executes a three-way merge.
static MergeEngine	getInstance() Gets the singleton instance of the merge engine.
boolean	isCancelable()
boolean	isCanceled()
void	prepareMerge(CompareContributor contributor1, CompareContributor contributor2, CompareContributor contributorA) Deprecated. use prepareMerge(CompareContributor, CompareContributor, CompareContributor, Node)
void	prepareMerge(CompareContributor contributor1, CompareContributor contributor2, CompareContributor contributorA, Node contextNode) Prepares a three-way merge.

Methods inherited from class java.lang.Object

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

Constructor Detail

MergeEngine

public MergeEngine()

Method Detail

getInstance

public static final MergeEngine getInstance()

Gets the singleton instance of the merge engine.

Returns:

the merge engine instance.

prepareMerge

@Deprecated
public void prepareMerge(CompareContributor contributor1,
                                    CompareContributor contributor2,
                                    CompareContributor contributorA)

Deprecated. use prepareMerge(CompareContributor, CompareContributor, CompareContributor, Node)

prepareMerge

public void prepareMerge(CompareContributor contributor1,
                         CompareContributor contributor2,
                         CompareContributor contributorA,
                         Node contextNode)

Prepares a three-way merge.

Parameters:

contributor1 - the first contributor.

contributor2 - the second contributor.

contributorA - the ancestor contributor.

executeMerge

public CompareModel executeMerge()
                          throws CompareFailedException

Executes a three-way merge.

Returns:

the resulting model, containing the merge result as the ancestor contributor.

Throws:

CompareFailedException

isCancelable

public boolean isCancelable()

isCanceled

public boolean isCanceled()

cancel

public void cancel()

Skip navigation links