Fixed Absolute position of fields, Added ToolTipText and made HelpText a Scrolling...

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

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/BootModesDlg.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/BootModesDlg.java
index 778ac09924afd177377be71d91068483204cfd00..1ff4c8bb9988d7ec0804fe9dc62264a044063b7c 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/BootModesDlg.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/BootModesDlg.java
@@ -1,6 +1,7 @@
 /** @file\r
- \r
- The file is used to create, update BootModes of MSA/MBD file\r
+ <<The file is used to create, update BootModes of MSA file>>\r
+\r
+ <<The BootModesDlg is called to add or edit a Module's Boot Modes definitions.>>\r
  \r
  Copyright (c) 2006, Intel Corporation\r
  All rights reserved. This program and the accompanying materials\r
@@ -11,6 +12,9 @@
  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
  \r
+ Package Name: Tools\r
+ Module Name:  FrameworkWizard\r
+ \r
  **/\r
 \r
 package org.tianocore.frameworkwizard.module.ui.dialog;\r
@@ -38,377 +42,379 @@ import org.tianocore.frameworkwizard.common.ui.StarLabel;
 import org.tianocore.frameworkwizard.module.Identifications.BootModes.BootModesIdentification;\r
 \r
 /**\r
- The class is used to create, update BootModes of MSA/MBD file\r
- It extends IDialog\r
- \r
-\r
-\r
- **/\r
+ * The class is used to create, update BootModes of MSA/MBD file It extends\r
+ * IDialog\r
+ * \r
+ * \r
+ * \r
+ */\r
 public class BootModesDlg extends IDialog {\r
 \r
-    ///\r
-    /// Define class Serial Version UID\r
-    ///\r
-    private static final long serialVersionUID = -3888558623432442561L;\r
-\r
-    //\r
-    //Define class members\r
-    //\r
-    private JPanel jContentPane = null;\r
-\r
-    private JLabel jLabelBootModeName = null;\r
-\r
-    private JComboBox jComboBoxBootModeName = null;\r
+  // /\r
+  // / Define class Serial Version UID\r
+  // /\r
+  private static final long serialVersionUID = -3888558623432442561L;\r
 \r
-    private JLabel jLabelUsage = null;\r
+  //\r
+  // Define class members\r
+  //\r
+  private JPanel jContentPane = null;\r
 \r
-    private JComboBox jComboBoxUsage = null;\r
+  private JLabel jLabelBootModeName = null;\r
 \r
-    private StarLabel jStarLabel1 = null;\r
+  private JComboBox jComboBoxBootModeName = null;\r
 \r
-    private StarLabel jStarLabel2 = null;\r
+  private JLabel jLabelUsage = null;\r
 \r
-    private JLabel jLabelFeatureFlag = null;\r
+  private JComboBox jComboBoxUsage = null;\r
 \r
-    private JTextField jTextFieldFeatureFlag = null;\r
+  private StarLabel jStarLabel1 = null;\r
 \r
-    private JLabel jLabelArch = null;\r
+  private StarLabel jStarLabel2 = null;\r
 \r
-    private JScrollPane jScrollPane = null;\r
+  private JLabel jLabelFeatureFlag = null;\r
 \r
-    private JLabel jLabelHelpText = null;\r
+  private JTextField jTextFieldFeatureFlag = null;\r
 \r
-    private JTextArea jTextAreaHelpText = null;\r
+  private JLabel jLabelArch = null;\r
 \r
-    private JScrollPane jScrollPaneHelpText = null;\r
+  private JScrollPane jScrollPane = null;\r
 \r
-    private ArchCheckBox jArchCheckBox = null;\r
+  private JLabel jLabelHelpText = null;\r
 \r
-    private JButton jButtonOk = null;\r
+  private JTextArea jTextAreaHelpText = null;\r
 \r
-    private JButton jButtonCancel = null;\r
+  private JScrollPane jScrollPaneHelpText = null;\r
 \r
-    //\r
-    // Not used by UI\r
-    //\r
-    private BootModesIdentification id = null;\r
-\r
-    private EnumerationData ed = new EnumerationData();\r
-\r
-    /**\r
-     This method initializes jComboBoxBootModeName \r
-     \r
-     @return javax.swing.JComboBox jComboBoxBootModeName\r
-     \r
-     **/\r
-    private JComboBox getJComboBoxBootModeName() {\r
-        if (jComboBoxBootModeName == null) {\r
-            jComboBoxBootModeName = new JComboBox();\r
-            jComboBoxBootModeName.setBounds(new java.awt.Rectangle(160, 10, 320, 20));\r
-            jComboBoxBootModeName.setPreferredSize(new java.awt.Dimension(320, 20));\r
-            jComboBoxBootModeName.setToolTipText("<html><table><tr><td>FULL</td><td>Boot with full configuration</td></tr><tr><td>MINIMAL</td><td>Boot with minimal configuration</td></tr><tr><td>NO_CHANGE</td><td>Boot assuming no configuration changes</td></tr><tr><td>DIAGNOSTICS</td><td>Boot with full configuration plus diagnostics</td></tr><tr><td>DEFAULT</td><td>Boot with default settings</td></tr><tr><td>BOOT_ON_S#_RESUME</td><td>where # is 2, 3, 4 or 5</td></tr><tr><td>FLASH_UPDATE</td><td>Boot on flash update</td></tr><tr><td>RECOVERY</td><td>Boot in recovery mode</td></tr></table></html>");\r
-        }\r
-        return jComboBoxBootModeName;\r
-    }\r
+  private ArchCheckBox jArchCheckBox = null;\r
 \r
-    /**\r
-     This method initializes jComboBoxUsage \r
-     \r
-     @return javax.swing.JComboBox jComboBoxUsage\r
-     \r
-     **/\r
-    private JComboBox getJComboBoxUsage() {\r
-        if (jComboBoxUsage == null) {\r
-            jComboBoxUsage = new JComboBox();\r
-            jComboBoxUsage.setBounds(new java.awt.Rectangle(160, 35, 320, 20));\r
-            jComboBoxUsage.setPreferredSize(new java.awt.Dimension(320, 20));\r
-            jComboBoxUsage.setToolTipText("<html><table><tr><td>ALWAYS_CONSUMED</td><td>Indicates Supports the specified boot mode</td></tr><tr><td>SOMETIMES_CONSUMED</td><td>Indicates Supports the specified boot mode on some execution paths</td></tr><tr><td>ALWAYS_PRODUCED</td><td>Always changes the boot mode</td></tr><tr><td>SOMETIMES_PRODUCED</td><td>Change the boot mode sometimes</td></tr></table></html>");\r
-        }\r
-        return jComboBoxUsage;\r
-    }\r
+  private JButton jButtonOk = null;\r
 \r
-    /**\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
-            jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(160, 105, 320, 20));\r
-            jTextFieldFeatureFlag.setPreferredSize(new java.awt.Dimension(320, 20));\r
-        }\r
-        return jTextFieldFeatureFlag;\r
-    }\r
+  private JButton jButtonCancel = null;\r
 \r
-    /**\r
-     This method initializes jScrollPane  \r
-     \r
-     @return javax.swing.JScrollPane  \r
-     */\r
-    private JScrollPane getJScrollPane() {\r
-        if (jScrollPane == null) {\r
-            jScrollPane = new JScrollPane();\r
-            jScrollPane.setViewportView(getJContentPane());\r
-        }\r
-        return jScrollPane;\r
-    }\r
+  //\r
+  // Not used by UI\r
+  //\r
+  private BootModesIdentification id = null;\r
 \r
-    /**\r
-     This method initializes jTextAreaHelpText  \r
-     \r
-     @return javax.swing.JTextArea  \r
-     \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, 60, 320, 20));\r
-//            jTextAreaHelpText.setPreferredSize(new java.awt.Dimension(320, 20));\r
-        }\r
-        return jTextAreaHelpText;\r
-    }\r
+  private EnumerationData ed = new EnumerationData();\r
 \r
-    /**\r
-     This method initializes jScrollPaneHelpText  \r
-     \r
-     @return javax.swing.JScrollPane  \r
-     \r
-     **/\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, 60));\r
-        jScrollPaneHelpText.setViewportView(getJTextAreaHelpText());\r
-      }\r
-      return jScrollPaneHelpText;\r
+  /**\r
+   * This method initializes jComboBoxBootModeName\r
+   * \r
+   * @return javax.swing.JComboBox jComboBoxBootModeName\r
+   * \r
+   */\r
+  private JComboBox getJComboBoxBootModeName() {\r
+    if (jComboBoxBootModeName == null) {\r
+      jComboBoxBootModeName = new JComboBox();\r
+      jComboBoxBootModeName.setBounds(new java.awt.Rectangle(160, 10, 320, 20));\r
+      jComboBoxBootModeName.setPreferredSize(new java.awt.Dimension(320, 20));\r
+      jComboBoxBootModeName.setToolTipText("<html><table><tr><td>FULL</td><td>Boot with full configuration</td></tr><tr><td>MINIMAL</td><td>Boot with minimal configuration</td></tr><tr><td>NO_CHANGE</td><td>Boot assuming no configuration changes</td></tr><tr><td>DIAGNOSTICS</td><td>Boot with full configuration plus diagnostics</td></tr><tr><td>DEFAULT</td><td>Boot with default settings</td></tr><tr><td>BOOT_ON_S#_RESUME</td><td>where # is 2, 3, 4 or 5</td></tr><tr><td>FLASH_UPDATE</td><td>Boot on flash update</td></tr><tr><td>RECOVERY</td><td>Boot in recovery mode</td></tr></table></html>");\r
     }\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
-            jButtonOk.setBounds(new java.awt.Rectangle(290, 157, 90, 20));\r
-            jButtonOk.setText("Ok");\r
-            jButtonOk.addActionListener(this);\r
-        }\r
-        return jButtonOk;\r
+    return jComboBoxBootModeName;\r
+  }\r
+\r
+  /**\r
+   * This method initializes jComboBoxUsage\r
+   * \r
+   * @return javax.swing.JComboBox jComboBoxUsage\r
+   * \r
+   */\r
+  private JComboBox getJComboBoxUsage() {\r
+    if (jComboBoxUsage == null) {\r
+      jComboBoxUsage = new JComboBox();\r
+      jComboBoxUsage.setBounds(new java.awt.Rectangle(160, 35, 320, 20));\r
+      jComboBoxUsage.setPreferredSize(new java.awt.Dimension(320, 20));\r
+      jComboBoxUsage.setToolTipText("<html><table><tr><td>ALWAYS_CONSUMED</td><td>Indicates Supports the specified boot mode</td></tr><tr><td>SOMETIMES_CONSUMED</td><td>Indicates Supports the specified boot mode on some execution paths</td></tr><tr><td>ALWAYS_PRODUCED</td><td>Always changes the boot mode</td></tr><tr><td>SOMETIMES_PRODUCED</td><td>Change the boot mode sometimes</td></tr></table></html>");\r
     }\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
-            jButtonCancel.setBounds(new java.awt.Rectangle(390, 157, 90, 20));\r
-            jButtonCancel.setText("Cancel");\r
-            jButtonCancel.addActionListener(this);\r
-        }\r
-        return jButtonCancel;\r
+    return jComboBoxUsage;\r
+  }\r
+\r
+  /**\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
+      jTextFieldFeatureFlag\r
+          .setBounds(new java.awt.Rectangle(160, 105, 320, 20));\r
+      jTextFieldFeatureFlag.setPreferredSize(new java.awt.Dimension(320, 20));\r
+      jTextFieldFeatureFlag.setToolTipText("Postfix expression that must evaluate to TRUE or FALSE");\r
     }\r
-\r
-    public static void main(String[] args) {\r
+    return jTextFieldFeatureFlag;\r
+  }\r
+\r
+  /**\r
+   * This method initializes jScrollPane\r
+   * \r
+   * @return javax.swing.JScrollPane\r
+   */\r
+  private JScrollPane getJScrollPane() {\r
+    if (jScrollPane == null) {\r
+      jScrollPane = new JScrollPane();\r
+      jScrollPane.setViewportView(getJContentPane());\r
     }\r
-\r
-    /**\r
-     This method initializes this\r
-     \r
-     **/\r
-    private void init() {\r
-        this.setSize(500, 230);\r
-        this.setContentPane(getJScrollPane());\r
-        this.setTitle("Boot Modes");\r
-        initFrame();\r
-        this.setViewMode(false);\r
-        this.centerWindow();\r
+    return jScrollPane;\r
+  }\r
+\r
+  /**\r
+   * This method initializes jTextAreaHelpText\r
+   * \r
+   * @return javax.swing.JTextArea\r
+   * \r
+   */\r
+  private JTextArea getJTextAreaHelpText() {\r
+    if (jTextAreaHelpText == null) {\r
+      jTextAreaHelpText = new JTextArea();\r
+      jTextAreaHelpText.setLineWrap(true);\r
+      jTextAreaHelpText.setWrapStyleWord(true);\r
     }\r
-\r
-    /**\r
-     This method initializes this\r
-     Fill values to all fields if these values are not empty\r
-     \r
-     @param inBootModesId\r
-\r
-     **/\r
-    private void init(BootModesIdentification inBootModesId) {\r
-        init();\r
-        this.id = inBootModesId;\r
-\r
-        if (this.id != null) {\r
-            this.jComboBoxBootModeName.setSelectedItem(id.getName());\r
-            this.jComboBoxUsage.setSelectedItem(id.getUsage());\r
-            this.jTextAreaHelpText.setText(id.getHelp());\r
-            this.jTextFieldFeatureFlag.setText(id.getFeatureFlag());\r
-            this.jArchCheckBox.setSelectedItems(id.getSupArchList());\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
+    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, 60));\r
+      jScrollPaneHelpText.setViewportView(getJTextAreaHelpText());\r
     }\r
-\r
-    /**\r
-     This is the override edit constructor\r
-     \r
-     @param inBootModesIdentification\r
-     @param iFrame\r
-     \r
-     **/\r
-    public BootModesDlg(BootModesIdentification inBootModesIdentification, IFrame iFrame) {\r
-        super(iFrame, true);\r
-        init(inBootModesIdentification);\r
+    return jScrollPaneHelpText;\r
+  }\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
+      jButtonOk.setBounds(new java.awt.Rectangle(290, 157, 90, 20));\r
+      jButtonOk.setText("Ok");\r
+      jButtonOk.addActionListener(this);\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
-    public void setViewMode(boolean isView) {\r
-        if (isView) {\r
-            this.jComboBoxBootModeName.setEnabled(!isView);\r
-            this.jComboBoxUsage.setEnabled(!isView);\r
-        }\r
+    return jButtonOk;\r
+  }\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
+      jButtonCancel.setBounds(new java.awt.Rectangle(390, 157, 90, 20));\r
+      jButtonCancel.setText("Cancel");\r
+      jButtonCancel.addActionListener(this);\r
     }\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
