A C D G I K M N O P R S U V
All Classes All Packages

A

apply(List<E>) - Method in interface org.xwiki.diff.Delta

Apply the delta on the provided list.

apply(List<E>) - Method in interface org.xwiki.diff.Patch

Apply the patch.

C

CHANGE - org.xwiki.diff.Delta.Type

Change one or several following elements.

Chunk<E> - Interface in org.xwiki.diff

A snippet of the source list.

concerns(Chunk<E>) - Method in interface org.xwiki.diff.Conflict

concerns(Delta<E>) - Method in interface org.xwiki.diff.Conflict

Conflict<E> - Interface in org.xwiki.diff

Represent a conflict that happened during a merge operation.

ConflictDecision<E> - Interface in org.xwiki.diff

Represent a decision taken to solve a given Conflict.

ConflictDecision.DecisionType - Enum in org.xwiki.diff

The decision made for this conflict.

CURRENT - org.xwiki.diff.ConflictDecision.DecisionType

Keep the current version, the returned chunk should be the current version.

CURRENT - org.xwiki.diff.MergeConfiguration.Version

The current version.

CUSTOM - org.xwiki.diff.ConflictDecision.DecisionType

Specify a custom version, the returned chunk is the one set by the user.

D

DELETE - org.xwiki.diff.Delta.Type

Deleted one or several following elements.

Delta<E> - Interface in org.xwiki.diff

A delta between two version of a list.

Delta.Type - Enum in org.xwiki.diff

The kind of modification to apply on the list.

diff(List<E>, List<E>, DiffConfiguration<E>) - Method in interface org.xwiki.diff.DiffManager

Produce a diff between the two provided versions.

DiffConfiguration<E> - Class in org.xwiki.diff

Setup diff behavior.

DiffConfiguration() - Constructor for class org.xwiki.diff.DiffConfiguration

DiffException - Exception in org.xwiki.diff

Any exception raised when failing to create a diff.

DiffException(String) - Constructor for exception org.xwiki.diff.DiffException

Constructs a new exception with the specified detail message.

DiffException(String, Throwable) - Constructor for exception org.xwiki.diff.DiffException

Constructs a new exception with the specified detail message and cause.

DiffManager - Interface in org.xwiki.diff

Various diff/merge tools.

DiffResult<E> - Interface in org.xwiki.diff

The result of the execution of a diff on two lists.

G

getChunk() - Method in interface org.xwiki.diff.ConflictDecision

getCommonAncestor() - Method in interface org.xwiki.diff.MergeResult

getConflict() - Method in interface org.xwiki.diff.ConflictDecision

getConflictDecisionList() - Method in class org.xwiki.diff.MergeConfiguration

getConflicts() - Method in interface org.xwiki.diff.MergeResult

getCurrent() - Method in interface org.xwiki.diff.MergeResult

getDeltaCurrent() - Method in interface org.xwiki.diff.Conflict

getDeltaNext() - Method in interface org.xwiki.diff.Conflict

getElements() - Method in interface org.xwiki.diff.Chunk

getFallbackOnConflict() - Method in class org.xwiki.diff.MergeConfiguration

getIndex() - Method in interface org.xwiki.diff.Chunk

getIndex() - Method in interface org.xwiki.diff.Conflict

getLastIndex() - Method in interface org.xwiki.diff.Chunk

getLog() - Method in interface org.xwiki.diff.DiffResult

getLog() - Method in interface org.xwiki.diff.MergeResult

getMaxChunkSize() - Method in interface org.xwiki.diff.Delta

getMaxSize() - Method in interface org.xwiki.diff.Conflict

The max size of a conflict is defined by the max size of the current or next chunk size.

getMerged() - Method in interface org.xwiki.diff.MergeResult

getNext() - Method in interface org.xwiki.diff.Delta

getNext() - Method in interface org.xwiki.diff.DiffResult

getNext() - Method in interface org.xwiki.diff.MergeResult

getPatch() - Method in interface org.xwiki.diff.DiffResult

getPrevious() - Method in interface org.xwiki.diff.Delta

getPrevious() - Method in interface org.xwiki.diff.DiffResult

getReference() - Method in interface org.xwiki.diff.Conflict

getType() - Method in interface org.xwiki.diff.ConflictDecision

getType() - Method in interface org.xwiki.diff.Delta

I

INSERT - org.xwiki.diff.Delta.Type

Insert one or several following elements.

isOverlappingWith(Chunk<E>) - Method in interface org.xwiki.diff.Chunk

Check if the current chunk is overlapping with another chunk based on the indexes.

