org.apache.subversion.javahl

Enum SVNUtil.ConflictDisplayStyle

java.lang.Object

java.lang.Enum<SVNUtil.ConflictDisplayStyle>

org.apache.subversion.javahl.SVNUtil.ConflictDisplayStyle

All Implemented Interfaces:

java.io.Serializable, java.lang.Comparable<SVNUtil.ConflictDisplayStyle>

Enclosing class:

SVNUtil

public static enum SVNUtil.ConflictDisplayStyle
extends java.lang.Enum<SVNUtil.ConflictDisplayStyle>

Style for displaying conflicts in merge output.

Enum Constant Summary

Enum Constants

Enum Constant and Description
latest Just display latest, with no markers.
modified Just display modified, with no markers.
modified_latest Display modified and latest, with conflict markers.
modified_original_latest Display modified, original, and latest, with conflict markers.
only_conflicts Like modified_original_latest, but only showing conflicts.
resolved_modified_latest Like modified_latest, but with an extra effort to identify common sequences between modified and latest.

Method Summary

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

modified_latest

public static final SVNUtil.ConflictDisplayStyle modified_latest

Display modified and latest, with conflict markers.

resolved_modified_latest

public static final SVNUtil.ConflictDisplayStyle resolved_modified_latest

Like modified_latest, but with an extra effort to identify common sequences between modified and latest.

modified_original_latest

public static final SVNUtil.ConflictDisplayStyle modified_original_latest

Display modified, original, and latest, with conflict markers.

modified

public static final SVNUtil.ConflictDisplayStyle modified

Just display modified, with no markers.

latest

public static final SVNUtil.ConflictDisplayStyle latest

Just display latest, with no markers.

only_conflicts

public static final SVNUtil.ConflictDisplayStyle only_conflicts

Like modified_original_latest, but only showing conflicts.

Method Detail

values

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

Returns:

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

valueOf

public static SVNUtil.ConflictDisplayStyle 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