org.netbeans.libs.git

Enum GitConflictDescriptor.Type

java.lang.Object

java.lang.Enum<GitConflictDescriptor.Type>

org.netbeans.libs.git.GitConflictDescriptor.Type

All Implemented Interfaces:

Serializable, Comparable<GitConflictDescriptor.Type>

Enclosing class:

GitConflictDescriptor

public static enum GitConflictDescriptor.Type
extends Enum<GitConflictDescriptor.Type>

Enum Constant Summary

Enum Constants

Enum Constant and Description
ADDED_BY_THEM Added by them
ADDED_BY_US Added by us
BOTH_ADDED Added in two branches simultaneously
BOTH_DELETED Deleted in both branches.
BOTH_MODIFIED Modified in two branches simultaneously
DELETED_BY_THEM Modified but deleted in other branch
DELETED_BY_US Deleted and modified in other branch

Method Summary

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

BOTH_DELETED

public static final GitConflictDescriptor.Type BOTH_DELETED

Deleted in both branches.

ADDED_BY_US

public static final GitConflictDescriptor.Type ADDED_BY_US

Added by us

DELETED_BY_THEM

public static final GitConflictDescriptor.Type DELETED_BY_THEM

Modified but deleted in other branch

ADDED_BY_THEM

public static final GitConflictDescriptor.Type ADDED_BY_THEM

Added by them

DELETED_BY_US

public static final GitConflictDescriptor.Type DELETED_BY_US

Deleted and modified in other branch

BOTH_ADDED

public static final GitConflictDescriptor.Type BOTH_ADDED

Added in two branches simultaneously

BOTH_MODIFIED

public static final GitConflictDescriptor.Type BOTH_MODIFIED

Modified in two branches simultaneously

Method Detail

values

public static GitConflictDescriptor.Type[] values()

Returns:

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

valueOf

public static GitConflictDescriptor.Type valueOf(String name)

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

getDescription

public abstract String getDescription()