K

KEY_FALLBACKONCONFLICT - Static variable in class org.xwiki.diff.MergeConfiguration

The name of the key used to setup the default fallback to use when finding a conflict.

M

merge(List<E>, List<E>, List<E>, MergeConfiguration<E>) - Method in interface org.xwiki.diff.DiffManager

Execute a 3-way merge on provided versions.

MergeConfiguration<E> - Class in org.xwiki.diff

Setup merge behavior.

MergeConfiguration() - Constructor for class org.xwiki.diff.MergeConfiguration

Create a default merge configuration without any decisions and with a fallback on current version by default.

MergeConfiguration(List<ConflictDecision<E>>) - Constructor for class org.xwiki.diff.MergeConfiguration

Create a merge configuration with the given list of decisions and a fallback to current version by default.

MergeConfiguration(MergeConfiguration.Version, List<ConflictDecision<E>>) - Constructor for class org.xwiki.diff.MergeConfiguration

Crate a merge configuration with the given fallback version and the given conflict decisions to be taken.

MergeConfiguration.Version - Enum in org.xwiki.diff

One of the merged versions.

MergeException - Exception in org.xwiki.diff

Any exception raised when failing to merge 3 lists.

MergeException(String) - Constructor for exception org.xwiki.diff.MergeException

Constructs a new exception with the specified detail message.

MergeException(String, Throwable) - Constructor for exception org.xwiki.diff.MergeException

Constructs a new exception with the specified detail message and cause.

MergeResult<E> - Interface in org.xwiki.diff

N

NEXT - org.xwiki.diff.ConflictDecision.DecisionType

Keep the next version, the returned chunk should be the next version.

NEXT - org.xwiki.diff.MergeConfiguration.Version

The new version.

O

org.xwiki.diff - package org.xwiki.diff

P

Patch<E> - Interface in org.xwiki.diff

A list of deltas between two versions.

PatchException - Exception in org.xwiki.diff

Any exception raised when failing to apply a patch.

PatchException(String) - Constructor for exception org.xwiki.diff.PatchException

Constructs a new exception with the specified detail message.

PatchException(String, Throwable) - Constructor for exception org.xwiki.diff.PatchException

Constructs a new exception with the specified detail message and cause.

PREVIOUS - org.xwiki.diff.ConflictDecision.DecisionType

Keep the previous version, the returned chunk should be the previous version.

PREVIOUS - org.xwiki.diff.MergeConfiguration.Version

The common ancestor.

R

restore(List<E>) - Method in interface org.xwiki.diff.Delta

Apply the an inverted version of the delta on the provided list.

restore(List<E>) - Method in interface org.xwiki.diff.Patch

Invert the patch.

S

setConflictDecisionList(List<ConflictDecision<E>>) - Method in class org.xwiki.diff.MergeConfiguration

Set the list of conflict decision to be taken.

setCustom(List<E>) - Method in interface org.xwiki.diff.ConflictDecision

Allow to specify a custom chunk.

setElements(List<E>) - Method in interface org.xwiki.diff.Chunk

setFallbackOnConflict(MergeConfiguration.Version) - Method in class org.xwiki.diff.MergeConfiguration

setType(ConflictDecision.DecisionType) - Method in interface org.xwiki.diff.ConflictDecision

size() - Method in interface org.xwiki.diff.Chunk

U

UNDECIDED - org.xwiki.diff.ConflictDecision.DecisionType

The decision has not been made yet, the returned chunk might be null.

V

valueOf(String) - Static method in enum org.xwiki.diff.ConflictDecision.DecisionType

Returns the enum constant of this type with the specified name.

valueOf(String) - Static method in enum org.xwiki.diff.Delta.Type

Returns the enum constant of this type with the specified name.

valueOf(String) - Static method in enum org.xwiki.diff.MergeConfiguration.Version

Returns the enum constant of this type with the specified name.

values() - Static method in enum org.xwiki.diff.ConflictDecision.DecisionType

Returns an array containing the constants of this enum type, in the order they are declared.

values() - Static method in enum org.xwiki.diff.Delta.Type

Returns an array containing the constants of this enum type, in the order they are declared.

values() - Static method in enum org.xwiki.diff.MergeConfiguration.Version

Returns an array containing the constants of this enum type, in the order they are declared.

verify(List<E>) - Method in interface org.xwiki.diff.Chunk

Verify that the chunk can be found in the provided list.

verify(List<E>) - Method in interface org.xwiki.diff.Delta

Try to apply the delta on the provided list.

A C D G I K M N O P R S U V
All Classes All Packages