oracle.jbo.mom

Class DiffResolver

java.lang.Object

oracle.adf.share.merge.ADFDiffResolver

oracle.jbo.mom.DiffResolver

Direct Known Subclasses:

VODiffResolver

public class DiffResolver
extends oracle.adf.share.merge.ADFDiffResolver

Nested Class Summary

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

oracle.adf.share.merge.ADFDiffResolver.UserDescription

Field Summary

Fields

Modifier and Type	Field and Description
static int	CONFLICT_INS_CHILD_DIFF
static int	CONFLICT_INS_CHILD_DIFF_DEL
static int	CONFLICT_INS_CHILD_DIFF_INS
static int	CONFLICT_INS_CHILD_DIFF_UPD
static int	RESOLVE_CHILD
static int	RESOLVE_IMMEDIATE
static int	RESOLVE_REMOVE

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
DiffResolver()

Method Summary

Modifier and Type	Method and Description
void	addAuxData(DifferAuxData auxData)
DifferAuxData	addAuxData(java.lang.String category, java.lang.Object key)
void	addAuxDataWithKey(java.lang.Object key, DifferAuxData auxData)
void	addSavedDiff(DifferBase difToSave)
void	applyDiffChildren(DifferDetails editDif)
void	applyDiffContents(DifferDetails editDif)
boolean	beforeResolve(DifferChangeEntry.DifferChangeOper oper, DifferBase resolveResult, java.lang.String id, java.lang.Class type, java.lang.Object newVal, java.lang.Object oldVal)
void	beforeResolveUnresolved(DifferChangeEntry.DifferChangeOper oper, DifferBase resolveResult, java.lang.String id, java.lang.Class type, java.lang.Object newVal, java.lang.Object oldVal)
void	beginMerge(int origin)
void	beginResolutionForDef(PersistableDefObject editObj, PersistableDefObject tipObj, PersistableDefObject origObj)
DifferBase	checkForRename(DifferBase resolveResult, java.lang.Object id, java.lang.Object editValue, java.lang.Object toMergeValue, DifferDetails childDif)
int	checkForResolution(int conflict, DifferBase resolveResult, java.lang.Object id, java.lang.Object editValue, java.lang.Object toMergeValue, java.lang.Object oldValue)
int	defAutoMerged(DiffMergeable toMergeDef, DiffMergeable origDef, DifferBase tipDif)
void	endMerge(boolean isOnError)
void	endResolutionForDef(PersistableDefObject editObj, PersistableDefObject tipObj, PersistableDefObject origObj)
DifferBase	findSavedDiff(java.lang.String fullName)
DifferAuxData	getAuxData(java.lang.Object ky)
DifferAuxData	getAuxData(java.lang.String category, java.lang.Object ky)
java.util.Set	getAuxDataKeySet()
java.util.Set	getAuxDataKeySet(java.lang.String category)
java.lang.Object	getPersistentObj(java.lang.String defFullName, java.lang.String id)
java.lang.String	getTransMajor()
java.lang.String	getTransMinor()
boolean	hasAuxData(java.lang.String category)
void	insertChild(DifferChildren editDif, DiffChildrenMerge dm, java.lang.Object id, java.lang.Object value)
boolean	isResolveEndPoint(int conflict, DifferBase resolveResult, java.lang.Object id, java.lang.Object editValue, java.lang.Object toMergeValue, java.lang.Object oldValue, java.lang.Object difDetails)
boolean	mergeDiffs(DifferBase editDif, DifferBase resolveResult)
void	registerDiffMergeManagers()
void	removeChild(DifferChildren editDif, DiffChildrenMerge dm, java.lang.Object id)
DifferBase	removeSavedDiff(DifferBase difToRemove)
void	renameChildDef(DifferDetails childDif, java.lang.Object newVal, int resolution, java.lang.Object editValue, java.lang.Object toMergeValue)
void	resetAuxData()
int	resolveADFMergeConflict(int conflict, java.lang.Object resolveResult, java.lang.Object id, java.lang.Object editValue, java.lang.Object toMergeValue, java.lang.Object oldValue, java.lang.Object childDifDetails)
int	resolveMergeConflict(int conflict, DifferBase resolveResult, java.lang.Object id, java.lang.Object editValue, java.lang.Object toMergeValue, java.lang.Object oldValue, java.lang.Object childDifDetails)
void	setPersistentObj(java.lang.String defFullName, java.lang.String id, java.lang.Object o)
void	updateChild(DifferChildren editDif, DiffChildrenMerge dm, java.lang.Object id, java.lang.Object value, java.lang.Object oldValue)

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

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

Methods inherited from class java.lang.Object

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

Field Detail

CONFLICT_INS_CHILD_DIFF

public static final int CONFLICT_INS_CHILD_DIFF

See Also:

Constant Field Values

CONFLICT_INS_CHILD_DIFF_DEL

public static final int CONFLICT_INS_CHILD_DIFF_DEL

See Also:

Constant Field Values

CONFLICT_INS_CHILD_DIFF_INS

public static final int CONFLICT_INS_CHILD_DIFF_INS

See Also:

Constant Field Values

CONFLICT_INS_CHILD_DIFF_UPD

public static final int CONFLICT_INS_CHILD_DIFF_UPD

See Also:

Constant Field Values

RESOLVE_CHILD

public static final int RESOLVE_CHILD

See Also:

Constant Field Values

RESOLVE_REMOVE

public static final int RESOLVE_REMOVE

See Also:

Constant Field Values

