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

Author: maxxbw

Diff for: lib/utils/FileUtil.java

@@ -1,16 +1,13 @@
 package javaToolkit.lib.utils;
 
 import java.io.BufferedReader;
-import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileReader;
-import java.io.FileWriter;
 import java.io.FilenameFilter;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.io.Writer;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -176,29 +173,6 @@ public static void copyDirectory(Path srcDirPath, Path destDirPath) {
 		}
 	}
 
-	public static void writeStringToFile(String filePath, String dataStr) {
-		BufferedWriter bufferedWriter = null;
-		try {
-			File file = new File(filePath);
-			if (!file.exists()) {
-				file.createNewFile();
-			}
-			Writer writer = new FileWriter(file);
-			bufferedWriter = new BufferedWriter(writer);
-			bufferedWriter.write(dataStr);
-		} catch (IOException e) {
-			e.printStackTrace();
-		} finally {
-			try {
-				if (bufferedWriter != null)
-					bufferedWriter.close();
-			} catch (Exception e) {
-				System.out.println("Write file error!");
-				e.printStackTrace();
-			}
-		}
-	}
-
 	public static String readStringFromFile(String filePath) {
 		try {
 			File file = new File(filePath);

Diff for: lib/utils/SRCUtil.java

@@ -1,5 +1,6 @@
 package javaToolkit.lib.utils;
 
+import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.List;
 
@@ -19,12 +20,12 @@ public static void changePackage(String oriSRCPath, String dstSRCPath, String ne
 			wrtStr += (line + "\n");
 		}
 
-		FileUtil.writeStringToFile(dstSRCPath, wrtStr);
+		FileUtil.writeStr2File(wrtStr, dstSRCPath);
 
 	}
 
-	public static void changePackage(String srcPath, String newPackName) {
-		List<String> srcStrList = FileUtil.readFileToLineList(Paths.get(srcPath));
+	public static void changePackage(Path srcPath, String newPackName) {
+		List<String> srcStrList = FileUtil.readFileToLineList(srcPath);
 
 		Boolean ifchanged = false;
 		String wrtStr = "";
@@ -37,7 +38,7 @@ public static void changePackage(String srcPath, String newPackName) {
 			wrtStr += (line + "\n");
 		}
 
-		FileUtil.writeStringToFile(srcPath, wrtStr);
+		FileUtil.writeStr2File(wrtStr, srcPath);
 
 	}