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

16 files changed:
Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/CreateMtFileTask.java
Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/EfiCompressTask.java
Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FfsHeader.java
Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FileParser.java
Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FwImageTask.java
Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenCRC32SectionTask.java
Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFfsFileTask.java
Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenSectionTask.java
Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/MakeDeps.java
Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/ModifyInfTask.java
Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/SectFile.java
Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/SplitfileTask.java
Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/StrGatherTask.java
Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/StripTask.java
Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/Tool.java
Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/VfrCompilerTask.java

index 2d97d7b..bb7e323 100644 (file)
@@ -121,7 +121,7 @@ public class CreateMtFileTask extends Task implements EfiDefine {
                 //\r
                 // command execution fail\r
                 //\r
-                EdkLog.log(EdkLog.EDK_INFO, "ERROR = "+ Integer.toHexString(revl));\r
+                EdkLog.log(EdkLog.EDK_INFO, "ERROR = " + Integer.toHexString(revl));\r
                 throw new BuildException("CreateMtFile failed!");\r
             }\r
         } catch (Exception e) {\r
index 55e7fa7..ef06e13 100644 (file)
@@ -119,7 +119,7 @@ public class EfiCompressTask extends Task implements EfiDefine {
                 // command execution fail\r
                 //\r
                 EdkLog.log(EdkLog.EDK_INFO, "ERROR = " + Integer.toHexString(revl));\r
-                throw new BuildException("Strip failed!");\r
+                throw new BuildException("EfiCompress failed!");\r
 \r
             }\r
         } catch (Exception e) {\r
index 4af4919..24cb3df 100644 (file)
@@ -52,7 +52,7 @@ public class FfsHeader {
         **/     \r
         public void bufferToStruct (byte[] dataBuffer){\r
             if (dataBuffer.length != 16) {\r
-                throw new BuildException ("Buffer is not fitting GUID type!");\r
+                throw new BuildException ("Buffer is not sized [" + dataBuffer.length + "] for data type, GUID!");\r
             }\r
 \r
             data1 = (int)(dataBuffer[3]& 0xff);\r
index 982fd65..cc48b71 100644 (file)
@@ -46,7 +46,7 @@ public class  FileParser {
         String str;\r
         \r
         if (!file.exists()) {\r
-            throw new BuildException("The file" + file + "is not exist");           \r
+            throw new BuildException("The file, " + file + " does not exist!");           \r
         } \r
         try {\r
             fileReader = new FileReader(file);\r
@@ -69,4 +69,4 @@ public class  FileParser {
         }\r
     }\r
     \r
-}
\ No newline at end of file
+}\r
index 1021f1a..6612a03 100644 (file)
@@ -102,13 +102,13 @@ public class FwImageTask extends Task implements EfiDefine{
             log(this.peImageName);\r
             revl = runner.execute();\r
             if (EFI_SUCCESS == revl) {\r
-                log("fwimage succeeded!", Project.MSG_VERBOSE);\r
+                log("FwImage succeeded!", Project.MSG_VERBOSE);\r
             } else {\r
                 //\r
                 // command execution fail\r
                 //\r
                 log("ERROR = " + Integer.toHexString(revl));\r
-                throw new BuildException("fwimage failed!");\r
+                throw new BuildException("FwImage failed!");\r
             }\r
         } catch (Exception e) {\r
             throw new BuildException(e.getMessage());\r
index cf02466..6754beb 100644 (file)
@@ -96,12 +96,14 @@ public class GenCRC32SectionTask extends Task implements EfiDefine{
                 //\r
                 //  command execution success \r
                 //\r
-                log("gencrc32section succeeded!", Project.MSG_VERBOSE);\r
+                log("GenCRC32Section succeeded!", Project.MSG_VERBOSE);\r
             } else {\r
                 // \r
                 // command execution fail\r
                 //\r
                 log("ERROR = " + Integer.toHexString(revl));\r
+// LAH Added This Line\r
+                throw new BuildException("GenCRC32Section failed!");\r
             }\r
         } catch (Exception e) {\r
             throw new BuildException(e.getMessage());\r
index 2c46f09..117ef39 100644 (file)
@@ -142,7 +142,7 @@ public class GenFfsFileTask extends Task implements EfiDefine, FfsTypes {
         //  Check does the BaseName, Guid, FileType set value.\r
         //\r
         if (this.baseName.equals("")) {\r
-            throw new BuildException ("Must set BaseName!\n");\r
+            throw new BuildException ("Must set OutputFileBasename!\n");\r
         }\r
 \r
         if (this.ffsFileGuid.equals("")) {\r
@@ -296,7 +296,7 @@ public class GenFfsFileTask extends Task implements EfiDefine, FfsTypes {
                 if (fileSize == ffsHeader.getSize()) {\r
                     throw new BuildException (\r
                                              "FFS_ATTRIB_TAIL_PRESENT=TRUE is " +\r
-                                             "invalid for 0-length files"\r
+                                             "invalid for zero length files"\r
                                              );            \r
                 }\r
                 fileSize = fileSize + 2;\r
@@ -503,7 +503,7 @@ public class GenFfsFileTask extends Task implements EfiDefine, FfsTypes {
     public void setFfsAttribDataAlignment(String ffsAligment) {\r
         this.ffsAttribDataAlignment = stringToInt(ffsAligment.replaceAll(" ", "").toLowerCase());\r
         if (this.ffsAttribDataAlignment < 0 || this.ffsAttribDataAlignment > 7) {\r
-            throw new BuildException ("FFS_ATTRIB_DATA_ALIGMENT must be 0-7");\r
+            throw new BuildException ("FFS_ATTRIB_DATA_ALIGMENT must be an integer value from 0 through 7, inclusive");\r
         } else {\r
             attributes |= (((byte)this.ffsAttribDataAlignment) << 3);\r
         }\r
@@ -664,13 +664,13 @@ public class GenFfsFileTask extends Task implements EfiDefine, FfsTypes {
 \r
         byte[] buffer = new byte[16];\r
         if (GuidStr.length()!=36) {\r
-            throw new BuildException ("Guid length is not correct!");\r
+            throw new BuildException ("The GUID length [" + GuidStr.length() + "] is not correct!");\r
         }\r
 \r
 \r
         SplitStr = GuidStr.split("-");\r
         if (SplitStr.length != 5) {\r
-            throw new BuildException ("Guid type is not correct!");\r
+            throw new BuildException ("The GUID format is not correct!");\r
         }\r
 \r
 \r
@@ -974,7 +974,7 @@ public class GenFfsFileTask extends Task implements EfiDefine, FfsTypes {
         try {\r
             value = Integer.parseInt(intStringNoPrefix, radix);\r
         } catch (NumberFormatException e) {\r
-            log("Incorrect format of int (" + intString + "). -1 is assumed");\r
+            log("Incorrect format of int [" + intString + "]. -1 is assumed");\r
             return -1;\r
         }\r
 \r
index 25328a1..a631d93 100644 (file)
@@ -97,13 +97,13 @@ public class GenSectionTask extends Task implements EfiDefine {
             log(Commandline.toString(cmdline.getCommandline()), Project.MSG_VERBOSE);\r
             revl = runner.execute();\r
             if (EFI_SUCCESS == revl) {\r
-                log("gensection succeeded!", Project.MSG_VERBOSE);\r
+                log("GenSection succeeded!", Project.MSG_VERBOSE);\r
             } else {\r
                 //\r
                 // command execution fail\r
                 //\r
                 log("ERROR = " + Integer.toHexString(revl));\r
-                throw new BuildException("gensection failed!");\r
+                throw new BuildException("GenSection failed!");\r
             }\r
         } catch (Exception e) {\r
             throw new BuildException(e.getMessage());\r
index 5c04977..231a371 100644 (file)
@@ -187,7 +187,7 @@ public class MakeDeps extends Task {
 \r
         // change the old DEP file format (makefile compatible) to just file list\r
         if (!cleanup()) {\r
-            throw new BuildException(depsFile + " was not generated");\r
+            throw new BuildException(depsFile + " was not generated!");\r
         }\r
     }\r
 \r
index 82f161a..7e67fda 100644 (file)
@@ -71,7 +71,7 @@ public class ModifyInfTask extends Task implements EfiDefine {
         //\r
         // set Logger\r
         //\r
-        FrameworkLogger logger = new FrameworkLogger(project, "modifytask");\r
+        FrameworkLogger logger = new FrameworkLogger(project, "modifyinftask");\r
         EdkLog.setLogLevel(project.getProperty("env.LOGLEVEL"));\r
         EdkLog.setLogger(logger);\r
         //\r
index b4e153d..b603a3e 100644 (file)
@@ -67,7 +67,7 @@ public class SectFile implements Section {
         /// check if file exist.\r
         ///     \r
         if (! sectFile.exists()) {\r
-            throw new BuildException("The file  " + this.fileName + "  is not exist!\n");     \r
+            throw new BuildException("The file  " + this.fileName + "  does not exist!\n");     \r
         }\r
 \r
 \r
@@ -110,7 +110,7 @@ public class SectFile implements Section {
 \r
         } catch (Exception e) {\r
             System.out.print(e.getMessage());\r
-            throw new BuildException("section file2Buffer failed!\n");            \r
+            throw new BuildException("SectFile, toBuffer failed!\n");            \r
         }\r
     }\r
-}
\ No newline at end of file
+}\r
index b2fad5c..8dbb94b 100644 (file)
@@ -105,13 +105,13 @@ public class SplitfileTask extends Task implements EfiDefine {
                 //\r
                 // command execution success\r
                 //\r
-                EdkLog.log(EdkLog.EDK_VERBOSE, "splitfile succeeded!");\r
+                EdkLog.log(EdkLog.EDK_VERBOSE, "SplitFile succeeded!");\r
             } else {\r
                 //\r
                 // command execution fail\r
                 //\r
                 EdkLog.log(EdkLog.EDK_INFO, "ERROR = " + Integer.toHexString(revl));\r
-                throw new BuildException("splitfile failed!");\r
+                throw new BuildException("SplitFile failed!");\r
             }\r
         } catch (Exception e) {\r
             throw new BuildException(e.getMessage());\r
index ed8ef2d..6f9fc73 100644 (file)
@@ -153,13 +153,13 @@ public class StrGatherTask extends Task implements EfiDefine {
             log(this.commandType.substring(2));\r
             revl = runner.execute();\r
             if (EFI_SUCCESS == revl) {\r
-                log("strgather succeeded!", Project.MSG_VERBOSE);\r
+                log("StrGather succeeded!", Project.MSG_VERBOSE);\r
             } else {\r
                 ///\r
                 /// command execution fail\r
                 ///\r
                 log("ERROR = " + Integer.toHexString(revl));\r
-                throw new BuildException("strgather failed!");\r
+                throw new BuildException("StrGather failed!");\r
             }\r
         } catch (Exception e) {\r
             throw new BuildException(e.getMessage());\r
index 0f775a5..d6e9bed 100644 (file)
@@ -62,7 +62,7 @@ public class StripTask extends Task implements EfiDefine {
         //\r
         // set Logger\r
         //\r
-        FrameworkLogger logger = new FrameworkLogger(project, "edkStrip");\r
+        FrameworkLogger logger = new FrameworkLogger(project, "strip");\r
         EdkLog.setLogLevel(project.getProperty("env.LOGLEVEL"));\r
         EdkLog.setLogger(logger);\r
         //\r
@@ -72,7 +72,7 @@ public class StripTask extends Task implements EfiDefine {
         String command;\r
         String argument;\r
         if (path == null) {\r
-            command = "strip";\r
+            command = "Strip";\r
         } else {\r
             command = path + File.separatorChar + "Strip";\r
         }\r
index c784a50..67e0a86 100644 (file)
@@ -49,7 +49,7 @@ public class Tool implements EfiDefine, Section {
         try {\r
             executeTool ();\r
         } catch (Exception e) {\r
-            throw new BuildException("Call tools failed!\n");\r
+            throw new BuildException("Call to executeTool failed!\n");\r
         }\r
 \r
         ///\r
@@ -58,7 +58,7 @@ public class Tool implements EfiDefine, Section {
         OutputFile = new File (this.outPutFileName);\r
         long fileLen = OutputFile.length();\r
         if (!OutputFile.exists()) {\r
-            throw new BuildException("The file " + outPutFileName + " is not exist!\n");\r
+            throw new BuildException("The file " + outPutFileName + " does not exist!\n");\r
         }\r
 \r
         ///\r
@@ -91,7 +91,7 @@ public class Tool implements EfiDefine, Section {
 \r
         } catch (Exception e) {\r
             System.out.print(e.getMessage());\r
-            throw new BuildException("Call tool2buffer failed!\n");\r
+            throw new BuildException("Tool call, toBuffer failed!\n");\r
         }\r
     }\r
 \r
@@ -137,7 +137,7 @@ public class Tool implements EfiDefine, Section {
             crcProcess.waitFor();\r
         } catch (Exception e) {\r
             System.out.print (e.getMessage());\r
-            throw new BuildException("Execute tools fails!\n");\r
+            throw new BuildException("Execution of externalTool task failed!\n");\r
         }\r
     }\r
 \r
index 8d3a22d..052c24e 100644 (file)
@@ -210,13 +210,13 @@ public class VfrCompilerTask extends Task implements EfiDefine {
             log(vfrFileName);\r
             int returnVal = runner.execute();\r
             if (EFI_SUCCESS == returnVal) {\r
-                log("VfrCompiler succeeded!", Project.MSG_VERBOSE);\r
+                log("VfrCompile succeeded!", Project.MSG_VERBOSE);\r
             } else {\r
                 log("ERROR = " + Integer.toHexString(returnVal));\r
-                throw new BuildException("VfrCompiler failed!");\r
+                throw new BuildException("VfrCompile failed!");\r
             }\r
         } catch (IOException e) {\r
             throw new BuildException(e.getMessage());\r
         }\r
     }\r
-}
\ No newline at end of file
+}\r