Package org.tigris.subversion.javahl
Class ConflictDescriptor
- java.lang.Object
-
- org.tigris.subversion.javahl.ConflictDescriptor
-
public class ConflictDescriptor extends java.lang.Object
The description of a merge conflict, encountered during merge/update/switch operations.- Since:
- 1.5
-
-
Nested Class Summary
Nested Classes Modifier and Type Class Description class
ConflictDescriptor.Action
Poor man's enum forsvn_wc_conflict_action_t
.class
ConflictDescriptor.Kind
Poor man's enum forsvn_wc_conflict_kind_t
.class
ConflictDescriptor.Reason
Poor man's enum forsvn_wc_conflict_reason_t
.
-
Field Summary
Fields Modifier and Type Field Description private int
action
private java.lang.String
basePath
private int
conflictKind
private boolean
isBinary
private java.lang.String
mergedPath
private java.lang.String
mimeType
private java.lang.String
myPath
private int
nodeKind
private int
operation
private java.lang.String
path
private java.lang.String
propertyName
private int
reason
private ConflictVersion
srcLeftVersion
private ConflictVersion
srcRightVersion
private java.lang.String
theirPath
-
Constructor Summary
Constructors Constructor Description ConflictDescriptor(java.lang.String path, int conflictKind, int nodeKind, java.lang.String propertyName, boolean isBinary, java.lang.String mimeType, int action, int reason, int operation, java.lang.String basePath, java.lang.String theirPath, java.lang.String myPath, java.lang.String mergedPath, ConflictVersion srcLeft, ConflictVersion srcRight)
This constructor should only be called from JNI code.ConflictDescriptor(ConflictDescriptor aDesc)
-
Method Summary
All Methods Instance Methods Concrete Methods Modifier and Type Method Description int
getAction()
java.lang.String
getBasePath()
int
getKind()
java.lang.String
getMergedPath()
java.lang.String
getMIMEType()
java.lang.String
getMyPath()
int
getNodeKind()
int
getOperation()
java.lang.String
getPath()
java.lang.String
getPropertyName()
int
getReason()
ConflictVersion
getSrcLeftVersion()
ConflictVersion
getSrcRightVersion()
java.lang.String
getTheirPath()
boolean
isBinary()
-
-
-
Field Detail
-
path
private java.lang.String path
-
conflictKind
private int conflictKind
-
nodeKind
private int nodeKind
- See Also:
NodeKind
-
propertyName
private java.lang.String propertyName
-
isBinary
private boolean isBinary
-
mimeType
private java.lang.String mimeType
-
action
private int action
- See Also:
#Action
-
reason
private int reason
- See Also:
#Reason
-
basePath
private java.lang.String basePath
-
theirPath
private java.lang.String theirPath
-
myPath
private java.lang.String myPath
-
mergedPath
private java.lang.String mergedPath
-
operation
private int operation
- See Also:
Operation
-
srcLeftVersion
private ConflictVersion srcLeftVersion
- See Also:
ConflictVersion
-
srcRightVersion
private ConflictVersion srcRightVersion
- See Also:
ConflictVersion
-
-
Constructor Detail
-
ConflictDescriptor
ConflictDescriptor(java.lang.String path, int conflictKind, int nodeKind, java.lang.String propertyName, boolean isBinary, java.lang.String mimeType, int action, int reason, int operation, java.lang.String basePath, java.lang.String theirPath, java.lang.String myPath, java.lang.String mergedPath, ConflictVersion srcLeft, ConflictVersion srcRight)
This constructor should only be called from JNI code.
-
ConflictDescriptor
public ConflictDescriptor(ConflictDescriptor aDesc)
-
-
Method Detail
-
getPath
public java.lang.String getPath()
-
getKind
public int getKind()
-
getNodeKind
public int getNodeKind()
- See Also:
NodeKind
-
getPropertyName
public java.lang.String getPropertyName()
-
isBinary
public boolean isBinary()
-
getMIMEType
public java.lang.String getMIMEType()
-
getAction
public int getAction()
-
getReason
public int getReason()
-
getBasePath
public java.lang.String getBasePath()
-
getTheirPath
public java.lang.String getTheirPath()
-
getMyPath
public java.lang.String getMyPath()
-
getMergedPath
public java.lang.String getMergedPath()
-
getOperation
public int getOperation()
-
getSrcLeftVersion
public ConflictVersion getSrcLeftVersion()
-
getSrcRightVersion
public ConflictVersion getSrcRightVersion()
-
-