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

Class SVNTreeConflictUtil

java.lang.Object

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

public class SVNTreeConflictUtil
extends Object

Version:

1.3

Constructor Summary

Constructors

Constructor	Description
SVNTreeConflictUtil()

Method Summary

Modifier and Type	Method	Description
private static SVNConflictAction	getAction(String name)
private static String	getActionString(SVNTreeConflictDescription treeConflict)
private static SVNConflictReason	getConflictReason(String name)
static SVNSkel	getConflictSkel(SVNConflictVersion nullVersion, SVNTreeConflictDescription conflict)
static String	getHumanReadableConflictDescription(SVNTreeConflictDescription treeConflict)
static String	getHumanReadableConflictVersion(SVNConflictVersion version)
private static SVNNodeKind	getNodeKind(String name)
private static String	getNodeKindString(SVNNodeKind kind)
private static SVNOperation	getOperation(String name)
private static String	getReasonString(SVNTreeConflictDescription treeConflict)
static String	getSingleTreeConflictData(SVNTreeConflictDescription conflict)
static byte[]	getSingleTreeConflictRawData(SVNTreeConflictDescription conflict)
static String	getTreeConflictData(Map conflicts)
static byte[]	getTreeConflictRawData(Map conflicts)
private static boolean	isValidConflict(SVNSkel skel)
private static boolean	isValidVersionInfo(SVNSkel skel)
private static void	mappingError(String type)
private static SVNSkel	prependVersionInfo(SVNSkel parent, SVNConflictVersion versionInfo)
private static SVNConflictVersion	readConflictVersion(SVNSkel skel)
static SVNTreeConflictDescription	readSingleTreeConflict(SVNSkel skel, File dirPath)
static Map	readTreeConflicts(File dirPath, byte[] conflictData)
static Map	readTreeConflicts(File dirPath, String conflictData)

Methods inherited from class java.lang.Object

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

Constructor Details

SVNTreeConflictUtil

public SVNTreeConflictUtil()

Method Details

readTreeConflicts

public static Map readTreeConflicts(File dirPath,
 String conflictData)
                             throws SVNException

Throws:

SVNException

readTreeConflicts

public static Map readTreeConflicts(File dirPath,
 byte[] conflictData)
                             throws SVNException

Throws:

SVNException

readSingleTreeConflict

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

Throws:

SVNException

readConflictVersion

private static SVNConflictVersion readConflictVersion(SVNSkel skel)
                                               throws SVNException

Throws:

SVNException

isValidVersionInfo

private static boolean isValidVersionInfo(SVNSkel skel)
                                   throws SVNException

Throws:

SVNException

isValidConflict

private static boolean isValidConflict(SVNSkel skel)
                                throws SVNException

Throws:

SVNException

getTreeConflictData

public static String getTreeConflictData(Map conflicts)
                                  throws SVNException

Throws:

SVNException

getTreeConflictRawData

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

Throws:

SVNException

getSingleTreeConflictData

public static 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 String getHumanReadableConflictDescription(SVNTreeConflictDescription treeConflict)

getHumanReadableConflictVersion

public static String getHumanReadableConflictVersion(SVNConflictVersion version)

getReasonString

private static String getReasonString(SVNTreeConflictDescription treeConflict)

getActionString

private static String getActionString(SVNTreeConflictDescription treeConflict)

prependVersionInfo

private static SVNSkel prependVersionInfo(SVNSkel parent,
 SVNConflictVersion versionInfo)
                                   throws SVNException

Throws:

SVNException

getNodeKind

private static SVNNodeKind getNodeKind(String name)
                                throws SVNException

Throws:

SVNException

getNodeKindString

private static String getNodeKindString(SVNNodeKind kind)

getOperation

private static SVNOperation getOperation(String name)
                                  throws SVNException

Throws:

SVNException

getAction

private static SVNConflictAction getAction(String name)
                                    throws SVNException

Throws:

SVNException

getConflictReason

private static SVNConflictReason getConflictReason(String name)
                                            throws SVNException

Throws:

SVNException

mappingError

private static void mappingError(String type)
                          throws SVNException

Throws:

SVNException