org.tmatesoft.svn.core.internal.wc2.ng

Class SvnNgAbstractUpdate.RecordConflictsResolver

java.lang.Object

org.tmatesoft.svn.core.internal.wc2.ng.SvnNgAbstractUpdate.RecordConflictsResolver

All Implemented Interfaces:

ISVNConflictHandler

Enclosing class:

SvnNgAbstractUpdate<V,T extends AbstractSvnUpdate<V>>

private static class SvnNgAbstractUpdate.RecordConflictsResolver
extends java.lang.Object
implements ISVNConflictHandler

Field Summary

Fields

Modifier and Type	Field and Description
private java.util.List<SVNConflictDescription>	conflicts

Constructor Summary

Constructors

Modifier	Constructor and Description
private	RecordConflictsResolver()

Method Summary

Modifier and Type	Method and Description
private java.util.List<SVNConflictDescription>	getConflicts()
SVNConflictResult	handleConflict(SVNConflictDescription conflictDescription) Handles the conflict given the conflict description conflictDescription and returns SVNConflictResult.getConflictChoice() values of SVNConflictChoice.MINE_CONFLICT and SVNConflictChoice.THEIRS_CONFLICT are not legal for conflicts in binary files or properties.
boolean	hasConflicts()

Methods inherited from class java.lang.Object

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

Field Detail

conflicts

private final java.util.List<SVNConflictDescription> conflicts

Constructor Detail

RecordConflictsResolver

private RecordConflictsResolver()

Method Detail

handleConflict

public SVNConflictResult handleConflict(SVNConflictDescription conflictDescription)
                                 throws SVNException

Description copied from interface: ISVNConflictHandler

Handles the conflict given the conflict description conflictDescription and returns

SVNConflictResult.getConflictChoice() values of SVNConflictChoice.MINE_CONFLICT and SVNConflictChoice.THEIRS_CONFLICT are not legal for conflicts in binary files or properties.

Specified by:

handleConflict in interface ISVNConflictHandler

Parameters:

conflictDescription - describes the exact nature of the conflict, and provides information to help resolve it

Returns:

result for the conflict described by conflictDescription

Throws:

SVNException

getConflicts

private java.util.List<SVNConflictDescription> getConflicts()

hasConflicts

public boolean hasConflicts()