X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Tools%2FSource%2FFrameworkWizard%2Fsrc%2Forg%2Ftianocore%2Fframeworkwizard%2Fmodule%2Fui%2Fdialog%2FPCDsDlg.java;h=81a4dfe3daa3a96b5ccbb01375f80f9368cc6687;hb=623db5caebe9ecf6ef8f78a46a0495761fe1912b;hp=c22f1f03c5f4b5a7bb22e1d7be3d9122959c3df4;hpb=9e857952dbebe1fcadb4efeee8ca338c1123bd13;p=mirror_edk2.git

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