Follow changes on grammar in messages by Larry

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1263 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java b/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java
index fa1843f15ea2bea95a6cdb4c6f4261ae4832bc48..220b3e8d4064485e8e3302c74a914c4b21db565d 100644 (file)
--- a/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java
@@ -81,7 +81,7 @@ public class ModuleInfo {
                dirScan("");\r
                String filename = null;\r
                if (msaorinf.isEmpty()) {\r
                dirScan("");\r
                String filename = null;\r
                if (msaorinf.isEmpty()) {\r

-                       ui.println("No .inf nor .msa file found! Tool Halt!");\r
+                       ui.println("No INF nor MSA file found!");\r

                        System.exit(0);\r
                } else {\r
                        filename = ui.choose("Found .inf or .msa file in the module\nChoose one Please", msaorinf.toArray());\r
                        System.exit(0);\r
                } else {\r
                        filename = ui.choose("Found .inf or .msa file in the module\nChoose one Please", msaorinf.toArray());\r


@@ -99,7 +99,7 @@ public class ModuleInfo {
                new SourceFileReplacer(modulepath, this, db, ui).flush();       // some adding library actions are taken here,so it must be put before "MsaWriter"\r
                \r
                // show result\r
                new SourceFileReplacer(modulepath, this, db, ui).flush();       // some adding library actions are taken here,so it must be put before "MsaWriter"\r
                \r
                // show result\r

-               if (ui.yesOrNo("Parse Module Information Complete . See details ?")) {\r
+               if (ui.yesOrNo("Parse of the Module Information has completed. View details?")) {\r

                        ui.println("\nModule Information : ");\r
                        ui.println("Entrypoint : " + entrypoint);\r
                        show(protocol, "Protocol : ");\r
                        ui.println("\nModule Information : ");\r
                        ui.println("Entrypoint : " + entrypoint);\r
                        show(protocol, "Protocol : ");\r


@@ -122,8 +122,8 @@ public class ModuleInfo {
                \r
                ui.println("Errors Left : " + db.error);\r
                ui.println("Complete!");\r
                \r
                ui.println("Errors Left : " + db.error);\r
                ui.println("Complete!");\r

-               ui.println("Your R9 module is placed at " + modulepath + File.separator + "result");\r
-               ui.println("Your logfile is placed at " + modulepath);\r
+               ui.println("Your R9 module was placed here: " + modulepath + File.separator + "result");\r
+               ui.println("Your logfile was placed here: " + modulepath);\r

        }\r
        \r
        private void show(Set<String> hash, String show) {\r
        }\r
        \r
        private void show(Set<String> hash, String show) {\r

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java b/Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java
index 34eb6be45478750a83e6d5523c772cf4854bbba7..dbe981ef94adccedf98431c51986348b2b1c969f 100644 (file)
--- 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;\r
                String outname = null;\r
                String inname = null;\r
                PrintWriter outfile;\r
                String outname = null;\r
                String inname = null;\r

-               if (ui.yesOrNo("Change Source Code is to be doing . See details ?")) {\r
+               if (ui.yesOrNo("Changes will be made to the Source Code.  View details?")) {\r

                        showdetails = true;\r
                }\r
                \r
                        showdetails = true;\r
                }\r
                \r


@@ -84,7 +84,7 @@ public class SourceFileReplacer {
                                } else {\r
                                        outname = inname;\r
                                }\r
                                } else {\r
                                        outname = inname;\r
                                }\r

-                               ui.println("\nModifying file : " + inname);\r
+                               ui.println("\nModifying file: " + inname);\r

                                mi.ensureDir(modulepath + File.separator + "result" + File.separator + outname);\r
                                outfile = new PrintWriter(new BufferedWriter(new FileWriter(modulepath + File.separator + "result" + File.separator + outname)));\r
                                outfile.append(sourcefilereplace(modulepath + File.separator + "temp" + File.separator + inname));\r
                                mi.ensureDir(modulepath + File.separator + "result" + File.separator + outname);\r
                                outfile = new PrintWriter(new BufferedWriter(new FileWriter(modulepath + File.separator + "result" + File.separator + outname)));\r
                                outfile.append(sourcefilereplace(modulepath + File.separator + "temp" + File.separator + inname));\r


@@ -96,7 +96,7 @@ public class SourceFileReplacer {
                                } else {\r
                                        outname = inname;\r
                                }\r
                                } else {\r
                                        outname = inname;\r
                                }\r

-                               ui.println("\nCopying file : " + inname);\r
+                               ui.println("\nCopying file: " + inname);\r

                                mi.ensureDir(modulepath + File.separator + "result" + File.separator + outname);\r
                                outfile = new PrintWriter(new BufferedWriter(new FileWriter(modulepath + File.separator + "result" + File.separator + outname)));\r
                                outfile.append(sourcefiletostring(modulepath + File.separator + "temp" + File.separator + inname));\r
                                mi.ensureDir(modulepath + File.separator + "result" + File.separator + outname);\r
                                outfile = new PrintWriter(new BufferedWriter(new FileWriter(modulepath + File.separator + "result" + File.separator + outname)));\r
                                outfile.append(sourcefiletostring(modulepath + File.separator + "temp" + File.separator + inname));\r


@@ -173,7 +173,7 @@ public class SourceFileReplacer {
                // replace BS -> gBS , RT -> gRT\r
                Matcher mat = pat.matcher(line);\r
                if (mat.find()) {                                                                                               // add a library here\r
                // replace BS -> gBS , RT -> gRT\r
                Matcher mat = pat.matcher(line);\r
                if (mat.find()) {                                                                                               // add a library here\r

-                       ui.println("Converting all BS->gBS,RT->gRT");\r
+                       ui.println("Converting all BS->gBS, RT->gRT");\r

                        line = mat.replaceAll("g$1$2$3");                                                       //unknown correctiveness\r
                }\r
                mat.reset();\r
                        line = mat.replaceAll("g$1$2$3");                                                       //unknown correctiveness\r
                }\r
                mat.reset();\r