com.deltaxml.mergecommon.config

Enum ThreeWayMergeResultType

java.lang.Object

java.lang.Enum<ThreeWayMergeResultType>

com.deltaxml.mergecommon.config.ThreeWayMergeResultType

All Implemented Interfaces:

Serializable, Comparable<ThreeWayMergeResultType>

public enum ThreeWayMergeResultType
extends Enum<ThreeWayMergeResultType>

The various types of result that can be produced by the Merger.

Some of these enumeration values follow those provided in the ConcurrentMergeResultType enumeration used in the n-way merge operations. The additional values in this enumeration are specific to three-way processing.

The product documentation describes these formats in further detail, the configuration and processes involved in producing them, use-cases and guidance on the choice of format.

See Also:

ConcurrentMergeResultType

Enum Constant Summary

Enum Constants

Enum Constant and Description
ANALYZED_DELTAV2 The deltaV2 with an analysis of the changes, described using deltaxml:mergeType attributes on general elements, attribute change nodes and textGroups.
DELTAV2 A pure deltaV2 file which contains all of the data in all of the inputs.
RULE_PROCESSED_DELTAV2 A result which is analyzed and then has various processing rules applied to process simple changes leaving interesting conflicts for interactive display and/or resolution.
RULE_PROCESSED_TWO_WAY_RESULT A three to two way merge result with rule processing.
SIMPLIFIED_DELTAV2 A simplified deltaV2 file which contains all of the data in all of the inputs.
SIMPLIFIED_RULE_PROCESSED_DELTAV2 A simplified result which is analyzed and then has various processing rules applied to process simple changes leaving interesting conflicts for interactive display and/or resolution.
THREE_WAY_OXYGEN_TRACK_CHANGES A result format with oXygen Author-mode track changes processing instructions.
TWO_WAY_RESULT A three to two way merge result.

Method Summary

Modifier and Type	Method and Description
static ThreeWayMergeResultType	valueOf(String name) Returns the enum constant of this type with the specified name.
static ThreeWayMergeResultType[]	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

DELTAV2

public static final ThreeWayMergeResultType DELTAV2

A pure deltaV2 file which contains all of the data in all of the inputs.

ANALYZED_DELTAV2

public static final ThreeWayMergeResultType ANALYZED_DELTAV2

The deltaV2 with an analysis of the changes, described using deltaxml:mergeType attributes on general elements, attribute change nodes and textGroups. For more info please see: Concurrent Merge Analysis

RULE_PROCESSED_DELTAV2

public static final ThreeWayMergeResultType RULE_PROCESSED_DELTAV2

A result which is analyzed and then has various processing rules applied to process simple changes leaving interesting conflicts for interactive display and/or resolution.

SIMPLIFIED_DELTAV2

public static final ThreeWayMergeResultType SIMPLIFIED_DELTAV2

A simplified deltaV2 file which contains all of the data in all of the inputs. But there is some change information loss.

SIMPLIFIED_RULE_PROCESSED_DELTAV2

public static final ThreeWayMergeResultType SIMPLIFIED_RULE_PROCESSED_DELTAV2

A simplified result which is analyzed and then has various processing rules applied to process simple changes leaving interesting conflicts for interactive display and/or resolution.

THREE_WAY_OXYGEN_TRACK_CHANGES

public static final ThreeWayMergeResultType THREE_WAY_OXYGEN_TRACK_CHANGES

A result format with oXygen Author-mode track changes processing instructions.

The result will contain change author information derived from the input version identifiers used in the merge methods or setAncestor/addVersion methods. The result is a symmetrical representation of the changes from the perspective of the ancestor version. It is also possible to generate track-change information with the ThreeWayMergeResultType.TWO_WAY_RESULT and ThreeWayMergeResultType.RULE_PROCESSED_TWO_WAY_RESULT values, however these generate a different result that is asymmetrical in nature with respect to the various merge inputs. Please see the documentation for further details and examples.

When this setting is used further configuration is possible through the ThreeWayMerge.setThreeWayTrackChangeAttributeMode method.

TWO_WAY_RESULT

public static final ThreeWayMergeResultType TWO_WAY_RESULT

A three to two way merge result.

This form of result presents a three way merge as a two way result that may be more familiar to users of systems such as accept/reject. In some cases information from the ancestor version is lost. Rather than being from the perspective of the ancestor version, the concept of add and delete is seen from the perspective of one of the versions, the 'local' version. This is supplied as the second argument of the merge methods or the first version supplied using addVersion methods. The third merge argument, or second supplied using addVersion, is seen as the other branch which is being merged from and in many version control systems is referred to as the 'remote branch', the 'other branch' or 'their' branch.

This result type can be represented in various ways. As well as the delta format used for three-way and n-way change it is also possible to the accept/reject interfaces associated with XML editor's compare and/or track-change systems. The ThreeWayMerge.setTwoWayResultFormat method can be used to further control the representation.

RULE_PROCESSED_TWO_WAY_RESULT

public static final ThreeWayMergeResultType RULE_PROCESSED_TWO_WAY_RESULT

A three to two way merge result with rule processing.

The processing to convert a raw three way merge result is the same as that described for ThreeWayMergeResultType.TWO_WAY_RESULT. Similarly the rule processing that is applied is the same process used with the ThreeWayMergeResultType.RULE_PROCESSED_DELTAV2 result type.

Method Detail

values

public static ThreeWayMergeResultType[] 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 (ThreeWayMergeResultType c : ThreeWayMergeResultType.values())
    System.out.println(c);

Returns:

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

valueOf

public static ThreeWayMergeResultType 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