Package org.tmatesoft.svn.core.internal.wc

Class SVNTreeConflictUtil

java.lang.Object

org.tmatesoft.svn.core.internal.wc.SVNTreeConflictUtil

public class SVNTreeConflictUtil
extends java.lang.Object

Version:

1.3

Author:

TMate Software Ltd.

Constructor Summary

Constructors

Constructor	Description
SVNTreeConflictUtil()

Method Summary

Modifier and Type	Method	Description
static SVNSkel	getConflictSkel(SVNConflictVersion nullVersion, SVNTreeConflictDescription conflict)
static java.lang.String	getHumanReadableConflictDescription(SVNTreeConflictDescription treeConflict)
static java.lang.String	getHumanReadableConflictVersion(SVNConflictVersion version)
static java.lang.String	getSingleTreeConflictData(SVNTreeConflictDescription conflict)
static byte[]	getSingleTreeConflictRawData(SVNTreeConflictDescription conflict)
static java.lang.String	getTreeConflictData(java.util.Map conflicts)
static byte[]	getTreeConflictRawData(java.util.Map conflicts)
static SVNTreeConflictDescription	readSingleTreeConflict(SVNSkel skel, java.io.File dirPath)
static java.util.Map	readTreeConflicts(java.io.File dirPath, byte[] conflictData)
static java.util.Map	readTreeConflicts(java.io.File dirPath, java.lang.String conflictData)

Methods inherited from class java.lang.Object

clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait

Constructor Detail

SVNTreeConflictUtil

public SVNTreeConflictUtil()

Method Detail

readTreeConflicts

public static java.util.Map readTreeConflicts(java.io.File dirPath,
                                              java.lang.String conflictData)
                                       throws SVNException

Throws:

SVNException

readTreeConflicts

public static java.util.Map readTreeConflicts(java.io.File dirPath,
                                              byte[] conflictData)
                                       throws SVNException

Throws:

SVNException

readSingleTreeConflict

public static SVNTreeConflictDescription readSingleTreeConflict(SVNSkel skel,
                                                                java.io.File dirPath)
                                                         throws SVNException

Throws:

SVNException

getTreeConflictData

public static java.lang.String getTreeConflictData(java.util.Map conflicts)
                                            throws SVNException

Throws:

SVNException

getTreeConflictRawData

public static byte[] getTreeConflictRawData(java.util.Map conflicts)
                                     throws SVNException

Throws:

SVNException

getSingleTreeConflictData

public static java.lang.String getSingleTreeConflictData(SVNTreeConflictDescription conflict)
                                                  throws SVNException

Throws:

SVNException

getSingleTreeConflictRawData

public static byte[] getSingleTreeConflictRawData(SVNTreeConflictDescription conflict)
                                           throws SVNException

Throws:

SVNException

getConflictSkel

public static SVNSkel getConflictSkel(SVNConflictVersion nullVersion,
                                      SVNTreeConflictDescription conflict)
                               throws SVNException

Throws:

SVNException

getHumanReadableConflictDescription

public static java.lang.String getHumanReadableConflictDescription(SVNTreeConflictDescription treeConflict)

getHumanReadableConflictVersion

public static java.lang.String getHumanReadableConflictVersion(SVNConflictVersion version)