public class SVNTreeConflictUtil
extends java.lang.Object
Constructor and Description |
---|
SVNTreeConflictUtil() |
Modifier and Type | Method and 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) |
public static java.util.Map readTreeConflicts(java.io.File dirPath, java.lang.String conflictData) throws SVNException
SVNException
public static java.util.Map readTreeConflicts(java.io.File dirPath, byte[] conflictData) throws SVNException
SVNException
public static SVNTreeConflictDescription readSingleTreeConflict(SVNSkel skel, java.io.File dirPath) throws SVNException
SVNException
public static java.lang.String getTreeConflictData(java.util.Map conflicts) throws SVNException
SVNException
public static byte[] getTreeConflictRawData(java.util.Map conflicts) throws SVNException
SVNException
public static java.lang.String getSingleTreeConflictData(SVNTreeConflictDescription conflict) throws SVNException
SVNException
public static byte[] getSingleTreeConflictRawData(SVNTreeConflictDescription conflict) throws SVNException
SVNException
public static SVNSkel getConflictSkel(SVNConflictVersion nullVersion, SVNTreeConflictDescription conflict) throws SVNException
SVNException
public static java.lang.String getHumanReadableConflictDescription(SVNTreeConflictDescription treeConflict)
public static java.lang.String getHumanReadableConflictVersion(SVNConflictVersion version)
Copyright © 2004-2012 TMate Software Ltd. All Rights Reserved.