-            jStarLabel1 = new StarLabel();\r
-            jStarLabel1.setLocation(new java.awt.Point(2, 10));\r
-            jLabelBootModeName = new JLabel();\r
-            jLabelBootModeName.setText("Boot Mode Name");\r
-            jLabelBootModeName.setBounds(new java.awt.Rectangle(15, 10, 145, 20));\r
-            jStarLabel2 = new StarLabel();\r
-            jStarLabel2.setLocation(new java.awt.Point(2, 35));\r
-            jLabelUsage = new JLabel();\r
-            jLabelUsage.setText("Usage");\r
-            jLabelUsage.setBounds(new java.awt.Rectangle(15, 35, 145, 20));\r
-            jLabelHelpText = new JLabel();\r
-            jLabelHelpText.setBounds(new java.awt.Rectangle(15, 60, 145, 20));\r
-            jLabelHelpText.setText("Help Text");\r
-            jLabelFeatureFlag = new JLabel();\r
-            jLabelFeatureFlag.setBounds(new java.awt.Rectangle(15, 105, 145, 20));\r
-            jLabelFeatureFlag.setText("Feature Flag");\r
-            jLabelArch = new JLabel();\r
-            jLabelArch.setBounds(new java.awt.Rectangle(15, 130, 145, 20));\r
-            jLabelArch.setText("Supported Archectures");\r
-            jArchCheckBox = new ArchCheckBox();\r
-            jArchCheckBox.setBounds(new java.awt.Rectangle(160, 130, 320, 20));\r
-            jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20));\r
-\r
-            jContentPane = new JPanel();\r
-            jContentPane.setLayout(null);\r
-            jContentPane.setPreferredSize(new java.awt.Dimension(485, 185));\r
-\r
-            jContentPane.add(jLabelBootModeName, null);\r
-            jContentPane.add(getJComboBoxBootModeName(), null);\r
-            jContentPane.add(jLabelUsage, null);\r
-            jContentPane.add(getJComboBoxUsage(), null);\r
-\r
-            jContentPane.add(jStarLabel1, null);\r
-            jContentPane.add(jStarLabel2, null);\r
-            jContentPane.add(jLabelFeatureFlag, null);\r
-            jContentPane.add(getJTextFieldFeatureFlag(), null);\r
-            jContentPane.add(jLabelArch, null);\r
-\r
-            jContentPane.add(jLabelHelpText, null);\r
-            jContentPane.add(getJScrollPaneHelpText(), null);\r
-            jContentPane.add(jArchCheckBox, null);\r
-            jContentPane.add(getJButtonOk(), null);\r
-            jContentPane.add(getJButtonCancel(), null);\r
-        }\r
-        return jContentPane;\r
+    return jButtonCancel;\r
+  }\r
+\r
+  public static void main(String[] args) {\r
+  }\r
+\r
+  /**\r
+   * This method initializes this\r
+   * \r
+   */\r
+  private void init() {\r
+    this.setSize(500, 230);\r
+    this.setContentPane(getJScrollPane());\r
+    this.setTitle("Boot Modes");\r
+    initFrame();\r
+    this.setViewMode(false);\r
+    this.centerWindow();\r
+  }\r
+\r
+  /**\r
+   * This method initializes this Fill values to all fields if these values are\r
+   * not empty\r
+   * \r
+   * @param inBootModesId\r
+   * \r
+   */\r
+  private void init(BootModesIdentification inBootModesId) {\r
+    init();\r
+    this.id = inBootModesId;\r
+\r
+    if (this.id != null) {\r
+      this.jComboBoxBootModeName.setSelectedItem(id.getName());\r
+      this.jComboBoxUsage.setSelectedItem(id.getUsage());\r
+      this.jTextAreaHelpText.setText(id.getHelp());\r
+      this.jTextFieldFeatureFlag.setText(id.getFeatureFlag());\r
+      this.jArchCheckBox.setSelectedItems(id.getSupArchList());\r
     }\r
-\r
-    /**\r
-     This method initializes BootModeName groups and Usage type\r
-     \r
-     **/\r
-    private void initFrame() {\r
-        Tools.generateComboBoxByVector(jComboBoxBootModeName, ed.getVBootModeNames());\r
-        Tools.generateComboBoxByVector(jComboBoxUsage, ed.getVPpiUsage());\r
+  }\r
+\r
+  /**\r
+   * This is the override edit constructor\r
+   * \r
+   * @param inBootModesIdentification\r
+   * @param iFrame\r
+   * \r
+   */\r
+  public BootModesDlg(BootModesIdentification inBootModesIdentification, IFrame iFrame) {\r
+    super(iFrame, true);\r
+    init(inBootModesIdentification);\r
+  }\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.jComboBoxBootModeName.setEnabled(!isView);\r
+      this.jComboBoxUsage.setEnabled(!isView);\r
     }\r
