Fixed grammar in messages.

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

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdGuidDecls.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdGuidDecls.java
index 2b8f3dd1a93f5ecf73db65310739243bb192636c..8cdcedd73d3b59e3d4182553d5f26e985657676a 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdGuidDecls.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdGuidDecls.java
@@ -182,11 +182,11 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{
            jTable.setRowHeight(20);\r
            jTable.setAutoResizeMode(javax.swing.JTable.AUTO_RESIZE_OFF);\r
            model.addColumn("Name");\r
            jTable.setRowHeight(20);\r
            jTable.setAutoResizeMode(javax.swing.JTable.AUTO_RESIZE_OFF);\r
            model.addColumn("Name");\r

-           model.addColumn("C_Name");\r
+           model.addColumn("The C Name");\r

            model.addColumn("GUID Value");\r
            model.addColumn("GUID Value");\r

-           model.addColumn("HelpText");\r
-           model.addColumn("SupportedArch");\r
-           model.addColumn("SupportedModuleType");\r
+           model.addColumn("Help Text");\r
+           model.addColumn("Supported Architectures");\r
+           model.addColumn("Supported Module Types");\r

            model.addColumn("GuidTypes");\r
            jTable.getColumnModel().getColumn(2).setCellEditor(new GuidEditor());\r
 \r
            model.addColumn("GuidTypes");\r
            jTable.getColumnModel().getColumn(2).setCellEditor(new GuidEditor());\r
 \r


@@ -468,7 +468,7 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{
             jLabelHelp.setLocation(new java.awt.Point(14,85));\r
             jLabelCName = new JLabel();\r
             jLabelCName.setBounds(new java.awt.Rectangle(14,35,111,20));\r
             jLabelHelp.setLocation(new java.awt.Point(14,85));\r
             jLabelCName = new JLabel();\r
             jLabelCName.setBounds(new java.awt.Rectangle(14,35,111,20));\r

-            jLabelCName.setText("C_Name");\r
+            jLabelCName.setText("C Name");\r

             jLabelGuid = new JLabel();\r
             jLabelGuid.setBounds(new java.awt.Rectangle(15,60,112,20));\r
             jLabelGuid.setText("Guid Value");\r
             jLabelGuid = new JLabel();\r
             jLabelGuid.setBounds(new java.awt.Rectangle(15,60,112,20));\r
             jLabelGuid.setText("Guid Value");\r


@@ -606,19 +606,19 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{
     \r
     protected boolean dataValidation(String[] row){\r
         if (!DataValidation.isUiNameType(row[0])) {\r
     \r
     protected boolean dataValidation(String[] row){\r
         if (!DataValidation.isUiNameType(row[0])) {\r

-            JOptionPane.showMessageDialog(this, "Name is NOT UiNameType.");\r
+            JOptionPane.showMessageDialog(this, "Name must start with an alpha character.");\r

             return false;\r
         }\r
         if (!DataValidation.isGuid(row[2])) {\r
             return false;\r
         }\r
         if (!DataValidation.isGuid(row[2])) {\r

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

             return false;\r
         }\r
         if (!DataValidation.isC_NameType(row[1])) {\r
             return false;\r
         }\r
         if (!DataValidation.isC_NameType(row[1])) {\r

-            JOptionPane.showMessageDialog(this, "C_Name is NOT C_NameType.");\r
+            JOptionPane.showMessageDialog(this, "C Name does not match C Name datatype.");\r

             return false;\r
         }\r
         if (row[3].length() == 0) {\r
             return false;\r
         }\r
         if (row[3].length() == 0) {\r

-            JOptionPane.showMessageDialog(this, "HelpText could NOT be empty.");\r
+            JOptionPane.showMessageDialog(this, "Help Text must be entered!");\r

             return false;\r
         }\r
         return true;\r
             return false;\r
         }\r
         return true;\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdLibClassDecls.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdLibClassDecls.java
index 6f660f5b5619b1a5285fdc134a9550fde9a80e13..d3ba1c092da47eac7a1ec9125289116a63df84c7 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdLibClassDecls.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdLibClassDecls.java
@@ -223,8 +223,8 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
            model.addColumn("Help Text");\r
            model.addColumn("Recommended Instance");\r
            model.addColumn("Version");\r
            model.addColumn("Help Text");\r
            model.addColumn("Recommended Instance");\r
            model.addColumn("Version");\r

-           model.addColumn("Sup. Arch");\r
-           model.addColumn("Mod. Types");\r
+           model.addColumn("Supported Architectures");\r
+           model.addColumn("Supported Module Types");\r

            \r
            Vector<String> vArch = new Vector<String>();\r
            vArch.add("IA32");\r
            \r
            Vector<String> vArch = new Vector<String>();\r
            vArch.add("IA32");\r


@@ -310,7 +310,7 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
                 getLibInstances(lib);\r
                 guid = nameToGuid(name);\r
                 if (guid == null){\r
                 getLibInstances(lib);\r
                 guid = nameToGuid(name);\r
                 if (guid == null){\r

-                  JOptionPane.showMessageDialog(frame, "Recommended Instance NOT exists.");\r
+                  JOptionPane.showMessageDialog(frame, "Recommended Instance does not exist.");\r

                   return;\r
                 }\r
             }\r
                   return;\r
                 }\r
             }\r


@@ -626,7 +626,7 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
             }\r
             else{\r
                 if (recommendGuid == null) {\r
             }\r
             else{\r
                 if (recommendGuid == null) {\r

-                  JOptionPane.showMessageDialog(frame, "Recommended Instance NOT exists.");\r
+                  JOptionPane.showMessageDialog(frame, "Recommended Instance does not exist.");\r

                   return;\r
                 }\r
             }\r
                   return;\r
                 }\r
             }\r


@@ -663,25 +663,25 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
 \r
     private boolean dataValidation(String[] row) {\r
         if (!DataValidation.isKeywordType(row[cnClassName])) {\r
 \r
     private boolean dataValidation(String[] row) {\r
         if (!DataValidation.isKeywordType(row[cnClassName])) {\r

-            JOptionPane.showMessageDialog(frame, "Library Class is NOT KeyWord Type.");\r
+            JOptionPane.showMessageDialog(frame, "Library Class name entered does not match KeyWord datatype.");\r

             return false;\r
         }\r
         if (!DataValidation.isPathAndFilename(row[cnHdrFile])) {\r
             return false;\r
         }\r
         if (!DataValidation.isPathAndFilename(row[cnHdrFile])) {\r

-            JOptionPane.showMessageDialog(frame, "Include Header is NOT PathAndFilename Type.");\r
+            JOptionPane.showMessageDialog(frame, "Include Header does not match the PathAndFilename datatype.");\r

             return false;\r
         }\r
         if (row[cnHelpText].length() == 0) {\r
             return false;\r
         }\r
         if (row[cnHelpText].length() == 0) {\r

-            JOptionPane.showMessageDialog(frame, "Help Text Must NOT be empty.");\r
+            JOptionPane.showMessageDialog(frame, "Help Text must be entered!");\r

             return false;\r
         }\r
         if (row[cnRecInstVer] != null && row[cnRecInstVer].length() > 0) {\r
             if (row[cnRecInstName] == null || row[cnRecInstName].length() == 0) {\r
             return false;\r
         }\r
         if (row[cnRecInstVer] != null && row[cnRecInstVer].length() > 0) {\r
             if (row[cnRecInstName] == null || row[cnRecInstName].length() == 0) {\r

-                JOptionPane.showMessageDialog(frame, "Recommended Instance Version must associate with Instance Name.");\r
+                JOptionPane.showMessageDialog(frame, "Recommended Instance Version must associate with the Instance Name.");\r

                 return false;\r
             }\r
             \r
             if (!DataValidation.isVersionDataType(row[cnRecInstVer])) {\r
                 return false;\r
             }\r
             \r
             if (!DataValidation.isVersionDataType(row[cnRecInstVer])) {\r

-                JOptionPane.showMessageDialog(frame, "Recommended Instance Version is NOT VersionDataType.");\r
+                JOptionPane.showMessageDialog(frame, "Recommended Instance Version does not match Version datatype.");\r

                 return false;\r
             }\r
         }\r
                 return false;\r
             }\r
         }\r


@@ -743,7 +743,7 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
                         theFile = chooser.getSelectedFile();\r
                         String file = theFile.getPath();\r
                         if (!file.startsWith(dirPrefix)) {\r
                         theFile = chooser.getSelectedFile();\r
                         String file = theFile.getPath();\r
                         if (!file.startsWith(dirPrefix)) {\r

-                            JOptionPane.showMessageDialog(frame, "You can only select files in current package!");\r
+                            JOptionPane.showMessageDialog(frame, "You can only select files in current package directory structure!");\r

                             return;\r
                         }\r
                         \r
                             return;\r
                         }\r
                         \r


@@ -943,7 +943,7 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
             }\r
         }\r
         catch(Exception e){\r
             }\r
         }\r
         catch(Exception e){\r

-            JOptionPane.showMessageDialog(frame, "Search Instances Fail.");\r
+            JOptionPane.showMessageDialog(frame, "Search Instances Failed.");\r

         }\r
         \r
     }\r
         }\r
         \r
     }\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPcdDefs.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPcdDefs.java
