com.deltaxml.ditamerge

Enum ThreeWayMerge.ThreeWayResultPreset

java.lang.Object

java.lang.Enum<ThreeWayMerge.ThreeWayResultPreset>

com.deltaxml.ditamerge.ThreeWayMerge.ThreeWayResultPreset

All Implemented Interfaces:

Serializable, Comparable<ThreeWayMerge.ThreeWayResultPreset>

Enclosing class:

ThreeWayMerge

public static enum ThreeWayMerge.ThreeWayResultPreset
extends Enum<ThreeWayMerge.ThreeWayResultPreset>

A enumeration used to provide preset values to the three to two way merge cases such as all changes, their changes and conflicting changes. The presets will define values of the ThreeWayMerge.ThreeWayMergeResultType and RuleConfiguration settings.

Enum Constant Summary

Enum Constants

Enum Constant and Description
ALL_CHANGES Three to two way merge result will have all the possible changes represented in the output.
CONFLICTING_CHANGES This result will have only conflicting changes.
THEIR_CHANGES This result will show the changes by other person or the changes on the other branch.

Method Summary

Modifier and Type	Method and Description
static ThreeWayMerge.ThreeWayResultPreset	valueOf(String name) Returns the enum constant of this type with the specified name.
static ThreeWayMerge.ThreeWayResultPreset[]	values() Returns an array containing the constants of this enum type, in the order they are declared.

Methods inherited from class java.lang.Enum

compareTo, equals, getDeclaringClass, hashCode, name, ordinal, toString, valueOf

Methods inherited from class java.lang.Object

getClass, notify, notifyAll, wait, wait, wait

Enum Constant Detail

ALL_CHANGES

public static final ThreeWayMerge.ThreeWayResultPreset ALL_CHANGES

Three to two way merge result will have all the possible changes represented in the output.

CONFLICTING_CHANGES

public static final ThreeWayMerge.ThreeWayResultPreset CONFLICTING_CHANGES

This result will have only conflicting changes.

THEIR_CHANGES

public static final ThreeWayMerge.ThreeWayResultPreset THEIR_CHANGES

This result will show the changes by other person or the changes on the other branch.

Method Detail

values

public static ThreeWayMerge.ThreeWayResultPreset[] values()

Returns an array containing the constants of this enum type, in the order they are declared. This method may be used to iterate over the constants as follows:

for (ThreeWayMerge.ThreeWayResultPreset c : ThreeWayMerge.ThreeWayResultPreset.values())
    System.out.println(c);

Returns:

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

valueOf

public static ThreeWayMerge.ThreeWayResultPreset valueOf(String name)

Returns the enum constant of this type with the specified name. The string must match exactly an identifier used to declare an enum constant in this type. (Extraneous whitespace characters are not permitted.)

Parameters:

name - the name of the enum constant to be returned.

Returns:

the enum constant with the specified name

Throws:

IllegalArgumentException - if this enum type has no constant with the specified name

NullPointerException - if the argument is null