X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FSource%2FFrameworkWizard%2Fsrc%2Forg%2Ftianocore%2Fframeworkwizard%2Fmodule%2Fui%2Fdialog%2FPCDsDlg.java;h=81a4dfe3daa3a96b5ccbb01375f80f9368cc6687;hp=b2a2f6dc6d1f46940fe10164ada77f9fd700cfa3;hb=623db5caebe9ecf6ef8f78a46a0495761fe1912b;hpb=fd16c6d5d404091051d010fe52a69196c9b89f1e 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 b2a2f6dc6d..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 @@ -1,6 +1,6 @@ /** @file - The file is used to create, update PCD of MSA/MBD file + The file is used to create, update PcdCode section of the MSA file Copyright (c) 2006, Intel Corporation All rights reserved. This program and the accompanying materials @@ -41,8 +41,9 @@ import org.tianocore.frameworkwizard.module.Identifications.PcdCoded.PcdVector; import org.tianocore.frameworkwizard.workspace.WorkspaceTools; /** - * The class is used to create, update PCD of MSA/MBD file It extends - * IInternalFrame + * The class is used to create, update PcdCoded section of the MSA file + * + * It extends IDialog * */ public class PCDsDlg extends IDialog implements ItemListener { @@ -98,7 +99,7 @@ public class PCDsDlg extends IDialog implements ItemListener { private JButton jButtonCancel = null; private JScrollPane jScrollPaneHelpText = null; - + private JLabel jLabelUsage = null; private JComboBox jComboBoxUsage = null; @@ -107,7 +108,7 @@ public class PCDsDlg extends IDialog implements ItemListener { // Not used by UI // private PcdCodedIdentification id = null; - + private EnumerationData ed = new EnumerationData(); private WorkspaceTools wt = new WorkspaceTools(); @@ -123,7 +124,7 @@ public class PCDsDlg extends IDialog implements ItemListener { private JComboBox getJComboBoxItemType() { if (jComboBoxItemType == null) { jComboBoxItemType = new JComboBox(); - jComboBoxItemType.setBounds(new java.awt.Rectangle(160, 35, 320, 20)); + jComboBoxItemType.setBounds(new java.awt.Rectangle(168, 37, 320, 20)); jComboBoxItemType.setPreferredSize(new java.awt.Dimension(320, 20)); } return jComboBoxItemType; @@ -138,7 +139,7 @@ public class PCDsDlg extends IDialog implements ItemListener { private JComboBox getJComboBoxCName() { if (jComboBoxCName == null) { jComboBoxCName = new JComboBox(); - jComboBoxCName.setBounds(new java.awt.Rectangle(160, 10, 320, 20)); + jComboBoxCName.setBounds(new java.awt.Rectangle(168, 12, 320, 20)); jComboBoxCName.setPreferredSize(new java.awt.Dimension(320, 20)); jComboBoxCName.addItemListener(this); } @@ -154,7 +155,7 @@ public class PCDsDlg extends IDialog implements ItemListener { private JTextField getJTextFieldDefaultValue() { if (jTextFieldDefaultValue == null) { jTextFieldDefaultValue = new JTextField(); - jTextFieldDefaultValue.setBounds(new java.awt.Rectangle(160, 60, 320, 20)); + jTextFieldDefaultValue.setBounds(new java.awt.Rectangle(168, 62, 320, 20)); jTextFieldDefaultValue.setPreferredSize(new java.awt.Dimension(320, 20)); } return jTextFieldDefaultValue; @@ -186,7 +187,7 @@ public class PCDsDlg extends IDialog implements ItemListener { jScrollPaneHelpText.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); jScrollPaneHelpText.setSize(new java.awt.Dimension(320, 40)); jScrollPaneHelpText.setPreferredSize(new java.awt.Dimension(320, 40)); - jScrollPaneHelpText.setLocation(new java.awt.Point(160, 110)); + jScrollPaneHelpText.setLocation(new java.awt.Point(168, 112)); jScrollPaneHelpText.setViewportView(getJTextAreaHelpText()); } return jScrollPaneHelpText; @@ -213,7 +214,7 @@ public class PCDsDlg extends IDialog implements ItemListener { private JTextField getJTextFieldTokenSpaceGuid() { if (jTextFieldTokenSpaceGuid == null) { jTextFieldTokenSpaceGuid = new JTextField(); - jTextFieldTokenSpaceGuid.setBounds(new java.awt.Rectangle(160, 60, 320, 20)); + jTextFieldTokenSpaceGuid.setBounds(new java.awt.Rectangle(168, 62, 320, 20)); jTextFieldTokenSpaceGuid.setPreferredSize(new java.awt.Dimension(320, 20)); jTextFieldTokenSpaceGuid.setVisible(false); } @@ -228,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(160, 155, 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; } @@ -244,7 +246,7 @@ public class PCDsDlg extends IDialog implements ItemListener { private JButton getJButtonOk() { if (jButtonOk == null) { jButtonOk = new JButton(); - jButtonOk.setBounds(new java.awt.Rectangle(290, 205, 90, 20)); + jButtonOk.setBounds(new java.awt.Rectangle(290, 212, 90, 20)); jButtonOk.setText("Ok"); jButtonOk.addActionListener(this); } @@ -260,7 +262,7 @@ public class PCDsDlg extends IDialog implements ItemListener { private JButton getJButtonCancel() { if (jButtonCancel == null) { jButtonCancel = new JButton(); - jButtonCancel.setBounds(new java.awt.Rectangle(390, 205, 90, 20)); + jButtonCancel.setBounds(new java.awt.Rectangle(390, 212, 90, 20)); jButtonCancel.setText("Cancel"); jButtonCancel.addActionListener(this); } @@ -275,7 +277,7 @@ public class PCDsDlg extends IDialog implements ItemListener { private JComboBox getJComboBoxUsage() { if (jComboBoxUsage == null) { jComboBoxUsage = new JComboBox(); - jComboBoxUsage.setBounds(new java.awt.Rectangle(160, 85, 320, 20)); + jComboBoxUsage.setBounds(new java.awt.Rectangle(168, 87, 320, 20)); jComboBoxUsage.setPreferredSize(new java.awt.Dimension(320, 20)); } return jComboBoxUsage; @@ -290,7 +292,7 @@ public class PCDsDlg extends IDialog implements ItemListener { * */ private void init() { - this.setSize(500, 270); + this.setSize(505, 280); this.setContentPane(getJScrollPane()); this.setTitle("Pcd Coded"); initFrame(); @@ -310,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()); @@ -356,33 +363,34 @@ public class PCDsDlg extends IDialog implements ItemListener { private JPanel getJContentPane() { if (jContentPane == null) { jLabelUsage = new JLabel(); - jLabelUsage.setBounds(new java.awt.Rectangle(15, 85, 140, 20)); + jLabelUsage.setBounds(new java.awt.Rectangle(12, 87, 168, 20)); jLabelUsage.setText("Usge"); jStarLabel1 = new StarLabel(); - jStarLabel1.setLocation(new java.awt.Point(2, 10)); + jStarLabel1.setLocation(new java.awt.Point(2, 12)); jLabelC_Name = new JLabel(); jLabelC_Name.setText("PCD C Name"); - jLabelC_Name.setBounds(new java.awt.Rectangle(15, 10, 145, 20)); + jLabelC_Name.setBounds(new java.awt.Rectangle(12, 12, 168, 20)); jStarLabel2 = new StarLabel(); - jStarLabel2.setLocation(new java.awt.Point(2, 35)); + jStarLabel2.setLocation(new java.awt.Point(2, 37)); jLabelItemType = new JLabel(); jLabelItemType.setText("PCD Item Type"); - jLabelItemType.setBounds(new java.awt.Rectangle(15, 35, 145, 20)); + jLabelItemType.setBounds(new java.awt.Rectangle(12, 37, 168, 20)); jLabelDefaultValue = new JLabel(); jLabelDefaultValue.setText("Default Value"); - jLabelDefaultValue.setBounds(new java.awt.Rectangle(15, 60, 145, 20)); + jLabelDefaultValue.setBounds(new java.awt.Rectangle(12, 62, 168, 20)); jStarLabel3 = new StarLabel(); - jStarLabel3.setLocation(new java.awt.Point(2, 110)); + jStarLabel3.setLocation(new java.awt.Point(2, 112)); jLabelHelpText = new JLabel(); jLabelHelpText.setText("Help Text"); - jLabelHelpText.setBounds(new java.awt.Rectangle(15, 110, 145, 20)); + jLabelHelpText.setBounds(new java.awt.Rectangle(12, 112, 168, 20)); jLabelFeatureFlag = new JLabel(); jLabelFeatureFlag.setText("Feature Flag Expression"); - jLabelFeatureFlag.setBounds(new java.awt.Rectangle(15, 155, 140, 20)); + jLabelFeatureFlag.setBounds(new java.awt.Rectangle(12, 182, 168, 20)); + jLabelFeatureFlag.setEnabled(false); jLabelTokenSpaceGuid = new JLabel(); jLabelTokenSpaceGuid.setText("Token Space C Name"); @@ -390,13 +398,13 @@ public class PCDsDlg extends IDialog implements ItemListener { jLabelArch = new JLabel(); jLabelArch.setText("Supported Architectures"); - jLabelArch.setBounds(new java.awt.Rectangle(15, 180, 145, 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(160, 180, 320, 20)); + jArchCheckBox.setBounds(new java.awt.Rectangle(168, 157, 320, 20)); // Hidden field - jLabelTokenSpaceGuid.setBounds(new java.awt.Rectangle(15, 60, 140, 20)); + jLabelTokenSpaceGuid.setBounds(new java.awt.Rectangle(12, 62, 140, 20)); jContentPane = new JPanel(); jContentPane.setLayout(null); @@ -491,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; } } @@ -569,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());