improve utils

Author: maxxbw

lib/utils/DiffUtil.java

@@ -1,9 +1,10 @@
 package javaToolkit.lib.utils;
 
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 public class DiffUtil {
 
@@ -84,25 +85,20 @@ public static List<Integer> getChangedLineNumListInNewVersion(String diffStr) {
 		return changedLineNumList;
 	}
 
-	public static List<String> getModifiedFileList(String diffFilePathString) {
-		/**
-		 * can to be further improved in future
-		 */
-		Path diffFilePath = Paths.get(diffFilePathString);
-		List<String> modifiedFileRelPathList = new ArrayList<String>();
+	public static List<Map<String, String>> getModifiedFileList(Path diffFilePath) {
+		List<Map<String, String>> modifiedFileRelPathList = new ArrayList<Map<String, String>>();
 		for (String line : FileUtil.readFileToLineList(diffFilePath)) {
 			if (line.startsWith("diff --git ")) {
 				// Heuristic
-				String fileRelPath = line.replace("diff --git ", "").split(" ")[0].replaceFirst("a/", "").trim();
-				modifiedFileRelPathList.add(fileRelPath);
+				String oldFileRelPath = line.replace("diff --git ", "").split(" ")[0].replaceFirst("a/", "").trim();
+				String newFileRelPath = line.replace("diff --git ", "").split(" ")[1].replaceFirst("b/", "").trim();
+				Map<String, String> oldNnewMap = new HashMap<String, String>();
+				oldNnewMap.put("old", oldFileRelPath);
+				oldNnewMap.put("new", newFileRelPath);
+				modifiedFileRelPathList.add(oldNnewMap);
 			}
 		}
 		return modifiedFileRelPathList;
 	}
 
-	public static void main(String[] args) {
-		String diffFilePath = "/media/sf__3_fix_groups/RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE/delete redundent null check/27769/diff.txt";
-		getModifiedFileList(diffFilePath);
-	}
-
 }

lib/utils/FileUtil.java

@@ -2,12 +2,10 @@
 
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.FilenameFilter;
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -173,36 +171,6 @@ public static void copyDirectory(Path srcDirPath, Path destDirPath) {
 		}
 	}
 
-	public static String readStringFromFile(String filePath) {
-		try {
-			File file = new File(filePath);
-			if (file.isFile() && file.exists()) {
-				InputStreamReader read = new InputStreamReader(new FileInputStream(file));
-				BufferedReader bufferedReader = new BufferedReader(read);
-				StringBuilder stringBuilder = new StringBuilder();
-				String line = null;
-				String ls = System.getProperty("line.separator");
-				while ((line = bufferedReader.readLine()) != null) {
-					stringBuilder.append(line);
-					stringBuilder.append(ls);
-				}
-
-				// delete the last new line separator
-				stringBuilder.deleteCharAt(stringBuilder.length() - 1);
-				bufferedReader.close();
-
-				String content = stringBuilder.toString();
-				return content;
-			} else {
-				System.out.printf("File not found! %s\n", filePath);
-			}
-		} catch (Exception e) {
-			System.out.println("Read file error!");
-			e.printStackTrace();
-		}
-		return null;
-	}
-
 	/**
 	 * there is no \newline at the end of each line
 	 *

lib/utils/SRCUtil.java

@@ -1,56 +1,30 @@
 package javaToolkit.lib.utils;
 
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.List;
 
 public class SRCUtil {
 
-	public static void changePackage(String oriSRCPath, String dstSRCPath, String newPackName) {
-		List<String> srcStrList = FileUtil.readFileToLineList(Paths.get(oriSRCPath));
+	public static String changePackage(Path SRCPath, String newPackName) {
+		List<String> srcStrList = FileUtil.readFileToLineList(SRCPath);
 
 		Boolean ifchanged = false;
-		String wrtStr = "package " + newPackName + ";";
+		String wrtStr = "";
 		for (int i = 0; i < srcStrList.size(); i++) {
 			String line = srcStrList.get(i);
 			if (line.trim().startsWith("package ") && !ifchanged) {
+				wrtStr += ("package " + newPackName + ";\n");
 				ifchanged = true;
 			} else {
 				wrtStr += (line + "\n");
 			}
 		}
 
-		FileUtil.writeStr2File(wrtStr, dstSRCPath);
-
-	}
-
-	public static void changePackage(Path srcPath, String newPackName) {
-		List<String> srcStrList = FileUtil.readFileToLineList(srcPath);
-
-		Boolean ifchanged = false;
-		String wrtStr = "";
-		for (int i = 0; i < srcStrList.size(); i++) {
-			String line = srcStrList.get(i);
-			if (line.trim().startsWith("package ") && !ifchanged) {
-				line = "package " + newPackName + ";";
-				ifchanged = true;
-			}
-			wrtStr += (line + "\n");
+		if (!ifchanged) {
+			wrtStr = "package " + newPackName + ";\n" + wrtStr;
 		}
-
-		FileUtil.writeStr2File(wrtStr, srcPath);
-
-	}
-
-	public static void main(String[] args) {
-		/*
-		 * test purpose
-		 */
-		String oriPathString = "/home/appevolve/Desktop/2019_ISSTA_AE_225/run/Update_Example_Analysis+API-Usage_Update/EPR-Data/RepositoryWriter.java";
-		String dstPathString = "/home/appevolve/Desktop/2019_ISSTA_AE_225/run/Update_Example_Analysis+API-Usage_Update/EPR-Data/RepositoryWriter_tmp.java";
-		String newPackString = "main";
-		changePackage(oriPathString, dstPathString, newPackString);
-		System.out.println("Finished!");
+		
+		return wrtStr.trim();
 
 	}