Skip navigation links
A C E G H I M O P R S V W 

A

addConflicts(List<Conflict<C>>) - Method in class org.xwiki.store.merge.MergeManagerResult
Add some conflicts returned by a MergeResult inside this result.

C

CollisionException - Exception in com.xpn.xwiki.doc.merge
Any exception raised when facing a collision during a 3 ways merge.
CollisionException(String) - Constructor for exception com.xpn.xwiki.doc.merge.CollisionException
Constructs a new exception with the specified detail message.
CollisionException(String, Throwable) - Constructor for exception com.xpn.xwiki.doc.merge.CollisionException
Constructs a new exception with the specified detail message and cause.
com.xpn.xwiki.doc.merge - package com.xpn.xwiki.doc.merge
 

E

error(Exception) - Method in class com.xpn.xwiki.doc.merge.MergeResult
Deprecated.
since 4.1RC1 use MergeResult.getLog() instead

G

getConcernedDocument() - Method in class com.xpn.xwiki.doc.merge.MergeConfiguration
 
getConflictDecisionList(DocumentReference, EntityReference) - Method in interface org.xwiki.store.merge.MergeConflictDecisionsManager
Retrieve the list of ConflictDecision recorded for the given document and user.
getConflicts(MergeDocumentResult.DocumentPart) - Method in class org.xwiki.store.merge.MergeDocumentResult
Retrieve the conclicts that occurred during merging a specific part of the document.
getConflicts() - Method in class org.xwiki.store.merge.MergeManagerResult
 
getCurrentDocument() - Method in class org.xwiki.store.merge.MergeDocumentResult
 
getErrors() - Method in class com.xpn.xwiki.doc.merge.MergeResult
Deprecated.
since 4.1RC1 use MergeResult.getLog() instead
getLog() - Method in class com.xpn.xwiki.doc.merge.MergeResult
Deprecated.
 
getLog() - Method in class org.xwiki.store.merge.MergeManagerResult
 
getMergeResult(MergeDocumentResult.DocumentPart) - Method in class org.xwiki.store.merge.MergeDocumentResult
 
getMergeResult() - Method in class org.xwiki.store.merge.MergeManagerResult
 
getNextDocument() - Method in class org.xwiki.store.merge.MergeDocumentResult
 
getPreviousDocument() - Method in class org.xwiki.store.merge.MergeDocumentResult
 
getUserReference() - Method in class com.xpn.xwiki.doc.merge.MergeConfiguration
 
getWarnings() - Method in class com.xpn.xwiki.doc.merge.MergeResult
Deprecated.
since 4.1RC1 use MergeResult.getLog() instead

H

hasConflicts() - Method in class org.xwiki.store.merge.MergeManagerResult
 

I

isModified() - Method in class com.xpn.xwiki.doc.merge.MergeResult
Deprecated.
 
isModified() - Method in class org.xwiki.store.merge.MergeManagerResult
 
isProvidedVersionsModifiables() - Method in class com.xpn.xwiki.doc.merge.MergeConfiguration
Indicate of the provided previous/new document can be modified.

M

mergeCharacters(String, String, String, MergeConfiguration) - Method in interface org.xwiki.store.merge.MergeManager
Perform a 3-way merge between the given strings by first splitting them into arrays of characters.
MergeConfiguration - Class in com.xpn.xwiki.doc.merge
Allow to define some behaviors of the merge.
MergeConfiguration() - Constructor for class com.xpn.xwiki.doc.merge.MergeConfiguration
 
