Skip to content

Commit 61407b4

Browse files
committed
fixes #164
1 parent e791091 commit 61407b4

1 file changed

Lines changed: 7 additions & 4 deletions

File tree

java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -351,9 +351,13 @@ public static List<String> generateOriginalAndDiff(List<String> original, List<S
351351
* @param revisedFileName revised file name
352352
*/
353353
public static List<String> generateOriginalAndDiff(List<String> original, List<String> revised, String originalFileName, String revisedFileName) {
354-
originalFileName = originalFileName == null ? "original" : originalFileName;
355-
revisedFileName = revisedFileName == null ? "revised" : revisedFileName;
356-
Patch<String> patch = com.github.difflib.DiffUtils.diff(original, revised);
354+
if (originalFileName == null) {
355+
originalFileName = "original";
356+
}
357+
if (revisedFileName == null) {
358+
revisedFileName = "revised";
359+
}
360+
Patch<String> patch = DiffUtils.diff(original, revised);
357361
List<String> unifiedDiff = generateUnifiedDiff(originalFileName, revisedFileName, original, patch, 0);
358362
if (unifiedDiff.isEmpty()) {
359363
unifiedDiff.add("--- " + originalFileName);
@@ -367,7 +371,6 @@ public static List<String> generateOriginalAndDiff(List<String> original, List<S
367371
return insertOrig(originalWithPrefix, unifiedDiff);
368372
}
369373

370-
371374
//Insert the diff format to the original file
372375
private static List<String> insertOrig(List<String> original, List<String> unifiedDiff) {
373376
List<String> result = new ArrayList<>();

0 commit comments

Comments
 (0)