public static enum IndexDiff.StageState extends java.lang.Enum<IndexDiff.StageState>
This is used for figuring out what kind of conflict occurred.
IndexDiff.getConflictingStageStates()
Enum Constant and Description |
---|
ADDED_BY_THEM
Only exists in theirs.
|
ADDED_BY_US
Only exists in ours.
|
BOTH_ADDED
Exists in ours and theirs, but not in base.
|
BOTH_DELETED
Exists in base, but neither in ours nor in theirs.
|
BOTH_MODIFIED
Exists in all stages, content conflict.
|
DELETED_BY_THEM
Exists in base and ours, but no in theirs.
|
DELETED_BY_US
Exists in base and theirs, but not in ours.
|
Modifier and Type | Field and Description |
---|---|
private int |
stageMask |
Modifier and Type | Method and Description |
---|---|
(package private) static IndexDiff.StageState |
fromMask(int stageMask) |
(package private) int |
getStageMask() |
boolean |
hasBase() |
boolean |
hasOurs() |
boolean |
hasTheirs() |
static IndexDiff.StageState |
valueOf(java.lang.String name)
Returns the enum constant of this type with the specified name.
|
static IndexDiff.StageState[] |
values()
Returns an array containing the constants of this enum type, in
the order they are declared.
|
public static final IndexDiff.StageState BOTH_DELETED
public static final IndexDiff.StageState ADDED_BY_US
public static final IndexDiff.StageState DELETED_BY_THEM
public static final IndexDiff.StageState ADDED_BY_THEM
public static final IndexDiff.StageState DELETED_BY_US
public static final IndexDiff.StageState BOTH_ADDED
public static final IndexDiff.StageState BOTH_MODIFIED
public static IndexDiff.StageState[] values()
for (IndexDiff.StageState c : IndexDiff.StageState.values()) System.out.println(c);
public static IndexDiff.StageState valueOf(java.lang.String name)
name
- the name of the enum constant to be returned.java.lang.IllegalArgumentException
- if this enum type has no constant with the specified namejava.lang.NullPointerException
- if the argument is nullint getStageMask()
public boolean hasBase()
public boolean hasOurs()
public boolean hasTheirs()
static IndexDiff.StageState fromMask(int stageMask)