oracle.adfinternal.share.merge.resolver

Class ConnectionsMergeResolver

java.lang.Object

oracle.adf.share.merge.ADFDiffResolver

oracle.adfinternal.share.merge.resolver.ConnectionsMergeResolver

public class ConnectionsMergeResolver
extends ADFDiffResolver

The connections merge resolver which is used by the merge handler to resolve the conflicts based on the mode set.

Nested Class Summary

Nested classes/interfaces inherited from class oracle.adf.share.merge.ADFDiffResolver

ADFDiffResolver.UserDescription

Field Summary

Fields

Modifier and Type	Field and Description
static DiffMergeMgrEntry[]	CONNECTION_DOCTYPES_FOR_MERGE

Fields inherited from class oracle.adf.share.merge.ADFDiffResolver

AUTO_MERGE_DEL_ELEM, AUTO_MERGE_INS_ELEM, AUTO_MERGE_UPD_ELEM, CONFLICT_CONTAINER, CONFLICT_DEL_ELEM_UPD_BY_ANOTHER, CONFLICT_INS_ELEM_INS_BY_ANOTHER, CONFLICT_UNKNOWN, CONFLICT_UPD_ELEM_DEL_BY_ANOTHER, CONFLICT_UPD_ELEM_UPD_BY_ANOTHER, DEF_MERGE_LOGGER, MERGE_ORIGIN_PUBLISH, MERGE_ORIGIN_REFRESH, MERGE_REPORT_FILLER_ID, mLogger, mResolveMode, mSkipMergeReportEntries, RESOLVE_EDIT_WINS, RESOLVE_NONE, RESOLVE_SCAN, RESOLVE_TO_MERGE_WINS, RESOLVE_UNRESOLVEABLE, VO_APPLY_RESOLUTIONS, VO_RECORD_CONFLICTS

Constructor Summary

Constructors

Constructor and Description
ConnectionsMergeResolver()

Method Summary

Modifier and Type	Method and Description
static void	connectionRegisterDiffMergeManagers()
int	getResolveMode() Returns the resolver conflict resolution mode
int	getResolveWinner() Returns the resolver conflict resolution mode
void	registerDiffMergeManagers()
ConnectionsMergeResolverResult	resolveConflicts(java.lang.String key, oracle.mds.core.MetadataObject sandBoxMO, oracle.mds.core.MetadataObject mainLineMO, ConnectionsMergeDiffDetails conflicts, boolean isConnDeleted) Called from the merge handler to resolve the conflicts based on the mode set on the resolver.
void	setResolveMode(int mode) Sets the resolver mode for conflict resolution
void	setResolveWinner(int mode) Sets the resolver mode for conflict resolution

Methods inherited from class oracle.adf.share.merge.ADFDiffResolver

addToPassMap, addToUnresolveableList, beginMerge, checkForMergeError, endMerge, getDocMergeException, getExceptionList, getFromPassMap, getMergeContext, getMergeLogger, getMergeLogTree, getMergeOrigin, getTopLevelObjectName, getUnresolveableList, getUserDescription, hasMergeError, isDocumentAutoMerged, isFailOnFirstError, isResolvable, isUserResolutionNeeded, logException, processMergeError, resetDocMergeException, resolveADFMergeConflict, setDocMergeException, setFailOnFirstError, setMergeContext, setMergeLogTree, setMergeOrigin, skipMergeReport

Methods inherited from class java.lang.Object

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

Field Detail

CONNECTION_DOCTYPES_FOR_MERGE

public static final DiffMergeMgrEntry[] CONNECTION_DOCTYPES_FOR_MERGE

Constructor Detail

ConnectionsMergeResolver

public ConnectionsMergeResolver()

Method Detail

setResolveMode

public void setResolveMode(int mode)

Sets the resolver mode for conflict resolution

Overrides:

setResolveMode in class ADFDiffResolver

Parameters:

mode - Mode for the resolver

getResolveMode

public int getResolveMode()

Returns the resolver conflict resolution mode

Overrides:

getResolveMode in class ADFDiffResolver

Returns:

Mode for the resolver

resolveConflicts

public ConnectionsMergeResolverResult resolveConflicts(java.lang.String key,
                                                       oracle.mds.core.MetadataObject sandBoxMO,
                                                       oracle.mds.core.MetadataObject mainLineMO,
                                                       ConnectionsMergeDiffDetails conflicts,
                                                       boolean isConnDeleted)

Called from the merge handler to resolve the conflicts based on the mode set on the resolver.

Parameters:

key - - trans-unit key for which the conflict needs to be resolved.

sandBoxMO - - Sandbox MO

mainLineMO - - Mainline MO

conflicts - - The conflicts for this trans-unit key

Returns:

Result object to store the merge result.

setResolveWinner

public void setResolveWinner(int mode)

Sets the resolver mode for conflict resolution

Overrides:

setResolveWinner in class ADFDiffResolver

Parameters:

mode - Mode for the resolver

getResolveWinner

public int getResolveWinner()

Returns the resolver conflict resolution mode

Overrides:

getResolveWinner in class ADFDiffResolver

Returns:

Mode for the resolver

connectionRegisterDiffMergeManagers

public static void connectionRegisterDiffMergeManagers()

registerDiffMergeManagers

public void registerDiffMergeManagers()

Overrides:

registerDiffMergeManagers in class ADFDiffResolver