Merge branch 'master' of https://github.com/Programming-Toolkit/javaToolkit

Author: maxxbw

lib/utils/DiffUtil.java

@@ -53,12 +53,10 @@ public static int getChangedLineCount(String diffStr, String mode) {
 		return count;
 	}
 
-	public static List<Integer> getChangedLineNumListInNewVersion(String diffFilePath) {
-
+	public static List<Integer> getChangedLineNumListInNewVersion(String diffStr) {
 		List<Integer> changedLineNumList = new ArrayList<>();
 		try {
-			List<String> diffFileStrList = FileUtil.readFileToLineList(diffFilePath);
-			for (String line : diffFileStrList) {
+			for (String line : diffStr.split("\n")) {
 				if (line.startsWith("@@")) {
 					for (String tmp : line.split(" ")) {
 						if (tmp.trim().startsWith("+")) {
@@ -73,7 +71,6 @@ public static List<Integer> getChangedLineNumListInNewVersion(String diffFilePat
 			}
 		} catch (Exception e) {
 			// TODO: handle exception
-			System.out.println(diffFilePath);
 			e.printStackTrace();
 		}
 		return changedLineNumList;

lib/utils/SRCUtil.java

@@ -21,6 +21,25 @@ public static void changePackage(String oriSRCPath, String dstSRCPath, String ne
 		FileUtil.writeStringToFile(dstSRCPath, wrtStr);
 
 	}
+	
+	
+	public static void changePackage(String 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");
+		}
+
+		FileUtil.writeStringToFile(srcPath, wrtStr);
+
+	}
 
 	public static void main(String[] args) {
 		/*