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

Class SvnNgMergeCallback

java.lang.Object

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

All Implemented Interfaces:

ISvnDiffCallback

public class SvnNgMergeCallback
extends java.lang.Object
implements ISvnDiffCallback

Constructor Summary

Constructors

Constructor	Description
SvnNgMergeCallback(SvnNgMergeDriver driver)

Method Summary

Modifier and Type	Method	Description
void	dirAdded(SvnDiffCallbackResult result, java.io.File path, long revision, java.lang.String copyFromPath, long copyFromRevision)
void	dirClosed(SvnDiffCallbackResult result, java.io.File path, boolean isAdded)
void	dirDeleted(SvnDiffCallbackResult result, java.io.File path)
void	dirOpened(SvnDiffCallbackResult result, java.io.File path, long revision)
void	dirPropsChanged(SvnDiffCallbackResult result, java.io.File path, boolean isAdded, SVNProperties propChanges, SVNProperties originalProperties)
void	fileAdded(SvnDiffCallbackResult result, java.io.File path, java.io.File leftFile, java.io.File rightFile, long rev1, long rev2, java.lang.String mimeType1, java.lang.String mimeType2, java.io.File copyFromPath, long copyFromRevision, SVNProperties propChanges, SVNProperties originalProperties)
void	fileChanged(SvnDiffCallbackResult result, java.io.File path, java.io.File tmpFile1, java.io.File tmpFile2, long rev1, long rev2, java.lang.String mimetype1, java.lang.String mimeType2, SVNProperties propChanges, SVNProperties originalProperties)
void	fileDeleted(SvnDiffCallbackResult result, java.io.File path, java.io.File leftFile, java.io.File rightFile, java.lang.String mimeType1, java.lang.String mimeType2, SVNProperties originalProperties)
void	fileOpened(SvnDiffCallbackResult result, java.io.File path, long revision)
java.util.Collection<java.io.File>	getConflictedPaths()
protected static SVNProperties	omitMergeInfoChanges(SVNProperties props)

Methods inherited from class java.lang.Object

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

Constructor Detail

SvnNgMergeCallback

public SvnNgMergeCallback(SvnNgMergeDriver driver)

Method Detail

getConflictedPaths

public java.util.Collection<java.io.File> getConflictedPaths()

fileOpened

public void fileOpened(SvnDiffCallbackResult result,
                       java.io.File path,
                       long revision)
                throws SVNException

Specified by:

fileOpened in interface ISvnDiffCallback

Throws:

SVNException

fileChanged

public void fileChanged(SvnDiffCallbackResult result,
                        java.io.File path,
                        java.io.File tmpFile1,
                        java.io.File tmpFile2,
                        long rev1,
                        long rev2,
                        java.lang.String mimetype1,
                        java.lang.String mimeType2,
                        SVNProperties propChanges,
                        SVNProperties originalProperties)
                 throws SVNException

Specified by:

fileChanged in interface ISvnDiffCallback

Throws:

SVNException

fileAdded

public void fileAdded(SvnDiffCallbackResult result,
                      java.io.File path,
                      java.io.File leftFile,
                      java.io.File rightFile,
                      long rev1,
                      long rev2,
                      java.lang.String mimeType1,
                      java.lang.String mimeType2,
                      java.io.File copyFromPath,
                      long copyFromRevision,
                      SVNProperties propChanges,
                      SVNProperties originalProperties)
               throws SVNException

Specified by:

fileAdded in interface ISvnDiffCallback

Throws:

SVNException

fileDeleted

public void fileDeleted(SvnDiffCallbackResult result,
                        java.io.File path,
                        java.io.File leftFile,
                        java.io.File rightFile,
                        java.lang.String mimeType1,
                        java.lang.String mimeType2,
                        SVNProperties originalProperties)
                 throws SVNException

Specified by:

fileDeleted in interface ISvnDiffCallback

Throws:

SVNException

dirDeleted

public void dirDeleted(SvnDiffCallbackResult result,
                       java.io.File path)
                throws SVNException

Specified by:

dirDeleted in interface ISvnDiffCallback

Throws:

SVNException

dirOpened

public void dirOpened(SvnDiffCallbackResult result,
                      java.io.File path,
                      long revision)
               throws SVNException

Specified by:

dirOpened in interface ISvnDiffCallback

Throws:

SVNException

dirAdded

public void dirAdded(SvnDiffCallbackResult result,
                     java.io.File path,
                     long revision,
                     java.lang.String copyFromPath,
                     long copyFromRevision)
              throws SVNException

Specified by:

dirAdded in interface ISvnDiffCallback

Throws:

SVNException

dirPropsChanged

public void dirPropsChanged(SvnDiffCallbackResult result,
                            java.io.File path,
                            boolean isAdded,
                            SVNProperties propChanges,
                            SVNProperties originalProperties)
                     throws SVNException

Specified by:

dirPropsChanged in interface ISvnDiffCallback

Throws:

SVNException

dirClosed

public void dirClosed(SvnDiffCallbackResult result,
                      java.io.File path,
                      boolean isAdded)
               throws SVNException

Specified by:

dirClosed in interface ISvnDiffCallback

Throws:

SVNException

omitMergeInfoChanges

protected static SVNProperties omitMergeInfoChanges(SVNProperties props)