codechicken.diffpatch.diff

Class Differ

java.lang.Object

codechicken.diffpatch.diff.Differ

Direct Known Subclasses:

PatienceDiffer

public abstract class Differ
extends java.lang.Object

Field Summary

Fields

Modifier and Type	Field and Description
protected CharRepresenter	charRep
static int	DEFAULT_CONTEXT

Constructor Summary

Constructors

Constructor and Description
Differ()
Differ(CharRepresenter charRep)

Method Summary

Modifier and Type	Method and Description
java.util.List<Diff>	diff(java.util.List<java.lang.String> lines1, java.util.List<java.lang.String> lines2)
static java.util.List<Patch>	makeFileAdded(java.util.List<java.lang.String> lines)
static java.util.List<Patch>	makeFileRemoved(java.util.List<java.lang.String> lines)
static java.util.List<Patch>	makePatches(java.util.List<Diff> diffs, int numContextLines, boolean collate)
java.util.List<Patch>	makePatches(java.util.List<java.lang.String> lines1, java.util.List<java.lang.String> lines2)
java.util.List<Patch>	makePatches(java.util.List<java.lang.String> lines1, java.util.List<java.lang.String> lines2, int numContextLines, boolean collate)
abstract int[]	match(java.util.List<java.lang.String> lines1, java.util.List<java.lang.String> lines2)

Methods inherited from class java.lang.Object

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

Field Detail

DEFAULT_CONTEXT

public static final int DEFAULT_CONTEXT

See Also:

Constant Field Values

charRep

protected final CharRepresenter charRep

Constructor Detail

Differ

public Differ()

Differ

public Differ(CharRepresenter charRep)

Method Detail

match

public abstract int[] match(java.util.List<java.lang.String> lines1,
                            java.util.List<java.lang.String> lines2)

diff

public java.util.List<Diff> diff(java.util.List<java.lang.String> lines1,
                                 java.util.List<java.lang.String> lines2)

makePatches

public java.util.List<Patch> makePatches(java.util.List<java.lang.String> lines1,
                                         java.util.List<java.lang.String> lines2)

makePatches

public java.util.List<Patch> makePatches(java.util.List<java.lang.String> lines1,
                                         java.util.List<java.lang.String> lines2,
                                         int numContextLines,
                                         boolean collate)

makeFileAdded

public static java.util.List<Patch> makeFileAdded(java.util.List<java.lang.String> lines)

makeFileRemoved

public static java.util.List<Patch> makeFileRemoved(java.util.List<java.lang.String> lines)

makePatches

public static java.util.List<Patch> makePatches(java.util.List<Diff> diffs,
                                                int numContextLines,
                                                boolean collate)