Skip to content

Commit 7d9d1ca

Browse files
15060858431506085843
committed
fix build issues
1 parent 61407b4 commit 7d9d1ca

2 files changed

Lines changed: 26 additions & 16 deletions

File tree

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

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -351,17 +351,19 @@ 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-
if (originalFileName == null) {
355-
originalFileName = "original";
354+
String originalFileNameTemp = originalFileName;
355+
String revisedFileNameTemp = originalFileName;
356+
if (originalFileNameTemp == null) {
357+
originalFileNameTemp = "original";
356358
}
357-
if (revisedFileName == null) {
358-
revisedFileName = "revised";
359+
if (revisedFileNameTemp == null) {
360+
revisedFileNameTemp = "revised";
359361
}
360362
Patch<String> patch = DiffUtils.diff(original, revised);
361-
List<String> unifiedDiff = generateUnifiedDiff(originalFileName, revisedFileName, original, patch, 0);
363+
List<String> unifiedDiff = generateUnifiedDiff(originalFileNameTemp, revisedFileNameTemp, original, patch, 0);
362364
if (unifiedDiff.isEmpty()) {
363-
unifiedDiff.add("--- " + originalFileName);
364-
unifiedDiff.add("+++ " + revisedFileName);
365+
unifiedDiff.add("--- " + originalFileNameTemp);
366+
unifiedDiff.add("+++ " + revisedFileNameTemp);
365367
unifiedDiff.add("@@ -0,0 +0,0 @@");
366368
} else if (unifiedDiff.size() >= 3 && !unifiedDiff.get(2).contains("@@ -1,")) {
367369
unifiedDiff.set(1, unifiedDiff.get(1));
@@ -396,12 +398,12 @@ private static List<String> insertOrig(List<String> original, List<String> unifi
396398
}
397399
diff.add(u);
398400
}
399-
insertOrig(diffList,result,original);
401+
insertOrig(diffList, result, original);
400402
return result;
401403
}
402404

403405
//Insert the diff format to the original file
404-
private static void insertOrig(List<List<String>> diffList, List<String> result,List<String> original) {
406+
private static void insertOrig(List<List<String>> diffList, List<String> result, List<String> original) {
405407
for (int i = 0; i < diffList.size(); i++) {
406408
List<String> diff = diffList.get(i);
407409
List<String> nexDiff = i == diffList.size() - 1 ? null : diffList.get(i + 1);
@@ -421,7 +423,7 @@ private static void insertOrig(List<List<String>> diffList, List<String> result,
421423
if (simb.contains("@@ -1,") && null == nexSimb && map.get("orgDel") != original.size()) {
422424
insert(result, getOrigList(original, 0, original.size() - 1));
423425
} else if (null == nexSimb && (map.get("orgRow") + map.get("orgDel") - 1) < original.size()) {
424-
int start = (map.get("orgRow") + map.get("orgDel") - 1);
426+
int start = map.get("orgRow") + map.get("orgDel") - 1;
425427
start = start == -1 ? 0 : start;
426428
insert(result, getOrigList(original, start, original.size() - 1));
427429
}
@@ -455,8 +457,9 @@ private static Map<String, Integer> getRowMap(String str) {
455457
private static List<String> getOrigList(List<String> originalWithPrefix, int start, int end) {
456458
List<String> list = new ArrayList<>();
457459
if (originalWithPrefix.size() >= 1 && start <= end && end < originalWithPrefix.size()) {
458-
for (; start <= end; start++) {
459-
list.add(originalWithPrefix.get(start));
460+
int startTemp = start;
461+
for (; startTemp <= end; startTemp++) {
462+
list.add(originalWithPrefix.get(startTemp));
460463
}
461464
}
462465
return list;

‎java-diff-utils/src/test/java/com/github/difflib/examples/OriginalAndDiffTest.java‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,22 @@
1212
import java.util.List;
1313

1414
import static java.util.stream.Collectors.joining;
15+
import static org.junit.jupiter.api.Assertions.fail;
1516

1617
public class OriginalAndDiffTest {
1718

1819
@Test
19-
public void testGenerateOriginalAndDiff() throws IOException {
20-
List<String> origLines = fileToLines(TestConstants.MOCK_FOLDER + "original.txt");
21-
List<String> revLines = fileToLines(TestConstants.MOCK_FOLDER + "revised.txt");
20+
public void testGenerateOriginalAndDiff() {
21+
List<String> origLines = null;
22+
List<String> revLines = null;
23+
try {
24+
origLines = fileToLines(TestConstants.MOCK_FOLDER + "original.txt");
25+
revLines = fileToLines(TestConstants.MOCK_FOLDER + "revised.txt");
26+
} catch (IOException e) {
27+
fail(e.getMessage());
28+
}
2229

23-
List<String> originalAndDiff = UnifiedDiffUtils.generateOriginalAndDiff(origLines,revLines);
30+
List<String> originalAndDiff = UnifiedDiffUtils.generateOriginalAndDiff(origLines, revLines);
2431
System.out.println(originalAndDiff.stream().collect(joining("\n")));
2532
}
2633

0 commit comments

Comments
 (0)