RESOLVE_IMMEDIATE

public static final int RESOLVE_IMMEDIATE

See Also:

Constant Field Values

Constructor Detail

DiffResolver

public DiffResolver()

Method Detail

beginMerge

public void beginMerge(int origin)

Overrides:

beginMerge in class oracle.adf.share.merge.ADFDiffResolver

endMerge

public void endMerge(boolean isOnError)

Overrides:

endMerge in class oracle.adf.share.merge.ADFDiffResolver

getTransMajor

public java.lang.String getTransMajor()

getTransMinor

public java.lang.String getTransMinor()

getPersistentObj

public java.lang.Object getPersistentObj(java.lang.String defFullName,
                                         java.lang.String id)

setPersistentObj

public void setPersistentObj(java.lang.String defFullName,
                             java.lang.String id,
                             java.lang.Object o)

hasAuxData

public boolean hasAuxData(java.lang.String category)

addAuxData

public void addAuxData(DifferAuxData auxData)

addAuxDataWithKey

public void addAuxDataWithKey(java.lang.Object key,
                              DifferAuxData auxData)

addAuxData

public DifferAuxData addAuxData(java.lang.String category,
                                java.lang.Object key)

getAuxData

public DifferAuxData getAuxData(java.lang.Object ky)

getAuxData

public DifferAuxData getAuxData(java.lang.String category,
                                java.lang.Object ky)

getAuxDataKeySet

public java.util.Set getAuxDataKeySet()

getAuxDataKeySet

public java.util.Set getAuxDataKeySet(java.lang.String category)

resetAuxData

public void resetAuxData()

addSavedDiff

public void addSavedDiff(DifferBase difToSave)

findSavedDiff

public DifferBase findSavedDiff(java.lang.String fullName)

removeSavedDiff

public DifferBase removeSavedDiff(DifferBase difToRemove)

beginResolutionForDef

public void beginResolutionForDef(PersistableDefObject editObj,
                                  PersistableDefObject tipObj,
                                  PersistableDefObject origObj)

endResolutionForDef

public void endResolutionForDef(PersistableDefObject editObj,
                                PersistableDefObject tipObj,
                                PersistableDefObject origObj)

beforeResolve

public boolean beforeResolve(DifferChangeEntry.DifferChangeOper oper,
                             DifferBase resolveResult,
                             java.lang.String id,
                             java.lang.Class type,
                             java.lang.Object newVal,
                             java.lang.Object oldVal)

beforeResolveUnresolved

public void beforeResolveUnresolved(DifferChangeEntry.DifferChangeOper oper,
                                    DifferBase resolveResult,
                                    java.lang.String id,
                                    java.lang.Class type,
                                    java.lang.Object newVal,
                                    java.lang.Object oldVal)

mergeDiffs

public boolean mergeDiffs(DifferBase editDif,
                          DifferBase resolveResult)

checkForRename

public DifferBase checkForRename(DifferBase resolveResult,
                                 java.lang.Object id,
                                 java.lang.Object editValue,
                                 java.lang.Object toMergeValue,
                                 DifferDetails childDif)

renameChildDef

public void renameChildDef(DifferDetails childDif,
                           java.lang.Object newVal,
                           int resolution,
                           java.lang.Object editValue,
                           java.lang.Object toMergeValue)

isResolveEndPoint

public boolean isResolveEndPoint(int conflict,
                                 DifferBase resolveResult,
                                 java.lang.Object id,
                                 java.lang.Object editValue,
                                 java.lang.Object toMergeValue,
                                 java.lang.Object oldValue,
                                 java.lang.Object difDetails)

resolveADFMergeConflict

public int resolveADFMergeConflict(int conflict,
                                   java.lang.Object resolveResult,
                                   java.lang.Object id,
                                   java.lang.Object editValue,
                                   java.lang.Object toMergeValue,
                                   java.lang.Object oldValue,
                                   java.lang.Object childDifDetails)

Overrides:

resolveADFMergeConflict in class oracle.adf.share.merge.ADFDiffResolver

resolveMergeConflict

public int resolveMergeConflict(int conflict,
                                DifferBase resolveResult,
                                java.lang.Object id,
                                java.lang.Object editValue,
                                java.lang.Object toMergeValue,
                                java.lang.Object oldValue,
                                java.lang.Object childDifDetails)

checkForResolution

public int checkForResolution(int conflict,
                              DifferBase resolveResult,
                              java.lang.Object id,
                              java.lang.Object editValue,
                              java.lang.Object toMergeValue,
                              java.lang.Object oldValue)

defAutoMerged

public int defAutoMerged(DiffMergeable toMergeDef,
                         DiffMergeable origDef,
                         DifferBase tipDif)

applyDiffContents

public void applyDiffContents(DifferDetails editDif)

applyDiffChildren

public void applyDiffChildren(DifferDetails editDif)

insertChild

public void insertChild(DifferChildren editDif,
                        DiffChildrenMerge dm,
                        java.lang.Object id,
                        java.lang.Object value)

updateChild

public void updateChild(DifferChildren editDif,
                        DiffChildrenMerge dm,
                        java.lang.Object id,
                        java.lang.Object value,
                        java.lang.Object oldValue)

removeChild

public void removeChild(DifferChildren editDif,
                        DiffChildrenMerge dm,
                        java.lang.Object id)

registerDiffMergeManagers

public void registerDiffMergeManagers()

Overrides:

registerDiffMergeManagers in class oracle.adf.share.merge.ADFDiffResolver