-\r
-    /* (non-Javadoc)\r
-     * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)\r
-     *\r
-     * Override actionPerformed to listen all actions\r
-     * \r
-     */\r
-    public void actionPerformed(ActionEvent arg0) {\r
-        if (arg0.getSource() == jButtonOk) {\r
-            if (checkAdd()) {\r
-                getCurrentBootModes();\r
-                this.returnType = DataType.RETURN_TYPE_OK;\r
-                this.setVisible(false);\r
-            }\r
-        }\r
-\r
-        if (arg0.getSource() == jButtonCancel) {\r
-            this.returnType = DataType.RETURN_TYPE_CANCEL;\r
-            this.setVisible(false);\r
-        }\r
+  }\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
+      jStarLabel1 = new StarLabel();\r
+      jStarLabel1.setLocation(new java.awt.Point(2, 10));\r
+      jLabelBootModeName = new JLabel();\r
+      jLabelBootModeName.setText("Boot Mode Name");\r
+      jLabelBootModeName.setBounds(new java.awt.Rectangle(15, 10, 145, 20));\r
+      jStarLabel2 = new StarLabel();\r
+      jStarLabel2.setLocation(new java.awt.Point(2, 35));\r
+      jLabelUsage = new JLabel();\r
+      jLabelUsage.setText("Usage");\r
+      jLabelUsage.setBounds(new java.awt.Rectangle(15, 35, 145, 20));\r
+      jLabelHelpText = new JLabel();\r
+      jLabelHelpText.setBounds(new java.awt.Rectangle(15, 60, 145, 20));\r
+      jLabelHelpText.setText("Help Text");\r
+      jLabelFeatureFlag = new JLabel();\r
+      jLabelFeatureFlag.setBounds(new java.awt.Rectangle(15, 105, 145, 20));\r
+      jLabelFeatureFlag.setText("Feature Flag Expression");\r
+      jLabelArch = new JLabel();\r
+      jLabelArch.setBounds(new java.awt.Rectangle(15, 130, 145, 20));\r
+      jLabelArch.setText("Supported Archectures");\r
+      jArchCheckBox = new ArchCheckBox();\r
+      jArchCheckBox.setBounds(new java.awt.Rectangle(160, 130, 320, 20));\r
+      jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20));\r
+\r
+      jContentPane = new JPanel();\r
+      jContentPane.setLayout(null);\r
+      jContentPane.setPreferredSize(new java.awt.Dimension(485, 185));\r
+\r
+      jContentPane.add(jLabelBootModeName, null);\r
+      jContentPane.add(getJComboBoxBootModeName(), null);\r
+      jContentPane.add(jLabelUsage, null);\r
+      jContentPane.add(getJComboBoxUsage(), null);\r
+\r
+      jContentPane.add(jStarLabel1, null);\r
+      jContentPane.add(jStarLabel2, null);\r
+      jContentPane.add(jLabelFeatureFlag, null);\r
+      jContentPane.add(getJTextFieldFeatureFlag(), null);\r
+      jContentPane.add(jLabelArch, null);\r
+\r
+      jContentPane.add(jLabelHelpText, null);\r
+      jContentPane.add(getJScrollPaneHelpText(), null);\r
+      jContentPane.add(jArchCheckBox, null);\r
+      jContentPane.add(getJButtonOk(), null);\r
+      jContentPane.add(getJButtonCancel(), null);\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
-    public boolean checkAdd() {\r
-        //\r
-        // Check if all fields have correct data types \r
-        //\r
-\r
-        //\r
-        // Check FeatureFlag\r
-        //\r
-        if (!isEmpty(this.jTextFieldFeatureFlag.getText())) {\r
-            if (!DataValidation.isFeatureFlag(this.jTextFieldFeatureFlag.getText())) {\r
-                Log.wrn("Update Boot Modes", "Incorrect data type for Feature Flag");\r
-                return false;\r
-            }\r
-        }\r
-\r
-        return true;\r
+    return jContentPane;\r
+  }\r
+\r
+  /**\r
+   * This method initializes BootModeName groups and Usage type\r
+   * \r
+   */\r
+  private void initFrame() {\r
+    Tools.generateComboBoxByVector(jComboBoxBootModeName, ed.getVBootModeNames());\r
+    Tools.generateComboBoxByVector(jComboBoxUsage, ed.getVPpiUsage());\r
+  }\r
+\r
+  /*\r
+   * (non-Javadoc)\r
+   * \r
+   * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)\r
+   * \r
+   * Override actionPerformed to listen all actions\r
+   * \r
+   */\r
+  public void actionPerformed(ActionEvent arg0) {\r
+    if (arg0.getSource() == jButtonOk) {\r
+      if (checkAdd()) {\r
+        getCurrentBootModes();\r
+        this.returnType = DataType.RETURN_TYPE_OK;\r
+        this.setVisible(false);\r
+      }\r
     }\r
 \r
-    private BootModesIdentification getCurrentBootModes() {\r
-        String arg0 = this.jComboBoxBootModeName.getSelectedItem().toString();\r
-\r
-        String arg1 = this.jComboBoxUsage.getSelectedItem().toString();\r
-\r
-        String arg2 = this.jTextFieldFeatureFlag.getText();\r
-        Vector<String> arg3 = this.jArchCheckBox.getSelectedItemsVector();\r
-        String arg4 = this.jTextAreaHelpText.getText();\r
-        id = new BootModesIdentification(arg0, arg1, arg2, arg3, arg4);\r
-        return id;\r
+    if (arg0.getSource() == jButtonCancel) {\r
+      this.returnType = DataType.RETURN_TYPE_CANCEL;\r
+      this.setVisible(false);\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
+  public boolean checkAdd() {\r
+    //\r
+    // Check if all fields have correct data types\r
+    //\r
 \r
-    public BootModesIdentification getId() {\r
-        return id;\r
+    //\r
+    // Check FeatureFlag\r
+    //\r
+    if (!isEmpty(this.jTextFieldFeatureFlag.getText())) {\r
+      if (!DataValidation.isFeatureFlag(this.jTextFieldFeatureFlag.getText())) {\r
+        Log.wrn("Update Boot Modes", "Incorrect data type for Feature Flag");\r
+        return false;\r
+      }\r
     }\r
 \r
-    public void setId(BootModesIdentification id) {\r
-        this.id = id;\r
-    }\r
+    return true;\r
+  }\r
+\r
+  private BootModesIdentification getCurrentBootModes() {\r
+    String arg0 = this.jComboBoxBootModeName.getSelectedItem().toString();\r
+    String arg1 = this.jComboBoxUsage.getSelectedItem().toString();\r
+\r
+    String arg2 = this.jTextFieldFeatureFlag.getText();\r
+    Vector<String> arg3 = this.jArchCheckBox.getSelectedItemsVector();\r
+    String arg4 = this.jTextAreaHelpText.getText();\r
+    id = new BootModesIdentification(arg0, arg1, arg2, arg3, arg4);\r
+    return id;\r
+  }\r
+  \r
+  public BootModesIdentification getId() {\r
+    return id;\r
+  }\r
+\r
+  public void setId(BootModesIdentification id) {\r
+    this.id = id;\r
+  }\r
 }\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/DataHubsDlg.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/DataHubsDlg.java
index ba71a20f67e45ddcd07bd105fb8cb3110c6b3e01..56a856e49d95e76d702fdff68d3340dda27f9045 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/DataHubsDlg.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/DataHubsDlg.java
@@ -1,6 +1,7 @@
 /** @file\r
+ <<The file is used to create, update Data Hub Record entries in a MSA file.>>\r
  \r
- The file is used to create, update DataHub of MSA/MBD file\r
+ <<The DataHbsDlg is a dialog called to add or edit a Data Hub Record within a MSA file.>>\r
  \r
  Copyright (c) 2006, Intel Corporation\r
  All rights reserved. This program and the accompanying materials\r
@@ -11,6 +12,9 @@
  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
  \r
+ Package Name: Tools\r
+ Module Name:  FrameworkWizard\r
+ \r
  **/\r
 \r
 package org.tianocore.frameworkwizard.module.ui.dialog;\r
@@ -24,6 +28,7 @@ import javax.swing.JLabel;
 import javax.swing.JPanel;\r
 import javax.swing.JScrollPane;\r
 import javax.swing.JTextField;\r
+import javax.swing.JTextArea;\r
 \r
 import org.tianocore.frameworkwizard.common.DataType;\r
 import org.tianocore.frameworkwizard.common.DataValidation;\r
@@ -37,371 +42,398 @@ import org.tianocore.frameworkwizard.common.ui.StarLabel;
 import org.tianocore.frameworkwizard.module.Identifications.DataHubs.DataHubsIdentification;\r
 \r
 /**\r
- The class is used to create, update DataHub of MSA/MBD file\r
- It extends IInternalFrame\r
- \r
+ * The class is used to create, update DataHub of MSA/MBD file It extends\r
+ * IInternalFrame\r
+ * \r
+ * \r
+ * \r
+ */\r
+public class DataHubsDlg extends IDialog {\r
 \r
+  // /\r
+  // / Define class Serial Version UID\r
+  // /\r
+  private static final long serialVersionUID = -3667906991966638892L;\r
 \r
- **/\r
-public class DataHubsDlg extends IDialog {\r
+  //\r
+  // Define class members\r
+  //\r
+  private JPanel jContentPane = null;\r
 \r
-    ///\r
-    /// Define class Serial Version UID\r
-    ///\r
-    private static final long serialVersionUID = -3667906991966638892L;\r
+  private JLabel jLabelUsage = null;\r
 \r
-    //\r
-    //Define class members\r
-    //\r
-    private JPanel jContentPane = null;\r
+  private JComboBox jComboBoxUsage = null;\r
 \r
-    private JLabel jLabelUsage = null;\r
+  private JLabel jLabelDataHubRecord = null;\r
 \r
-    private JComboBox jComboBoxUsage = null;\r
+  private JTextField jTextFieldDataHubRecord = null;\r
 \r
-    private JLabel jLabelDataHubRecord = null;\r
+  private StarLabel jStarLabel1 = null;\r
 \r
-    private JTextField jTextFieldDataHubRecord = null;\r
+  private StarLabel jStarLabel2 = null;\r
 \r
-    private StarLabel jStarLabel1 = null;\r
+  private JLabel jLabelFeatureFlag = null;\r
 \r
-    private StarLabel jStarLabel2 = null;\r
+  private JTextField jTextFieldFeatureFlag = null;\r
 \r
-    private JLabel jLabelFeatureFlag = null;\r
+  private JLabel jLabelArch = null;\r
 \r
-    private JTextField jTextFieldFeatureFlag = null;\r
+  private JScrollPane jScrollPane = null;\r
 \r
-    private JLabel jLabelArch = null;\r
+  private JLabel jLabelHelpText = null;\r
 \r
-    private JScrollPane jScrollPane = null;\r
+  private JTextArea jTextAreaHelpText = null;\r
 \r
-    private JLabel jLabelHelpText = null;\r
+  private JScrollPane jScrollPaneHelpText = null;\r
 \r
-    private JTextField jTextFieldHelpText = null;\r
+  private ArchCheckBox jArchCheckBox = null;\r
 \r
-    private ArchCheckBox jArchCheckBox = null;\r
+  private JButton jButtonOk = null;\r
 \r
-    private JButton jButtonOk = null;\r
+  private JButton jButtonCancel = null;\r
 \r
-    private JButton jButtonCancel = null;\r
+  //\r
+  // Not used by UI\r
+  //\r
+  private DataHubsIdentification id = null;\r
 \r
-    //\r
-    // Not used by UI\r
-    //\r
-    private DataHubsIdentification id = null;\r
-\r
-    private EnumerationData ed = new EnumerationData();\r
-\r
-    /**\r
-     This method initializes jComboBoxUsage \r
-     \r
-     @return javax.swing.JComboBox jComboBoxUsage\r
-     \r
-     **/\r
-    private JComboBox getJComboBoxUsage() {\r
-        if (jComboBoxUsage == null) {\r
-            jComboBoxUsage = new JComboBox();\r
-            jComboBoxUsage.setBounds(new java.awt.Rectangle(160, 35, 320, 20));\r
-            jComboBoxUsage.setPreferredSize(new java.awt.Dimension(320, 20));\r
-        }\r
-        return jComboBoxUsage;\r
-    }\r
+  private EnumerationData ed = new EnumerationData();\r
 \r
-    /**\r
-     This method initializes jTextFieldDataHubRecord \r
-     \r
-     @return javax.swing.JTextField jTextFieldDataHubRecord\r
-     \r
-     **/\r
-    private JTextField getJTextFieldDataHubRecord() {\r
-        if (jTextFieldDataHubRecord == null) {\r
-            jTextFieldDataHubRecord = new JTextField();\r
-            jTextFieldDataHubRecord.setBounds(new java.awt.Rectangle(160, 10, 320, 20));\r
-            jTextFieldDataHubRecord.setPreferredSize(new java.awt.Dimension(320, 20));\r
-            jTextFieldDataHubRecord.setToolTipText("Enter the C Name of the Data Hub Record");\r
-        }\r
-        return jTextFieldDataHubRecord;\r
+  /**\r
+   * This method initializes jTextFieldDataHubRecord\r
+   * \r
+   * @return javax.swing.JTextField jTextFieldDataHubRecord\r
+   * \r
+   */\r
+  private JTextField getJTextFieldDataHubRecord() {\r
+    if (jTextFieldDataHubRecord == null) {\r
+      jTextFieldDataHubRecord = new JTextField();\r
+      jTextFieldDataHubRecord\r
+          .setBounds(new java.awt.Rectangle(160, 10, 320, 20));\r
+      jTextFieldDataHubRecord.setPreferredSize(new java.awt.Dimension(320, 20));\r
+      jTextFieldDataHubRecord\r
+          .setToolTipText("Enter the C Name of the Data Hub Record");\r
     }\r
-\r
-    /**\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
-            jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(160, 85, 320, 20));\r
-            jTextFieldFeatureFlag.setPreferredSize(new java.awt.Dimension(320, 20));\r
-        }\r
-        return jTextFieldFeatureFlag;\r
+    return jTextFieldDataHubRecord;\r
+  }\r
+\r
+  /**\r
+   * This method initializes jComboBoxUsage\r
+   * \r
+   * @return javax.swing.JComboBox jComboBoxUsage\r
+   * \r
+   */\r
+  private JComboBox getJComboBoxUsage() {\r
+    if (jComboBoxUsage == null) {\r
+      jComboBoxUsage = new JComboBox();\r
+      jComboBoxUsage.setBounds(new java.awt.Rectangle(160, 35, 320, 20));\r
+      jComboBoxUsage.setPreferredSize(new java.awt.Dimension(320, 20));\r
+      jComboBoxUsage\r
+          .setToolTipText("<html><table><tr><td>ALWAYS_CONSUMED</td><td>Module always consumes a Data Hub Entry<br>via registering a filter driver.</td></tr><tr><td>SOMETIMES_CONSUMED</td><td>Module will use a Data Hub Entry if it exists<br>via registering a filter driver</td></tr><tr><td>ALWAYS_PRODUCED</td><td>Always logs data into the Data Hub</td></tr><tr><td>SOMETIMES_PRODUCED</td><td>Log data into the Data Hub under<br>certain circumstances</td></tr></table></html>");\r
     }\r
-\r
-    /**\r
-     This method initializes jScrollPane  \r
-     \r
-     @return javax.swing.JScrollPane  \r
-     */\r
-    private JScrollPane getJScrollPane() {\r
-        if (jScrollPane == null) {\r
-            jScrollPane = new JScrollPane();\r
-            jScrollPane.setViewportView(getJContentPane());\r
-        }\r
-        return jScrollPane;\r
+    return jComboBoxUsage;\r
+  }\r
+\r
+  /**\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
+      jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(160, 105, 320, 20));\r
+      jTextFieldFeatureFlag.setPreferredSize(new java.awt.Dimension(320, 20));\r
+      jTextFieldFeatureFlag.setToolTipText("Postfix expression that must evaluate to TRUE or FALSE");\r
     }\r
-\r
-    /**\r
-     This method initializes jTextFieldHelpText  \r
-     \r
-     @return javax.swing.JTextField  \r
-     \r
-     **/\r
-    private JTextField getJTextFieldHelpText() {\r
-        if (jTextFieldHelpText == null) {\r
-            jTextFieldHelpText = new JTextField();\r
-            jTextFieldHelpText.setBounds(new java.awt.Rectangle(160, 60, 320, 20));\r
-            jTextFieldHelpText.setPreferredSize(new java.awt.Dimension(320, 20));\r
-        }\r
-        return jTextFieldHelpText;\r
+    return jTextFieldFeatureFlag;\r
+  }\r
+\r
+  /**\r
+   * This method initializes jScrollPane\r
+   * \r
+   * @return javax.swing.JScrollPane\r
+   */\r
+  private JScrollPane getJScrollPane() {\r
+    if (jScrollPane == null) {\r
+      jScrollPane = new JScrollPane();\r
+      jScrollPane.setViewportView(getJContentPane());\r
     }\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
-            jButtonOk.setBounds(new java.awt.Rectangle(290, 140, 90, 20));\r
-            jButtonOk.setText("Ok");\r
-            jButtonOk.addActionListener(this);\r
-        }\r
-        return jButtonOk;\r
+    return jScrollPane;\r
+  }\r
+\r
+  /**\r
+   * This method initializes jTextAreaHelpText\r
+   * \r
+   * @return javax.swing.JTextArea\r
+   * \r
+   */\r
+  private JTextArea getJTextAreaHelpText() {\r
+    if (jTextAreaHelpText == null) {\r
+      jTextAreaHelpText = new JTextArea();\r
+      jTextAreaHelpText.setLineWrap(true);\r
+      jTextAreaHelpText.setWrapStyleWord(true);\r
     }\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
-            jButtonCancel.setBounds(new java.awt.Rectangle(390, 140, 90, 20));\r
-            jButtonCancel.setText("Cancel");\r
-            jButtonCancel.addActionListener(this);\r
-        }\r
-        return jButtonCancel;\r
+    return jTextAreaHelpText;\r
+  }\r
+\r
+  /**\r
+   * This method initializes jScrollPaneHelpText\r
+   * \r
+   * @return javax.swing.JScrollPane\r
+   * \r
+   */\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,60));\r
+      jScrollPaneHelpText.setViewportView(getJTextAreaHelpText());\r
     }\r
-\r
-    public static void main(String[] args) {\r
-\r
+    return jScrollPaneHelpText;\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
+      jButtonOk.setBounds(new java.awt.Rectangle(290, 157, 90, 20));\r
+      jButtonOk.setText("Ok");\r
+      jButtonOk.addActionListener(this);\r
     }\r
-\r
-    /**\r
-     This method initializes this\r
-     \r
-     **/\r
-    private void init() {\r
-        this.setSize(508, 220);\r
-        this.setContentPane(getJScrollPane());\r
-        this.setTitle("Data Hubs");\r
-        initFrame();\r
-        this.setViewMode(false);\r
-        this.centerWindow();\r
+    return jButtonOk;\r
+  }\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
+      jButtonCancel.setBounds(new java.awt.Rectangle(390, 157, 90, 20));\r
+      jButtonCancel.setText("Cancel");\r
+      jButtonCancel.addActionListener(this);\r
     }\r
-\r
-    /**\r
-     This method initializes this\r
-     Fill values to all fields if these values are not empty\r
-     \r
-     @param inDataHubsId\r
-\r
-     **/\r
-    private void init(DataHubsIdentification inDataHubsId) {\r
-        init();\r
-        this.id = inDataHubsId;\r
-\r
-        if (this.id != null) {\r
-            this.jTextFieldDataHubRecord.setText(id.getName());\r
-            this.jComboBoxUsage.setSelectedItem(id.getUsage());\r
-            this.jTextFieldHelpText.setText(id.getHelp());\r
-            this.jTextFieldFeatureFlag.setText(id.getFeatureFlag());\r
-            this.jArchCheckBox.setSelectedItems(id.getSupArchList());\r
-        }\r
+    return jButtonCancel;\r
+  }\r
+\r
+  public static void main(String[] args) {\r
+\r
+  }\r
+\r
+  /**\r
+   * This method initializes this\r
+   * \r
+   */\r
+  private void init() {\r
+    this.setSize(500, 230);\r
+    this.setContentPane(getJScrollPane());\r
+    this.setTitle("Data Hubs");\r
+    initFrame();\r
+    this.setViewMode(false);\r
+    this.centerWindow();\r
+  }\r
+\r
+  /**\r
+   * This method initializes this Fill values to all fields if these values are\r
+   * not empty\r
+   * \r
+   * @param inDataHubsId\r
+   * \r
+   */\r
+  private void init(DataHubsIdentification inDataHubsId) {\r
+    init();\r
+    this.id = inDataHubsId;\r
+\r
+    if (this.id != null) {\r
+      this.jTextFieldDataHubRecord.setText(id.getName());\r
+      this.jComboBoxUsage.setSelectedItem(id.getUsage());\r
+      this.jTextAreaHelpText.setText(id.getHelp());\r
+      this.jTextFieldFeatureFlag.setText(id.getFeatureFlag());\r
+      this.jArchCheckBox.setSelectedItems(id.getSupArchList());\r
     }\r
-\r
-    /**\r
-     This is the override edit constructor\r
-     \r
-     @param inDataHubsIdentification\r
-     @param iFrame\r
-     \r
-     **/\r
-    public DataHubsDlg(DataHubsIdentification inDataHubsIdentification, IFrame iFrame) {\r
-        super(iFrame, true);\r
-        init(inDataHubsIdentification);\r
+  }\r
+\r
+  /**\r
+   * This is the override edit constructor\r
+   * \r
+   * @param inDataHubsIdentification\r
+   * @param iFrame\r
+   * \r
+   */\r
+  public DataHubsDlg(DataHubsIdentification inDataHubsIdentification,\r
+      IFrame iFrame) {\r
+    super(iFrame, true);\r
+    init(inDataHubsIdentification);\r
+  }\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.jTextFieldDataHubRecord.setEnabled(!isView);\r
+      this.jComboBoxUsage.setEnabled(!isView);\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
-    public void setViewMode(boolean isView) {\r
-        if (isView) {\r
-            this.jTextFieldDataHubRecord.setEnabled(!isView);\r
-            this.jComboBoxUsage.setEnabled(!isView);\r
-        }\r
+  }\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
+      jStarLabel1 = new StarLabel();\r
+      jStarLabel1.setLocation(new java.awt.Point(2, 10));\r
+      jLabelDataHubRecord = new JLabel();\r
+      jLabelDataHubRecord.setBounds(new java.awt.Rectangle(15, 10, 145, 20));\r
+      jLabelDataHubRecord.setText("Data Hub Record");\r
+      jStarLabel2 = new StarLabel();\r
+      jStarLabel2.setLocation(new java.awt.Point(2, 35));\r
+      jLabelUsage = new JLabel();\r
+      jLabelUsage.setText("Usage");\r
+      jLabelUsage.setBounds(new java.awt.Rectangle(15, 35, 145, 20));\r
+      jLabelHelpText = new JLabel();\r
+      jLabelHelpText.setBounds(new java.awt.Rectangle(14, 60, 145, 20));\r
+      jLabelHelpText.setText("Help Text");\r
+      jLabelFeatureFlag = new JLabel();\r
+      jLabelFeatureFlag.setBounds(new java.awt.Rectangle(15, 105, 145, 20));\r
+      jLabelFeatureFlag.setText("Feature Flag Expression");\r
+      jLabelArch = new JLabel();\r
+      jLabelArch.setBounds(new java.awt.Rectangle(15, 130, 145, 20));\r
+      jLabelArch.setText("Supported Architectures");\r
+      jArchCheckBox = new ArchCheckBox();\r
+      jArchCheckBox.setBounds(new java.awt.Rectangle(160, 130, 320, 20));\r
+      jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20));\r
+\r
+      jContentPane = new JPanel();\r
+      jContentPane.setLayout(null);\r
+      jContentPane.setPreferredSize(new java.awt.Dimension(485, 185));\r
+\r
+      jContentPane.add(jLabelDataHubRecord, null);\r
+      jContentPane.add(jLabelUsage, null);\r
+      jContentPane.add(jLabelFeatureFlag, null);\r
+      jContentPane.add(jLabelArch, null);\r
+\r
+      jContentPane.add(getJTextFieldDataHubRecord(), null);\r
+      jContentPane.add(getJComboBoxUsage(), null);\r
+      jContentPane.add(getJTextFieldFeatureFlag(), null);\r
+\r
+      jContentPane.add(jStarLabel1, null);\r
+      jContentPane.add(jStarLabel2, null);\r
+\r
+      jContentPane.add(jLabelHelpText, null);\r
+      jContentPane.add(getJScrollPaneHelpText(), null);\r
+      jContentPane.add(jArchCheckBox, null);\r
+      jContentPane.add(getJButtonOk(), null);\r
+      jContentPane.add(getJButtonCancel(), null);\r
+    }\r
+    return jContentPane;\r
+  }\r
+\r
+  /**\r
+   * This method initializes Usage type\r
+   * \r
+   */\r
+  private void initFrame() {\r
+    Tools.generateComboBoxByVector(jComboBoxUsage, ed.getVDataHubUsage());\r
+  }\r
+\r
+  /*\r
+   * (non-Javadoc)\r
+   * \r
+   * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)\r
+   * \r
+   * Override actionPerformed to listen all actions\r
+   * \r
+   */\r
+  public void actionPerformed(ActionEvent arg0) {\r
+    if (arg0.getSource() == jButtonOk) {\r
+      if (checkAdd()) {\r
+        getCurrentDataHubs();\r
+        this.returnType = DataType.RETURN_TYPE_OK;\r
+        this.setVisible(false);\r
+      }\r
     }\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
-            jArchCheckBox = new ArchCheckBox();\r
-            jArchCheckBox.setBounds(new java.awt.Rectangle(160, 110, 320, 20));\r
-            jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20));\r
-            jLabelDataHubRecord = new JLabel();\r
-            jLabelDataHubRecord.setBounds(new java.awt.Rectangle(15, 10, 140, 20));\r
-            jLabelDataHubRecord.setText("Data Hub Record");\r
-            jLabelUsage = new JLabel();\r
-            jLabelUsage.setText("Usage");\r
-            jLabelUsage.setBounds(new java.awt.Rectangle(15, 35, 140, 20));\r
-            jLabelArch = new JLabel();\r
-            jLabelArch.setBounds(new java.awt.Rectangle(15, 110, 140, 20));\r
-            jLabelArch.setText("Arch");\r
-            jLabelFeatureFlag = new JLabel();\r
-            jLabelFeatureFlag.setBounds(new java.awt.Rectangle(15, 85, 140, 20));\r
-            jLabelFeatureFlag.setText("Feature Flag");\r
-            jLabelHelpText = new JLabel();\r
-            jLabelHelpText.setBounds(new java.awt.Rectangle(14, 60, 140, 20));\r
-            jLabelHelpText.setText("Help Text");\r
-\r
-            jContentPane = new JPanel();\r
-            jContentPane.setLayout(null);\r
-            jContentPane.setPreferredSize(new java.awt.Dimension(490, 165));\r
-\r
-            jContentPane.add(jLabelDataHubRecord, null);\r
-            jContentPane.add(jLabelUsage, null);\r
-            jContentPane.add(jLabelFeatureFlag, null);\r
-            jContentPane.add(jLabelArch, null);\r
-\r
-            jContentPane.add(getJTextFieldDataHubRecord(), null);\r
-            jContentPane.add(getJComboBoxUsage(), null);\r
-            jContentPane.add(getJTextFieldFeatureFlag(), null);\r
-\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
-\r
-            jContentPane.add(jStarLabel1, null);\r
-            jContentPane.add(jStarLabel2, null);\r
-\r
-            jContentPane.add(jLabelHelpText, null);\r
-            jContentPane.add(getJTextFieldHelpText(), null);\r
-            jContentPane.add(jArchCheckBox, null);\r
-            jContentPane.add(getJButtonOk(), null);\r
-            jContentPane.add(getJButtonCancel(), null);\r
-        }\r
-        return jContentPane;\r
+    if (arg0.getSource() == jButtonCancel) {\r
+      this.returnType = DataType.RETURN_TYPE_CANCEL;\r
+      this.setVisible(false);\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
+  public boolean checkAdd() {\r
+    //\r
+    // Check if all fields have correct data types\r
+    //\r
 \r
-    /**\r
-     This method initializes Usage type\r
-     \r
-     **/\r
-    private void initFrame() {\r
-        Tools.generateComboBoxByVector(jComboBoxUsage, ed.getVDataHubUsage());\r
+    //\r
+    // Check DataHubRecord\r
+    //\r
+    if (isEmpty(this.jTextFieldDataHubRecord.getText())) {\r
+      Log.wrn("Update Hubs", "Data Hub Record must not be empty");\r
+      return false;\r
     }\r
 \r
-    /* (non-Javadoc)\r
-     * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)\r
-     *\r
-     * Override actionPerformed to listen all actions\r
-     * \r
-     */\r
-    public void actionPerformed(ActionEvent arg0) {\r
-        if (arg0.getSource() == jButtonOk) {\r
-            if (checkAdd()) {\r
-                getCurrentDataHubs();\r
-                this.returnType = DataType.RETURN_TYPE_OK;\r
-                this.setVisible(false);\r
-            }\r
-        }\r
-\r
-        if (arg0.getSource() == jButtonCancel) {\r
-            this.returnType = DataType.RETURN_TYPE_CANCEL;\r
-            this.setVisible(false);\r
-        }\r
+    if (!isEmpty(this.jTextFieldDataHubRecord.getText())) {\r
+      if (!DataValidation.isC_NameType(this.jTextFieldDataHubRecord.getText())) {\r
+        Log.wrn("Update Hubs", "Incorrect data type for Data Hub Record");\r
+        return false;\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
-    public boolean checkAdd() {\r
-        //\r
-        // Check if all fields have correct data types \r
-        //\r
-\r
-        //\r
-        // Check DataHubRecord \r
-        //\r
-        if (isEmpty(this.jTextFieldDataHubRecord.getText())) {\r
-            Log.wrn("Update Hubs", "Data Hub Record couldn't be empty");\r
-            return false;\r
-        }\r
-\r
-        if (!isEmpty(this.jTextFieldDataHubRecord.getText())) {\r
-            if (!DataValidation.isC_NameType(this.jTextFieldDataHubRecord.getText())) {\r
-                Log.wrn("Update Hubs", "Incorrect data type for Data Hub Record");\r
-                return false;\r
-            }\r
-        }\r
-\r
-        //\r
-        // Check FeatureFlag\r
-        //\r
-        if (!isEmpty(this.jTextFieldFeatureFlag.getText())) {\r
-            if (!DataValidation.isFeatureFlag(this.jTextFieldFeatureFlag.getText())) {\r
-                Log.wrn("Update Hubs", "Incorrect data type for Feature Flag");\r
-                return false;\r
-            }\r
-        }\r
-\r
-        return true;\r
+    //\r
+    // Check FeatureFlag\r
+    //\r
+    if (!isEmpty(this.jTextFieldFeatureFlag.getText())) {\r
+      if (!DataValidation.isFeatureFlag(this.jTextFieldFeatureFlag.getText())) {\r
+        Log.wrn("Update Hubs", "Incorrect data type for Feature Flag");\r
+        return false;\r
+      }\r
     }\r
 \r
-    private DataHubsIdentification getCurrentDataHubs() {\r
-        String arg0 = this.jTextFieldDataHubRecord.getText();\r
-        String arg1 = this.jComboBoxUsage.getSelectedItem().toString();\r
+    return true;\r
+  }\r
 \r
-        String arg2 = this.jTextFieldFeatureFlag.getText();\r
-        Vector<String> arg3 = this.jArchCheckBox.getSelectedItemsVector();\r
-        String arg4 = this.jTextFieldHelpText.getText();\r
+  private DataHubsIdentification getCurrentDataHubs() {\r
+    String arg0 = this.jTextFieldDataHubRecord.getText();\r
+    String arg1 = this.jComboBoxUsage.getSelectedItem().toString();\r
 \r
-        id = new DataHubsIdentification(arg0, arg1, arg2, arg3, arg4);\r
-        return id;\r
-    }\r
+    String arg2 = this.jTextFieldFeatureFlag.getText();\r
+    Vector<String> arg3 = this.jArchCheckBox.getSelectedItemsVector();\r
+    String arg4 = this.jTextAreaHelpText.getText();\r
 \r
-    public DataHubsIdentification getId() {\r
-        return id;\r
-    }\r
+    id = new DataHubsIdentification(arg0, arg1, arg2, arg3, arg4);\r
+    return id;\r
+  }\r
+  \r
+  public DataHubsIdentification getId() {\r
+    return id;\r
+  }\r
 \r
-    public void setId(DataHubsIdentification id) {\r
-        this.id = id;\r
-    }\r
+  public void setId(DataHubsIdentification id) {\r
+    this.id = id;\r
+  }\r
 }\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/GuidsDlg.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/GuidsDlg.java
index f9eaa3a0a77d8136164d89a8283a01d9a2b95b3a..7bfff4dad7d07b1bd8c948bfb04b65a854588484 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/GuidsDlg.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/GuidsDlg.java
@@ -1,6 +1,5 @@
 /** @file\r
- \r
- The file is used to create, update Guids of MSA/MBD file\r
+ <<The file is used to create, update Guids of the MSA file>>\r
  \r
  Copyright (c) 2006, Intel Corporation\r
  All rights reserved. This program and the accompanying materials\r
@@ -23,6 +22,7 @@ import javax.swing.JLabel;
 import javax.swing.JPanel;\r
 import javax.swing.JScrollPane;\r
 import javax.swing.JTextField;\r
+import javax.swing.JTextArea;\r
 \r
 import org.tianocore.frameworkwizard.common.DataType;\r
 import org.tianocore.frameworkwizard.common.DataValidation;\r
@@ -37,367 +37,394 @@ import org.tianocore.frameworkwizard.module.Identifications.Guids.GuidsIdentific
 import org.tianocore.frameworkwizard.workspace.WorkspaceTools;\r
 \r
 /**\r
- The class is used to create, update Guids of MSA/MBD file\r
- It extends IInternalFrame\r
- \r
+ * The class is used to create, update Guids of the MSA file\r
+ *  \r
+ * It extends IDialog\r
+ * \r
+ */\r
+public class GuidsDlg extends IDialog {\r
 \r
+  // /\r
+  // / Define class Serial Version UID\r
+  // /\r
+  private static final long serialVersionUID = 6710858997766979803L;\r
 \r
- **/\r
-public class GuidsDlg extends IDialog {\r
+  //\r
+  // Define class members\r
+  //\r
+  private JPanel jContentPane = null;\r
 \r
-    ///\r
-    /// Define class Serial Version UID\r
-    ///\r
-    private static final long serialVersionUID = 6710858997766979803L;\r
+  private JLabel jLabelC_Name = null;\r
 \r
-    //\r
-    //Define class members\r
-    //\r
-    private JPanel jContentPane = null;\r
+  private JComboBox jComboBoxCName = null;\r
 \r
-    private JLabel jLabelC_Name = null;\r
+  private JLabel jLabelUsage = null;\r
 \r
-    private JComboBox jComboBoxCName = null;\r
+  private JComboBox jComboBoxUsage = null;\r
 \r
-    private JLabel jLabelUsage = null;\r
+  private StarLabel jStarLabel1 = null;\r
 \r
-    private JComboBox jComboBoxUsage = null;\r
+  private StarLabel jStarLabel2 = null;\r
 \r
-    private StarLabel jStarLabel1 = null;\r
+  private JLabel jLabelFeatureFlag = null;\r
 \r
-    private StarLabel jStarLabel2 = null;\r
+  private JTextField jTextFieldFeatureFlag = null;\r
 \r
-    private JLabel jLabelFeatureFlag = null;\r
+  private JLabel jLabelArch = null;\r
 \r
-    private JTextField jTextFieldFeatureFlag = null;\r
+  private JScrollPane jScrollPane = null;\r
 \r
-    private JLabel jLabelArch = null;\r
+  private JLabel jLabelHelpText = null;\r
 \r
-    private JScrollPane jScrollPane = null;\r
+  private JTextArea jTextAreaHelpText = null;\r
 \r
-    private JLabel jLabelHelpText = null;\r
+  private JScrollPane jScrollPaneHelpText = null;\r
+  \r
+  private ArchCheckBox jArchCheckBox = null;\r
 \r
-    private JTextField jTextFieldHelpText = null;\r
+  private JButton jButtonOk = null;\r
 \r
-    private ArchCheckBox jArchCheckBox = null;\r
+  private JButton jButtonCancel = null;\r
 \r
-    private JButton jButtonOk = null;\r
+  //\r
+  // Not used by UI\r
+  //\r
+  private GuidsIdentification id = null;\r
 \r
-    private JButton jButtonCancel = null;\r
+  private EnumerationData ed = new EnumerationData();\r
 \r
-    //\r
-    // Not used by UI\r
-    //\r
-    private GuidsIdentification id = null;\r
-\r
-    private EnumerationData ed = new EnumerationData();\r
-\r
-    private WorkspaceTools wt = new WorkspaceTools();\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
-            jComboBoxCName.setBounds(new java.awt.Rectangle(160, 10, 320, 20));\r
-            jComboBoxCName.setPreferredSize(new java.awt.Dimension(320, 20));\r
-        }\r
-        return jComboBoxCName;\r
-    }\r
+  private WorkspaceTools wt = new WorkspaceTools();\r
 \r
-    /**\r
-     This method initializes jComboBoxUsage \r
-     \r
-     @return javax.swing.JComboBox jComboBoxUsage\r
-     \r
-     **/\r
-    private JComboBox getJComboBoxUsage() {\r
-        if (jComboBoxUsage == null) {\r
-            jComboBoxUsage = new JComboBox();\r
-            jComboBoxUsage.setBounds(new java.awt.Rectangle(160, 35, 320, 20));\r
-            jComboBoxUsage.setPreferredSize(new java.awt.Dimension(320, 20));\r
-        }\r
-        return jComboBoxUsage;\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
+      jComboBoxCName.setBounds(new java.awt.Rectangle(160, 10, 320, 20));\r
+      jComboBoxCName.setPreferredSize(new java.awt.Dimension(320, 20));\r
+      jComboBoxCName.setToolTipText("Select the C Name of the GUID");\r
     }\r
-\r
-    /**\r
-     This method initializes jTextFieldFeatureFlag    \r
-     \r
-     @return javax.swing.JTextField   \r
-     \r
-     **/\r
-    private JTextField getJTextFieldFeatureFlag() {\r
-        if (jTextFieldFeatureFlag == null) {\r
-            jTextFieldFeatureFlag = new JTextField();\r
-            jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(160, 85, 320, 20));\r
-            jTextFieldFeatureFlag.setPreferredSize(new java.awt.Dimension(320, 20));\r
-        }\r
-        return jTextFieldFeatureFlag;\r
+    return jComboBoxCName;\r
+  }\r
+\r
+  /**\r
+   * This method initializes jComboBoxUsage\r
+   * \r
+   * @return javax.swing.JComboBox jComboBoxUsage\r
+   * \r
+   */\r
+  private JComboBox getJComboBoxUsage() {\r
+    if (jComboBoxUsage == null) {\r
+      jComboBoxUsage = new JComboBox();\r
+      jComboBoxUsage.setBounds(new java.awt.Rectangle(160, 35, 320, 20));\r
+      jComboBoxUsage.setPreferredSize(new java.awt.Dimension(320, 20));\r
+      jComboBoxUsage.setToolTipText("<html><table><tr><td>ALWAYS_CONSUMED</td><td>Module always consumes the GUID</td></tr><tr><td>SOMETIMES_CONSUMED</td><td>Module will use the GUID only if it is present</td></tr><tr><td>ALWAYS_PRODUCED</td><td>Module always produces the GUID</td></tr><tr><td>SOMETIMES_PRODUCED</td><td>Module will sometimes produce the GUID</td></tr><tr><td>DEFAULT</td><td>Default is the the GUID that specified the<br>instance of the package</td></tr></table></html>");\r
     }\r
-\r
-    /**\r
-     This method initializes jScrollPane  \r
-     \r
-     @return javax.swing.JScrollPane  \r
-     */\r
-    private JScrollPane getJScrollPane() {\r
-        if (jScrollPane == null) {\r
-            jScrollPane = new JScrollPane();\r
-            jScrollPane.setViewportView(getJContentPane());\r
-        }\r
-        return jScrollPane;\r
+    return jComboBoxUsage;\r
+  }\r
+\r
+  /**\r
+   * This method initializes jTextFieldFeatureFlag\r
+   * \r
+   * @return javax.swing.JTextField\r
+   * \r
+   */\r
+  private JTextField getJTextFieldFeatureFlag() {\r
+    if (jTextFieldFeatureFlag == null) {\r
+      jTextFieldFeatureFlag = new JTextField();\r
+      jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(160, 105, 320, 20));\r
+      jTextFieldFeatureFlag.setPreferredSize(new java.awt.Dimension(320, 20));\r
+      jTextFieldFeatureFlag.setToolTipText("Postfix expression that must evaluate to TRUE or FALSE");\r
     }\r
-\r
-    /**\r
-     This method initializes jTextFieldHelpText  \r
-     \r
-     @return javax.swing.JTextField  \r
-     \r
-     **/\r
-    private JTextField getJTextFieldHelpText() {\r
-        if (jTextFieldHelpText == null) {\r
-            jTextFieldHelpText = new JTextField();\r
-            jTextFieldHelpText.setBounds(new java.awt.Rectangle(160, 60, 320, 20));\r
-            jTextFieldHelpText.setPreferredSize(new java.awt.Dimension(320, 20));\r
-        }\r
-        return jTextFieldHelpText;\r
+    return jTextFieldFeatureFlag;\r
+  }\r
+\r
+  /**\r
+   * This method initializes jScrollPane\r
+   * \r
+   * @return javax.swing.JScrollPane\r
+   */\r
+  private JScrollPane getJScrollPane() {\r
+    if (jScrollPane == null) {\r
+      jScrollPane = new JScrollPane();\r
+      jScrollPane.setViewportView(getJContentPane());\r
     }\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
-            jButtonOk.setBounds(new java.awt.Rectangle(290, 140, 90, 20));\r
-            jButtonOk.setText("Ok");\r
-            jButtonOk.addActionListener(this);\r
-        }\r
-        return jButtonOk;\r
+    return jScrollPane;\r
+  }\r
+\r
+  /**\r
+   * This method initializes jTextAreaHelpText\r
+   * \r
+   * @return javax.swing.JTextArea\r
+   * \r
+   */\r
+  private JTextArea getJTextAreaHelpText() {\r
+    if (jTextAreaHelpText == null) {\r
+      jTextAreaHelpText = new JTextArea();\r
+      jTextAreaHelpText.setLineWrap(true);\r
+      jTextAreaHelpText.setWrapStyleWord(true);\r
     }\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
-            jButtonCancel.setBounds(new java.awt.Rectangle(390, 140, 90, 20));\r
-            jButtonCancel.setText("Cancel");\r
-            jButtonCancel.addActionListener(this);\r
-        }\r
-        return jButtonCancel;\r
+    return jTextAreaHelpText;\r
+  }\r
+\r
+  /**\r
+   * \r
+   * This method initializes jScrollPaneHelpText\r
+   * \r
+   * @return javax.swing.JScrollPane jScrollPaneHelpText\r
+   * \r
+   **/\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.setLocation(new java.awt.Point(160,60));\r
+      jScrollPaneHelpText.setViewportView(getJTextAreaHelpText());\r
     }\r
-\r
-    public static void main(String[] args) {\r
-\r
+    return jScrollPaneHelpText;\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
+      jButtonOk.setBounds(new java.awt.Rectangle(290, 157, 90, 20));\r
+      jButtonOk.setText("Ok");\r
+      jButtonOk.addActionListener(this);\r
     }\r
-\r
-    /**\r
-     This method initializes this\r
-     \r
-     **/\r
-    private void init() {\r
-        this.setSize(508, 220);\r
-        this.setContentPane(getJScrollPane());\r
-        this.setTitle("Guids");\r
-        initFrame();\r
-        this.setViewMode(false);\r
-        this.centerWindow();\r
+    return jButtonOk;\r
+  }\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
+      jButtonCancel.setBounds(new java.awt.Rectangle(390, 157, 90, 20));\r
+      jButtonCancel.setText("Cancel");\r
+      jButtonCancel.addActionListener(this);\r
     }\r
-\r
-    /**\r
-     This method initializes this\r
-     Fill values to all fields if these values are not empty\r
-     \r
-     @param inGuidsId\r
-\r
-     **/\r
-    private void init(GuidsIdentification inGuidsId) {\r
-        init();\r
-        this.id = inGuidsId;\r
-\r
-        if (this.id != null) {\r
-            this.jComboBoxCName.setSelectedItem(id.getName());\r
-            this.jComboBoxUsage.setSelectedItem(id.getUsage());\r
-            this.jTextFieldHelpText.setText(id.getHelp());\r
-            this.jTextFieldFeatureFlag.setText(id.getFeatureFlag());\r
-            this.jArchCheckBox.setSelectedItems(id.getSupArchList());\r
-        }\r
+    return jButtonCancel;\r
+  }\r
+\r
+  public static void main(String[] args) {\r
+\r
+  }\r
+\r
+  /**\r
+   * \r
+   * This method initializes this\r
+   * \r
+   */\r
+  private void init() {\r
+    this.setSize(500, 230);\r
+    this.setContentPane(getJScrollPane());\r
+    this.setTitle("Guids");\r
+    initFrame();\r
+    this.setViewMode(false);\r
+    this.centerWindow();\r
+  }\r
+\r
+  /**\r
+   * \r
+   * This method initializes this Fill values to all fields if these values are\r
+   * not empty\r
+   * \r
+   * @param inGuidsId\r
+   * \r
+   */\r
+  private void init(GuidsIdentification inGuidsId) {\r
+    init();\r
+    this.id = inGuidsId;\r
+\r
+    if (this.id != null) {\r
+      this.jComboBoxCName.setSelectedItem(id.getName());\r
+      this.jComboBoxUsage.setSelectedItem(id.getUsage());\r
+      this.jTextAreaHelpText.setText(id.getHelp());\r
+      this.jTextFieldFeatureFlag.setText(id.getFeatureFlag());\r
+      this.jArchCheckBox.setSelectedItems(id.getSupArchList());\r
     }\r
-\r
-    /**\r
-     This is the override edit constructor\r
-     \r
-     @param inGuidsIdentification\r
-     @param iFrame\r
-     \r
-     **/\r
-    public GuidsDlg(GuidsIdentification inGuidsIdentification, IFrame iFrame) {\r
-        super(iFrame, true);\r
-        init(inGuidsIdentification);\r
+  }\r
+\r
+  /**\r
+   * This is the override edit constructor\r
+   * \r
+   * @param inGuidsIdentification\r
+   * @param iFrame\r
+   * \r
+   */\r
+  public GuidsDlg(GuidsIdentification inGuidsIdentification, IFrame iFrame) {\r
+    super(iFrame, true);\r
+    init(inGuidsIdentification);\r
+  }\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.jComboBoxUsage.setEnabled(!isView);\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
-    public void setViewMode(boolean isView) {\r
-        if (isView) {\r
-            this.jComboBoxUsage.setEnabled(!isView);\r
-        }\r
+  }\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
+      jStarLabel1 = new StarLabel();\r
+      jStarLabel1.setLocation(new java.awt.Point(2, 10));\r
+      jLabelC_Name = new JLabel();\r
+      jLabelC_Name.setText("Select GUID's C Name");\r
+      jLabelC_Name.setBounds(new java.awt.Rectangle(15, 10, 145, 20));\r
+\r
+      jStarLabel2 = new StarLabel();\r
+      jStarLabel2.setLocation(new java.awt.Point(2, 35));\r
+      jLabelUsage = new JLabel();\r
+      jLabelUsage.setText("Usage");\r
+      jLabelUsage.setBounds(new java.awt.Rectangle(15, 35, 145, 20));\r
+\r
+      jLabelHelpText = new JLabel();\r
+      jLabelHelpText.setBounds(new java.awt.Rectangle(14, 60, 145, 20));\r
+      jLabelHelpText.setText("Help Text");\r
+\r
+      jLabelFeatureFlag = new JLabel();\r
+      jLabelFeatureFlag.setBounds(new java.awt.Rectangle(15, 105, 145, 20));\r
+      jLabelFeatureFlag.setText("Feature Flag Expression");\r
+\r
+      jLabelArch = new JLabel();\r
+      jLabelArch.setBounds(new java.awt.Rectangle(15, 130, 145, 20));\r
+      jLabelArch.setText("Supported Architectures");\r
+      jArchCheckBox = new ArchCheckBox();\r
+      jArchCheckBox.setBounds(new java.awt.Rectangle(160, 130, 320, 20));\r
+      jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20));\r
+\r
+      jContentPane = new JPanel();\r
+      jContentPane.setLayout(null);\r
+      jContentPane.setPreferredSize(new java.awt.Dimension(490, 165));\r
+      \r
+      jContentPane.add(jStarLabel1, null);\r
+      jContentPane.add(jLabelC_Name, null);\r
+      jContentPane.add(getJComboBoxCName(), null);\r
+      jContentPane.add(jStarLabel2, null);\r
+      jContentPane.add(jLabelUsage, null);\r
+      jContentPane.add(getJComboBoxUsage(), null);\r
+      jContentPane.add(jLabelHelpText, 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(getJButtonOk(), null);\r
+      jContentPane.add(getJButtonCancel(), null);\r
     }\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
