X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Tools%2FSource%2FMigrationTools%2Forg%2Ftianocore%2Fmigration%2FSourceFileReplacer.java;h=03617ab7167cc61e51d0031b20be09fced2b994a;hb=90503bad37fea5edf22531754c203f77268dfa36;hp=34eb6be45478750a83e6d5523c772cf4854bbba7;hpb=e6a5df3bbd1d371ce18eebd0a692a50298cb31f3;p=mirror_edk2.git

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java b/Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java
index 34eb6be454..03617ab716 100644
--- a/Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java
@@ -71,7 +71,7 @@ public class SourceFileReplacer {
 		PrintWriter outfile;
 		String outname = null;
 		String inname = null;
-		if (ui.yesOrNo("Change Source Code is to be doing . See details ?")) {
+		if (ui.yesOrNo("Changes will be made to the Source Code.  View details?")) {
 			showdetails = true;
 		}
 		
@@ -84,8 +84,8 @@ public class SourceFileReplacer {
 				} else {
 					outname = inname;
 				}
-				ui.println("\nModifying file : " + inname);
-				mi.ensureDir(modulepath + File.separator + "result" + File.separator + outname);
+				ui.println("\nModifying file: " + inname);
+				Common.ensureDir(modulepath + File.separator + "result" + File.separator + outname);
 				outfile = new PrintWriter(new BufferedWriter(new FileWriter(modulepath + File.separator + "result" + File.separator + outname)));
 				outfile.append(sourcefilereplace(modulepath + File.separator + "temp" + File.separator + inname));
 				outfile.flush();
@@ -96,10 +96,10 @@ public class SourceFileReplacer {
 				} else {
 					outname = inname;
 				}
-				ui.println("\nCopying file : " + inname);
-				mi.ensureDir(modulepath + File.separator + "result" + File.separator + outname);
+				ui.println("\nCopying file: " + inname);
+				Common.ensureDir(modulepath + File.separator + "result" + File.separator + outname);
 				outfile = new PrintWriter(new BufferedWriter(new FileWriter(modulepath + File.separator + "result" + File.separator + outname)));
-				outfile.append(sourcefiletostring(modulepath + File.separator + "temp" + File.separator + inname));
+				outfile.append(Common.sourcefiletostring(modulepath + File.separator + "temp" + File.separator + inname));
 				outfile.flush();
 				outfile.close();
 			}
@@ -112,8 +112,8 @@ public class SourceFileReplacer {
 	
 	private void addr8only() throws Exception {
 		String paragraph = null;
-		String line = sourcefiletostring(Database.defaultpath + File.separator + "R8Lib.c");
-		mi.ensureDir(modulepath + File.separator + "result" + File.separator + "R8Lib.c");
+		String line = Common.sourcefiletostring(Database.defaultpath + File.separator + "R8Lib.c");
+		Common.ensureDir(modulepath + File.separator + "result" + File.separator + "R8Lib.c");
 		PrintWriter outfile1 = new PrintWriter(new BufferedWriter(new FileWriter(modulepath + File.separator + "result" + File.separator + "R8Lib.c")));
 		PrintWriter outfile2 = new PrintWriter(new BufferedWriter(new FileWriter(modulepath + File.separator + "result" + File.separator + "R8Lib.h")));
 		Pattern ptnr8only = Pattern.compile("////#?(\\w*)?.*?R8_(\\w*).*?////~", Pattern.DOTALL);
@@ -142,16 +142,6 @@ public class SourceFileReplacer {
 		mi.localmodulesources.add("R8Lib.c");
 	}
 	
-	private String sourcefiletostring(String filename) throws Exception {
-		BufferedReader rd = new BufferedReader(new FileReader(filename));
-		StringBuffer wholefile = new StringBuffer();
-		String line;
-		while ((line = rd.readLine()) != null) {
-			wholefile.append(line + "\n");
-		}
-		return wholefile.toString();
-	}
-	
 	// Caution : if there is @ in file , it will be replaced with \n , so is you use Doxygen ... God Bless you!
 	private String sourcefilereplace(String filename) throws Exception {
 		BufferedReader rd = new BufferedReader(new FileReader(filename));
@@ -173,7 +163,7 @@ public class SourceFileReplacer {
 		// replace BS -> gBS , RT -> gRT
 		Matcher mat = pat.matcher(line);
 		if (mat.find()) {												// add a library here
-			ui.println("Converting all BS->gBS,RT->gRT");
+			ui.println("Converting all BS->gBS, RT->gRT");
 			line = mat.replaceAll("g$1$2$3");							//unknown correctiveness
 		}
 		mat.reset();