public class JUDiffResolver extends VODiffResolver
Modifier and Type | Field and Description |
---|---|
static oracle.adf.share.merge.DiffMergeMgrEntry[] |
JU_DOCTYPES_FOR_MERGE |
BC_ATTR_HINTS_TO_CHECK, BC_DOCTYPES_FOR_MERGE, CONFLICT_ELEM_VALUE_PREFIX, mAttrHintsSet
CONFLICT_INS_CHILD_DIFF, CONFLICT_INS_CHILD_DIFF_DEL, CONFLICT_INS_CHILD_DIFF_INS, CONFLICT_INS_CHILD_DIFF_UPD, RESOLVE_CHILD, RESOLVE_IMMEDIATE, RESOLVE_REMOVE
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 and Description |
---|
JUDiffResolver() |
JUDiffResolver(ApplicationModule appMod,
java.lang.String voName,
java.lang.String viewDefName,
int resolveMode) |
JUDiffResolver(ViewObject vo,
int resolveMode) |
Modifier and Type | Method and Description |
---|---|
void |
beginMerge(int origin) |
void |
beginResolutionForDef(PersistableDefObject editObj,
PersistableDefObject tipObj,
PersistableDefObject origObj) |
void |
endMerge(boolean isOnError) |
static void |
juRegisterDiffMergeManagers() |
void |
registerDiffMergeManagers() |
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) |
bcRegisterDiffMergeManagers, beforeResolve, beforeResolveUnresolved, checkForResolution, findRowForConflict, findRowForConflictObject, findRowForConflictValue, getApplicationModule, getAttrHintsToCheck, getCustomAttrPrefix, getCustomAttrSuffix, getCustomObjectPrefix, getCustomObjectSuffix, getMergeLogTree, getMoRef, getRefreshLogger, getResolveMode, getViewObject, isCollapseConflicts, isUserResolutionNeeded, keepChildSandboxInserted, pesistMergeRepotInUSBTable, renameChildDef, resolveChildDifValues, resolveMergeConflict, setApplicationModule, setCollapseConflicts, setCustomAttrPrefix, setCustomAttrSuffix, setCustomObjectPrefix, setCustomObjectSuffix, setMoRef, setResolutionForRow, setResolveMode, setViewObject, transformPlanVOStructureToUSBLogStructure
addAuxData, addAuxData, addAuxDataWithKey, addSavedDiff, applyDiffChildren, applyDiffContents, checkForRename, defAutoMerged, endResolutionForDef, findSavedDiff, getAuxData, getAuxData, getAuxDataKeySet, getAuxDataKeySet, getPersistentObj, getTransMajor, getTransMinor, hasAuxData, insertChild, isResolveEndPoint, mergeDiffs, removeChild, removeSavedDiff, resetAuxData, setPersistentObj, updateChild
addToPassMap, addToUnresolveableList, checkForMergeError, getDocMergeException, getExceptionList, getFromPassMap, getMergeContext, getMergeLogger, getMergeOrigin, getResolveWinner, getTopLevelObjectName, getUnresolveableList, getUserDescription, hasMergeError, isDocumentAutoMerged, isFailOnFirstError, isResolvable, logException, processMergeError, resetDocMergeException, setDocMergeException, setFailOnFirstError, setMergeContext, setMergeLogTree, setMergeOrigin, setResolveWinner, skipMergeReport
public static final oracle.adf.share.merge.DiffMergeMgrEntry[] JU_DOCTYPES_FOR_MERGE
public JUDiffResolver()
public JUDiffResolver(ApplicationModule appMod, java.lang.String voName, java.lang.String viewDefName, int resolveMode)
public JUDiffResolver(ViewObject vo, int resolveMode)
public void beginMerge(int origin)
beginMerge
in class VODiffResolver
public void endMerge(boolean isOnError)
endMerge
in class VODiffResolver
public static void juRegisterDiffMergeManagers()
public void registerDiffMergeManagers()
registerDiffMergeManagers
in class VODiffResolver
public void beginResolutionForDef(PersistableDefObject editObj, PersistableDefObject tipObj, PersistableDefObject origObj)
beginResolutionForDef
in class DiffResolver
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)
resolveADFMergeConflict
in class VODiffResolver