Class SVNTreeConflictUtil
java.lang.Object
org.tmatesoft.svn.core.internal.wc.SVNTreeConflictUtil
- Version:
- 1.3
-
Constructor Summary
Constructors -
Method Summary
Modifier and TypeMethodDescriptionprivate static SVNConflictAction
private static String
getActionString
(SVNTreeConflictDescription treeConflict) private static SVNConflictReason
getConflictReason
(String name) static SVNSkel
getConflictSkel
(SVNConflictVersion nullVersion, SVNTreeConflictDescription conflict) static String
static String
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
static byte[]
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)
-
Constructor Details
-
SVNTreeConflictUtil
public SVNTreeConflictUtil()
-
-
Method Details
-
readTreeConflicts
- Throws:
SVNException
-
readTreeConflicts
- Throws:
SVNException
-
readSingleTreeConflict
public static SVNTreeConflictDescription readSingleTreeConflict(SVNSkel skel, File dirPath) throws SVNException - Throws:
SVNException
-
readConflictVersion
- Throws:
SVNException
-
isValidVersionInfo
- Throws:
SVNException
-
isValidConflict
- Throws:
SVNException
-
getTreeConflictData
- Throws:
SVNException
-
getTreeConflictRawData
- 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
-
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
-