|
5 | 5 |
|
6 | 6 | public class DiffUtil {
|
7 | 7 |
|
8 |
| - public static int getChangedLine(String diffFilePath) { |
9 |
| - try { |
10 |
| - List<String> diffFileStrList = FileUtil.readFileToStrList(diffFilePath); |
11 |
| - for (String line : diffFileStrList) { |
12 |
| - if (line.startsWith("@@")) { |
13 |
| - for (String tmp : line.split(" ")) { |
14 |
| - if (tmp.trim().startsWith("-")) { |
15 |
| - if (tmp.contains(",")) { |
16 |
| - return Integer.valueOf(tmp.trim().replace("-", "").split(",")[0]); |
17 |
| - } else { |
18 |
| - return Integer.valueOf(tmp.trim().replace("-", "")); |
19 |
| - } |
20 |
| - } |
21 |
| - } |
22 |
| - } |
23 |
| - } |
24 |
| - } catch (Exception e) { |
25 |
| - // TODO: handle exception |
26 |
| - System.out.println(diffFilePath); |
27 |
| - System.exit(0); |
28 |
| - } |
29 |
| - return -1; |
30 |
| - } |
| 8 | + public static List<Integer> getChangedLineNumList(String diffFilePath) { |
31 | 9 |
|
32 |
| - public static List<String> getModifiedFileList(String diffFilePath) { |
33 |
| - /** |
34 |
| - * can to be further improved in future |
35 |
| - */ |
36 |
| - List<String> modifiedFileRelPathList = new ArrayList<String>(); |
37 |
| - for (String line : FileUtil.readFileToStrList(diffFilePath)) { |
38 |
| - if (line.startsWith("diff --git ")) { |
39 |
| - // Heuristic |
40 |
| - String fileRelPath = line.replace("diff --git ", "").split(" ")[0].replaceFirst("a/", "").trim(); |
41 |
| - modifiedFileRelPathList.add(fileRelPath); |
42 |
| - } |
43 |
| - } |
44 |
| - return modifiedFileRelPathList; |
45 |
| - } |
| 10 | + List<Integer> changedLineNumList = new ArrayList<>(); |
| 11 | + try { |
| 12 | + List<String> diffFileStrList = FileUtil.readFileToStrList(diffFilePath); |
| 13 | + for (String line : diffFileStrList) { |
| 14 | + if (line.startsWith("@@")) { |
| 15 | + for (String tmp : line.split(" ")) { |
| 16 | + if (tmp.trim().startsWith("-")) { |
| 17 | + if (tmp.contains(",")) { |
| 18 | + changedLineNumList.add(Integer.valueOf(tmp.trim().replace("-", "").split(",")[0])); |
| 19 | + } else { |
| 20 | + changedLineNumList.add(Integer.valueOf(tmp.trim().replace("-", ""))); |
| 21 | + } |
| 22 | + } |
| 23 | + } |
| 24 | + } |
| 25 | + } |
| 26 | + } catch (Exception e) { |
| 27 | + // TODO: handle exception |
| 28 | + System.out.println(diffFilePath); |
| 29 | + System.exit(0); |
| 30 | + } |
| 31 | + return changedLineNumList; |
| 32 | + } |
46 | 33 |
|
47 |
| - public static void main(String[] args) { |
48 |
| - String diffFilePath = "/media/sf__3_fix_groups/RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE/delete redundent null check/27769/diff.txt"; |
49 |
| - getModifiedFileList(diffFilePath); |
50 |
| - } |
| 34 | + public static List<String> getModifiedFileList(String diffFilePath) { |
| 35 | + /** |
| 36 | + * can to be further improved in future |
| 37 | + */ |
| 38 | + List<String> modifiedFileRelPathList = new ArrayList<String>(); |
| 39 | + for (String line : FileUtil.readFileToStrList(diffFilePath)) { |
| 40 | + if (line.startsWith("diff --git ")) { |
| 41 | + // Heuristic |
| 42 | + String fileRelPath = line.replace("diff --git ", "").split(" ")[0].replaceFirst("a/", "").trim(); |
| 43 | + modifiedFileRelPathList.add(fileRelPath); |
| 44 | + } |
| 45 | + } |
| 46 | + return modifiedFileRelPathList; |
| 47 | + } |
| 48 | + |
| 49 | + public static void main(String[] args) { |
| 50 | + String diffFilePath = "/media/sf__3_fix_groups/RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE/delete redundent null check/27769/diff.txt"; |
| 51 | + getModifiedFileList(diffFilePath); |
| 52 | + } |
51 | 53 |
|
52 | 54 | }
|
0 commit comments