Fixed grammar in messages.
authorlhauch <lhauch@6f19259b-4bc3-4df7-8a09-765794883524>
Mon, 14 Aug 2006 19:20:35 +0000 (19:20 +0000)
committerlhauch <lhauch@6f19259b-4bc3-4df7-8a09-765794883524>
Mon, 14 Aug 2006 19:20:35 +0000 (19:20 +0000)
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1257 6f19259b-4bc3-4df7-8a09-765794883524

Tools/Source/MigrationTools/org/tianocore/migration/Database.java
Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java
Tools/Source/MigrationTools/org/tianocore/migration/ModuleReader.java
Tools/Source/MigrationTools/org/tianocore/migration/MsaWriter.java
Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java

index 69cb62e..f33670e 100644 (file)
@@ -46,7 +46,7 @@ public class Database {
                Func lf;\r
                \r
                if (rd.ready()) {\r
-                       System.out.println("Found " + filename + " , Importing Library Database");\r
+                       System.out.println("Found " + filename + ", Importing Library Database.");\r
                        while ((line = rd.readLine()) != null) {\r
                                if (line.length() != 0) {\r
                                        linecontext = line.split(",");\r
@@ -64,7 +64,7 @@ public class Database {
                Guid gu;\r
                \r
                if (rd.ready()) {\r
-                       System.out.println("Found " + filename + " , Importing " + type + " Database");\r
+                       System.out.println("Found " + filename + ", Importing " + type + " Database.");\r
                        while ((line = rd.readLine()) != null) {\r
                                if (line.length() != 0) {\r
                                        linecontext = line.split(",");\r
@@ -82,7 +82,7 @@ public class Database {
                Macro mc;\r
                \r
                if (rd.ready()) {\r
-                       System.out.println("Found " + filename + " , Importing Macro Database");\r
+                       System.out.println("Found " + filename + ", Importing Macro Database.");\r
                        while ((line = rd.readLine()) != null) {\r
                                if (line.length() != 0) {\r
                                        linecontext = line.split(",");\r
index 72d39bb..b238551 100644 (file)
@@ -74,14 +74,14 @@ public class ModuleInfo {
                                } else if (list[i].contains(".uni")) {\r
                                        localmodulesources.add(list[i]);\r
                                } else if (list[i].contains(".inf")) {\r
-                                       if (ui.yesOrNo("Found .inf file : " + list[i] + "\nUse this file as this module's .inf ?")) {\r
+                                       if (ui.yesOrNo("Found .inf file : " + list[i] + "\nDo you want to use this file as this module's .inf?")) {\r
                                                hasInf = true;\r
                                                infname = list[i];\r
                                        } else {\r
                                                continue;\r
                                        }\r
                                } else if (list[i].contains(".msa")) {\r
-                                       if (ui.yesOrNo("Found .msa file : " + list[i] + "\nUse this file as this module's .msa ?")) {\r
+                                       if (ui.yesOrNo("Found .msa file : " + list[i] + "\nDo you want to use this file as this module's .msa?")) {\r
                                                hasMsa = true;\r
                                                msaname = list[i];\r
                                        } else {\r
@@ -97,7 +97,7 @@ public class ModuleInfo {
                } else if (hasMsa) {\r
                        mr.readMsa(msaname);\r
                } else {\r
-                       ui.println("No Inf Nor Msa Found");\r
+                       ui.println("No INF nor MSA file found!");\r
                }\r
                \r
                CommentOutNonLocalHFile();\r
@@ -106,7 +106,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
-               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
@@ -129,8 +129,8 @@ public class ModuleInfo {
                \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
@@ -291,4 +291,4 @@ public class ModuleInfo {
        public static void main(String[] args) throws Exception {\r
                FirstPanel.init();\r
        }\r
-}
\ No newline at end of file
+}\r
index f4cebde..3f379b7 100644 (file)
@@ -44,13 +44,13 @@ public class ModuleReader {
                Iterator<FilenameDocument.Filename> li = sourcefiles.getFilenameList().iterator();\r
                while (li.hasNext()) {\r
                        if (!mi.localmodulesources.contains(temp = li.next().toString())) {\r
-                               System.out.println("Source File Missing ! : " + temp);\r
+                               System.out.println("Source File Missing! : " + temp);\r
                        }\r
                }\r
        }\r
        \r
        public void readInf(String name) throws Exception {\r
-               System.out.println("Reading From Inf : " + name);\r
+               System.out.println("Parsing INF file: " + name);\r
                BufferedReader rd = new BufferedReader(new FileReader(modulepath + File.separator + name));\r
                String line;\r
                String[] linecontext;\r
@@ -66,7 +66,7 @@ public class ModuleReader {
                                                linecontext = line.split(" ");\r
                                                if (linecontext[2].length() != 0) {\r
                                                        if (!mi.localmodulesources.contains(linecontext[2])) {\r
-                                                               System.out.println("Source File Missing ! : " + linecontext[2]);\r
+                                                               System.out.println("Source File Missing! : " + linecontext[2]);\r
                                                        }\r
                                                }\r
                                        }\r
@@ -92,4 +92,4 @@ public class ModuleReader {
                        }\r
                }\r
        }\r
-}
\ No newline at end of file
+}\r
index 82e34ee..7d90769 100644 (file)
@@ -58,12 +58,12 @@ public class MsaWriter {
                if (mi.modulename != null) {\r
                        msaheader.setModuleName(mi.modulename);\r
                } else {\r
-                       msaheader.setModuleName(mi.modulename = Query("ModuleName Not Found . Please Input ModuleName"));\r
+                       msaheader.setModuleName(mi.modulename = Query("Module Name Not Found!  Please Input ModuleName"));\r
                }\r
                if (mi.guidvalue != null) {\r
                        msaheader.setGuidValue(mi.guidvalue);\r
                } else {\r
-                       msaheader.setGuidValue(mi.guidvalue = Query("GuidValue Not Found . Please Input GuidValue"));\r
+                       msaheader.setGuidValue(mi.guidvalue = Query("Guid Value Not Found!  Please Input Guid Value"));\r
                }\r
                if (mi.moduletype != null) {\r
                        if (mi.moduletype.contains("PEI")) {\r
@@ -72,7 +72,7 @@ public class MsaWriter {
                                msaheader.setModuleType(ModuleTypeDef.Enum.forString("DXE_DRIVER"));\r
                        }\r
                } else {\r
-                       msaheader.setModuleType(ModuleTypeDef.Enum.forString(mi.moduletype = Query("GuidValue Not Found . Please Input GuidValue")));\r
+                       msaheader.setModuleType(ModuleTypeDef.Enum.forString(mi.moduletype = Query("Guid Value Not Found!  Please Input Guid Value")));\r
                }\r
 \r
                msaheader.setCopyright("Copyright (c) 2006, Intel Corporation");\r
index 6f56e51..2df0ffd 100644 (file)
@@ -70,7 +70,7 @@ public class SourceFileReplacer {
        public void flush() throws Exception {\r
                PrintWriter outfile;\r
                String temp = 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
                File tempdir = new File(modulepath + File.separator + "result" + File.separator);\r
@@ -78,7 +78,7 @@ public class SourceFileReplacer {
                String[] list = new File(modulepath + File.separator + "temp").list();  //what I change is the non-local .h commented-out files\r
                for (int i = 0 ; i < list.length ; i++) {\r
                        if (list[i].contains(".c")) {\r
-                               ui.println("\nModifying file : " + list[i]);\r
+                               ui.println("\nModifying file: " + list[i]);\r
                                outfile = new PrintWriter(new BufferedWriter(new FileWriter(modulepath + File.separator + "result" + File.separator + list[i])));\r
                                outfile.append(sourcefilereplace(modulepath + File.separator + "temp" + File.separator + list[i]));\r
                                outfile.flush();\r
@@ -93,7 +93,7 @@ public class SourceFileReplacer {
                                } else {\r
                                        continue;\r
                                }\r
-                               ui.println("\nCopying file : " + temp);\r
+                               ui.println("\nCopying file: " + temp);\r
                                outfile = new PrintWriter(new BufferedWriter(new FileWriter(modulepath + File.separator + "result" + File.separator + temp)));\r
                                outfile.append(sourcefiletostring(modulepath + File.separator + "temp" + File.separator + list[i]));\r
                                outfile.flush();\r
@@ -167,7 +167,7 @@ public class SourceFileReplacer {
                // 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