update from larc1

Author: maxxbw

lib/utils/DiffUtil.java

@@ -29,9 +29,9 @@ public static List<Integer> getChangedLineNumListInOldVersion(String diffStr) {
 		return changedLineNumList;
 	}
 
-	
 	/**
 	 * the mode can only be "add" or "delete"
+	 * 
 	 * @param diffStr
 	 * @param mode
 	 * @return
@@ -47,7 +47,13 @@ public static int getChangedLineCount(String diffStr, String mode) {
 		}
 		for (String line : diffStr.split("\n")) {
 			if (line.startsWith(symbol) && !line.startsWith("---") && !line.startsWith("+++")) {
-				count++;
+				// if the line is comment
+				if (line.substring(1).trim().startsWith("*") || line.substring(1).trim().startsWith("/*")
+						|| line.substring(1).trim().startsWith("//")) {
+					continue;
+				} else {
+					count++;
+				}
 			}
 		}
 		return count;

lib/utils/FileUtil.java

@@ -52,10 +52,10 @@ public boolean accept(File current, String name) {
 		return directories;
 	}
 
-	public static String readFile2Str(String fpath) {
+	public static String readFile2Str(Path fpath) {
 		String content = "";
 		try {
-			content = new String(Files.readAllBytes(Paths.get(fpath)));
+			content = new String(Files.readAllBytes(fpath));
 		} catch (IOException e) {
 			System.out.printf("%s not found!", fpath);
 			e.printStackTrace();

lib/utils/GitUtil.java

@@ -10,14 +10,14 @@
 
 public class GitUtil {
 
-	public static Boolean clone(String repoName, String usrName, Path targetDir) {
+	public static Boolean clone(String usrName, String repoName, Path targetDir) {
 
 		if (targetDir.toFile().exists()) {
 			FileUtil.deleteDirectory(targetDir.toFile());
 		}
 		targetDir.toFile().mkdirs();
 
-		String cmd = "timeout 600 git clone https://github.com/" + repoName + "/" + usrName + " " + targetDir;
+		String cmd = "timeout 600 git clone https://github.com/" + usrName + "/" + repoName + " " + targetDir;
 
 		ProcessUtil.ProcessReporter pr = ProcessUtil.executeCMD(cmd, null, targetDir, 0);
 		if (pr.exitCode == 0) {
@@ -174,9 +174,6 @@ public static Boolean checkout(Path repoDir, String com, Boolean ifForce) {
 		}
 
 		String defaultBranchNameString = getDefaultBranch(repoDir);
-		if (defaultBranchNameString == null || defaultBranchNameString == "") {
-			defaultBranchNameString = "master";
-		}
 
 		String checkoutCMD = null;
 		if (com == null) { // checkout latest if null
@@ -208,8 +205,13 @@ private static String getDefaultBranch(Path gitDirPath) {
 		// TODO Auto-generated method stub
 		String cmdString = "git symbolic-ref refs/remotes/origin/HEAD";
 		ProcessUtil.ProcessReporter pr = ProcessUtil.executeCMD(cmdString, null, gitDirPath, 0);
+
 		// output refs/remotes/origin/master
-		return pr.out.trim().split("refs/remotes/origin/")[1].trim();
+		if (pr.out.trim().contains("refs/remotes/origin/")) {
+			return pr.out.trim().split("refs/remotes/origin/")[1].trim();
+		} else {
+			return "master";
+		}
 
 	}
 

lib/utils/ProcessUtil.java

@@ -77,6 +77,7 @@ public static ProcessReporter executeCMD(String cmd, String[] envp, Path workDir
 			}
 		} catch (Exception e) {
 			TimeUtil.printCurTimewithMsg(pr.toString());
+			TimeUtil.printCurTimewithMsg("WorkingDir " + workDir.toString());
 			e.printStackTrace();
 		}