diff --git a/java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java b/java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java index 2098aacf..06a61073 100644 --- a/java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java +++ b/java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java @@ -129,7 +129,7 @@ private static void processLinesInPrevChunk(List rawChunk, Patch rawChunk, Patch generateUnifiedDiff(String originalFileName, String revisedFileName, List originalLines, Patch patch, @@ -200,13 +199,12 @@ public static List generateUnifiedDiff(String originalFileName, /** * processDeltas takes a list of Deltas and outputs them together in a single block of - * Unified-Diff-format text. + * Unified-Diff-format text. Author: Bill James (tankerbay@gmail.com). * * @param origLines - the lines of the original file * @param deltas - the Deltas to be output as a single block * @param contextSize - the number of lines of context to place around block * @return - * @author Bill James (tankerbay@gmail.com) */ private static List processDeltas(List origLines, List> deltas, int contextSize, boolean newFile) { @@ -297,11 +295,10 @@ private static List processDeltas(List origLines, } /** - * getDeltaText returns the lines to be added to the Unified Diff text from the Delta parameter + * getDeltaText returns the lines to be added to the Unified Diff text from the Delta parameter. Author: Bill James (tankerbay@gmail.com). * * @param delta - the Delta to output * @return list of String lines of code. - * @author Bill James (tankerbay@gmail.com) */ private static List getDeltaText(AbstractDelta delta) { List buffer = new ArrayList<>(); diff --git a/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java b/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java index 6cd13b38..5370b16d 100644 --- a/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java +++ b/java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java @@ -554,8 +554,8 @@ public Builder processDiffs(Function processDiffs) { * Set the column width of generated lines of original and revised * texts. * - * @param width the width to set. Making it < 0 doesn't make any sense. - * Default 80. @return builder with config of column width + * @param width the width to set. Making it < 0 doesn't make any sense. Default 80. + * @return builder with config of column width */ public Builder columnWidth(int width) { if (width >= 0) { diff --git a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java index 8d6c58bf..7cac8a2c 100644 --- a/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java +++ b/java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java @@ -189,10 +189,10 @@ private static void processDeltas(Consumer writer, } /** - * getDeltaText returns the lines to be added to the Unified Diff text from the Delta parameter + * getDeltaText returns the lines to be added to the Unified Diff text from the Delta parameter. * - * @param delta - the Delta to output - * @return list of String lines of code. + * @param writer consumer for the list of String lines of code + * @param delta the Delta to output */ private static void getDeltaText(Consumer writer, AbstractDelta delta) { for (String line : delta.getSource().getLines()) {