Property Detail

• static final int DEFAULT_CONTEXT_SIZE

• final int contextSize

• final org.slf4j.Logger log

Constructor Detail

• Differ(org.slf4j.Logger log)

• Differ(int contextSize, org.slf4j.Logger log)

Method Detail

• void apply(java.io.File patch, java.io.File content, java.io.File destination)

  Applies the parameter patch(es) to the parameter file(s).

  Parameters:

  patch - The patch file to apply

  content - The content to apply the patch to

  destination - The destination to write to

• java.util.List<java.lang.String> apply(java.io.File contentFileOrDir, java.io.File modifiedFileOrDir, java.lang.String diffExtension, java.nio.charset.Charset charset, java.io.File destinationDir)

  Creates one or more patches from one or more file pairs.

  Parameters:

  contentFileOrDir - The original content

  modifiedFileOrDir - The modified content

  diffExtension - The diff file extension

  charset - The character set in use, defaults to UTF-8

  destinatinDir - The directory to write to

  Returns:

  A list of errors, or an empty list if patching succeeded

• java.util.List<java.lang.String> applyDirectory(java.io.File contentDir, java.io.File modifiedDir, java.lang.String diffExtension, java.nio.charset.Charset charset, java.io.File destinationDir)

  Creates a directory of patches from directories of content and modifications.

  Parameters:

  contentDir - A directory containing original content

  modifiedDir - A directory containing modifications

  diffExtension - The file extension that identifies the patch files

  charset - The character set in use, defaults to UTF-8

  destinationDir - The directory to write to

  Returns:

  A list of errors, empty if patching succeeded

• java.util.List<java.lang.String> applyFile(java.io.File modifiedFile, java.io.File contentFile, java.nio.charset.Charset charset, java.io.File destinationFile, java.util.List<java.lang.String> errors)

  Generates a patch file from a content file and a modified file.

  Parameters:

  modifiedFile - A modified file

  contentFile - A content file

  charset - The character set in use, defaults to UTF-8

  destinationFile - The file to write the patch to

  errors - An error list to add to if patching fails

  Returns:

  The parameter list of errors, unmodified if diffing succeeded

• java.io.File applyOrThrow(java.io.File modifiedFile, java.io.File contentFile, java.io.File destinationFile)

  Creates a patch file from a content file and a modified file.

  Parameters:

  modifiedFile - A modified file

  contentFile - A content file

  destinationFile - The file to write the patch to

  Returns:

  The destination file

• java.io.File applyOrThrow(java.io.File modifiedFile, java.io.File contentFile, java.nio.charset.Charset charset, java.io.File destinationFile)

  Creates a patch file from a content file and a modified file.

  Parameters:

  modifiedFile - A modified file

  contentFile - A content file

  charset - The character set in use, defaults to UTF-8

  destinationFile - The output file to write to

  Returns:

  The destination file

• difflib.Patch<java.lang.String> applyOrThrow(java.util.List<java.lang.String> modifiedLines, java.util.List<java.lang.String> contentLines)

• java.util.List<java.lang.String> applyOrThrow(java.io.File contentFile, java.io.File modifiedFile, java.util.List<java.lang.String> contentLines, difflib.Patch<java.lang.String> patch, int contextSize)