-            jArchCheckBox = new ArchCheckBox();\r
-            jArchCheckBox.setBounds(new java.awt.Rectangle(160, 110, 320, 20));\r
-            jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20));\r
-            jLabelUsage = new JLabel();\r
-            jLabelUsage.setText("Usage");\r
-            jLabelUsage.setBounds(new java.awt.Rectangle(15, 35, 140, 20));\r
-            jLabelC_Name = new JLabel();\r
-            jLabelC_Name.setText("C_Name");\r
-            jLabelC_Name.setBounds(new java.awt.Rectangle(15, 10, 140, 20));\r
-            jLabelArch = new JLabel();\r
-            jLabelArch.setBounds(new java.awt.Rectangle(15, 110, 140, 20));\r
-            jLabelArch.setText("Arch");\r
-            jLabelFeatureFlag = new JLabel();\r
-            jLabelFeatureFlag.setBounds(new java.awt.Rectangle(15, 85, 140, 20));\r
-            jLabelFeatureFlag.setText("Feature Flag");\r
-            jLabelHelpText = new JLabel();\r
-            jLabelHelpText.setBounds(new java.awt.Rectangle(14, 60, 140, 20));\r
-            jLabelHelpText.setText("Help Text");\r
-\r
-            jContentPane = new JPanel();\r
-            jContentPane.setLayout(null);\r
-            jContentPane.setPreferredSize(new java.awt.Dimension(490, 165));\r
-\r
-            jContentPane.add(jLabelC_Name, null);\r
-            jContentPane.add(getJComboBoxCName(), null);\r
-            jContentPane.add(jLabelUsage, null);\r
-            jContentPane.add(getJComboBoxUsage(), null);\r
-            jContentPane.add(jLabelFeatureFlag, null);\r
-            jContentPane.add(jLabelArch, null);\r
-            jContentPane.add(getJTextFieldFeatureFlag(), null);\r
-\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
-\r
-            jContentPane.add(jStarLabel1, null);\r
-            jContentPane.add(jStarLabel2, null);\r
-\r
-            jContentPane.add(jLabelHelpText, null);\r
-            jContentPane.add(getJTextFieldHelpText(), null);\r
-            jContentPane.add(jArchCheckBox, null);\r
-            jContentPane.add(getJButtonOk(), null);\r
-            jContentPane.add(getJButtonCancel(), null);\r
-        }\r
-        return jContentPane;\r
+    return jContentPane;\r
+  }\r
+\r
+  /**\r
+   * This method initializes Usage type\r
+   * \r
+   */\r
+  private void initFrame() {\r
+    Tools.generateComboBoxByVector(jComboBoxCName, wt\r
+        .getAllGuidDeclarationsFromWorkspace());\r
+    Tools.generateComboBoxByVector(jComboBoxUsage, ed.getVGuidUsage());\r
+  }\r
+\r
+  /*\r
+   * (non-Javadoc)\r
+   * \r
+   * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)\r
+   * \r
+   * Override actionPerformed to listen all actions\r
+   * \r
+   */\r
+  public void actionPerformed(ActionEvent arg0) {\r
+    if (arg0.getSource() == jButtonOk) {\r
+      if (checkAdd()) {\r
+        getCurrentGuids();\r
+        this.returnType = DataType.RETURN_TYPE_OK;\r
+        this.setVisible(false);\r
+      }\r
     }\r
 \r
-    /**\r
-     This method initializes Usage type\r
-     \r
-     **/\r
-    private void initFrame() {\r
-        Tools.generateComboBoxByVector(jComboBoxCName, wt.getAllGuidDeclarationsFromWorkspace());\r
-        Tools.generateComboBoxByVector(jComboBoxUsage, ed.getVGuidUsage());\r
+    if (arg0.getSource() == jButtonCancel) {\r
+      this.returnType = DataType.RETURN_TYPE_CANCEL;\r
+      this.setVisible(false);\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
+  public boolean checkAdd() {\r
+    //\r
+    // Check if all fields have correct data types\r
+    //\r
 \r
-    /* (non-Javadoc)\r
-     * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)\r
-     *\r
-     * Override actionPerformed to listen all actions\r
-     * \r
-     */\r
-    public void actionPerformed(ActionEvent arg0) {\r
-        if (arg0.getSource() == jButtonOk) {\r
-            if (checkAdd()) {\r
-                getCurrentGuids();\r
-                this.returnType = DataType.RETURN_TYPE_OK;\r
-                this.setVisible(false);\r
-            }\r
-        }\r
-\r
-        if (arg0.getSource() == jButtonCancel) {\r
-            this.returnType = DataType.RETURN_TYPE_CANCEL;\r
-            this.setVisible(false);\r
-        }\r
+    //\r
+    // Check Name\r
+    //\r
+    if (!isEmpty(this.jComboBoxCName.getSelectedItem().toString())) {\r
+      if (!DataValidation.isC_NameType(this.jComboBoxCName.getSelectedItem()\r
+          .toString())) {\r
+        Log.wrn("Update Guids", "Incorrect data type for Guid Name");\r
+        return false;\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
-    public boolean checkAdd() {\r
-        //\r
-        // Check if all fields have correct data types \r
-        //\r
-\r
-        //\r
-        // Check Name \r
-        //\r
-        if (!isEmpty(this.jComboBoxCName.getSelectedItem().toString())) {\r
-            if (!DataValidation.isC_NameType(this.jComboBoxCName.getSelectedItem().toString())) {\r
-                Log.wrn("Update Guids", "Incorrect data type for Guid Name");\r
-                return false;\r
-            }\r
-        }\r
-\r
-        //\r
-        // Check FeatureFlag\r
-        //\r
-        if (!isEmpty(this.jTextFieldFeatureFlag.getText())) {\r
-            if (!DataValidation.isFeatureFlag(this.jTextFieldFeatureFlag.getText())) {\r
-                Log.wrn("Update Guids", "Incorrect data type for Feature Flag");\r
-                return false;\r
-            }\r
-        }\r
-\r
-        return true;\r
+    //\r
+    // Check FeatureFlag\r
+    //\r
+    if (!isEmpty(this.jTextFieldFeatureFlag.getText())) {\r
+      if (!DataValidation.isFeatureFlag(this.jTextFieldFeatureFlag.getText())) {\r
+        Log.wrn("Update Guids", "Incorrect data type for Feature Flag");\r
+        return false;\r
+      }\r
     }\r
 \r
-    private GuidsIdentification getCurrentGuids() {\r
+    return true;\r
+  }\r
+\r
+private GuidsIdentification getCurrentGuids() {\r
         String arg0 = this.jComboBoxCName.getSelectedItem().toString();\r
         String arg1 = this.jComboBoxUsage.getSelectedItem().toString();\r
 \r
         String arg2 = this.jTextFieldFeatureFlag.getText();\r
         Vector<String> arg3 = this.jArchCheckBox.getSelectedItemsVector();\r
-        String arg4 = this.jTextFieldHelpText.getText();\r
+        String arg4 = this.jTextAreaHelpText.getText();\r
 \r
         id = new GuidsIdentification(arg0, arg1, arg2, arg3, arg4);\r
         return id;\r
-    }\r
-\r
-    public GuidsIdentification getId() {\r
-        return id;\r
-    }\r
+    }  public GuidsIdentification getId() {\r
+    return id;\r
+  }\r
 \r
-    public void setId(GuidsIdentification id) {\r
-        this.id = id;\r
-    }\r
+  public void setId(GuidsIdentification id) {\r
+    this.id = id;\r
+  }\r
 }\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/HiiPackagesDlg.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/HiiPackagesDlg.java
index 216d2e04fde21fbca0d83cd6ff4b4dea977a3915..5db8cd59572ff8095ea3de618419157b8478a886 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/HiiPackagesDlg.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/HiiPackagesDlg.java
@@ -23,6 +23,7 @@ import javax.swing.JLabel;
 import javax.swing.JPanel;\r
 import javax.swing.JScrollPane;\r
 import javax.swing.JTextField;\r
+import javax.swing.JTextArea;\r
 \r
 import org.tianocore.frameworkwizard.common.DataType;\r
 import org.tianocore.frameworkwizard.common.DataValidation;\r
@@ -36,371 +37,416 @@ import org.tianocore.frameworkwizard.common.ui.StarLabel;
 import org.tianocore.frameworkwizard.module.Identifications.HiiPackages.HiiPackagesIdentification;\r
 \r
 /**\r
- The class is used to create, update Formset of MSA/MBD file\r
- It extends IInternalFrame\r
- \r
+ * The class is used to create, update Hii Packages of the MSA file\r
+ * \r
+ * It extends IDialog\r
+ * \r
+ */\r
+public class HiiPackagesDlg extends IDialog {\r
 \r
+  // /\r
+  // / Define class Serial Version UID\r
+  // /\r
+  private static final long serialVersionUID = -6851574146786158116L;\r
 \r
- **/\r
-public class HiiPackagesDlg extends IDialog {\r
+  //\r
+  // Define class members\r
+  //\r
+  private JPanel jContentPane = null;\r
 \r
-    ///\r
-    /// Define class Serial Version UID\r
-    ///\r
-    private static final long serialVersionUID = -6851574146786158116L;\r
+  private JLabel jLabelName = null;\r
 \r
-    //\r
-    //Define class members\r
-    //\r
-    private JPanel jContentPane = null;\r
+  private JTextField jTextFieldName = null;\r
 \r
-    private JLabel jLabelName = null;\r
+  private JLabel jLabelUsage = null;\r
 \r
-    private JTextField jTextFieldName = null;\r
+  private JComboBox jComboBoxUsage = null;\r
 \r
-    private JLabel jLabelUsage = null;\r
+  private StarLabel jStarLabel1 = null;\r
 \r
-    private JComboBox jComboBoxUsage = null;\r
+  private StarLabel jStarLabel2 = null;\r
 \r
-    private StarLabel jStarLabel1 = null;\r
+  private JLabel jLabelFeatureFlag = null;\r
 \r
-    private StarLabel jStarLabel2 = null;\r
+  private JTextField jTextFieldFeatureFlag = null;\r
 \r
-    private JLabel jLabelFeatureFlag = null;\r
+  private JLabel jLabelArch = null;\r
 \r
-    private JTextField jTextFieldFeatureFlag = null;\r
+  private JScrollPane jScrollPane = null;\r
 \r
-    private JLabel jLabelArch = null;\r
+  private JLabel jLabelHelpText = null;\r
 \r
-    private JScrollPane jScrollPane = null;\r
+  private JTextArea jTextAreaHelpText = null;\r
 \r
-    private JLabel jLabelHelpText = null;\r
+  private JScrollPane jScrollPaneHelpText = null;\r
 \r
-    private JTextField jTextFieldHelpText = null;\r
+  private ArchCheckBox jArchCheckBox = null;\r
 \r
-    private ArchCheckBox jArchCheckBox = null;\r
+  private JButton jButtonOk = null;\r
 \r
-    private JButton jButtonOk = null;\r
+  private JButton jButtonCancel = null;\r
 \r
-    private JButton jButtonCancel = null;\r
+  //\r
+  // Not used by UI\r
+  //\r
+  private HiiPackagesIdentification id = null;\r
 \r
-    //\r
-    // Not used by UI\r
-    //\r
-    private HiiPackagesIdentification id = null;\r
-\r
-    private EnumerationData ed = new EnumerationData();\r
-\r
-    /**\r
-     This method initializes jTextFieldName \r
-     \r
-     @return javax.swing.JTextField jTextFieldName\r
-     \r
-     **/\r
-    private JTextField getJTextFieldName() {\r
-        if (jTextFieldName == null) {\r
-            jTextFieldName = new JTextField();\r
-            jTextFieldName.setBounds(new java.awt.Rectangle(160, 10, 320, 20));\r
-            jTextFieldName.setPreferredSize(new java.awt.Dimension(320, 20));\r
-            jTextFieldName.setToolTipText("Enter the C Name of the HII Package");\r
-        }\r
-        return jTextFieldName;\r
-    }\r
+  private EnumerationData ed = new EnumerationData();\r
 \r
-    /**\r
-     This method initializes jComboBoxUsage \r
-     \r
-     @return javax.swing.JComboBox jComboBoxUsage\r
-     \r
-     **/\r
-    private JComboBox getJComboBoxUsage() {\r
-        if (jComboBoxUsage == null) {\r
-            jComboBoxUsage = new JComboBox();\r
-            jComboBoxUsage.setBounds(new java.awt.Rectangle(160, 35, 320, 20));\r
-            jComboBoxUsage.setPreferredSize(new java.awt.Dimension(320, 20));\r
-        }\r
-        return jComboBoxUsage;\r
+  /**\r
+   * \r
+   * This method initializes jTextFieldName\r
+   * \r
+   * @return javax.swing.JTextField jTextFieldName\r
+   * \r
+   */\r
+  private JTextField getJTextFieldName() {\r
+    if (jTextFieldName == null) {\r
+      jTextFieldName = new JTextField();\r
+      jTextFieldName.setBounds(new java.awt.Rectangle(160, 10, 320, 20));\r
+      jTextFieldName.setPreferredSize(new java.awt.Dimension(320, 20));\r
+      jTextFieldName.setToolTipText("Enter the C Name of the HII Package");\r
     }\r
-\r
-    /**\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
-            jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(160, 85, 320, 20));\r
-            jTextFieldFeatureFlag.setPreferredSize(new java.awt.Dimension(320, 20));\r
-        }\r
-        return jTextFieldFeatureFlag;\r
+    return jTextFieldName;\r
+  }\r
+\r
+  /**\r
+   * \r
+   * This method initializes jComboBoxUsage\r
+   * \r
+   * @return javax.swing.JComboBox jComboBoxUsage\r
+   * \r
+   */\r
+  private JComboBox getJComboBoxUsage() {\r
+    if (jComboBoxUsage == null) {\r
+      jComboBoxUsage = new JComboBox();\r
+      jComboBoxUsage.setBounds(new java.awt.Rectangle(160, 35, 320, 20));\r
+      jComboBoxUsage.setPreferredSize(new java.awt.Dimension(320, 20));\r
+      jComboBoxUsage\r
+          .setToolTipText("<html><table><tr><td>ALWAYS_PRODUCED</td><td>Hii is always registered</td></tr><tr><td>SOMETIMES_PRODUCED</td><td>Some executions paths will require the Hii to be registered</td></tr></table></html>");\r
     }\r
-\r
-    /**\r
-     This method initializes jScrollPane  \r
-     \r
-     @return javax.swing.JScrollPane  \r
-     */\r
-    private JScrollPane getJScrollPane() {\r
-        if (jScrollPane == null) {\r
-            jScrollPane = new JScrollPane();\r
-            jScrollPane.setViewportView(getJContentPane());\r
-        }\r
-        return jScrollPane;\r
+    return jComboBoxUsage;\r
+  }\r
+\r
+  /**\r
+   * \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
+      jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(160, 105, 320, 20));\r
+      jTextFieldFeatureFlag.setPreferredSize(new java.awt.Dimension(320, 20));\r
+      jTextFieldFeatureFlag\r
+          .setToolTipText("Postfix expression that must evaluate to TRUE or FALSE");\r
     }\r
-\r
-    /**\r
-     This method initializes jTextFieldHelpText  \r
-     \r
-     @return javax.swing.JTextField  \r
-     \r
-     **/\r
-    private JTextField getJTextFieldHelpText() {\r
-        if (jTextFieldHelpText == null) {\r
-            jTextFieldHelpText = new JTextField();\r
-            jTextFieldHelpText.setBounds(new java.awt.Rectangle(160, 60, 320, 20));\r
-            jTextFieldHelpText.setPreferredSize(new java.awt.Dimension(320, 20));\r
-        }\r
-        return jTextFieldHelpText;\r
+    return jTextFieldFeatureFlag;\r
+  }\r
+\r
+  /**\r
+   * \r
+   * This method initializes jScrollPane\r
+   * \r
+   * @return javax.swing.JScrollPane\r
+   * \r
+   */\r
+  private JScrollPane getJScrollPane() {\r
+    if (jScrollPane == null) {\r
+      jScrollPane = new JScrollPane();\r
+      jScrollPane.setViewportView(getJContentPane());\r
     }\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
-            jButtonOk.setBounds(new java.awt.Rectangle(290, 140, 90, 20));\r
-            jButtonOk.setText("Ok");\r
-            jButtonOk.addActionListener(this);\r
-        }\r
-        return jButtonOk;\r
+    return jScrollPane;\r
+  }\r
+\r
+  /**\r
+   * \r
+   * This method initializes jTextAreaHelpText\r
+   * \r
+   * @return javax.swing.JTextArea jTextAreaHelpText\r
+   * \r
+   */\r
+  private JTextArea getJTextAreaHelpText() {\r
+    if (jTextAreaHelpText == null) {\r
+      jTextAreaHelpText = new JTextArea();\r
+      jTextAreaHelpText.setLineWrap(true);\r
+      jTextAreaHelpText.setWrapStyleWord(true);\r
     }\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
-            jButtonCancel.setBounds(new java.awt.Rectangle(390, 140, 90, 20));\r
-            jButtonCancel.setText("Cancel");\r
-            jButtonCancel.addActionListener(this);\r
-        }\r
-        return jButtonCancel;\r
+    return jTextAreaHelpText;\r
+  }\r
+\r
+  /**\r
+   * \r
+   * This method initializes jScrollPaneHelpText\r
+   * \r
+   * @return javax.swing.JScrollPane\r
+   * \r
+   */\r
+  private JScrollPane getJScrollPaneHelpText() {\r
+    if (jScrollPaneHelpText == null) {\r
+      jScrollPaneHelpText = new JScrollPane();\r
+      jScrollPaneHelpText\r
+          .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, 60));\r
+      jScrollPaneHelpText.setViewportView(getJTextAreaHelpText());\r
     }\r
-\r
-    public static void main(String[] args) {\r
-\r
+    return jScrollPaneHelpText;\r
+  }\r
+\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
+      jButtonOk.setBounds(new java.awt.Rectangle(290, 157, 90, 20));\r
+      jButtonOk.setText("Ok");\r
+      jButtonOk.addActionListener(this);\r
     }\r
-\r
-    /**\r
-     This method initializes this\r
-     \r
-     **/\r
-    private void init() {\r
-        this.setSize(508, 220);\r
-        this.setContentPane(getJScrollPane());\r
-        this.setTitle("Hii Packages");\r
-        initFrame();\r
-        this.setViewMode(false);\r
-        this.centerWindow();\r
+    return jButtonOk;\r
+  }\r
+\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
+      jButtonCancel.setBounds(new java.awt.Rectangle(390, 157, 90, 20));\r
+      jButtonCancel.setText("Cancel");\r
+      jButtonCancel.addActionListener(this);\r
     }\r
-\r
-    /**\r
-     This method initializes this\r
-     Fill values to all fields if these values are not empty\r
-     \r
-     @param inHiiPackagesId\r
-\r
-     **/\r
-    private void init(HiiPackagesIdentification inHiiPackagesId) {\r
-        init();\r
-        this.id = inHiiPackagesId;\r
-\r
-        if (this.id != null) {\r
-            this.jTextFieldName.setText(id.getName());\r
-            this.jComboBoxUsage.setSelectedItem(id.getUsage());\r
-            this.jTextFieldHelpText.setText(id.getHelp());\r
-            this.jTextFieldFeatureFlag.setText(id.getFeatureFlag());\r
-            this.jArchCheckBox.setSelectedItems(id.getSupArchList());\r
-        }\r
+    return jButtonCancel;\r
+  }\r
+\r
+  public static void main(String[] args) {\r
+\r
+  }\r
+\r
+  /**\r
+   * \r
+   * This method initializes this\r
+   * \r
+   **/\r
+  private void init() {\r
+    this.setSize(500, 230);\r
+    this.setContentPane(getJScrollPane());\r
+    this.setTitle("Hii Packages");\r
+    initFrame();\r
+    this.setViewMode(false);\r
+    this.centerWindow();\r
+  }\r
+\r
+  /**\r
+   * This method initializes this Fill values to all fields if these values are\r
+   * not empty\r
+   * \r
+   * @param inHiiPackagesId\r
+   * \r
+   **/\r
+  private void init(HiiPackagesIdentification inHiiPackagesId) {\r
+    init();\r
+    this.id = inHiiPackagesId;\r
+\r
+    if (this.id != null) {\r
+      this.jTextFieldName.setText(id.getName());\r
+      this.jComboBoxUsage.setSelectedItem(id.getUsage());\r
+      this.jTextAreaHelpText.setText(id.getHelp());\r
+      this.jTextFieldFeatureFlag.setText(id.getFeatureFlag());\r
+      this.jArchCheckBox.setSelectedItems(id.getSupArchList());\r
     }\r
-\r
-    /**\r
-     This is the override edit constructor\r
-     \r
-     @param inHiiPackagesIdentification\r
-     @param iFrame\r
-     \r
-     **/\r
-    public HiiPackagesDlg(HiiPackagesIdentification inHiiPackagesIdentification, IFrame iFrame) {\r
-        super(iFrame, true);\r
-        init(inHiiPackagesIdentification);\r
+  }\r
+\r
+  /**\r
+   * This is the override edit constructor\r
+   * \r
+   * @param inHiiPackagesIdentification\r
+   * @param iFrame\r
+   * \r
+   **/\r
+  public HiiPackagesDlg(HiiPackagesIdentification inHiiPackagesIdentification,\r
+      IFrame iFrame) {\r
+    super(iFrame, true);\r
+    init(inHiiPackagesIdentification);\r
+  }\r
+\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.jTextFieldName.setEnabled(!isView);\r
+      this.jComboBoxUsage.setEnabled(!isView);\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
-    public void setViewMode(boolean isView) {\r
-        if (isView) {\r
-            this.jTextFieldName.setEnabled(!isView);\r
-            this.jComboBoxUsage.setEnabled(!isView);\r
-        }\r
+  }\r
+\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
+      jStarLabel1 = new StarLabel();\r
+      jStarLabel1.setLocation(new java.awt.Point(2, 10));\r
+      jLabelName = new JLabel();\r
+      jLabelName.setText("Hii Package C Name");\r
+      jLabelName.setBounds(new java.awt.Rectangle(15, 10, 145, 20));\r
+      jStarLabel2 = new StarLabel();\r
+      jStarLabel2.setLocation(new java.awt.Point(2, 35));\r
+      jLabelUsage = new JLabel();\r
+      jLabelUsage.setText("Usage");\r
+      jLabelUsage.setBounds(new java.awt.Rectangle(15, 35, 145, 20));\r
+      jLabelHelpText = new JLabel();\r
+      jLabelHelpText.setBounds(new java.awt.Rectangle(14, 60, 145, 20));\r
+      jLabelHelpText.setText("Help Text");\r
+      jLabelFeatureFlag = new JLabel();\r
+      jLabelFeatureFlag.setBounds(new java.awt.Rectangle(15, 105, 145, 20));\r
+      jLabelFeatureFlag.setText("Feature Flag Expression");\r
+      jLabelArch = new JLabel();\r
+      jLabelArch.setBounds(new java.awt.Rectangle(15, 130, 145, 20));\r
+      jLabelArch.setText("Supported Architectures");\r
+      jArchCheckBox = new ArchCheckBox();\r
+      jArchCheckBox.setBounds(new java.awt.Rectangle(160, 130, 320, 20));\r
+      jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20));\r
+\r
+      jContentPane = new JPanel();\r
+      jContentPane.setLayout(null);\r
+      jContentPane.setPreferredSize(new java.awt.Dimension(485, 185));\r
+\r
+      jContentPane.add(jStarLabel1, null);\r
+      jContentPane.add(jLabelName, null);\r
+      jContentPane.add(getJTextFieldName(), null);\r
+      \r
+      jContentPane.add(jStarLabel2, null);\r
+      jContentPane.add(jLabelUsage, null);\r
+      jContentPane.add(getJComboBoxUsage(), null);\r
+\r
+      jContentPane.add(jLabelHelpText, null);\r
+      jContentPane.add(getJScrollPaneHelpText(), null);\r
+\r
+      jContentPane.add(jLabelFeatureFlag, null);\r
+      jContentPane.add(getJTextFieldFeatureFlag(), null);\r
+      \r
+      jContentPane.add(jLabelArch, null);\r
+      jContentPane.add(jArchCheckBox, null);\r
+\r
+      jContentPane.add(getJButtonOk(), null);\r
+      jContentPane.add(getJButtonCancel(), null);\r
+    }\r
+    return jContentPane;\r
+  }\r
+\r
+  /**\r
+   * \r
+   * This method initializes Usage type\r
+   * \r
+   */\r
+  private void initFrame() {\r
+    Tools.generateComboBoxByVector(jComboBoxUsage, ed.getVHiiPackageUsage());\r
+  }\r
+\r
+  /*\r
+   * (non-Javadoc)\r
+   * \r
+   * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)\r
+   * \r
+   * Override actionPerformed to listen all actions\r
+   * \r
+   */\r
+  public void actionPerformed(ActionEvent arg0) {\r
+    if (arg0.getSource() == jButtonOk) {\r
+      if (checkAdd()) {\r
+        getCurrentHiiPackages();\r
+        this.returnType = DataType.RETURN_TYPE_OK;\r
+        this.setVisible(false);\r
+      }\r
     }\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
-            jArchCheckBox = new ArchCheckBox();\r
-            jArchCheckBox.setBounds(new java.awt.Rectangle(160, 110, 320, 20));\r
-            jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20));\r
-            jLabelUsage = new JLabel();\r
-            jLabelUsage.setText("Usage");\r
-            jLabelUsage.setBounds(new java.awt.Rectangle(15, 35, 140, 20));\r
-            jLabelName = new JLabel();\r
-            jLabelName.setText("Name");\r
-            jLabelName.setBounds(new java.awt.Rectangle(15, 10, 140, 20));\r
-            jLabelArch = new JLabel();\r
-            jLabelArch.setBounds(new java.awt.Rectangle(15, 110, 140, 20));\r
-            jLabelArch.setText("Arch");\r
-            jLabelFeatureFlag = new JLabel();\r
-            jLabelFeatureFlag.setBounds(new java.awt.Rectangle(15, 85, 140, 20));\r
-            jLabelFeatureFlag.setText("Feature Flag");\r
-            jLabelHelpText = new JLabel();\r
-            jLabelHelpText.setBounds(new java.awt.Rectangle(14, 60, 140, 20));\r
-            jLabelHelpText.setText("Help Text");\r
-\r
-            jContentPane = new JPanel();\r
-            jContentPane.setLayout(null);\r
-            jContentPane.setPreferredSize(new java.awt.Dimension(490, 165));\r
-\r
-            jContentPane.add(jLabelName, null);\r
-            jContentPane.add(jLabelUsage, null);\r
-            jContentPane.add(getJTextFieldName(), null);\r
-            jContentPane.add(getJComboBoxUsage(), null);\r
-\r
-            jContentPane.add(jLabelFeatureFlag, null);\r
-            jContentPane.add(jLabelArch, null);\r
-            jContentPane.add(getJTextFieldFeatureFlag(), null);\r
-\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
-\r
-            jContentPane.add(jStarLabel1, null);\r
-            jContentPane.add(jStarLabel2, null);\r
-\r
-            jContentPane.add(jLabelHelpText, null);\r
-            jContentPane.add(getJTextFieldHelpText(), null);\r
-            jContentPane.add(jArchCheckBox, null);\r
-            jContentPane.add(getJButtonOk(), null);\r
-            jContentPane.add(getJButtonCancel(), null);\r
-        }\r
-        return jContentPane;\r
+    if (arg0.getSource() == jButtonCancel) {\r
+      this.returnType = DataType.RETURN_TYPE_CANCEL;\r
+      this.setVisible(false);\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
+  public boolean checkAdd() {\r
+    //\r
+    // Check if all fields have correct data types\r
+    //\r
 \r
-    /**\r
-     This method initializes Usage type\r
-     \r
-     **/\r
-    private void initFrame() {\r
-        Tools.generateComboBoxByVector(jComboBoxUsage, ed.getVHiiPackageUsage());\r
+    //\r
+    // Check Hii Package Name\r
+    //\r
+    if (isEmpty(this.jTextFieldName.getText())) {\r
+      Log.wrn("Update Hii Packages",\r
+          "Hii Package Name Record must not be empty");\r
+      return false;\r
     }\r
 \r
-    /* (non-Javadoc)\r
-     * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)\r
-     *\r
-     * Override actionPerformed to listen all actions\r
-     * \r
-     */\r
-    public void actionPerformed(ActionEvent arg0) {\r
-        if (arg0.getSource() == jButtonOk) {\r
-            if (checkAdd()) {\r
-                getCurrentHiiPackages();\r
-                this.returnType = DataType.RETURN_TYPE_OK;\r
-                this.setVisible(false);\r
-            }\r
-        }\r
-\r
-        if (arg0.getSource() == jButtonCancel) {\r
-            this.returnType = DataType.RETURN_TYPE_CANCEL;\r
-            this.setVisible(false);\r
-        }\r
+    if (!isEmpty(this.jTextFieldName.getText())) {\r
+      if (!DataValidation.isC_NameType(this.jTextFieldName.getText())) {\r
+        Log.wrn("Update Hii Packages",\r
+            "Incorrect data type for Hii Package Name");\r
+        return false;\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
-    public boolean checkAdd() {\r
-        //\r
-        // Check if all fields have correct data types \r
-        //\r
-\r
-        //\r
-        // Check Hii Package Name \r
-        //\r
-        if (isEmpty(this.jTextFieldName.getText())) {\r
-            Log.wrn("Update Hii Packages", "Hii Package Name Record couldn't be empty");\r
-            return false;\r
-        }\r
-\r
-        if (!isEmpty(this.jTextFieldName.getText())) {\r
-            if (!DataValidation.isC_NameType(this.jTextFieldName.getText())) {\r
-                Log.wrn("Update Hii Packages", "Incorrect data type for Hii Package Name");\r
-                return false;\r
-            }\r
-        }\r
-\r
-        //\r
-        // Check FeatureFlag\r
-        //\r
-        if (!isEmpty(this.jTextFieldFeatureFlag.getText())) {\r
-            if (!DataValidation.isFeatureFlag(this.jTextFieldFeatureFlag.getText())) {\r
-                Log.wrn("Update Hii Packages", "Incorrect data type for Feature Flag");\r
-                return false;\r
-            }\r
-        }\r
-\r
-        return true;\r
+    //\r
+    // Check FeatureFlag\r
+    //\r
+    if (!isEmpty(this.jTextFieldFeatureFlag.getText())) {\r
+      if (!DataValidation.isFeatureFlag(this.jTextFieldFeatureFlag.getText())) {\r
+        Log.wrn("Update Hii Packages", "Incorrect data type for Feature Flag");\r
+        return false;\r
+      }\r
     }\r
 \r
-    private HiiPackagesIdentification getCurrentHiiPackages() {\r
-        String arg0 = this.jTextFieldName.getText();\r
-        String arg1 = this.jComboBoxUsage.getSelectedItem().toString();\r
+    return true;\r
+  }\r
 \r
-        String arg2 = this.jTextFieldFeatureFlag.getText();\r
-        Vector<String> arg3 = this.jArchCheckBox.getSelectedItemsVector();\r
-        String arg4 = this.jTextFieldHelpText.getText();\r
+  private HiiPackagesIdentification getCurrentHiiPackages() {\r
+    String arg0 = this.jTextFieldName.getText();\r
+    String arg1 = this.jComboBoxUsage.getSelectedItem().toString();\r
 \r
-        id = new HiiPackagesIdentification(arg0, arg1, arg2, arg3, arg4);\r
-        return id;\r
-    }\r
+    String arg2 = this.jTextFieldFeatureFlag.getText();\r
+    Vector<String> arg3 = this.jArchCheckBox.getSelectedItemsVector();\r
+    String arg4 = this.jTextAreaHelpText.getText();\r
 \r
-    public HiiPackagesIdentification getId() {\r
-        return id;\r
-    }\r
+    id = new HiiPackagesIdentification(arg0, arg1, arg2, arg3, arg4);\r
+    return id;\r
+  }\r
+  \r
+  public HiiPackagesIdentification getId() {\r
+    return id;\r
+  }\r
 \r
-    public void setId(HiiPackagesIdentification id) {\r
-        this.id = id;\r
-    }\r
+  public void setId(HiiPackagesIdentification id) {\r
+    this.id = id;\r
+  }\r
 }\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/ProtocolsDlg.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/ProtocolsDlg.java
index 5ca71a0ac5719299b6fef1d3eb1d9991590494a8..6a794f41fed787b68129a1977cb7c3ea301f53c4 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/ProtocolsDlg.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/ProtocolsDlg.java
@@ -127,6 +127,7 @@ public class ProtocolsDlg extends IDialog implements ItemListener {
             jComboBoxUsage = new JComboBox();\r
             jComboBoxUsage.setBounds(new java.awt.Rectangle(160, 60, 320, 20));\r
             jComboBoxUsage.setPreferredSize(new java.awt.Dimension(320, 20));\r
+            jComboBoxUsage.setToolTipText("ALWAYS_CONSUMED is the only valid usage for type ProtocolNotify.");\r
         }\r
         return jComboBoxUsage;\r
     }\r
@@ -155,7 +156,7 @@ public class ProtocolsDlg extends IDialog implements ItemListener {
             jComboBoxProtocolType.setBounds(new java.awt.Rectangle(160, 10, 320, 20));\r
             jComboBoxProtocolType.setPreferredSize(new java.awt.Dimension(320, 20));\r
             jComboBoxProtocolType.addItemListener(this);\r
-            jComboBoxProtocolType.setToolTipText("Select Protocol Type");\r
+            jComboBoxProtocolType.setToolTipText("<html>Select Protocol Type<br>Protocol Notify is a register protocol notify mechanism.");\r
         }\r
         return jComboBoxProtocolType;\r
     }\r
@@ -170,6 +171,7 @@ public class ProtocolsDlg extends IDialog implements ItemListener {
             jComboBoxCName = new JComboBox();\r
             jComboBoxCName.setBounds(new java.awt.Rectangle(160, 35, 320, 20));\r
             jComboBoxCName.setPreferredSize(new java.awt.Dimension(320, 20));\r
+            jComboBoxCName.setToolTipText("Select Guid C Name of the Protocol");\r
 \r
         }\r
         return jComboBoxCName;\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/SystemTablesDlg.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/SystemTablesDlg.java
index 741ee3da774c731a30def9fb1a9be8b4c237abad..465a428060ad222cdb2265b203dc8dd3d4c62841 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/SystemTablesDlg.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/SystemTablesDlg.java
@@ -1,6 +1,7 @@
 /** @file\r
-\r
- The file is used to create, update SystemTable of MSA/MBD file\r
+ <<The file is used to create, update SystemTable in the MSA file>>\r
+ \r
+ <<This dialog is used to add or edit a System Table entry in the MSA file.>>\r
  \r
  Copyright (c) 2006, Intel Corporation\r
  All rights reserved. This program and the accompanying materials\r
@@ -23,6 +24,7 @@ import javax.swing.JLabel;
 import javax.swing.JPanel;\r
 import javax.swing.JScrollPane;\r
 import javax.swing.JTextField;\r
+import javax.swing.JTextArea;\r
 \r
 import org.tianocore.frameworkwizard.common.DataType;\r
 import org.tianocore.frameworkwizard.common.DataValidation;\r
@@ -37,356 +39,383 @@ import org.tianocore.frameworkwizard.module.Identifications.SystemTables.SystemT
 import org.tianocore.frameworkwizard.workspace.WorkspaceTools;\r
 \r
 /**\r
- The class is used to create, update SystemTable of MSA/MBD file\r
- It extends IInternalFrame\r
- \r
+ * The class is used to create, update SystemTable of MSA/MBD file It extends\r
+ * IInternalFrame\r
+ * \r
+ * \r
+ * \r
+ */\r
+public class SystemTablesDlg extends IDialog {\r
 \r
+  // /\r
+  // / Define class Serial Version UID\r
+  // /\r
+  private static final long serialVersionUID = 7488769180379442276L;\r
 \r
- **/\r
-public class SystemTablesDlg extends IDialog {\r
+  //\r
+  // Define class members\r
+  //\r
+  private JPanel jContentPane = null;\r
 \r
-    ///\r
-    /// Define class Serial Version UID\r
-    ///\r
-    private static final long serialVersionUID = 7488769180379442276L;\r
+  private JLabel jLabelEntry = null;\r
 \r
-    //\r
-    //Define class members\r
-    //\r
-    private JPanel jContentPane = null;\r
+  private JLabel jLabelUsage = null;\r
 \r
-    private JLabel jLabelEntry = null;\r
+  private JComboBox jComboBoxUsage = null;\r
 \r
-    private JLabel jLabelUsage = null;\r
+  private StarLabel jStarLabel1 = null;\r
 \r
-    private JComboBox jComboBoxUsage = null;\r
+  private StarLabel jStarLabel2 = null;\r
 \r
-    private StarLabel jStarLabel1 = null;\r
+  private JComboBox jComboBoxGuidC_Name = null;\r
 \r
-    private StarLabel jStarLabel2 = null;\r
+  private JLabel jLabelFeatureFlag = null;\r
 \r
-    private JComboBox jComboBoxGuidC_Name = null;\r
+  private JTextField jTextFieldFeatureFlag = null;\r
 \r
-    private JLabel jLabelFeatureFlag = null;\r
+  private JLabel jLabelArch = null;\r
 \r
-    private JTextField jTextFieldFeatureFlag = null;\r
+  private JScrollPane jScrollPane = null;\r
 \r
-    private JLabel jLabelArch = null;\r
+  private JLabel jLabelHelpText = null;\r
 \r
-    private JScrollPane jScrollPane = null;\r
+  private JTextArea jTextAreaHelpText = null;\r
 \r
-    private JLabel jLabelHelpText = null;\r
+  private JScrollPane jScrollPaneHelpText = null;\r
 \r
-    private JTextField jTextFieldHelpText = null;\r
+  private ArchCheckBox jArchCheckBox = null;\r
 \r
-    private ArchCheckBox jArchCheckBox = null;\r
+  private JButton jButtonOk = null;\r
 \r
-    private JButton jButtonOk = null;\r
+  private JButton jButtonCancel = null;\r
 \r
-    private JButton jButtonCancel = null;\r
+  //\r
+  // Not used by UI\r
+  //\r
+  private SystemTablesIdentification id = null;\r
 \r
-    //\r
-    // Not used by UI\r
-    //\r
-    private SystemTablesIdentification id = null;\r
-\r
-    private EnumerationData ed = new EnumerationData();\r
-\r
-    private WorkspaceTools wt = new WorkspaceTools();\r
-\r
-    /**\r
-     This method initializes jComboBoxUsage \r
-     \r
-     @return javax.swing.JComboBox jComboBoxUsage\r
-     \r
-     **/\r
-    private JComboBox getJComboBoxUsage() {\r
-        if (jComboBoxUsage == null) {\r
-            jComboBoxUsage = new JComboBox();\r
-            jComboBoxUsage.setBounds(new java.awt.Rectangle(160, 35, 320, 20));\r
-            jComboBoxUsage.setPreferredSize(new java.awt.Dimension(320, 20));\r
-        }\r
-        return jComboBoxUsage;\r
-    }\r
+  private EnumerationData ed = new EnumerationData();\r
 \r
-    /**\r
-     This method initializes jTextField \r
-     \r
-     @return javax.swing.JTextField jTextFieldC_Name\r
-     \r
-     **/\r
-    private JComboBox getJComboBoxGuidC_Name() {\r
-        if (jComboBoxGuidC_Name == null) {\r
-            jComboBoxGuidC_Name = new JComboBox();\r
-            jComboBoxGuidC_Name.setBounds(new java.awt.Rectangle(160, 10, 320, 20));\r
-            jComboBoxGuidC_Name.setPreferredSize(new java.awt.Dimension(320, 20));\r
-            jComboBoxGuidC_Name.setToolTipText("Select the GUID C Name of the Hob");\r
-        }\r
-        return jComboBoxGuidC_Name;\r
-    }\r
+  private WorkspaceTools wt = new WorkspaceTools();\r
 \r
-    /**\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
-            jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(160, 85, 320, 20));\r
-            jTextFieldFeatureFlag.setPreferredSize(new java.awt.Dimension(320, 20));\r
-        }\r
-        return jTextFieldFeatureFlag;\r
+  /**\r
+   * This method initializes jComboBoxGuidC_Name\r
+   * \r
+   * @return javax.swing.JComboBox jComboBoxGuidC_Name\r
+   * \r
+   */\r
+  private JComboBox getJComboBoxGuidC_Name() {\r
+    if (jComboBoxGuidC_Name == null) {\r
+      jComboBoxGuidC_Name = new JComboBox();\r
+      jComboBoxGuidC_Name.setBounds(new java.awt.Rectangle(160, 10, 320, 20));\r
+      jComboBoxGuidC_Name.setPreferredSize(new java.awt.Dimension(320, 20));\r
+      jComboBoxGuidC_Name\r
+          .setToolTipText("Select the GUID C Name of the System Table");\r
     }\r
-\r
-    /**\r
-     This method initializes jScrollPane  \r
-     \r
-     @return javax.swing.JScrollPane  \r
-     */\r
-    private JScrollPane getJScrollPane() {\r
-        if (jScrollPane == null) {\r
-            jScrollPane = new JScrollPane();\r
-            jScrollPane.setViewportView(getJContentPane());\r
-        }\r
-        return jScrollPane;\r
+    return jComboBoxGuidC_Name;\r
+  }\r
+\r
+  /**\r
+   * This method initializes jComboBoxUsage\r
+   * \r
+   * @return javax.swing.JComboBox jComboBoxUsage\r
+   * \r
+   */\r
+  private JComboBox getJComboBoxUsage() {\r
+    if (jComboBoxUsage == null) {\r
+      jComboBoxUsage = new JComboBox();\r
+      jComboBoxUsage.setBounds(new java.awt.Rectangle(160, 35, 320, 20));\r
+      jComboBoxUsage.setPreferredSize(new java.awt.Dimension(320, 20));\r
+      jComboBoxUsage\r
+          .setToolTipText("<html><table><tr><td>ALWAYS_CONSUMED</td><td>Module requires a GUIDed entry in the system table</td></tr><tr><td>SOMETIMES_CONSUMED</td><td>Module consumes a GUIDed entry in the system<br>table if it is present</td></tr><tr><td>ALWAYS_PRODUCED</td><td>Module always produces a GUIDed entry in the system table</td></tr><tr><td>SOMETIMES_PRODUCED</td><td>Module produces a GUIDed entry in the system table<br>for some of its execution flows.</td></tr></table></html>");\r
     }\r
-\r
-    /**\r
-     This method initializes jTextFieldHelpText  \r
-     \r
-     @return javax.swing.JTextField  \r
-     \r
-     **/\r
-    private JTextField getJTextFieldHelpText() {\r
-        if (jTextFieldHelpText == null) {\r
-            jTextFieldHelpText = new JTextField();\r
-            jTextFieldHelpText.setBounds(new java.awt.Rectangle(160, 60, 320, 20));\r
-            jTextFieldHelpText.setPreferredSize(new java.awt.Dimension(320, 20));\r
-        }\r
-        return jTextFieldHelpText;\r
+    return jComboBoxUsage;\r
+  }\r
+\r
+  /**\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
+      jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(160, 105, 320, 20));\r
+      jTextFieldFeatureFlag.setPreferredSize(new java.awt.Dimension(320, 20));\r
+      jTextFieldFeatureFlag.setToolTipText("Postfix expression that must evaluate to TRUE or FALSE");\r
     }\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
-            jButtonOk.setBounds(new java.awt.Rectangle(290, 140, 90, 20));\r
-            jButtonOk.setText("Ok");\r
-            jButtonOk.addActionListener(this);\r
-        }\r
-        return jButtonOk;\r
+    return jTextFieldFeatureFlag;\r
+  }\r
+\r
+  /**\r
+   * This method initializes jScrollPane\r
+   * \r
+   * @return javax.swing.JScrollPane\r
+   */\r
+  private JScrollPane getJScrollPane() {\r
+    if (jScrollPane == null) {\r
+      jScrollPane = new JScrollPane();\r
+      jScrollPane.setViewportView(getJContentPane());\r
     }\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
-            jButtonCancel.setBounds(new java.awt.Rectangle(390, 140, 90, 20));\r
-            jButtonCancel.setText("Cancel");\r
-            jButtonCancel.addActionListener(this);\r
-        }\r
-        return jButtonCancel;\r
+    return jScrollPane;\r
+  }\r
+\r
+  /**\r
+   * This method initializes jTextAreaHelpText\r
+   * \r
+   * @return javax.swing.JTextArea\r
+   * \r
+   */\r
+  private JTextArea getJTextAreaHelpText() {\r
+    if (jTextAreaHelpText == null) {\r
+      jTextAreaHelpText = new JTextArea();\r
+      jTextAreaHelpText.setLineWrap(true);\r
+      jTextAreaHelpText.setWrapStyleWord(true);\r
     }\r
-\r
-    public static void main(String[] args) {\r
-\r
+    return jTextAreaHelpText;\r
+  }\r
+\r
+  /**\r
+   * This method initializes jScrollPaneHelpText\r
+   * \r
+   * @returns javax.swing.JScrollPane jScrollPaneHelpText\r
+   */\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, 60));\r
+      jScrollPaneHelpText.setViewportView(getJTextAreaHelpText());\r
     }\r
-\r
-    /**\r
-     This method initializes this\r
-     \r
-     **/\r
-    private void init() {\r
-        this.setSize(508, 215);\r
-        this.setContentPane(getJScrollPane());\r
-        this.setTitle("System Tables");\r
-        initFrame();\r
-        this.setViewMode(false);\r
-        this.centerWindow();\r
+    return jScrollPaneHelpText;\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
+      jButtonOk.setBounds(new java.awt.Rectangle(290, 157, 90, 20));\r
+      jButtonOk.setText("Ok");\r
+      jButtonOk.addActionListener(this);\r
     }\r
-\r
-    /**\r
-     This method initializes this\r
-     Fill values to all fields if these values are not empty\r
-     \r
-     @param inSystemTablesId\r
-\r
-     **/\r
-    private void init(SystemTablesIdentification inSystemTablesId) {\r
-        init();\r
-        this.id = inSystemTablesId;\r
-\r
-        if (this.id != null) {\r
-            this.jComboBoxGuidC_Name.setSelectedItem(id.getName());\r
-            this.jComboBoxUsage.setSelectedItem(id.getUsage());\r
-            this.jTextFieldHelpText.setText(id.getHelp());\r
-            this.jTextFieldFeatureFlag.setText(id.getFeatureFlag());\r
-            this.jArchCheckBox.setSelectedItems(id.getSupArchList());\r
-        }\r
+    return jButtonOk;\r
+  }\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
+      jButtonCancel.setBounds(new java.awt.Rectangle(390, 157, 90, 20));\r
+      jButtonCancel.setText("Cancel");\r
+      jButtonCancel.addActionListener(this);\r
     }\r
-\r
-    /**\r
-     This is the override edit constructor\r
-     \r
-     @param inBootModesIdentification\r
-     @param iFrame\r
-     \r
-     **/\r
-    public SystemTablesDlg(SystemTablesIdentification inSystemTablesIdentification, IFrame iFrame) {\r
-        super(iFrame, true);\r
-        init(inSystemTablesIdentification);\r
+    return jButtonCancel;\r
+  }\r
+\r
+  public static void main(String[] args) {\r
+\r
+  }\r
+\r
+  /**\r
+   * This method initializes this\r
+   * \r
+   */\r
+  private void init() {\r
+    this.setSize(500, 230);\r
+    this.setContentPane(getJScrollPane());\r
+    this.setTitle("System Tables");\r
+    initFrame();\r
+    this.setViewMode(false);\r
+    this.centerWindow();\r
+  }\r
+\r
+  /**\r
+   * This method initializes this Fill values to all fields if these values are\r
+   * not empty\r
+   * \r
+   * @param inSystemTablesId\r
+   * \r
+   */\r
+  private void init(SystemTablesIdentification inSystemTablesId) {\r
+    init();\r
+    this.id = inSystemTablesId;\r
+\r
+    if (this.id != null) {\r
+      this.jComboBoxGuidC_Name.setSelectedItem(id.getName());\r
+      this.jComboBoxUsage.setSelectedItem(id.getUsage());\r
+      this.jTextAreaHelpText.setText(id.getHelp());\r
+      this.jTextFieldFeatureFlag.setText(id.getFeatureFlag());\r
+      this.jArchCheckBox.setSelectedItems(id.getSupArchList());\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
-    public void setViewMode(boolean isView) {\r
-        if (isView) {\r
-            this.jComboBoxUsage.setEnabled(!isView);\r
-        }\r
+  }\r
+\r
+  /**\r
+   * This is the override edit constructor\r
+   * \r
+   * @param inBootModesIdentification\r
+   * @param iFrame\r
+   * \r
+   */\r
+  public SystemTablesDlg(\r
+      SystemTablesIdentification inSystemTablesIdentification, IFrame iFrame) {\r
+    super(iFrame, true);\r
+    init(inSystemTablesIdentification);\r
+  }\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.jComboBoxUsage.setEnabled(!isView);\r
     }\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
-            jLabelArch = new JLabel();\r
-            jLabelArch.setBounds(new java.awt.Rectangle(15, 110, 140, 20));\r
-            jLabelArch.setText("Arch");\r
-            jArchCheckBox = new ArchCheckBox();\r
-            jArchCheckBox.setBounds(new java.awt.Rectangle(160, 110, 320, 20));\r
-            jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20));\r
-            jLabelFeatureFlag = new JLabel();\r
-            jLabelFeatureFlag.setBounds(new java.awt.Rectangle(15, 85, 140, 20));\r
-            jLabelFeatureFlag.setText("Feature Flag");\r
-            jLabelUsage = new JLabel();\r
-            jLabelUsage.setText("Usage");\r
-            jLabelUsage.setBounds(new java.awt.Rectangle(15, 35, 140, 20));\r
-            jLabelEntry = new JLabel();\r
-            jLabelEntry.setText("Guid C Name");\r
-            jLabelEntry.setBounds(new java.awt.Rectangle(15, 10, 140, 20));\r
-            jLabelHelpText = new JLabel();\r
-            jLabelHelpText.setBounds(new java.awt.Rectangle(14, 60, 140, 20));\r
-            jLabelHelpText.setText("Help Text");\r
-\r
-            jContentPane = new JPanel();\r
-            jContentPane.setLayout(null);\r
-            jContentPane.setPreferredSize(new java.awt.Dimension(490, 165));\r
-\r
-            jContentPane.add(jLabelEntry, null);\r
-            jContentPane.add(jLabelFeatureFlag, null);\r
-            jContentPane.add(getJTextFieldFeatureFlag(), null);\r
-            jContentPane.add(getJComboBoxGuidC_Name(), null);\r
-            jContentPane.add(jLabelArch, null);\r
-            jContentPane.add(jLabelUsage, null);\r
-            jContentPane.add(getJComboBoxUsage(), null);\r
-            jStarLabel1 = new StarLabel();\r
-            jStarLabel1.setBounds(new java.awt.Rectangle(0, 10, 10, 20));\r
-            jStarLabel2 = new StarLabel();\r
-            jStarLabel2.setBounds(new java.awt.Rectangle(0, 35, 10, 20));\r
-\r
-            jContentPane.add(jStarLabel1, null);\r
-            jContentPane.add(jStarLabel2, null);\r
-\r
-            jContentPane.add(jLabelHelpText, null);\r
-            jContentPane.add(getJTextFieldHelpText(), null);\r
-            jContentPane.add(jArchCheckBox, null);\r
-            jContentPane.add(getJButtonOk(), null);\r
-            jContentPane.add(getJButtonCancel(), null);\r
-        }\r
-        return jContentPane;\r
+  }\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
+      jStarLabel1 = new StarLabel();\r
+      jStarLabel1.setLocation(new java.awt.Point(2, 10));\r
+      jLabelEntry = new JLabel();\r
+      jLabelEntry.setText("Table's GUID C Name");\r
+      jLabelEntry.setBounds(new java.awt.Rectangle(15, 10, 145, 20));\r
+      jStarLabel2 = new StarLabel();\r
+      jStarLabel2.setLocation(new java.awt.Point(2, 35));\r
+      jLabelUsage = new JLabel();\r
+      jLabelUsage.setText("Usage");\r
+      jLabelUsage.setBounds(new java.awt.Rectangle(15, 35, 145, 20));\r
+      jLabelHelpText = new JLabel();\r
+      jLabelHelpText.setBounds(new java.awt.Rectangle(14, 60, 145, 20));\r
+      jLabelHelpText.setText("Help Text");\r
+      jLabelFeatureFlag = new JLabel();\r
+      jLabelFeatureFlag.setBounds(new java.awt.Rectangle(15, 105, 140, 20));\r
+      jLabelFeatureFlag.setText("Feature Flag Expression");\r
+      jLabelArch = new JLabel();\r
+      jLabelArch.setBounds(new java.awt.Rectangle(15, 130, 145, 20));\r
+      jLabelArch.setText("Supported Architectures");\r
+      jArchCheckBox = new ArchCheckBox();\r
+      jArchCheckBox.setBounds(new java.awt.Rectangle(160, 130, 320, 20));\r
+      jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20));\r
+\r
+      jContentPane = new JPanel();\r
+      jContentPane.setLayout(null);\r
+      jContentPane.setPreferredSize(new java.awt.Dimension(485, 185));\r
+\r
+      jContentPane.add(jLabelEntry, null);\r
+      jContentPane.add(jLabelFeatureFlag, null);\r
+      jContentPane.add(getJTextFieldFeatureFlag(), null);\r
+      jContentPane.add(getJComboBoxGuidC_Name(), null);\r
+      jContentPane.add(jLabelArch, null);\r
+      jContentPane.add(jLabelUsage, null);\r
+      jContentPane.add(getJComboBoxUsage(), null);\r
+\r
+      jContentPane.add(jStarLabel1, null);\r
+      jContentPane.add(jStarLabel2, null);\r
+\r
+      jContentPane.add(jLabelHelpText, null);\r
+      jContentPane.add(getJScrollPaneHelpText(), null);\r
+      jContentPane.add(jArchCheckBox, null);\r
+      jContentPane.add(getJButtonOk(), null);\r
+      jContentPane.add(getJButtonCancel(), null);\r
     }\r
