Enum ConflictType
- All Implemented Interfaces:
Serializable
,Comparable<ConflictType>
Enum to define various types of conflicts.
- See Also:
-
Enum Constant Summary
Enum ConstantsEnum ConstantDescriptionA node has been added that is different from a node of them same name that has been added to the trunk.A property has been added that has a different value than a property with the same name that has been added in trunk.A property has been changed while a property of the same name has been changed to a different value in trunk.A node has been changed while a node of the same name has been removed in trunk.A property has been changed while a property of the same name has been removed in trunk.A node has been removed while a node of the same name has been changed in trunk.A property has been removed while a property of the same name has been changed in trunk.A node has been removed while a node of the same name has been removed in trunk.A property has been removed while a property of the same name has been removed in trunk. -
Method Summary
Modifier and TypeMethodDescriptionboolean
static ConflictType
getName()
static ConflictType
Returns the enum constant of this type with the specified name.static ConflictType[]
values()
Returns an array containing the constants of this enum type, in the order they are declared.
-
Enum Constant Details
-
DELETE_CHANGED_PROPERTY
A property has been removed while a property of the same name has been changed in trunk. -
DELETE_CHANGED_NODE
A node has been removed while a node of the same name has been changed in trunk. -
ADD_EXISTING_PROPERTY
A property has been added that has a different value than a property with the same name that has been added in trunk. -
CHANGE_DELETED_PROPERTY
A property has been changed while a property of the same name has been removed in trunk. -
CHANGE_CHANGED_PROPERTY
A property has been changed while a property of the same name has been changed to a different value in trunk. -
DELETE_DELETED_PROPERTY
A property has been removed while a property of the same name has been removed in trunk. -
ADD_EXISTING_NODE
A node has been added that is different from a node of them same name that has been added to the trunk. -
CHANGE_DELETED_NODE
A node has been changed while a node of the same name has been removed in trunk. -
DELETE_DELETED_NODE
A node has been removed while a node of the same name has been removed in trunk.
-
-
Method Details
-
values
Returns an array containing the constants of this enum type, in the order they are declared.- Returns:
- an array containing the constants of this enum type, in the order they are declared
-
valueOf
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 nameNullPointerException
- if the argument is null
-
getName
-
effectsNode
public boolean effectsNode() -
fromName
-