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 -
Method Summary
Modifier and TypeMethodDescriptionprivate 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
static java.lang.String
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
static byte[]
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) 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 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
- Throws:
SVNException
-
isValidVersionInfo
- Throws:
SVNException
-
isValidConflict
- Throws:
SVNException
-
getTreeConflictData
- Throws:
SVNException
-
getTreeConflictRawData
- 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
-
getReasonString
-
getActionString
-
prependVersionInfo
private static SVNSkel prependVersionInfo(SVNSkel parent, SVNConflictVersion versionInfo) throws SVNException - Throws:
SVNException
-
getNodeKind
- Throws:
SVNException
-
getNodeKindString
-
getOperation
- Throws:
SVNException
-
getAction
- Throws:
SVNException
-
getConflictReason
- Throws:
SVNException
-
mappingError
- Throws:
SVNException
-