Package | Description |
---|---|
com.xpn.xwiki.doc | |
com.xpn.xwiki.objects | |
com.xpn.xwiki.objects.classes |
Modifier and Type | Method and Description |
---|---|
MergeResult |
XWikiDocument.merge(XWikiDocument previousDocument,
XWikiDocument newDocument,
MergeConfiguration configuration,
XWikiContext context)
Apply a 3 ways merge on the current document based on provided previous and new version of the document.
|
Modifier and Type | Method and Description |
---|---|
void |
XWikiAttachment.merge(XWikiAttachment previousAttachment,
XWikiAttachment nextAttachment,
MergeConfiguration configuration,
XWikiContext xcontext,
MergeResult mergeResult) |
Modifier and Type | Method and Description |
---|---|
void |
ElementInterface.merge(ElementInterface previousElement,
ElementInterface newElement,
MergeConfiguration configuration,
XWikiContext context,
MergeResult mergeResult)
Apply a 3 ways merge on the current element based on provided previous and new version of the element.
|
void |
BaseElement.merge(ElementInterface previousElement,
ElementInterface newElement,
MergeConfiguration configuration,
XWikiContext context,
MergeResult mergeResult) |
void |
BaseCollection.merge(ElementInterface previousElement,
ElementInterface newElement,
MergeConfiguration configuration,
XWikiContext context,
MergeResult mergeResult) |
void |
BaseProperty.merge(ElementInterface previousElement,
ElementInterface newElement,
MergeConfiguration configuration,
XWikiContext context,
MergeResult mergeResult) |
protected void |
BaseObject.mergeField(PropertyInterface currentElement,
ElementInterface previousElement,
ElementInterface newElement,
MergeConfiguration configuration,
XWikiContext context,
MergeResult mergeResult) |
protected void |
BaseCollection.mergeField(PropertyInterface currentElement,
ElementInterface previousElement,
ElementInterface newElement,
MergeConfiguration configuration,
XWikiContext context,
MergeResult mergeResult) |
protected void |
LargeStringProperty.mergeValue(Object previousValue,
Object newValue,
MergeResult mergeResult) |
protected void |
ListProperty.mergeValue(Object previousValue,
Object newValue,
MergeResult mergeResult) |
protected void |
BaseProperty.mergeValue(Object previousValue,
Object newValue,
MergeResult mergeResult)
Try to apply 3 ways merge on property value.
|
Modifier and Type | Method and Description |
---|---|
void |
BaseClass.merge(ElementInterface previousElement,
ElementInterface newElement,
MergeConfiguration configuration,
XWikiContext context,
MergeResult mergeResult) |
protected <T extends EntityReference> |
ListClass.mergeNotOrderedListProperty(BaseProperty<T> currentProperty,
BaseProperty<T> previousProperty,
BaseProperty<T> newProperty,
MergeConfiguration configuration,
XWikiContext context,
MergeResult mergeResult) |
<T extends EntityReference> |
GroupsClass.mergeProperty(BaseProperty<T> currentProperty,
BaseProperty<T> previousProperty,
BaseProperty<T> newProperty,
MergeConfiguration configuration,
XWikiContext xcontext,
MergeResult mergeResult) |
<T extends EntityReference> |
LevelsClass.mergeProperty(BaseProperty<T> currentProperty,
BaseProperty<T> previousProperty,
BaseProperty<T> newProperty,
MergeConfiguration configuration,
XWikiContext xcontext,
MergeResult mergeResult) |
<T extends EntityReference> |
UsersClass.mergeProperty(BaseProperty<T> currentProperty,
BaseProperty<T> previousProperty,
BaseProperty<T> newProperty,
MergeConfiguration configuration,
XWikiContext xcontext,
MergeResult mergeResult) |
<T extends EntityReference> |
ListClass.mergeProperty(BaseProperty<T> currentProperty,
BaseProperty<T> previousProperty,
BaseProperty<T> newProperty,
MergeConfiguration configuration,
XWikiContext context,
MergeResult mergeResult) |
<T extends EntityReference> |
PropertyClass.mergeProperty(BaseProperty<T> currentProperty,
BaseProperty<T> previousProperty,
BaseProperty<T> newProperty,
MergeConfiguration configuration,
XWikiContext context,
MergeResult mergeResult)
Apply a 3 ways merge on passed current, previous and new version of the same property.
|
Copyright © 2004–2018 XWiki. All rights reserved.