Class SVNTreeConflictUtil
- java.lang.Object
-
- org.tmatesoft.svn.core.internal.wc.SVNTreeConflictUtil
-
public class SVNTreeConflictUtil extends java.lang.Object
- Version:
- 1.3
-
-
Constructor Summary
Constructors Constructor Description SVNTreeConflictUtil()
-
Method Summary
All Methods Static Methods Concrete Methods Modifier and Type Method Description private static SVNConflictAction
getAction(java.lang.String name)
private static java.lang.String
getActionString(SVNTreeConflictDescription treeConflict)
private static SVNConflictReason
getConflictReason(java.lang.String name)
static SVNSkel
getConflictSkel(SVNConflictVersion nullVersion, SVNTreeConflictDescription conflict)
static java.lang.String
getHumanReadableConflictDescription(SVNTreeConflictDescription treeConflict)
static java.lang.String
getHumanReadableConflictVersion(SVNConflictVersion version)
private static SVNNodeKind
getNodeKind(java.lang.String name)
private static java.lang.String
getNodeKindString(SVNNodeKind kind)
private static SVNOperation
getOperation(java.lang.String name)
private static java.lang.String
getReasonString(SVNTreeConflictDescription treeConflict)
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)
private static boolean
isValidConflict(SVNSkel skel)
private static boolean
isValidVersionInfo(SVNSkel skel)
private static void
mappingError(java.lang.String type)
private static SVNSkel
prependVersionInfo(SVNSkel parent, SVNConflictVersion versionInfo)
private static SVNConflictVersion
readConflictVersion(SVNSkel skel)
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)
-
-
-
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
-
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 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)
-
getReasonString
private static java.lang.String getReasonString(SVNTreeConflictDescription treeConflict)
-
getActionString
private static java.lang.String getActionString(SVNTreeConflictDescription treeConflict)
-
prependVersionInfo
private static SVNSkel prependVersionInfo(SVNSkel parent, SVNConflictVersion versionInfo) throws SVNException
- Throws:
SVNException
-
getNodeKind
private static SVNNodeKind getNodeKind(java.lang.String name) throws SVNException
- Throws:
SVNException
-
getNodeKindString
private static java.lang.String getNodeKindString(SVNNodeKind kind)
-
getOperation
private static SVNOperation getOperation(java.lang.String name) throws SVNException
- Throws:
SVNException
-
getAction
private static SVNConflictAction getAction(java.lang.String name) throws SVNException
- Throws:
SVNException
-
getConflictReason
private static SVNConflictReason getConflictReason(java.lang.String name) throws SVNException
- Throws:
SVNException
-
mappingError
private static void mappingError(java.lang.String type) throws SVNException
- Throws:
SVNException
-
-