Skip to content

Commit 4a19d0b

Browse files
maxxbwmaxxbw
committed
merge conflict
2 parents 3cc84a0 + 98f658f commit 4a19d0b

8 files changed

+486
-101
lines changed

‎.gitignore_java

+76
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
##############################
2+
## Java
3+
##############################
4+
.mtj.tmp/
5+
*.class
6+
*.jar
7+
*.war
8+
*.ear
9+
*.nar
10+
hs_err_pid*
11+
12+
##############################
13+
## Maven
14+
##############################
15+
target/
16+
pom.xml.tag
17+
pom.xml.releaseBackup
18+
pom.xml.versionsBackup
19+
pom.xml.next
20+
release.properties
21+
dependency-reduced-pom.xml
22+
buildNumber.properties
23+
.mvn/timing.properties
24+
.mvn/wrapper/maven-wrapper.jar
25+
26+
##############################
27+
## Gradle
28+
##############################
29+
bin/
30+
build/
31+
.gradle
32+
.gradletasknamecache
33+
gradle-app.setting
34+
!gradle-wrapper.jar
35+
36+
##############################
37+
## IntelliJ
38+
##############################
39+
out/
40+
.idea/
41+
.idea_modules/
42+
*.iml
43+
*.ipr
44+
*.iws
45+
46+
##############################
47+
## Eclipse
48+
##############################
49+
.settings/
50+
bin/
51+
tmp/
52+
.metadata
53+
.classpath
54+
.project
55+
*.tmp
56+
*.bak
57+
*.swp
58+
*~.nib
59+
local.properties
60+
.loadpath
61+
62+
##############################
63+
## NetBeans
64+
##############################
65+
nbproject/private/
66+
build/
67+
nbbuild/
68+
dist/
69+
nbdist/
70+
nbactions.xml
71+
nb-configuration.xml
72+
73+
##############################
74+
## OS X
75+
##############################
76+
.DS_Store

‎lib/utils/CollectionUtil.java

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
package javaToolkit.lib.utils;
2+
3+
import java.util.*;
4+
5+
public class CollectionUtil {
6+
7+
/**
8+
* https://stackoverflow.com/a/109389/4315608
9+
*
10+
* @param map
11+
* @param <K>
12+
* @param <V>
13+
* @return
14+
*/
15+
public static <K, V> Map<K, V> sortByValue(Map<K, V> map) {
16+
List<Map.Entry<K, V>> list = new LinkedList<>(map.entrySet());
17+
Collections.sort(list, new Comparator<Object>() {
18+
@SuppressWarnings("unchecked")
19+
public int compare(Object o1, Object o2) {
20+
return ((Comparable<V>) ((Map.Entry<K, V>) (o1)).getValue()).compareTo(((Map.Entry<K, V>) (o2)).getValue());
21+
}
22+
});
23+
24+
Map<K, V> result = new LinkedHashMap<>();
25+
for (Iterator<Map.Entry<K, V>> it = list.iterator(); it.hasNext(); ) {
26+
Map.Entry<K, V> entry = (Map.Entry<K, V>) it.next();
27+
result.put(entry.getKey(), entry.getValue());
28+
}
29+
30+
return result;
31+
}
32+
33+
34+
}

‎lib/utils/DiffUtil.java

+72-48
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,81 @@
11
package javaToolkit.lib.utils;
22

3-
import java.io.FileInputStream;
4-
import java.io.FileNotFoundException;
5-
import java.io.InputStream;
63
import java.util.ArrayList;
74
import java.util.List;
85

9-
import javaToolkit.lib.utils.FileUtil;
10-
116
public class DiffUtil {
7+
8+
9+
public static List<Integer> getChangedLineNumListInOldVersion(String diffFilePath) {
10+
11+
List<Integer> changedLineNumList = new ArrayList<>();
12+
try {
13+
List<String> diffFileStrList = FileUtil.readFileToStrList(diffFilePath);
14+
for (String line : diffFileStrList) {
15+
if (line.startsWith("@@")) {
16+
for (String tmp : line.split(" ")) {
17+
if (tmp.trim().startsWith("-")) {
18+
if (tmp.contains(",")) {
19+
changedLineNumList.add(Integer.valueOf(tmp.trim().replace("-", "").split(",")[0]));
20+
} else {
21+
changedLineNumList.add(Integer.valueOf(tmp.trim().replace("-", "")));
22+
}
23+
}
24+
}
25+
}
26+
}
27+
} catch (Exception e) {
28+
// TODO: handle exception
29+
System.out.println(diffFilePath);
30+
System.exit(0);
31+
}
32+
return changedLineNumList;
33+
}
34+
35+
public static List<Integer> getChangedLineNumListInNewVersion(String diffFilePath) {
36+
37+
List<Integer> changedLineNumList = new ArrayList<>();
38+
try {
39+
List<String> diffFileStrList = FileUtil.readFileToStrList(diffFilePath);
40+
for (String line : diffFileStrList) {
41+
if (line.startsWith("@@")) {
42+
for (String tmp : line.split(" ")) {
43+
if (tmp.trim().startsWith("+")) {
44+
if (tmp.contains(",")) {
45+
changedLineNumList.add(Integer.valueOf(tmp.trim().replace("-", "").split(",")[0]));
46+
} else {
47+
changedLineNumList.add(Integer.valueOf(tmp.trim().replace("-", "")));
48+
}
49+
}
50+
}
51+
}
52+
}
53+
} catch (Exception e) {
54+
// TODO: handle exception
55+
System.out.println(diffFilePath);
56+
System.exit(0);
57+
}
58+
return changedLineNumList;
59+
}
60+
61+
public static List<String> getModifiedFileList(String diffFilePath) {
62+
/**
63+
* can to be further improved in future
64+
*/
65+
List<String> modifiedFileRelPathList = new ArrayList<String>();
66+
for (String line : FileUtil.readFileToStrList(diffFilePath)) {
67+
if (line.startsWith("diff --git ")) {
68+
// Heuristic
69+
String fileRelPath = line.replace("diff --git ", "").split(" ")[0].replaceFirst("a/", "").trim();
70+
modifiedFileRelPathList.add(fileRelPath);
71+
}
72+
}
73+
return modifiedFileRelPathList;
74+
}
1275

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

5781
}

0 commit comments

Comments
 (0)