Added some additional comments in the files, as well as fixed some of them.

[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 ecd4ee30a01086714f6346cd9e77062f6beb349a..c22f1f03c5f4b5a7bb22e1d7be3d9122959c3df4 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
@@ -1,6 +1,6 @@
 /** @file\r
  \r
 /** @file\r
  \r

- The file is used to create, update PCD of MSA/MBD file\r
+ The file is used to create, update PcdCode section of the MSA file\r

  \r
  Copyright (c) 2006, Intel Corporation\r
  All rights reserved. This program and the accompanying materials\r
  \r
  Copyright (c) 2006, Intel Corporation\r
  All rights reserved. This program and the accompanying materials\r


@@ -29,6 +29,7 @@ import javax.swing.JTextArea;
 \r
 import org.tianocore.frameworkwizard.common.DataType;\r
 import org.tianocore.frameworkwizard.common.DataValidation;\r
 \r
 import org.tianocore.frameworkwizard.common.DataType;\r
 import org.tianocore.frameworkwizard.common.DataValidation;\r

+import org.tianocore.frameworkwizard.common.EnumerationData;\r

 import org.tianocore.frameworkwizard.common.Log;\r
 import org.tianocore.frameworkwizard.common.Tools;\r
 import org.tianocore.frameworkwizard.common.ui.ArchCheckBox;\r
 import org.tianocore.frameworkwizard.common.Log;\r
 import org.tianocore.frameworkwizard.common.Tools;\r
 import org.tianocore.frameworkwizard.common.ui.ArchCheckBox;\r


@@ -40,19 +41,20 @@ import org.tianocore.frameworkwizard.module.Identifications.PcdCoded.PcdVector;
 import org.tianocore.frameworkwizard.workspace.WorkspaceTools;\r
 \r
 /**\r
 import org.tianocore.frameworkwizard.workspace.WorkspaceTools;\r
 \r
 /**\r

- The class is used to create, update PCD of MSA/MBD file\r
- It extends IInternalFrame\r
- \r
- **/\r
+ * The class is used to create, update PcdCoded section of the MSA file\r
+ * \r
+ * It extends IDialog\r
+ * \r
+ */\r

 public class PCDsDlg extends IDialog implements ItemListener {\r
 \r
 public class PCDsDlg extends IDialog implements ItemListener {\r
 \r

-    ///\r
-    /// Define class Serial Version UID\r
-    ///\r
+    // /\r
+    // / Define class Serial Version UID\r
+    // /\r

     private static final long serialVersionUID = 2227717658188438696L;\r
 \r
     //\r
     private static final long serialVersionUID = 2227717658188438696L;\r
 \r
     //\r

-    //Define class members\r
+    // Define class members\r

     //\r
     private JPanel jContentPane = null;\r
 \r
     //\r
     private JPanel jContentPane = null;\r
 \r


@@ -97,95 +99,104 @@ public class PCDsDlg extends IDialog implements ItemListener {
     private JButton jButtonCancel = null;\r
 \r
     private JScrollPane jScrollPaneHelpText = null;\r
     private JButton jButtonCancel = null;\r
 \r
     private JScrollPane jScrollPaneHelpText = null;\r

+\r
+    private JLabel jLabelUsage = null;\r
+\r
+    private JComboBox jComboBoxUsage = null;\r
+\r

     //\r
     // Not used by UI\r
     //\r
     private PcdCodedIdentification id = null;\r
 \r
     //\r
     // Not used by UI\r
     //\r
     private PcdCodedIdentification id = null;\r
 \r

+    private EnumerationData ed = new EnumerationData();\r
+\r

     private WorkspaceTools wt = new WorkspaceTools();\r
 \r
     private PcdVector pcd = wt.getAllPcdDeclarationsFromWorkspace();\r
     private WorkspaceTools wt = new WorkspaceTools();\r
 \r
     private PcdVector pcd = wt.getAllPcdDeclarationsFromWorkspace();\r

-    \r
+\r

     /**\r
     /**\r

-     This method initializes jComboBoxItemType \r
-     \r
-     @return javax.swing.JComboBox jComboBoxItemType\r
-     \r
-     **/\r
+     * This method initializes jComboBoxItemType\r
+     * \r
+     * @return javax.swing.JComboBox jComboBoxItemType\r
+     * \r
+     */\r

     private JComboBox getJComboBoxItemType() {\r
         if (jComboBoxItemType == null) {\r
             jComboBoxItemType = new JComboBox();\r
     private JComboBox getJComboBoxItemType() {\r
         if (jComboBoxItemType == null) {\r
             jComboBoxItemType = new JComboBox();\r

-            jComboBoxItemType.setBounds(new java.awt.Rectangle(160, 35, 320, 20));\r
+            jComboBoxItemType.setBounds(new java.awt.Rectangle(168, 37, 320, 20));\r

             jComboBoxItemType.setPreferredSize(new java.awt.Dimension(320, 20));\r
         }\r
         return jComboBoxItemType;\r
     }\r
 \r
     /**\r
             jComboBoxItemType.setPreferredSize(new java.awt.Dimension(320, 20));\r
         }\r
         return jComboBoxItemType;\r
     }\r
 \r
     /**\r

-     This method initializes jTextFieldC_Name \r
-     \r
-     @return javax.swing.JTextField jTextFieldC_Name\r
-     \r
-     **/\r
+     * This method initializes jTextFieldC_Name\r
+     * \r
+     * @return javax.swing.JTextField jTextFieldC_Name\r
+     * \r
+     */\r

     private JComboBox getJComboBoxCName() {\r
         if (jComboBoxCName == null) {\r
             jComboBoxCName = new JComboBox();\r
     private JComboBox getJComboBoxCName() {\r
         if (jComboBoxCName == null) {\r
             jComboBoxCName = new JComboBox();\r

-            jComboBoxCName.setBounds(new java.awt.Rectangle(160, 10, 320, 20));\r
+            jComboBoxCName.setBounds(new java.awt.Rectangle(168, 12, 320, 20));\r

             jComboBoxCName.setPreferredSize(new java.awt.Dimension(320, 20));\r
             jComboBoxCName.addItemListener(this);\r
             jComboBoxCName.setPreferredSize(new java.awt.Dimension(320, 20));\r
             jComboBoxCName.addItemListener(this);\r

-            //jComboBoxCName.addActionListener(this);\r

         }\r
         return jComboBoxCName;\r
     }\r
 \r
     /**\r
         }\r
         return jComboBoxCName;\r
     }\r
 \r
     /**\r

-     This method initializes jTextFieldDefaultValue \r
-     \r
-     @return javax.swing.JTextField jTextFieldDefaultValue\r
-     \r
-     **/\r
+     * This method initializes jTextFieldDefaultValue\r
+     * \r
+     * @return javax.swing.JTextField jTextFieldDefaultValue\r
+     * \r
+     */\r

     private JTextField getJTextFieldDefaultValue() {\r
         if (jTextFieldDefaultValue == null) {\r
             jTextFieldDefaultValue = new JTextField();\r
     private JTextField getJTextFieldDefaultValue() {\r
         if (jTextFieldDefaultValue == null) {\r
             jTextFieldDefaultValue = new JTextField();\r

-            jTextFieldDefaultValue.setBounds(new java.awt.Rectangle(160, 60, 320, 20));\r
+            jTextFieldDefaultValue.setBounds(new java.awt.Rectangle(168, 62, 320, 20));\r

             jTextFieldDefaultValue.setPreferredSize(new java.awt.Dimension(320, 20));\r
         }\r
         return jTextFieldDefaultValue;\r
     }\r
 \r
     /**\r
             jTextFieldDefaultValue.setPreferredSize(new java.awt.Dimension(320, 20));\r
         }\r
         return jTextFieldDefaultValue;\r
     }\r
 \r
     /**\r

-     * This method initializes jTextAreaHelpText       \r
-     *         \r
-     * @return javax.swing.JTextArea   \r
+     * This method initializes jTextAreaHelpText\r
+     * \r
+     * @return javax.swing.JTextArea\r

      */\r
     private JTextArea getJTextAreaHelpText() {\r
         if (jTextAreaHelpText == null) {\r
             jTextAreaHelpText = new JTextArea();\r
             jTextAreaHelpText.setLineWrap(true);\r
             jTextAreaHelpText.setWrapStyleWord(true);\r
      */\r
     private JTextArea getJTextAreaHelpText() {\r
         if (jTextAreaHelpText == null) {\r
             jTextAreaHelpText = new JTextArea();\r
             jTextAreaHelpText.setLineWrap(true);\r
             jTextAreaHelpText.setWrapStyleWord(true);\r

-//            jTextAreaHelpText.setBounds(new java.awt.Rectangle(160, 85, 320, 20));\r
-//            jTextAreaHelpText.setPreferredSize(new java.awt.Dimension(320, 20));\r

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

+\r
+    /**\r
+     * This method initializes jScrollPaneHelpText\r
+     * \r
+     * @return javax.swing.JScrollPane\r
+     * \r
+     */\r

     private JScrollPane getJScrollPaneHelpText() {\r
     private JScrollPane getJScrollPaneHelpText() {\r

-      if (jScrollPaneHelpText == null ) {\r
-        jScrollPaneHelpText = new JScrollPane();\r
-        jScrollPaneHelpText.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);\r
-        jScrollPaneHelpText.setSize(new java.awt.Dimension(320, 40));\r
-        jScrollPaneHelpText.setPreferredSize(new java.awt.Dimension(320, 40));\r
-        jScrollPaneHelpText.setLocation(new java.awt.Point(160, 85));\r
-        jScrollPaneHelpText.setViewportView(getJTextAreaHelpText());\r
-\r
-      }\r
-      return jScrollPaneHelpText;\r
+        if (jScrollPaneHelpText == null) {\r
+            jScrollPaneHelpText = new JScrollPane();\r
+            jScrollPaneHelpText.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);\r
+            jScrollPaneHelpText.setSize(new java.awt.Dimension(320, 40));\r
+            jScrollPaneHelpText.setPreferredSize(new java.awt.Dimension(320, 40));\r
+            jScrollPaneHelpText.setLocation(new java.awt.Point(168, 112));\r
+            jScrollPaneHelpText.setViewportView(getJTextAreaHelpText());\r
+        }\r
+        return jScrollPaneHelpText;\r

     }\r
 \r
     }\r
 \r

-\r

     /**\r
     /**\r

-     This method initializes jScrollPane  \r
-     \r
-     @return javax.swing.JScrollPane  \r
+     * This method initializes jScrollPane\r
+     * \r
+     * @return javax.swing.JScrollPane\r

      */\r
     private JScrollPane getJScrollPane() {\r
         if (jScrollPane == null) {\r
      */\r
     private JScrollPane getJScrollPane() {\r
         if (jScrollPane == null) {\r


@@ -196,14 +207,14 @@ public class PCDsDlg extends IDialog implements ItemListener {
     }\r
 \r
     /**\r
     }\r
 \r
     /**\r

-     * This method initializes jTextFieldTokenSpaceGuid        \r
-     *         \r
-     * @return javax.swing.JTextField  \r
+     * This method initializes jTextFieldTokenSpaceGuid\r
+     * \r
+     * @return javax.swing.JTextField\r

      */\r
     private JTextField getJTextFieldTokenSpaceGuid() {\r
         if (jTextFieldTokenSpaceGuid == null) {\r
             jTextFieldTokenSpaceGuid = new JTextField();\r
      */\r
     private JTextField getJTextFieldTokenSpaceGuid() {\r
         if (jTextFieldTokenSpaceGuid == null) {\r
             jTextFieldTokenSpaceGuid = new JTextField();\r

-            jTextFieldTokenSpaceGuid.setBounds(new java.awt.Rectangle(160, 60, 320, 20));\r
+            jTextFieldTokenSpaceGuid.setBounds(new java.awt.Rectangle(168, 62, 320, 20));\r

             jTextFieldTokenSpaceGuid.setPreferredSize(new java.awt.Dimension(320, 20));\r
             jTextFieldTokenSpaceGuid.setVisible(false);\r
         }\r
             jTextFieldTokenSpaceGuid.setPreferredSize(new java.awt.Dimension(320, 20));\r
             jTextFieldTokenSpaceGuid.setVisible(false);\r
         }\r


@@ -211,30 +222,30 @@ public class PCDsDlg extends IDialog implements ItemListener {
     }\r
 \r
     /**\r
     }\r
 \r
     /**\r

-     * This method initializes jTextFieldFeatureFlag   \r
-     *         \r
-     * @return javax.swing.JTextField  \r
+     * This method initializes jTextFieldFeatureFlag\r
+     * \r
+     * @return javax.swing.JTextField\r

      */\r
     private JTextField getJTextFieldFeatureFlag() {\r
         if (jTextFieldFeatureFlag == null) {\r
             jTextFieldFeatureFlag = new JTextField();\r
      */\r
     private JTextField getJTextFieldFeatureFlag() {\r
         if (jTextFieldFeatureFlag == null) {\r
             jTextFieldFeatureFlag = new JTextField();\r

-            jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(160, 130, 320, 20));\r
+            jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(168, 157, 320, 20));\r

             jTextFieldFeatureFlag.setPreferredSize(new java.awt.Dimension(320, 20));\r
             jTextFieldFeatureFlag.setPreferredSize(new java.awt.Dimension(320, 20));\r

-            //jLabelFeatureFlag.setBounds(new  java.awt.Rectangle(15, 130, 140, 20));\r
+            jTextFieldFeatureFlag.setToolTipText("Postfix expression that must evaluate to TRUE or FALSE");\r

         }\r
         return jTextFieldFeatureFlag;\r
     }\r
 \r
     /**\r
         }\r
         return jTextFieldFeatureFlag;\r
     }\r
 \r
     /**\r

-     This method initializes jButtonOk    \r
-     \r
-     @return javax.swing.JButton  \r
-     \r
-     **/\r
+     * This method initializes jButtonOk\r
+     * \r
+     * @return javax.swing.JButton\r
+     * \r
+     */\r

     private JButton getJButtonOk() {\r
         if (jButtonOk == null) {\r
             jButtonOk = new JButton();\r
     private JButton getJButtonOk() {\r
         if (jButtonOk == null) {\r
             jButtonOk = new JButton();\r

-            jButtonOk.setBounds(new java.awt.Rectangle(290, 185, 90, 20));\r
+            jButtonOk.setBounds(new java.awt.Rectangle(290, 212, 90, 20));\r

             jButtonOk.setText("Ok");\r
             jButtonOk.addActionListener(this);\r
         }\r
             jButtonOk.setText("Ok");\r
             jButtonOk.addActionListener(this);\r
         }\r


@@ -242,31 +253,45 @@ public class PCDsDlg extends IDialog implements ItemListener {
     }\r
 \r
     /**\r
     }\r
 \r
     /**\r

-     This method initializes jButtonCancel    \r
-     \r
-     @return javax.swing.JButton  \r
-     \r
-     **/\r
+     * This method initializes jButtonCancel\r
+     * \r
+     * @return javax.swing.JButton\r
+     * \r
+     */\r

     private JButton getJButtonCancel() {\r
         if (jButtonCancel == null) {\r
             jButtonCancel = new JButton();\r
     private JButton getJButtonCancel() {\r
         if (jButtonCancel == null) {\r
             jButtonCancel = new JButton();\r

-            jButtonCancel.setBounds(new java.awt.Rectangle(390, 185, 90, 20));\r
+            jButtonCancel.setBounds(new java.awt.Rectangle(390, 212, 90, 20));\r

             jButtonCancel.setText("Cancel");\r
             jButtonCancel.addActionListener(this);\r
         }\r
         return jButtonCancel;\r
     }\r
 \r
             jButtonCancel.setText("Cancel");\r
             jButtonCancel.addActionListener(this);\r
         }\r
         return jButtonCancel;\r
     }\r
 \r

+    /**\r
+     * This method initializes jComboBoxUsage  \r
+     *         \r
+     * @return javax.swing.JComboBox   \r
+     */\r
+    private JComboBox getJComboBoxUsage() {\r
+        if (jComboBoxUsage == null) {\r
+            jComboBoxUsage = new JComboBox();\r
+            jComboBoxUsage.setBounds(new java.awt.Rectangle(168, 87, 320, 20));\r
+            jComboBoxUsage.setPreferredSize(new java.awt.Dimension(320, 20));\r
+        }\r
+        return jComboBoxUsage;\r
+    }\r
+\r

     public static void main(String[] args) {\r
 \r
     }\r
 \r
     /**\r
     public static void main(String[] args) {\r
 \r
     }\r
 \r
     /**\r

-     This method initializes this\r
-     \r
-     **/\r
+     * This method initializes this\r
+     * \r
+     */\r

     private void init() {\r
     private void init() {\r

-        this.setSize(508, 260);\r
+        this.setSize(505, 280);\r

         this.setContentPane(getJScrollPane());\r
         this.setTitle("Pcd Coded");\r
         initFrame();\r
         this.setContentPane(getJScrollPane());\r
         this.setTitle("Pcd Coded");\r
         initFrame();\r


@@ -275,12 +300,12 @@ public class PCDsDlg extends IDialog implements ItemListener {
     }\r
 \r
     /**\r
     }\r
 \r
     /**\r

-     This method initializes this\r
-     Fill values to all fields if these values are not empty\r
-     \r
-     @param inPcdCodedId\r
-\r
-     **/\r
+     * This method initializes this Fill values to all fields if these values are\r
+     * not empty\r
+     * \r
+     * @param inPcdCodedId\r
+     * \r
+     */\r

     private void init(PcdCodedIdentification inPcdCodedId) {\r
         init();\r
         this.id = inPcdCodedId;\r
     private void init(PcdCodedIdentification inPcdCodedId) {\r
         init();\r
         this.id = inPcdCodedId;\r


@@ -289,6 +314,7 @@ public class PCDsDlg extends IDialog implements ItemListener {
             this.jComboBoxCName.setSelectedItem(id.getName());\r
             this.jTextFieldTokenSpaceGuid.setText(id.getGuid());\r
             this.jTextFieldDefaultValue.setText(id.getValue());\r
             this.jComboBoxCName.setSelectedItem(id.getName());\r
             this.jTextFieldTokenSpaceGuid.setText(id.getGuid());\r
             this.jTextFieldDefaultValue.setText(id.getValue());\r

+            this.jComboBoxUsage.setSelectedItem(id.getUsage());\r

             this.jTextAreaHelpText.setText(id.getHelp());\r
             this.jComboBoxItemType.setSelectedItem(id.getType());\r
             this.jTextFieldFeatureFlag.setText(id.getFeatureFlag());\r
             this.jTextAreaHelpText.setText(id.getHelp());\r
             this.jComboBoxItemType.setSelectedItem(id.getType());\r
             this.jTextFieldFeatureFlag.setText(id.getFeatureFlag());\r


@@ -297,23 +323,24 @@ public class PCDsDlg extends IDialog implements ItemListener {
     }\r
 \r
     /**\r
     }\r
 \r
     /**\r

-     This is the override edit constructor\r
-     \r
-     @param inPcdCodedId\r
-     @param iFrame\r
-     \r
-     **/\r
+     * This is the override edit constructor\r
+     * \r
+     * @param inPcdCodedId\r
+     * @param iFrame\r
+     * \r
+     */\r

     public PCDsDlg(PcdCodedIdentification inPcdCodedId, IFrame iFrame) {\r
         super(iFrame, true);\r
         init(inPcdCodedId);\r
     }\r
 \r
     /**\r
     public PCDsDlg(PcdCodedIdentification inPcdCodedId, IFrame iFrame) {\r
         super(iFrame, true);\r
         init(inPcdCodedId);\r
     }\r
 \r
     /**\r

-     Disable all components when the mode is view\r
-     \r
-     @param isView true - The view mode; false - The non-view mode\r
-     \r
-     **/\r
+     * Disable all components when the mode is view\r
+     * \r
+     * @param isView\r
+     *          true - The view mode; false - The non-view mode\r
+     * \r
+     */\r

     public void setViewMode(boolean isView) {\r
         if (isView) {\r
             this.jTextFieldDefaultValue.setEnabled(!isView);\r
     public void setViewMode(boolean isView) {\r
         if (isView) {\r
             this.jTextFieldDefaultValue.setEnabled(!isView);\r


@@ -322,91 +349,103 @@ public class PCDsDlg extends IDialog implements ItemListener {
     }\r
 \r
     /**\r
     }\r
 \r
     /**\r

-     This method initializes jContentPane\r
-     \r
-     @return javax.swing.JPanel jContentPane\r
-     \r
-     **/\r
+     * This method initializes jContentPane\r
+     * \r
+     * @return javax.swing.JPanel jContentPane\r
+     * \r
+     */\r

     private JPanel getJContentPane() {\r
         if (jContentPane == null) {\r
     private JPanel getJContentPane() {\r
         if (jContentPane == null) {\r

-            jArchCheckBox = new ArchCheckBox();\r
-            jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20));\r
-            jLabelArch = new JLabel();\r
-            jLabelArch.setText("Sup Arch List");\r
+            jLabelUsage = new JLabel();\r
+            jLabelUsage.setBounds(new java.awt.Rectangle(12, 87, 168, 20));\r
+            jLabelUsage.setText("Usge");\r
+            jStarLabel1 = new StarLabel();\r
+            jStarLabel1.setLocation(new java.awt.Point(2, 12));\r
+            jLabelC_Name = new JLabel();\r
+            jLabelC_Name.setText("PCD C Name");\r
+            jLabelC_Name.setBounds(new java.awt.Rectangle(12, 12, 168, 20));\r
+\r
+            jStarLabel2 = new StarLabel();\r
+            jStarLabel2.setLocation(new java.awt.Point(2, 37));\r
+            jLabelItemType = new JLabel();\r
+            jLabelItemType.setText("PCD Item Type");\r
+            jLabelItemType.setBounds(new java.awt.Rectangle(12, 37, 168, 20));\r
+\r
+            jLabelDefaultValue = new JLabel();\r
+            jLabelDefaultValue.setText("Default Value");\r
+            jLabelDefaultValue.setBounds(new java.awt.Rectangle(12, 62, 168, 20));\r
+\r
+            jStarLabel3 = new StarLabel();\r
+            jStarLabel3.setLocation(new java.awt.Point(2, 112));\r
+            jLabelHelpText = new JLabel();\r
+            jLabelHelpText.setText("Help Text");\r
+            jLabelHelpText.setBounds(new java.awt.Rectangle(12, 112, 168, 20));\r
+\r

             jLabelFeatureFlag = new JLabel();\r
             jLabelFeatureFlag = new JLabel();\r

-            jLabelFeatureFlag.setText("Feature Flag");\r
+            jLabelFeatureFlag.setText("Feature Flag Expression");\r
+            jLabelFeatureFlag.setBounds(new java.awt.Rectangle(12, 157, 168, 20));\r
+\r

             jLabelTokenSpaceGuid = new JLabel();\r
             jLabelTokenSpaceGuid.setText("Token Space C Name");\r
             jLabelTokenSpaceGuid.setVisible(false);\r
             jLabelTokenSpaceGuid = new JLabel();\r
             jLabelTokenSpaceGuid.setText("Token Space C Name");\r
             jLabelTokenSpaceGuid.setVisible(false);\r

-            jLabelHelpText = new JLabel();\r
-            jLabelHelpText.setText("Help Text");\r
-            jLabelC_Name = new JLabel();\r
-            jLabelC_Name.setText("C Name");\r
-            jLabelDefaultValue = new JLabel();\r
-            jLabelDefaultValue.setText("Default Value");\r
-            jLabelItemType = new JLabel();\r
-            jLabelItemType.setText("Item Type");\r

 \r
 \r

-            jLabelC_Name.setBounds(new       java.awt.Rectangle(15, 10, 140, 20));\r
-            jLabelItemType.setBounds(new     java.awt.Rectangle(15, 35, 140, 20));\r
-            jLabelDefaultValue.setBounds(new java.awt.Rectangle(15, 60, 140, 20));\r
-            jLabelHelpText.setBounds(new     java.awt.Rectangle(15, 85, 140, 20));\r
-            jLabelFeatureFlag.setBounds(new  java.awt.Rectangle(15, 130, 140, 20));\r
-            jLabelArch.setBounds(new java.awt.Rectangle(15, 155, 140, 20));\r
+            jLabelArch = new JLabel();\r
+            jLabelArch.setText("Supported Architectures");\r
+            jLabelArch.setBounds(new java.awt.Rectangle(12, 182, 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

 \r
 \r

-            jArchCheckBox.setBounds(new      java.awt.Rectangle(160, 155, 320, 20));\r
-            jLabelTokenSpaceGuid.setBounds(new java.awt.Rectangle(15, 60, 140, 20));\r
+            // Hidden field\r
+            jLabelTokenSpaceGuid.setBounds(new java.awt.Rectangle(12, 62, 140, 20));\r

 \r
             jContentPane = new JPanel();\r
             jContentPane.setLayout(null);\r
 \r
             jContentPane = new JPanel();\r
             jContentPane.setLayout(null);\r

-            jContentPane.setPreferredSize(new java.awt.Dimension(490, 190));\r
+            jContentPane.setPreferredSize(new java.awt.Dimension(485, 235));\r

 \r
 \r

-            jContentPane.add(jLabelItemType, null);\r
+            jContentPane.add(jStarLabel1, null);\r

             jContentPane.add(jLabelC_Name, null);\r
             jContentPane.add(getJComboBoxCName(), null);\r
             jContentPane.add(jLabelC_Name, null);\r
             jContentPane.add(getJComboBoxCName(), null);\r

+            jContentPane.add(jStarLabel2, null);\r
+            jContentPane.add(jLabelItemType, null);\r
+            jContentPane.add(getJComboBoxItemType(), null);\r

             jContentPane.add(jLabelDefaultValue, null);\r
             jContentPane.add(getJTextFieldDefaultValue(), null);\r
             jContentPane.add(jLabelDefaultValue, null);\r
             jContentPane.add(getJTextFieldDefaultValue(), null);\r

-            jContentPane.add(getJScrollPaneHelpText(), null);\r
-            jContentPane.add(getJComboBoxItemType(), null);\r
-            jStarLabel1 = new StarLabel();\r
-            jStarLabel1.setLocation(new java.awt.Point(0, 10));\r
-            jStarLabel2 = new StarLabel();\r
-            jStarLabel2.setLocation(new java.awt.Point(0, 35));\r
-            jStarLabel3 = new StarLabel();\r
-            jStarLabel3.setLocation(new java.awt.Point(0, 85));\r
-            jContentPane.add(jStarLabel1, null);\r
-            jContentPane.add(jStarLabel2, null);\r

             jContentPane.add(jStarLabel3, null);\r
             jContentPane.add(jLabelHelpText, null);\r
             jContentPane.add(jStarLabel3, null);\r
             jContentPane.add(jLabelHelpText, null);\r

-//            jContentPane.add(getJTextFieldHelpText(), null);\r
-\r
-            jContentPane.add(jLabelTokenSpaceGuid, null);\r
-            jContentPane.add(getJTextFieldTokenSpaceGuid(), null);\r
+            jContentPane.add(getJScrollPaneHelpText(), null);\r

             jContentPane.add(jLabelFeatureFlag, null);\r
             jContentPane.add(getJTextFieldFeatureFlag(), null);\r
             jContentPane.add(jLabelArch, null);\r
             jContentPane.add(jArchCheckBox, null);\r
             jContentPane.add(jLabelFeatureFlag, null);\r
             jContentPane.add(getJTextFieldFeatureFlag(), null);\r
             jContentPane.add(jLabelArch, null);\r
             jContentPane.add(jArchCheckBox, null);\r

+            // Hidden\r
+            jContentPane.add(getJTextFieldTokenSpaceGuid(), null);\r
+            jContentPane.add(jLabelTokenSpaceGuid, null);\r

             jContentPane.add(getJButtonOk(), null);\r
             jContentPane.add(getJButtonCancel(), null);\r
             jContentPane.add(getJButtonOk(), null);\r
             jContentPane.add(getJButtonCancel(), null);\r

+            jContentPane.add(jLabelUsage, null);\r
+            jContentPane.add(getJComboBoxUsage(), null);\r

         }\r
         return jContentPane;\r
     }\r
 \r
     /**\r
         }\r
         return jContentPane;\r
     }\r
 \r
     /**\r

-     This method initializes Usage type, Item type and Datum type\r
-     \r
-     **/\r
+     * This method initializes Usage type, Item type and Datum type\r
+     * \r
+     */\r

     private void initFrame() {\r
         for (int index = 0; index < pcd.size(); index++) {\r
             jComboBoxCName.addItem(pcd.getPcd(index));\r
         }\r
     private void initFrame() {\r
         for (int index = 0; index < pcd.size(); index++) {\r
             jComboBoxCName.addItem(pcd.getPcd(index));\r
         }\r

-        \r
-        //Tools.generateComboBoxByVector(jComboBoxItemType, ed.getVPcdItemTypes());\r
+\r
+        Tools.generateComboBoxByVector(jComboBoxUsage, ed.getVPcdUsage());\r

     }\r
 \r
     }\r
 \r

-    /* (non-Javadoc)\r
+    /*\r
+     * (non-Javadoc)\r
+     * \r

      * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)\r
      * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)\r

-     *\r
+     * \r

      * Override actionPerformed to listen all actions\r
      * \r
      */\r
      * Override actionPerformed to listen all actions\r
      * \r
      */\r


@@ -426,19 +465,19 @@ public class PCDsDlg extends IDialog implements ItemListener {
     }\r
 \r
     /**\r
     }\r
 \r
     /**\r

-     Data validation for all fields\r
-     \r
-     @retval true - All datas are valid\r
-     @retval false - At least one data is invalid\r
-     \r
-     **/\r
+     * Data validation for all fields\r
+     * \r
+     * @retval true - All datas are valid\r
+     * @retval false - At least one data is invalid\r
+     * \r
+     */\r

     public boolean checkAdd() {\r
         //\r
     public boolean checkAdd() {\r
         //\r

-        // Check if all fields have correct data types \r
+        // Check if all fields have correct data types\r

         //\r
 \r
         //\r
         //\r
 \r
         //\r

-        // Check C_Name \r
+        // Check C_Name\r

         //\r
         if (!isEmpty(this.jComboBoxCName.getSelectedItem().toString())) {\r
             if (!DataValidation.isC_NameType(this.jComboBoxCName.getSelectedItem().toString())) {\r
         //\r
         if (!isEmpty(this.jComboBoxCName.getSelectedItem().toString())) {\r
             if (!DataValidation.isC_NameType(this.jComboBoxCName.getSelectedItem().toString())) {\r


@@ -452,7 +491,8 @@ public class PCDsDlg extends IDialog implements ItemListener {
         //\r
         if (!isEmpty(this.jTextFieldTokenSpaceGuid.getText())) {\r
             if (!DataValidation.isC_NameType(this.jTextFieldTokenSpaceGuid.getText())) {\r
         //\r
         if (!isEmpty(this.jTextFieldTokenSpaceGuid.getText())) {\r
             if (!DataValidation.isC_NameType(this.jTextFieldTokenSpaceGuid.getText())) {\r

-                Log.wrn("Update PcdCoded", "Incorrect data type for the selected pcd entry, please check in in spd file");\r
+                Log.wrn("Update PcdCoded",\r
+                        "Incorrect data type for the selected pcd entry, please check in in spd file");\r

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


@@ -498,7 +538,12 @@ public class PCDsDlg extends IDialog implements ItemListener {
         String arg4 = this.jTextFieldDefaultValue.getText();\r
         String arg5 = this.jTextAreaHelpText.getText();\r
         String arg6 = this.jComboBoxItemType.getSelectedItem().toString();\r
         String arg4 = this.jTextFieldDefaultValue.getText();\r
         String arg5 = this.jTextAreaHelpText.getText();\r
         String arg6 = this.jComboBoxItemType.getSelectedItem().toString();\r

-        id = new PcdCodedIdentification(arg0, arg1, arg2, arg3, arg4, arg5, arg6);\r
+        String arg7 = this.jComboBoxUsage.getSelectedItem().toString();\r
+        if (arg7.equals(DataType.EMPTY_SELECT_ITEM)) {\r
+            arg7 = "";\r
+        }\r
+\r
+        id = new PcdCodedIdentification(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);\r

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


@@ -510,18 +555,22 @@ public class PCDsDlg extends IDialog implements ItemListener {
         this.id = id;\r
     }\r
 \r
         this.id = id;\r
     }\r
 \r

-    /* (non-Javadoc)\r
+    /*\r
+     * (non-Javadoc)\r
+     * \r

      * @see java.awt.event.ItemListener#itemStateChanged(java.awt.event.ItemEvent)\r
      * @see java.awt.event.ItemListener#itemStateChanged(java.awt.event.ItemEvent)\r

-     *\r
+     * \r

      * Reflesh the frame when selected item changed\r
      * \r
      */\r
     public void itemStateChanged(ItemEvent arg0) {\r
         int index = this.jComboBoxCName.getSelectedIndex();\r
      * Reflesh the frame when selected item changed\r
      * \r
      */\r
     public void itemStateChanged(ItemEvent arg0) {\r
         int index = this.jComboBoxCName.getSelectedIndex();\r

-        if (arg0.getSource() == this.jComboBoxCName && arg0.getStateChange() == ItemEvent.SELECTED ) {\r
+        if (arg0.getSource() == this.jComboBoxCName && arg0.getStateChange() == ItemEvent.SELECTED) {\r

             if (pcd.getPcd(index).getGuidCName() == null || isEmpty(pcd.getPcd(index).getGuidCName())\r
             if (pcd.getPcd(index).getGuidCName() == null || isEmpty(pcd.getPcd(index).getGuidCName())\r

-                || pcd.getPcd(index).getType() == null || pcd.getPcd(index).getHelp() == null || isEmpty(pcd.getPcd(index).getHelp())) {\r
-                Log.wrn("select pcd entry when editing msa", "The selected is defined incorrectly.\r\nPlease check it in spd file");\r
+                || 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

             } else {\r
                 this.jTextFieldTokenSpaceGuid.setText(pcd.getPcd(index).getGuidCName());\r
                 Tools.generateComboBoxByVector(this.jComboBoxItemType, pcd.getPcd(index).getType());\r
             } else {\r
                 this.jTextFieldTokenSpaceGuid.setText(pcd.getPcd(index).getGuidCName());\r
                 Tools.generateComboBoxByVector(this.jComboBoxItemType, pcd.getPcd(index).getType());\r