MergeConflictDecisionsManager - Interface in org.xwiki.store.merge
Manage the decisions taken to solve the merge conflicts.
mergeDocument(DocumentModelBridge, DocumentModelBridge, DocumentModelBridge, MergeConfiguration) - Method in interface org.xwiki.store.merge.MergeManager
Perform a 3-way merge between documents.
MergeDocumentResult - Class in org.xwiki.store.merge
Store information about a merge operation of documents.
MergeDocumentResult(DocumentModelBridge, DocumentModelBridge, DocumentModelBridge) - Constructor for class org.xwiki.store.merge.MergeDocumentResult
Default constructor.
MergeDocumentResult.DocumentPart - Enum in org.xwiki.store.merge
Represents the different parts of a document that are merged.
MergeException - Exception in com.xpn.xwiki.doc.merge
Any exception raised during a merge.
MergeException(String) - Constructor for exception com.xpn.xwiki.doc.merge.MergeException
Constructs a new exception with the specified detail message.
MergeException(String, Throwable) - Constructor for exception com.xpn.xwiki.doc.merge.MergeException
Constructs a new exception with the specified detail message and cause.
mergeLines(String, String, String, MergeConfiguration) - Method in interface org.xwiki.store.merge.MergeManager
Perform a 3-way merge between the given strings by first splitting them into lines.
mergeList(List<T>, List<T>, List<T>, MergeConfiguration) - Method in interface org.xwiki.store.merge.MergeManager
Perform a 3-way merge between the list of elements.
MergeManager - Interface in org.xwiki.store.merge
Provides general merge utility methods.
MergeManagerResult<R,C> - Class in org.xwiki.store.merge
This represents the result of a merge operation: it contains both the result of the merge, the possible conflicts that happened during the merge, and the logs.
MergeManagerResult() - Constructor for class org.xwiki.store.merge.MergeManagerResult
Default constructor.
mergeObject(T, T, T, MergeConfiguration) - Method in interface org.xwiki.store.merge.MergeManager
Perform a 3-way merge between the given objects.
MergeResult - Class in com.xpn.xwiki.doc.merge
Deprecated.
Since 11.8RC1, prefer using MergeManagerResult.
MergeResult() - Constructor for class com.xpn.xwiki.doc.merge.MergeResult
Deprecated.
 

O

org.xwiki.store.merge - package org.xwiki.store.merge
 

P

putMergeResult(MergeDocumentResult.DocumentPart, MergeManagerResult) - Method in class org.xwiki.store.merge.MergeDocumentResult
Stores the result of merging a part of the document.

R

recordConflicts(DocumentReference, EntityReference, List<Conflict<?>>) - Method in interface org.xwiki.store.merge.MergeConflictDecisionsManager
Record a list of conflicts to be used in for the later decisions.
recordDecision(DocumentReference, EntityReference, String, ConflictDecision.DecisionType, List<E>) - Method in interface org.xwiki.store.merge.MergeConflictDecisionsManager
Record a decision made for a given conflict.
removeConflictDecisionList(DocumentReference, EntityReference) - Method in interface org.xwiki.store.merge.MergeConflictDecisionsManager
Remove a record of decisions.

S

setConcernedDocument(DocumentReference) - Method in class com.xpn.xwiki.doc.merge.MergeConfiguration
Specify which document is currently merged.
setConflictDecisionList(List<ConflictDecision>, DocumentReference, EntityReference) - Method in interface org.xwiki.store.merge.MergeConflictDecisionsManager
Record a list of decisions for a given document and a given user.
setMergeResult(R) - Method in class org.xwiki.store.merge.MergeManagerResult
Set the result obtained during the merge.
setModified(boolean) - Method in class com.xpn.xwiki.doc.merge.MergeResult
Deprecated.
 
setModified(boolean) - Method in class org.xwiki.store.merge.MergeManagerResult
 
setProvidedVersionsModifiables(boolean) - Method in class com.xpn.xwiki.doc.merge.MergeConfiguration
 
setUserReference(EntityReference) - Method in class com.xpn.xwiki.doc.merge.MergeConfiguration
Specify which user is performing the merge.

V

valueOf(String) - Static method in enum org.xwiki.store.merge.MergeDocumentResult.DocumentPart
Returns the enum constant of this type with the specified name.
values() - Static method in enum org.xwiki.store.merge.MergeDocumentResult.DocumentPart
Returns an array containing the constants of this enum type, in the order they are declared.

W

warn(Exception) - Method in class com.xpn.xwiki.doc.merge.MergeResult
Deprecated.
since 4.1RC1 use MergeResult.getLog() instead
A C E G H I M O P R S V W 
Skip navigation links

Copyright © 2004–2020 XWiki. All rights reserved.