Fix the bug

JiyeongYun · May 11, 2020 · de40452 · de40452
1 parent 1ee2c3c
commit de40452
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/src/main/java/hgu/csee/isel/alinew/szz/AGSZZ.java b/src/main/java/hgu/csee/isel/alinew/szz/AGSZZ.java
@@ -5,6 +5,7 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Paths;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
@@ -63,7 +64,7 @@ public void run() throws IOException {
 			List<String> issueKeys = Files.readAllLines(Paths.get(issueKeyFilePath), StandardCharsets.UTF_8);
 
 			// Colleting BFCs
-			List<RevCommit> bfcList = GitUtils.getBFCList(issueKeys, revs);
+			ArrayList<RevCommit> bfcList = GitUtils.getBFCList(issueKeys, revs);
 
 			// Pre-step for building annotation graph
 			List<String> targetPaths = GitUtils.getTargetPaths(repo, bfcList);

diff --git a/src/main/java/hgu/csee/isel/alinew/szz/trace/Tracer.java b/src/main/java/hgu/csee/isel/alinew/szz/trace/Tracer.java
@@ -167,20 +167,19 @@ public List<BICInfo> collectBILines(Repository repo, List<RevCommit> BFCList, An
 							}
 						}
 					}
-
-				}
-
+				} 
+
 				String fixSha1 = BFC.name() + "";
 				String fixDate = Utils.getStringDateTimeFromCommitTime(BFC);
 
 				for (Line line : BILines) {
 					BICInfo bicInfo = new BICInfo(fixSha1, path, fixDate, line);
 					bicList.add(bicInfo);
 				}
-
+				
 				BILines.clear();
-			}
-		}
+			} 
+		} 
 
 		return bicList;
 	}

diff --git a/src/main/java/hgu/csee/isel/alinew/szz/util/GitUtils.java b/src/main/java/hgu/csee/isel/alinew/szz/util/GitUtils.java
@@ -2,6 +2,7 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
@@ -181,16 +182,16 @@ public static List<RevCommit> getRevs(Git git) throws NoHeadException, GitAPIExc
 		return commits;
 	}
 
-	public static List<RevCommit> getBFCList(List<String> issueKeys, List<RevCommit> revs) {
-		List<RevCommit> BFCList = new ArrayList<RevCommit>();
+	public static ArrayList<RevCommit> getBFCList(List<String> issueKeys, List<RevCommit> revs) {
+		// To avoid duplicate BFCs
+		HashSet<RevCommit> BFCSet = new HashSet<RevCommit>();
 
 		for (String issueKey : issueKeys) {
 			for (RevCommit rev : revs) 
-				if (rev.getFullMessage().contains(issueKey)) BFCList.add(rev); 
-
+				if (rev.getFullMessage().contains(issueKey)) BFCSet.add(rev); 
 		}
 
-		return BFCList;
+		return new ArrayList<RevCommit>(BFCSet);
 	}
 
 	public static List<String> getTargetPaths(Repository repo, List<RevCommit> BFCList) throws IOException {