Fixed grammar in messages.

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

16 files changed, 36 insertions, 34 deletions

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/CreateMtFileTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/CreateMtFileTask.java
index 2d97d7b..bb7e323 100644
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/CreateMtFileTask.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/CreateMtFileTask.java
@@ -121,7 +121,7 @@ public class CreateMtFileTask extends Task implements EfiDefine {
                 //

                 // command execution fail

                 //

-                EdkLog.log(EdkLog.EDK_INFO, "ERROR = "+ Integer.toHexString(revl));

+                EdkLog.log(EdkLog.EDK_INFO, "ERROR = " + Integer.toHexString(revl));

                 throw new BuildException("CreateMtFile failed!");

             }

         } catch (Exception e) {

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/EfiCompressTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/EfiCompressTask.java
index 55e7fa7..ef06e13 100644
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/EfiCompressTask.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/EfiCompressTask.java
@@ -119,7 +119,7 @@ public class EfiCompressTask extends Task implements EfiDefine {
                 // command execution fail

                 //

                 EdkLog.log(EdkLog.EDK_INFO, "ERROR = " + Integer.toHexString(revl));

-                throw new BuildException("Strip failed!");

+                throw new BuildException("EfiCompress failed!");

 

             }

         } catch (Exception e) {

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FfsHeader.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FfsHeader.java
index 4af4919..24cb3df 100644
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FfsHeader.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FfsHeader.java
@@ -52,7 +52,7 @@ public class FfsHeader {
         **/     

         public void bufferToStruct (byte[] dataBuffer){

             if (dataBuffer.length != 16) {

-                throw new BuildException ("Buffer is not fitting GUID type!");

+                throw new BuildException ("Buffer is not sized [" + dataBuffer.length + "] for data type, GUID!");

             }

 

             data1 = (int)(dataBuffer[3]& 0xff);

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FileParser.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FileParser.java
index 982fd65..cc48b71 100644
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FileParser.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FileParser.java
@@ -46,7 +46,7 @@ public class  FileParser {
         String str;

         

         if (!file.exists()) {

-            throw new BuildException("The file" + file + "is not exist");           

+            throw new BuildException("The file, " + file + " does not exist!");           

         } 

         try {

             fileReader = new FileReader(file);

@@ -69,4 +69,4 @@ public class  FileParser {
         }

     }

     

-}
\ No newline at end of file
+}

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FwImageTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FwImageTask.java
index 1021f1a..6612a03 100644
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FwImageTask.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/FwImageTask.java
@@ -102,13 +102,13 @@ public class FwImageTask extends Task implements EfiDefine{
             log(this.peImageName);

             revl = runner.execute();

             if (EFI_SUCCESS == revl) {

-                log("fwimage succeeded!", Project.MSG_VERBOSE);

+                log("FwImage succeeded!", Project.MSG_VERBOSE);

             } else {

                 //

                 // command execution fail

                 //

                 log("ERROR = " + Integer.toHexString(revl));

-                throw new BuildException("fwimage failed!");

+                throw new BuildException("FwImage failed!");

             }

         } catch (Exception e) {

             throw new BuildException(e.getMessage());

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenCRC32SectionTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenCRC32SectionTask.java
index cf02466..6754beb 100644
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenCRC32SectionTask.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenCRC32SectionTask.java
@@ -96,12 +96,14 @@ public class GenCRC32SectionTask extends Task implements EfiDefine{
                 //

                 //  command execution success 

                 //

-                log("gencrc32section succeeded!", Project.MSG_VERBOSE);

+                log("GenCRC32Section succeeded!", Project.MSG_VERBOSE);

             } else {

                 // 

                 // command execution fail

                 //

                 log("ERROR = " + Integer.toHexString(revl));

+// LAH Added This Line

+                throw new BuildException("GenCRC32Section failed!");

             }

         } catch (Exception e) {

             throw new BuildException(e.getMessage());

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFfsFileTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFfsFileTask.java
index 2c46f09..117ef39 100644
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFfsFileTask.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenFfsFileTask.java
@@ -142,7 +142,7 @@ public class GenFfsFileTask extends Task implements EfiDefine, FfsTypes {
         //  Check does the BaseName, Guid, FileType set value.

         //

         if (this.baseName.equals("")) {

-            throw new BuildException ("Must set BaseName!\n");

+            throw new BuildException ("Must set OutputFileBasename!\n");

         }

 

         if (this.ffsFileGuid.equals("")) {

@@ -296,7 +296,7 @@ public class GenFfsFileTask extends Task implements EfiDefine, FfsTypes {
                 if (fileSize == ffsHeader.getSize()) {

                     throw new BuildException (

                                              "FFS_ATTRIB_TAIL_PRESENT=TRUE is " +

-                                             "invalid for 0-length files"

+                                             "invalid for zero length files"

                                              );            

                 }

                 fileSize = fileSize + 2;

@@ -503,7 +503,7 @@ public class GenFfsFileTask extends Task implements EfiDefine, FfsTypes {
     public void setFfsAttribDataAlignment(String ffsAligment) {

         this.ffsAttribDataAlignment = stringToInt(ffsAligment.replaceAll(" ", "").toLowerCase());

         if (this.ffsAttribDataAlignment < 0 || this.ffsAttribDataAlignment > 7) {

-            throw new BuildException ("FFS_ATTRIB_DATA_ALIGMENT must be 0-7");

+            throw new BuildException ("FFS_ATTRIB_DATA_ALIGMENT must be an integer value from 0 through 7, inclusive");

         } else {

             attributes |= (((byte)this.ffsAttribDataAlignment) << 3);

         }

@@ -664,13 +664,13 @@ public class GenFfsFileTask extends Task implements EfiDefine, FfsTypes {
 

         byte[] buffer = new byte[16];

         if (GuidStr.length()!=36) {

-            throw new BuildException ("Guid length is not correct!");

+            throw new BuildException ("The GUID length [" + GuidStr.length() + "] is not correct!");

         }

 

 

         SplitStr = GuidStr.split("-");

         if (SplitStr.length != 5) {

-            throw new BuildException ("Guid type is not correct!");

+            throw new BuildException ("The GUID format is not correct!");

         }

 

 

@@ -974,7 +974,7 @@ public class GenFfsFileTask extends Task implements EfiDefine, FfsTypes {
         try {

             value = Integer.parseInt(intStringNoPrefix, radix);

         } catch (NumberFormatException e) {

-            log("Incorrect format of int (" + intString + "). -1 is assumed");

+            log("Incorrect format of int [" + intString + "]. -1 is assumed");

             return -1;

         }

 

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenSectionTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenSectionTask.java
index 25328a1..a631d93 100644
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenSectionTask.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/GenSectionTask.java
@@ -97,13 +97,13 @@ public class GenSectionTask extends Task implements EfiDefine {
             log(Commandline.toString(cmdline.getCommandline()), Project.MSG_VERBOSE);

             revl = runner.execute();

             if (EFI_SUCCESS == revl) {

-                log("gensection succeeded!", Project.MSG_VERBOSE);

+                log("GenSection succeeded!", Project.MSG_VERBOSE);

             } else {

                 //

                 // command execution fail

                 //

                 log("ERROR = " + Integer.toHexString(revl));

-                throw new BuildException("gensection failed!");

+                throw new BuildException("GenSection failed!");

             }

         } catch (Exception e) {

             throw new BuildException(e.getMessage());

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/MakeDeps.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/MakeDeps.java
index 5c04977..231a371 100644
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/MakeDeps.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/MakeDeps.java
@@ -187,7 +187,7 @@ public class MakeDeps extends Task {
 

         // change the old DEP file format (makefile compatible) to just file list

         if (!cleanup()) {

-            throw new BuildException(depsFile + " was not generated");

+            throw new BuildException(depsFile + " was not generated!");

         }

     }

 

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/ModifyInfTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/ModifyInfTask.java
index 82f161a..7e67fda 100644
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/ModifyInfTask.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/ModifyInfTask.java
@@ -71,7 +71,7 @@ public class ModifyInfTask extends Task implements EfiDefine {
         //

         // set Logger

         //

-        FrameworkLogger logger = new FrameworkLogger(project, "modifytask");

+        FrameworkLogger logger = new FrameworkLogger(project, "modifyinftask");

         EdkLog.setLogLevel(project.getProperty("env.LOGLEVEL"));

         EdkLog.setLogger(logger);

         //

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/SectFile.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/SectFile.java
index b4e153d..b603a3e 100644
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/SectFile.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/SectFile.java
@@ -67,7 +67,7 @@ public class SectFile implements Section {
         /// check if file exist.

         ///     

         if (! sectFile.exists()) {

-            throw new BuildException("The file  " + this.fileName + "  is not exist!\n");     

+            throw new BuildException("The file  " + this.fileName + "  does not exist!\n");     

         }

 

 

@@ -110,7 +110,7 @@ public class SectFile implements Section {
 

         } catch (Exception e) {

             System.out.print(e.getMessage());

-            throw new BuildException("section file2Buffer failed!\n");            

+            throw new BuildException("SectFile, toBuffer failed!\n");            

         }

     }

-}
\ No newline at end of file
+}

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/SplitfileTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/SplitfileTask.java
index b2fad5c..8dbb94b 100644
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/SplitfileTask.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/SplitfileTask.java
@@ -105,13 +105,13 @@ public class SplitfileTask extends Task implements EfiDefine {
                 //

                 // command execution success

                 //

-                EdkLog.log(EdkLog.EDK_VERBOSE, "splitfile succeeded!");

+                EdkLog.log(EdkLog.EDK_VERBOSE, "SplitFile succeeded!");

             } else {

                 //

                 // command execution fail

                 //

                 EdkLog.log(EdkLog.EDK_INFO, "ERROR = " + Integer.toHexString(revl));

-                throw new BuildException("splitfile failed!");

+                throw new BuildException("SplitFile failed!");

             }

         } catch (Exception e) {

             throw new BuildException(e.getMessage());

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/StrGatherTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/StrGatherTask.java
index ed8ef2d..6f9fc73 100644
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/StrGatherTask.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/StrGatherTask.java
@@ -153,13 +153,13 @@ public class StrGatherTask extends Task implements EfiDefine {
             log(this.commandType.substring(2));

             revl = runner.execute();

             if (EFI_SUCCESS == revl) {

-                log("strgather succeeded!", Project.MSG_VERBOSE);

+                log("StrGather succeeded!", Project.MSG_VERBOSE);

             } else {

                 ///

                 /// command execution fail

                 ///

                 log("ERROR = " + Integer.toHexString(revl));

-                throw new BuildException("strgather failed!");

+                throw new BuildException("StrGather failed!");

             }

         } catch (Exception e) {

             throw new BuildException(e.getMessage());

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/StripTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/StripTask.java
index 0f775a5..d6e9bed 100644
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/StripTask.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/StripTask.java
@@ -62,7 +62,7 @@ public class StripTask extends Task implements EfiDefine {
         //

         // set Logger

         //

-        FrameworkLogger logger = new FrameworkLogger(project, "edkStrip");

+        FrameworkLogger logger = new FrameworkLogger(project, "strip");

         EdkLog.setLogLevel(project.getProperty("env.LOGLEVEL"));

         EdkLog.setLogger(logger);

         //

@@ -72,7 +72,7 @@ public class StripTask extends Task implements EfiDefine {
         String command;

         String argument;

         if (path == null) {

-            command = "strip";

+            command = "Strip";

         } else {

             command = path + File.separatorChar + "Strip";

         }

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/Tool.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/Tool.java
index c784a50..67e0a86 100644
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/Tool.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/Tool.java
@@ -49,7 +49,7 @@ public class Tool implements EfiDefine, Section {
         try {

             executeTool ();

         } catch (Exception e) {

-            throw new BuildException("Call tools failed!\n");

+            throw new BuildException("Call to executeTool failed!\n");

         }

 

         ///

@@ -58,7 +58,7 @@ public class Tool implements EfiDefine, Section {
         OutputFile = new File (this.outPutFileName);

         long fileLen = OutputFile.length();

         if (!OutputFile.exists()) {

-            throw new BuildException("The file " + outPutFileName + " is not exist!\n");

+            throw new BuildException("The file " + outPutFileName + " does not exist!\n");

         }

 

         ///

@@ -91,7 +91,7 @@ public class Tool implements EfiDefine, Section {
 

         } catch (Exception e) {

             System.out.print(e.getMessage());

-            throw new BuildException("Call tool2buffer failed!\n");

+            throw new BuildException("Tool call, toBuffer failed!\n");

         }

     }

 

@@ -137,7 +137,7 @@ public class Tool implements EfiDefine, Section {
             crcProcess.waitFor();

         } catch (Exception e) {

             System.out.print (e.getMessage());

-            throw new BuildException("Execute tools fails!\n");

+            throw new BuildException("Execution of externalTool task failed!\n");

         }

     }

 

diff --git a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/VfrCompilerTask.java b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/VfrCompilerTask.java
index 8d3a22d..052c24e 100644
--- a/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/VfrCompilerTask.java
+++ b/Tools/Source/FrameworkTasks/org/tianocore/framework/tasks/VfrCompilerTask.java
@@ -210,13 +210,13 @@ public class VfrCompilerTask extends Task implements EfiDefine {
             log(vfrFileName);

             int returnVal = runner.execute();

             if (EFI_SUCCESS == returnVal) {

-                log("VfrCompiler succeeded!", Project.MSG_VERBOSE);

+                log("VfrCompile succeeded!", Project.MSG_VERBOSE);

             } else {

                 log("ERROR = " + Integer.toHexString(returnVal));

-                throw new BuildException("VfrCompiler failed!");

+                throw new BuildException("VfrCompile failed!");

             }

         } catch (IOException e) {

             throw new BuildException(e.getMessage());

         }

     }

-}
\ No newline at end of file
+}