-\r
-    /**\r
-     This method initializes Usage type\r
-     \r
-     **/\r
-    private void initFrame() {\r
-        Tools.generateComboBoxByVector(jComboBoxUsage, ed.getVSystemTableUsage());\r
-        Tools.generateComboBoxByVector(jComboBoxGuidC_Name, wt.getAllGuidDeclarationsFromWorkspace());\r
+    return jContentPane;\r
+  }\r
+\r
+  /**\r
+   * This method initializes Usage type\r
+   * \r
+   */\r
+  private void initFrame() {\r
+    Tools.generateComboBoxByVector(jComboBoxUsage, ed.getVSystemTableUsage());\r
+    Tools.generateComboBoxByVector(jComboBoxGuidC_Name, wt\r
+        .getAllGuidDeclarationsFromWorkspace());\r
+  }\r
+\r
+  /*\r
+   * (non-Javadoc)\r
+   * \r
+   * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)\r
+   * \r
+   * Override actionPerformed to listen all actions\r
+   * \r
+   */\r
+  public void actionPerformed(ActionEvent arg0) {\r
+    if (arg0.getSource() == jButtonOk) {\r
+      if (checkAdd()) {\r
+        getCurrentSystemTables();\r
+        this.returnType = DataType.RETURN_TYPE_OK;\r
+        this.setVisible(false);\r
+      }\r
     }\r
 \r
-    /* (non-Javadoc)\r
-     * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)\r
-     *\r
-     *  Override actionPerformed to listen all actions\r
-     *  \r
-     */\r
-    public void actionPerformed(ActionEvent arg0) {\r
-        if (arg0.getSource() == jButtonOk) {\r
-            if (checkAdd()) {\r
-                getCurrentSystemTables();\r
-                this.returnType = DataType.RETURN_TYPE_OK;\r
-                this.setVisible(false);\r
-            }\r
-        }\r
-\r
-        if (arg0.getSource() == jButtonCancel) {\r
-            this.returnType = DataType.RETURN_TYPE_CANCEL;\r
-            this.setVisible(false);\r
-        }\r
+    if (arg0.getSource() == jButtonCancel) {\r
+      this.returnType = DataType.RETURN_TYPE_CANCEL;\r
+      this.setVisible(false);\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
+  public boolean checkAdd() {\r
+    //\r
+    // Check if all fields have correct data types\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
-    public boolean checkAdd() {\r
-        //\r
-        // Check if all fields have correct data types \r
-        //\r
-\r
-        //\r
-        // Check FeatureFlag\r
-        //\r
-        if (!isEmpty(this.jTextFieldFeatureFlag.getText())) {\r
-            if (!DataValidation.isFeatureFlag(this.jTextFieldFeatureFlag.getText())) {\r
-                Log.wrn("Update System Tables", "Incorrect data type for Feature Flag");\r
-                return false;\r
-            }\r
-        }\r
-\r
-        return true;\r
+    //\r
+    // Check FeatureFlag\r
+    //\r
+    if (!isEmpty(this.jTextFieldFeatureFlag.getText())) {\r
+      if (!DataValidation.isFeatureFlag(this.jTextFieldFeatureFlag.getText())) {\r
+        Log.wrn("Update System Tables", "Incorrect data type for Feature Flag");\r
+        return false;\r
+      }\r
     }\r
 \r
-    private SystemTablesIdentification getCurrentSystemTables() {\r
-        String arg0 = this.jComboBoxGuidC_Name.getSelectedItem().toString();\r
-        String arg1 = this.jComboBoxUsage.getSelectedItem().toString();\r
+    return true;\r
+  }\r
 \r
-        String arg2 = this.jTextFieldFeatureFlag.getText();\r
-        Vector<String> arg3 = this.jArchCheckBox.getSelectedItemsVector();\r
-        String arg4 = this.jTextFieldHelpText.getText();\r
+  private SystemTablesIdentification getCurrentSystemTables() {\r
+    String arg0 = this.jComboBoxGuidC_Name.getSelectedItem().toString();\r
+    String arg1 = this.jComboBoxUsage.getSelectedItem().toString();\r
 \r
-        id = new SystemTablesIdentification(arg0, arg1, arg2, arg3, arg4);\r
-        return id;\r
-    }\r
+    String arg2 = this.jTextFieldFeatureFlag.getText();\r
+    Vector<String> arg3 = this.jArchCheckBox.getSelectedItemsVector();\r
+    String arg4 = this.jTextAreaHelpText.getText();\r
 \r
-    public SystemTablesIdentification getId() {\r
-        return id;\r
-    }\r
+    id = new SystemTablesIdentification(arg0, arg1, arg2, arg3, arg4);\r
+    return id;\r
+  }\r
 \r
-    public void setId(SystemTablesIdentification id) {\r
-        this.id = id;\r
-    }\r
+  public SystemTablesIdentification getId() {\r
+    return id;\r
+  }\r
+\r
+  public void setId(SystemTablesIdentification id) {\r
+    this.id = id;\r
+  }\r
 }\r