org.xwiki.diff

Class MergeConfiguration<E>

java.lang.Object

java.util.AbstractMap<K,V>

java.util.HashMap<String,Object>

org.xwiki.diff.MergeConfiguration<E>

Type Parameters:

E - the type of compared elements

All Implemented Interfaces:

Serializable, Cloneable, Map<String,Object>

public class MergeConfiguration<E>
extends HashMap<String,Object>

Setup merge behavior.

Version:

$Id: ab31e7fb13d1653b3494f5c9eb8247fb2f5a00e7 $

See Also:

Serialized Form

Nested Class Summary

Nested Classes

Modifier and Type	Class and Description
static class	MergeConfiguration.Version One of the merged versions.

Nested classes/interfaces inherited from class java.util.AbstractMap

AbstractMap.SimpleEntry<K,V>, AbstractMap.SimpleImmutableEntry<K,V>

Field Summary

Fields

Modifier and Type	Field and Description
static String	KEY_FALLBACKONCONFLICT The name of the key used to setup the default fallback to use when finding a conflict.

Constructor Summary

Constructors

Constructor and Description
MergeConfiguration()

Method Summary

Methods

Modifier and Type	Method and Description
MergeConfiguration.Version	getFallbackOnConflict()
void	setFallbackOnConflict(MergeConfiguration.Version version)

Methods inherited from class java.util.HashMap

clear, clone, containsKey, containsValue, entrySet, get, isEmpty, keySet, put, putAll, remove, size, values

Methods inherited from class java.util.AbstractMap

equals, hashCode, toString

Methods inherited from class java.lang.Object

finalize, getClass, notify, notifyAll, wait, wait, wait

Methods inherited from interface java.util.Map

equals, hashCode

Field Detail

KEY_FALLBACKONCONFLICT

public static final String KEY_FALLBACKONCONFLICT

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

See Also:

Constant Field Values

Constructor Detail

MergeConfiguration

public MergeConfiguration()

Method Detail

setFallbackOnConflict

public void setFallbackOnConflict(MergeConfiguration.Version version)

Parameters:

version - the version to fallback on when finding a conflict. Default is MergeConfiguration.Version.CURRENT.

getFallbackOnConflict

public MergeConfiguration.Version getFallbackOnConflict()

Returns:

the version to fallback on when finding a conflict. Default is MergeConfiguration.Version.CURRENT.