com.redhat.rhn.common.filediff

Class Diff

java.lang.Object

com.redhat.rhn.common.filediff.Diff

public class Diff
extends java.lang.Object

Manages the action of diffing files and displaying the result using an API of recipes. Differ is the actual file diff tool and implementers of DiffVisitor and DiffWriter are used to write results.

Constructor Summary

Constructors

Constructor and Description
Diff(java.lang.String[] firstfileIn, java.lang.String[] secondfileIn)

Method Summary

Modifier and Type	Method and Description
java.util.List<Hunk>	diffFiles() Performs the file diff.
java.lang.String	htmlDiff(boolean onlyChanged)
java.lang.String	patchDiff(java.lang.String pathOne, java.lang.String pathTwo, java.util.Date fromDate, java.util.Date toDate)

Methods inherited from class java.lang.Object

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

Constructor Detail

Diff

public Diff(java.lang.String[] firstfileIn,
            java.lang.String[] secondfileIn)

Parameters:

firstfileIn - The old(from) file as a String array.

secondfileIn - The new(to) file as a String array.

Method Detail

htmlDiff

public java.lang.String htmlDiff(boolean onlyChanged)

Parameters:

onlyChanged - whether the results should only changed lines.

Returns:

An html string for the difference between the two files.

See Also:

RhnHtmlDiffWriter

patchDiff

public java.lang.String patchDiff(java.lang.String pathOne,
                                  java.lang.String pathTwo,
                                  java.util.Date fromDate,
                                  java.util.Date toDate)

Parameters:

pathOne - The path of the from(old, first) file

pathTwo - The path of the to(new, second) file

fromDate - The modified timestamp for the from (old, first) file

toDate - The modified timestamp for the to(new, second) file

Returns:

A diff in unified output format. Able to be used by GNU patch.

See Also:

RhnPatchDiffWriter

diffFiles

public java.util.List<Hunk> diffFiles()

Performs the file diff.

Returns:

A list of Hunks.

See Also:

Hunk