org.apache.subversion.javahl
Class ConflictDescriptor

java.lang.Object
  extended by org.apache.subversion.javahl.ConflictDescriptor

public class ConflictDescriptor
extends Object

The description of a merge conflict, encountered during merge/update/switch operations.


Nested Class Summary
static class ConflictDescriptor.Action
          Rich man's enum for svn_wc_conflict_action_t.
static class ConflictDescriptor.Kind
          Rich man's enum for svn_wc_conflict_kind_t.
static class ConflictDescriptor.Operation
           
static class ConflictDescriptor.Reason
          Rich man's enum for svn_wc_conflict_reason_t.
 
Constructor Summary
ConflictDescriptor(String path, ConflictDescriptor.Kind conflictKind, NodeKind nodeKind, String propertyName, boolean isBinary, String mimeType, ConflictDescriptor.Action action, ConflictDescriptor.Reason reason, ConflictDescriptor.Operation operation, String basePath, String theirPath, String myPath, String mergedPath, ConflictVersion srcLeft, ConflictVersion srcRight)
          Deprecated.  
 
Method Summary
 ConflictDescriptor.Action getAction()
           
 String getBasePath()
           
 ConflictDescriptor.Kind getKind()
           
 String getMergedPath()
           
 String getMIMEType()
           
 String getMyPath()
           
 NodeKind getNodeKind()
           
 ConflictDescriptor.Operation getOperation()
           
 String getPath()
           
 String getPropertyName()
           
 String getPropRejectAbspath()
           
 byte[] getPropValueBase()
           
 byte[] getPropValueIncomingNew()
           
 byte[] getPropValueIncomingOld()
           
 byte[] getPropValueWorking()
           
 ConflictDescriptor.Reason getReason()
           
 ConflictVersion getSrcLeftVersion()
           
 ConflictVersion getSrcRightVersion()
           
 String getTheirPath()
           
 boolean isBinary()
           
 
Methods inherited from class java.lang.Object
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
 

Constructor Detail

ConflictDescriptor

@Deprecated
public ConflictDescriptor(String path,
                                     ConflictDescriptor.Kind conflictKind,
                                     NodeKind nodeKind,
                                     String propertyName,
                                     boolean isBinary,
                                     String mimeType,
                                     ConflictDescriptor.Action action,
                                     ConflictDescriptor.Reason reason,
                                     ConflictDescriptor.Operation operation,
                                     String basePath,
                                     String theirPath,
                                     String myPath,
                                     String mergedPath,
                                     ConflictVersion srcLeft,
                                     ConflictVersion srcRight)
Deprecated. 

This constructor should only be called from JNI code.

Method Detail

getPath

public String getPath()

getKind

public ConflictDescriptor.Kind getKind()

getNodeKind

public NodeKind getNodeKind()

getPropertyName

public String getPropertyName()

isBinary

public boolean isBinary()

getMIMEType

public String getMIMEType()

getAction

public ConflictDescriptor.Action getAction()

getReason

public ConflictDescriptor.Reason getReason()

getBasePath

public String getBasePath()

getTheirPath

public String getTheirPath()

getMyPath

public String getMyPath()

getMergedPath

public String getMergedPath()

getOperation

public ConflictDescriptor.Operation getOperation()

getSrcLeftVersion

public ConflictVersion getSrcLeftVersion()

getSrcRightVersion

public ConflictVersion getSrcRightVersion()

getPropRejectAbspath

public String getPropRejectAbspath()

getPropValueBase

public byte[] getPropValueBase()

getPropValueWorking

public byte[] getPropValueWorking()

getPropValueIncomingOld

public byte[] getPropValueIncomingOld()

getPropValueIncomingNew

public byte[] getPropValueIncomingNew()