index 8eeef72e15d4b6b565f579a864798950a2002019..f5b963cdbb0ea47a5e8f4962f514a7b042878ae6 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPcdDefs.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPcdDefs.java
@@ -342,11 +342,11 @@ public class SpdPcdDefs extends IInternalFrame implements TableModelListener{
            \r
             jLabelSupArch = new JLabel();\r
             jLabelSupArch.setBounds(new java.awt.Rectangle(241,192,89,16));\r
            \r
             jLabelSupArch = new JLabel();\r
             jLabelSupArch.setBounds(new java.awt.Rectangle(241,192,89,16));\r

-            jLabelSupArch.setText("Supported Arch");\r
+            jLabelSupArch.setText("Supported Architectures");\r

             jLabelSupArch.setEnabled(true);\r
             jLabelSupMod = new JLabel();\r
             jLabelSupMod.setBounds(new java.awt.Rectangle(15,193,103,16));\r
             jLabelSupArch.setEnabled(true);\r
             jLabelSupMod = new JLabel();\r
             jLabelSupMod.setBounds(new java.awt.Rectangle(15,193,103,16));\r

-            jLabelSupMod.setText("Supported Module");\r
+            jLabelSupMod.setText("Supported Module type");\r

             jLabelSupMod.setEnabled(true);\r
             starLabel = new StarLabel();\r
             starLabel.setBounds(new java.awt.Rectangle(2,134,10,20));\r
             jLabelSupMod.setEnabled(true);\r
             starLabel = new StarLabel();\r
             starLabel.setBounds(new java.awt.Rectangle(2,134,10,20));\r


@@ -357,7 +357,7 @@ public class SpdPcdDefs extends IInternalFrame implements TableModelListener{
             jLabelVarVal.setBounds(new java.awt.Rectangle(11,133,84,20));\r
             jLabelVarVal.setText("Valid Usage");\r
             jLabelC_Name = new JLabel();\r
             jLabelVarVal.setBounds(new java.awt.Rectangle(11,133,84,20));\r
             jLabelVarVal.setText("Valid Usage");\r
             jLabelC_Name = new JLabel();\r

-            jLabelC_Name.setText("C_Name");\r
+            jLabelC_Name.setText("C Name");\r

             jLabelC_Name.setBounds(new java.awt.Rectangle(11,9,140,20));\r
             jLabelTokenSpace = new JLabel();\r
             jLabelTokenSpace.setBounds(new java.awt.Rectangle(11,58,140,20));\r
             jLabelC_Name.setBounds(new java.awt.Rectangle(11,9,140,20));\r
             jLabelTokenSpace = new JLabel();\r
             jLabelTokenSpace.setBounds(new java.awt.Rectangle(11,58,140,20));\r