| java.lang.Object com.finalist.util.DiffConflictLine
DiffConflictLine | public class DiffConflictLine (Code) | | This class represents a line of text from a source file that conflicted during the diff process.
author: Michael O'Connor - Finalist IT Group. |
Field Summary | |
final public static DiffConflictLine | EOF A special case of DiffConflictLine, used to represent the last line in a file. |
Constructor Summary | |
public | DiffConflictLine(boolean firstFile, int number, String line) Constructs a DiffConflictLine. |
EOF | final public static DiffConflictLine EOF(Code) | | A special case of DiffConflictLine, used to represent the last line in a file.
|
DiffConflictLine | public DiffConflictLine(boolean firstFile, int number, String line)(Code) | | Constructs a DiffConflictLine.
Parameters: firstFile - true if this line comes from the 'first' file (a diff involves 2 files). Parameters: number - the line number within the original file. Parameters: line - the text of the line. |
getLineNumber | public int getLineNumber()(Code) | | |
isEof | public boolean isEof()(Code) | | |
isFirstFile | public boolean isFirstFile()(Code) | | |
lineEquals | public boolean lineEquals(DiffConflictLine line2)(Code) | | Checks if the given line has the same text as this one (ignoring whitespace).
Parameters: line2 - the other line. true if equal. |
precedes | public boolean precedes(DiffConflictLine next)(Code) | | Checks if a given conflict line precedes this one.
Parameters: next - |
toString | public String toString()(Code) | | By default this renders a HTML result.
|
|
|