Package com.nomagic.magicdraw.merge

Enum MergeUtil.ConflictResolution

java.lang.Object

java.lang.Enum<MergeUtil.ConflictResolution>

com.nomagic.magicdraw.merge.MergeUtil.ConflictResolution

All Implemented Interfaces:

java.io.Serializable, java.lang.Comparable<MergeUtil.ConflictResolution>

Enclosing class:

MergeUtil

public static enum MergeUtil.ConflictResolution
extends java.lang.Enum<MergeUtil.ConflictResolution>

Conflict resolution for 3-way merge.

Enum Constant Summary

Enum Constants

Enum Constant	Description
NOT_ALLOWED	Do not allow conflicts.
SOURCE_PREFERRED	Prefer source changes if conflicts are detected.
TARGET_PREFERRED	Prefer target changes if conflicts are detected.

Field Summary

Fields

Modifier and Type	Field	Description
private boolean	mAllowConflicts
private boolean	mPreferSourceChanges

Constructor Summary

Constructors

Modifier	Constructor	Description
private	ConflictResolution(boolean allowConflicts, boolean preferSourceChanges)

Method Summary

Modifier and Type	Method	Description
private boolean	isAllowConflicts()
private boolean	isPreferSourceChanges()
static MergeUtil.ConflictResolution	valueOf(java.lang.String name)	Returns the enum constant of this type with the specified name.
static MergeUtil.ConflictResolution[]	values()	Returns an array containing the constants of this enum type, in the order they are declared.

Methods inherited from class java.lang.Enum

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

Methods inherited from class java.lang.Object

getClass, notify, notifyAll, wait, wait, wait

Enum Constant Detail

TARGET_PREFERRED

public static final MergeUtil.ConflictResolution TARGET_PREFERRED

Prefer target changes if conflicts are detected.

SOURCE_PREFERRED

public static final MergeUtil.ConflictResolution SOURCE_PREFERRED

Prefer source changes if conflicts are detected.

NOT_ALLOWED

public static final MergeUtil.ConflictResolution NOT_ALLOWED

Do not allow conflicts.

Field Detail

mAllowConflicts

private final boolean mAllowConflicts

mPreferSourceChanges

private final boolean mPreferSourceChanges

Constructor Detail

ConflictResolution

private ConflictResolution(boolean allowConflicts,
                           boolean preferSourceChanges)

Method Detail

values

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

Returns:

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

valueOf

public static MergeUtil.ConflictResolution valueOf(java.lang.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:

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

java.lang.NullPointerException - if the argument is null

isAllowConflicts

private boolean isAllowConflicts()

isPreferSourceChanges

private boolean isPreferSourceChanges()