Fixed grammar in messages.

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

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java
index 6d9f84d6896fb28e817b3f8a5b99999fc2ee19f1..096fec5810359f1e9f28fef6be36ab82c2db299a 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java
@@ -1145,7 +1145,7 @@ public class FpdFileContents {
                 \r
                 if (value > 0xFF) {\r
 //                   "[FPD file error] The datum type of PCD %s in %s is VOID*, "+\r
                 \r
                 if (value > 0xFF) {\r
 //                   "[FPD file error] The datum type of PCD %s in %s is VOID*, "+\r

-//                   "it is byte array in fact. But the element of %s exceed the byte range",\r
+//                   "it must be a byte array. But the element of %s exceed the byte range",\r

                     throw new PcdValueMalFormed (datum);                               \r
                 }\r
             }\r
                     throw new PcdValueMalFormed (datum);                               \r
                 }\r
             }\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdHeader.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdHeader.java
index 6c583f3c06b4cb81ac13fb04e7885871e8448406..0e3c9517e87b919c9be50f1cb446d4050a7c747d 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdHeader.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdHeader.java
@@ -143,7 +143,7 @@ public class FpdHeader extends IInternalFrame {
             jTextFieldBaseName.addFocusListener(new FocusAdapter(){\r
                public void focusLost(FocusEvent e) {\r
                    if (!DataValidation.isUiNameType(jTextFieldBaseName.getText())) {\r
             jTextFieldBaseName.addFocusListener(new FocusAdapter(){\r
                public void focusLost(FocusEvent e) {\r
                    if (!DataValidation.isUiNameType(jTextFieldBaseName.getText())) {\r

-                       JOptionPane.showMessageDialog(frame, "Package Name is NOT UiNameType.");\r
+                       JOptionPane.showMessageDialog(frame, "Package Name does not match the UiNameType datatype.");\r

                        return;\r
                    }\r
                    if (jTextFieldBaseName.getText().equals(ffc.getFpdHdrPlatformName())) {\r
                        return;\r
                    }\r
                    if (jTextFieldBaseName.getText().equals(ffc.getFpdHdrPlatformName())) {\r


@@ -171,7 +171,7 @@ public class FpdHeader extends IInternalFrame {
             jTextFieldGuid.addFocusListener(new FocusAdapter(){\r
                 public void focusLost(FocusEvent e) {\r
                     if (!DataValidation.isGuid(jTextFieldGuid.getText())) {\r
             jTextFieldGuid.addFocusListener(new FocusAdapter(){\r
                 public void focusLost(FocusEvent e) {\r
                     if (!DataValidation.isGuid(jTextFieldGuid.getText())) {\r

-                        JOptionPane.showMessageDialog(frame, "Guid is NOT GuidType.");\r
+                        JOptionPane.showMessageDialog(frame, "Guid must be in registry (8-4-4-4-12) format.");\r

                         return;\r
                     }\r
                     if (jTextFieldGuid.getText().equals(ffc.getFpdHdrGuidValue())) {\r
                         return;\r
                     }\r
                     if (jTextFieldGuid.getText().equals(ffc.getFpdHdrGuidValue())) {\r


@@ -199,7 +199,7 @@ public class FpdHeader extends IInternalFrame {
             jTextFieldVersion.addFocusListener(new FocusAdapter(){\r
                 public void focusLost(FocusEvent e) {\r
                     if (!DataValidation.isVersion(jTextFieldVersion.getText())) {\r
             jTextFieldVersion.addFocusListener(new FocusAdapter(){\r
                 public void focusLost(FocusEvent e) {\r
                     if (!DataValidation.isVersion(jTextFieldVersion.getText())) {\r

-                        JOptionPane.showMessageDialog(frame, "Version is NOT version type.");\r
+                        JOptionPane.showMessageDialog(frame, "Version does not match the Version datatype.");\r

                         return;\r
                     }\r
                     if (jTextFieldVersion.getText().equals(ffc.getFpdHdrVer())) {\r
                         return;\r
                     }\r
                     if (jTextFieldVersion.getText().equals(ffc.getFpdHdrVer())) {\r


@@ -243,7 +243,7 @@ public class FpdHeader extends IInternalFrame {
             jTextAreaLicense.addFocusListener(new FocusAdapter(){\r
                 public void focusLost(FocusEvent e) {\r
                     if (jTextAreaLicense.getText().length() == 0) {\r
             jTextAreaLicense.addFocusListener(new FocusAdapter(){\r
                 public void focusLost(FocusEvent e) {\r
                     if (jTextAreaLicense.getText().length() == 0) {\r

-                        JOptionPane.showMessageDialog(frame, "License contents could NOT be empty.");\r
+                        JOptionPane.showMessageDialog(frame, "License must be entered!");\r

                         return;\r
                     }\r
                     if (jTextAreaLicense.getText().equals(ffc.getFpdHdrLicense())) {\r
                         return;\r
                     }\r
                     if (jTextAreaLicense.getText().equals(ffc.getFpdHdrLicense())) {\r


@@ -270,7 +270,7 @@ public class FpdHeader extends IInternalFrame {
             jTextAreaDescription.addFocusListener(new FocusAdapter(){\r
                 public void focusLost(FocusEvent e) {\r
                     if (jTextAreaDescription.getText().length() == 0) {\r
             jTextAreaDescription.addFocusListener(new FocusAdapter(){\r
                 public void focusLost(FocusEvent e) {\r
                     if (jTextAreaDescription.getText().length() == 0) {\r

-                        JOptionPane.showMessageDialog(frame, "Description contents could NOT be empty.");\r
+                        JOptionPane.showMessageDialog(frame, "Description must be entered.");\r

                         return;\r
                     }\r
                     if (jTextAreaDescription.getText().equals(ffc.getFpdHdrDescription())) {\r
                         return;\r
                     }\r
                     if (jTextAreaDescription.getText().equals(ffc.getFpdHdrDescription())) {\r


@@ -386,7 +386,7 @@ public class FpdHeader extends IInternalFrame {
             jTextFieldAbstract.addFocusListener(new FocusAdapter(){\r
                 public void focusLost(FocusEvent e) {\r
                     if (!DataValidation.isAbstract(jTextFieldAbstract.getText())) {\r
             jTextFieldAbstract.addFocusListener(new FocusAdapter(){\r
                 public void focusLost(FocusEvent e) {\r
                     if (!DataValidation.isAbstract(jTextFieldAbstract.getText())) {\r

-                        JOptionPane.showMessageDialog(frame, "Abstract could NOT be empty.");\r
+                        JOptionPane.showMessageDialog(frame, "Abstract must be entered.");\r

                         return;\r
                     }\r
                     if (jTextFieldAbstract.getText().equals(ffc.getFpdHdrAbs())) {\r
                         return;\r
                     }\r
                     if (jTextFieldAbstract.getText().equals(ffc.getFpdHdrAbs())) {\r


@@ -414,7 +414,7 @@ public class FpdHeader extends IInternalFrame {
             jTextFieldCopyright.addFocusListener(new FocusAdapter(){\r
                 public void focusLost(FocusEvent e) {\r
                     if (!DataValidation.isCopyright(jTextFieldCopyright.getText())) {\r
             jTextFieldCopyright.addFocusListener(new FocusAdapter(){\r
                 public void focusLost(FocusEvent e) {\r
                     if (!DataValidation.isCopyright(jTextFieldCopyright.getText())) {\r

-                        JOptionPane.showMessageDialog(frame, "Copyright contents could not be empty.");\r
+                        JOptionPane.showMessageDialog(frame, "Copyright must be entered.");\r

                         return;\r
                     }\r
                     if (jTextFieldCopyright.getText().equals(ffc.getFpdHdrCopyright())) {\r
                         return;\r
                     }\r
                     if (jTextFieldCopyright.getText().equals(ffc.getFpdHdrCopyright())) {\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdPlatformDefs.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdPlatformDefs.java
index cda63d0bd4c3a5a3335334338074a592c35bf1f6..d23c90cf51a8c47a8f838741443c511cfdbb727a 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdPlatformDefs.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdPlatformDefs.java
@@ -356,7 +356,7 @@ public class FpdPlatformDefs extends IInternalFrame {
                     Vector<Object> v = new Vector<Object>();\r
                     getToolChain(v);\r
                     if (v.size() == 0) {\r
                     Vector<Object> v = new Vector<Object>();\r
                     getToolChain(v);\r
                     if (v.size() == 0) {\r

-                        JOptionPane.showMessageDialog(frame, "Platform must contain at least ONE supported Arch.");\r
+                        JOptionPane.showMessageDialog(frame, "Platform must contain at least ONE supported Architecture.");\r

                         return;\r
                     }\r
                     ffc.setPlatformDefsSupportedArchs(v);\r
                         return;\r
                     }\r
                     ffc.setPlatformDefsSupportedArchs(v);\r


@@ -380,7 +380,7 @@ public class FpdPlatformDefs extends IInternalFrame {
                     Vector<Object> v = new Vector<Object>();\r
                     getToolChain(v);\r
                     if (v.size() == 0) {\r
                     Vector<Object> v = new Vector<Object>();\r
                     getToolChain(v);\r
                     if (v.size() == 0) {\r

-                        JOptionPane.showMessageDialog(frame, "Platform must contain at least ONE supported Arch.");\r
+                        JOptionPane.showMessageDialog(frame, "Platform must contain at least ONE supported Architecture.");\r

                         return;\r
                     }\r
                     ffc.setPlatformDefsSupportedArchs(v);\r
                         return;\r
                     }\r
                     ffc.setPlatformDefsSupportedArchs(v);\r


@@ -404,7 +404,7 @@ public class FpdPlatformDefs extends IInternalFrame {
                     Vector<Object> v = new Vector<Object>();\r
                     getToolChain(v);\r
                     if (v.size() == 0) {\r
                     Vector<Object> v = new Vector<Object>();\r
                     getToolChain(v);\r
                     if (v.size() == 0) {\r

-                        JOptionPane.showMessageDialog(frame, "Platform must contain at least ONE supported Arch.");\r
+                        JOptionPane.showMessageDialog(frame, "Platform must contain at least ONE supported Architecture.");\r

                         return;\r
                     }\r
                     ffc.setPlatformDefsSupportedArchs(v);\r
                         return;\r
                     }\r
                     ffc.setPlatformDefsSupportedArchs(v);\r


@@ -662,7 +662,7 @@ public class FpdPlatformDefs extends IInternalFrame {
                     Vector<Object> v = new Vector<Object>();\r
                     getToolChain(v);\r
                     if (v.size() == 0) {\r
                     Vector<Object> v = new Vector<Object>();\r
                     getToolChain(v);\r
                     if (v.size() == 0) {\r

-                        JOptionPane.showMessageDialog(frame, "Platform must contain at least ONE supported Arch.");\r
+                        JOptionPane.showMessageDialog(frame, "Platform must contain at least ONE supported Architecture.");\r

                         return;\r
                     }\r
                     ffc.setPlatformDefsSupportedArchs(v);\r
                         return;\r
                     }\r
                     ffc.setPlatformDefsSupportedArchs(v);\r


@@ -688,7 +688,7 @@ public class FpdPlatformDefs extends IInternalFrame {
                     Vector<Object> v = new Vector<Object>();\r
                     getToolChain(v);\r
                     if (v.size() == 0) {\r
                     Vector<Object> v = new Vector<Object>();\r
                     getToolChain(v);\r
                     if (v.size() == 0) {\r

-                        JOptionPane.showMessageDialog(frame, "Platform must contain at least ONE supported Arch.");\r
+                        JOptionPane.showMessageDialog(frame, "Platform must contain at least ONE supported Architecture.");\r

                         return;\r
                     }\r
                     ffc.setPlatformDefsSupportedArchs(v);\r
                         return;\r
                     }\r
                     ffc.setPlatformDefsSupportedArchs(v);\r


@@ -714,7 +714,7 @@ public class FpdPlatformDefs extends IInternalFrame {
                     Vector<Object> v = new Vector<Object>();\r
                     getToolChain(v);\r
                     if (v.size() == 0) {\r
                     Vector<Object> v = new Vector<Object>();\r
                     getToolChain(v);\r
                     if (v.size() == 0) {\r

-                        JOptionPane.showMessageDialog(frame, "Platform must contain at least ONE supported Arch.");\r
+                        JOptionPane.showMessageDialog(frame, "Platform must contain at least ONE supported Architecture.");\r

                         return;\r
                     }\r
                     ffc.setPlatformDefsSupportedArchs(v);\r
                         return;\r
                     }\r
                     ffc.setPlatformDefsSupportedArchs(v);\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/global/WorkspaceProfile.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/global/WorkspaceProfile.java
index 007df778ea654331897d45a4c0cfb5c99d31d265..71278e9a1eea5da391b5368c9050cad46196f699 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/global/WorkspaceProfile.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/global/WorkspaceProfile.java
@@ -174,7 +174,7 @@ public class WorkspaceProfile {
             }\r
         }\r
         if (msaFile == null){\r
             }\r
         }\r
         if (msaFile == null){\r

-            throw new Exception("Can't find Module [" + moduleId.getName() + "] in all packages. ");\r
+            throw new Exception("Can not find Module [" + moduleId.getName() + "] in any packages in this workspace.");\r

         }\r
         else {\r
             return msaFile;\r
         }\r
         else {\r
             return msaFile;\r


@@ -371,7 +371,7 @@ public class WorkspaceProfile {
                 return platformId;\r
             }\r
         }\r
                 return platformId;\r
             }\r
         }\r

-        throw new Exception("Can't find platform [" + name + "] in current workspace. ");\r
+        throw new Exception("Can not find platform [" + name + "] in the current workspace. ");\r

     }\r
     \r
     public synchronized static File getPackageFile(PackageIdentification packageId) throws Exception {\r
     }\r
     \r
     public synchronized static File getPackageFile(PackageIdentification packageId) throws Exception {\r


@@ -383,7 +383,7 @@ public class WorkspaceProfile {
                 return packageItem.getSpdFile();\r
             }\r
         }\r
                 return packageItem.getSpdFile();\r
             }\r
         }\r

-        throw new Exception("Can't find " + packageId + " in current workspace. ");\r
+        throw new Exception("Can not find " + packageId + " in the current workspace. ");\r

     }\r
     \r
     public synchronized static File getModuleFile(ModuleIdentification moduleId) throws Exception {\r
     }\r
     \r
     public synchronized static File getModuleFile(ModuleIdentification moduleId) throws Exception {\r