Fixed grammar in messages.

[mirror_edk2.git] / Tools / Source / FrameworkWizard / src / org / tianocore / frameworkwizard / module / ui / dialog / PCDsDlg.java

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PCDsDlg.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PCDsDlg.java
index c22f1f03c5f4b5a7bb22e1d7be3d9122959c3df4..81a4dfe3daa3a96b5ccbb01375f80f9368cc6687 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PCDsDlg.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PCDsDlg.java
@@ -229,9 +229,10 @@ public class PCDsDlg extends IDialog implements ItemListener {
     private JTextField getJTextFieldFeatureFlag() {\r
         if (jTextFieldFeatureFlag == null) {\r
             jTextFieldFeatureFlag = new JTextField();\r
-            jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(168, 157, 320, 20));\r
+            jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(168, 182, 320, 20));\r
             jTextFieldFeatureFlag.setPreferredSize(new java.awt.Dimension(320, 20));\r
             jTextFieldFeatureFlag.setToolTipText("Postfix expression that must evaluate to TRUE or FALSE");\r
+            jTextFieldFeatureFlag.setEnabled(false);\r
         }\r
         return jTextFieldFeatureFlag;\r
     }\r
@@ -311,7 +312,12 @@ public class PCDsDlg extends IDialog implements ItemListener {
         this.id = inPcdCodedId;\r
 \r
         if (this.id != null) {\r
-            this.jComboBoxCName.setSelectedItem(id.getName());\r
+            for (int index = 0; index < this.jComboBoxCName.getItemCount(); index++) {\r
+                if (this.jComboBoxCName.getItemAt(index).toString().equals(id.getName())) {\r
+                    this.jComboBoxCName.setSelectedIndex(index);\r
+                    break;\r
+                }\r
+            }\r
             this.jTextFieldTokenSpaceGuid.setText(id.getGuid());\r
             this.jTextFieldDefaultValue.setText(id.getValue());\r
             this.jComboBoxUsage.setSelectedItem(id.getUsage());\r
@@ -383,7 +389,8 @@ public class PCDsDlg extends IDialog implements ItemListener {
 \r
             jLabelFeatureFlag = new JLabel();\r
             jLabelFeatureFlag.setText("Feature Flag Expression");\r
-            jLabelFeatureFlag.setBounds(new java.awt.Rectangle(12, 157, 168, 20));\r
+            jLabelFeatureFlag.setBounds(new java.awt.Rectangle(12, 182, 168, 20));\r
+            jLabelFeatureFlag.setEnabled(false);\r
 \r
             jLabelTokenSpaceGuid = new JLabel();\r
             jLabelTokenSpaceGuid.setText("Token Space C Name");\r
@@ -391,10 +398,10 @@ public class PCDsDlg extends IDialog implements ItemListener {
 \r
             jLabelArch = new JLabel();\r
             jLabelArch.setText("Supported Architectures");\r
-            jLabelArch.setBounds(new java.awt.Rectangle(12, 182, 168, 20));\r
+            jLabelArch.setBounds(new java.awt.Rectangle(12, 157, 168, 20));\r
             jArchCheckBox = new ArchCheckBox();\r
             jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20));\r
-            jArchCheckBox.setBounds(new java.awt.Rectangle(168, 182, 320, 20));\r
+            jArchCheckBox.setBounds(new java.awt.Rectangle(168, 157, 320, 20));\r
 \r
             // Hidden field\r
             jLabelTokenSpaceGuid.setBounds(new java.awt.Rectangle(12, 62, 140, 20));\r
@@ -492,7 +499,7 @@ public class PCDsDlg extends IDialog implements ItemListener {
         if (!isEmpty(this.jTextFieldTokenSpaceGuid.getText())) {\r
             if (!DataValidation.isC_NameType(this.jTextFieldTokenSpaceGuid.getText())) {\r
                 Log.wrn("Update PcdCoded",\r
-                        "Incorrect data type for the selected pcd entry, please check in in spd file");\r
+                        "Incorrect data type for the selected pcd entry, please check the datatype specified in the spd file");\r
                 return false;\r
             }\r
         }\r
@@ -570,7 +577,7 @@ public class PCDsDlg extends IDialog implements ItemListener {
                 || pcd.getPcd(index).getType() == null || pcd.getPcd(index).getHelp() == null\r
                 || isEmpty(pcd.getPcd(index).getHelp())) {\r
                 Log.wrn("select pcd entry when editing msa",\r
-                        "The selected is defined incorrectly.\r\nPlease check it in spd file");\r
+                        "The selected value is defined incorrectly.\r\nPlease check it in the spd file");\r
             } else {\r
                 this.jTextFieldTokenSpaceGuid.setText(pcd.getPcd(index).getGuidCName());\r
                 Tools.generateComboBoxByVector(this.jComboBoxItemType, pcd.getPcd(index).getType());\r