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

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

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/EventsDlg.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/EventsDlg.java
index d16057b4b139d13b3f356d13057b8dfa0b77884a..477393cc65057e7aaa3b30fe0dc8697bbae7d349 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/EventsDlg.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/EventsDlg.java
@@ -348,7 +348,7 @@ public class EventsDlg extends IDialog {
       jStarLabel1 = new StarLabel();\r
       jStarLabel1.setLocation(new java.awt.Point(2, 10));\r
       jLabelEventType = new JLabel();\r
       jStarLabel1 = new StarLabel();\r
       jStarLabel1.setLocation(new java.awt.Point(2, 10));\r
       jLabelEventType = new JLabel();\r

-      jLabelEventType.setText("Type");\r
+      jLabelEventType.setText("Select Event Type");\r

       jLabelEventType.setBounds(new java.awt.Rectangle(15, 10, 145, 20));\r
 \r
       jStarLabel2 = new StarLabel();\r
       jLabelEventType.setBounds(new java.awt.Rectangle(15, 10, 145, 20));\r
 \r
       jStarLabel2 = new StarLabel();\r


@@ -360,7 +360,7 @@ public class EventsDlg extends IDialog {
       jStarLabel3 = new StarLabel();\r
       jStarLabel3.setLocation(new java.awt.Point(2, 60));\r
       jLabelGroup = new JLabel();\r
       jStarLabel3 = new StarLabel();\r
       jStarLabel3.setLocation(new java.awt.Point(2, 60));\r
       jLabelGroup = new JLabel();\r

-      jLabelGroup.setText("Event Type");\r
+      jLabelGroup.setText("Event Group Type");\r

       jLabelGroup.setBounds(new java.awt.Rectangle(15, 60, 145, 20));\r
 \r
       jStarLabel4 = new StarLabel();\r
       jLabelGroup.setBounds(new java.awt.Rectangle(15, 60, 145, 20));\r
 \r
       jStarLabel4 = new StarLabel();\r


@@ -375,11 +375,11 @@ public class EventsDlg extends IDialog {
 \r
       jLabelFeatureFlag = new JLabel();\r
       jLabelFeatureFlag.setBounds(new java.awt.Rectangle(15, 155, 145, 20));\r
 \r
       jLabelFeatureFlag = new JLabel();\r
       jLabelFeatureFlag.setBounds(new java.awt.Rectangle(15, 155, 145, 20));\r

-      jLabelFeatureFlag.setText("Feature Flag");\r
+      jLabelFeatureFlag.setText("Feature Flag Expression");\r

 \r
       jLabelArch = new JLabel();\r
       jLabelArch.setBounds(new java.awt.Rectangle(15, 180, 145, 20));\r
 \r
       jLabelArch = new JLabel();\r
       jLabelArch.setBounds(new java.awt.Rectangle(15, 180, 145, 20));\r

-      jLabelArch.setText("Arch");\r
+      jLabelArch.setText("Supported Architectures");\r

       jArchCheckBox = new ArchCheckBox();\r
       jArchCheckBox.setBounds(new java.awt.Rectangle(160, 180, 320, 20));\r
       jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20));\r
       jArchCheckBox = new ArchCheckBox();\r
       jArchCheckBox.setBounds(new java.awt.Rectangle(160, 180, 320, 20));\r
       jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20));\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/ExternsDlg.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/ExternsDlg.java
index b53058952a8182aa1fdd927b272f41846fd5318a..bca2a5c179cc827bfae67ac583e21c89daa8947e 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/ExternsDlg.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/ExternsDlg.java
@@ -257,16 +257,16 @@ public class ExternsDlg extends IDialog implements ItemListener {
             jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20));\r
             jLabelC_Name = new JLabel();\r
             jLabelC_Name.setBounds(new java.awt.Rectangle(15, 35, 140, 20));\r
             jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20));\r
             jLabelC_Name = new JLabel();\r
             jLabelC_Name.setBounds(new java.awt.Rectangle(15, 35, 140, 20));\r

-            jLabelC_Name.setText("Value");\r
+            jLabelC_Name.setText("Enter Value");\r

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

-            jLabelName.setText("Choose Type");\r
+            jLabelName.setText("Choose Extern Type");\r

             jLabelName.setBounds(new java.awt.Rectangle(15, 10, 140, 20));\r
             jLabelArch = new JLabel();\r
             jLabelArch.setBounds(new java.awt.Rectangle(15, 85, 140, 20));\r
             jLabelName.setBounds(new java.awt.Rectangle(15, 10, 140, 20));\r
             jLabelArch = new JLabel();\r
             jLabelArch.setBounds(new java.awt.Rectangle(15, 85, 140, 20));\r

-            jLabelArch.setText("Arch");\r
+            jLabelArch.setText("Supported Architectures");\r

             jLabelFeatureFlag = new JLabel();\r
             jLabelFeatureFlag.setBounds(new java.awt.Rectangle(15, 60, 140, 20));\r
             jLabelFeatureFlag = new JLabel();\r
             jLabelFeatureFlag.setBounds(new java.awt.Rectangle(15, 60, 140, 20));\r

-            jLabelFeatureFlag.setText("Feature Flag");\r
+            jLabelFeatureFlag.setText("Feature Flag Expression");\r

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

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/LibraryClassDefsDlg.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/LibraryClassDefsDlg.java
index cb89109d3dc05ade3d1c5fb8086c3c663d2aa75c..e7474a52c8c5e2a7ef1c1eaee7db8b1627f07943 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/LibraryClassDefsDlg.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/LibraryClassDefsDlg.java
@@ -362,14 +362,14 @@ public class LibraryClassDefsDlg extends IDialog {
             jArchCheckBox.setBounds(new java.awt.Rectangle(160, 110, 320, 20));\r
             jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20));\r
             jLabelHelpText = new JLabel();\r
             jArchCheckBox.setBounds(new java.awt.Rectangle(160, 110, 320, 20));\r
             jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20));\r
             jLabelHelpText = new JLabel();\r

-            jLabelHelpText.setBounds(new java.awt.Rectangle(14, 60, 140, 20));\r
+            jLabelHelpText.setBounds(new java.awt.Rectangle(15, 60, 140, 20));\r

             jLabelHelpText.setText("Help Text");\r
             jLabelModuleList = new JLabel();\r
             jLabelModuleList.setBounds(new java.awt.Rectangle(15, 135, 140, 20));\r
             jLabelHelpText.setText("Help Text");\r
             jLabelModuleList = new JLabel();\r
             jLabelModuleList.setBounds(new java.awt.Rectangle(15, 135, 140, 20));\r

-            jLabelModuleList.setText("Sup Module List");\r
+            jLabelModuleList.setText("Supported Module Types");\r

             jLabelArch = new JLabel();\r
             jLabelArch.setBounds(new java.awt.Rectangle(15, 110, 140, 20));\r
             jLabelArch = new JLabel();\r
             jLabelArch.setBounds(new java.awt.Rectangle(15, 110, 140, 20));\r

-            jLabelArch.setText("Sup Arch List");\r
+            jLabelArch.setText("Supported Architectures");\r

             jLabelFeatureFlag = new JLabel();\r
             jLabelFeatureFlag.setBounds(new java.awt.Rectangle(15, 85, 140, 20));\r
             jLabelFeatureFlag.setText("Feature Flag");\r
             jLabelFeatureFlag = new JLabel();\r
             jLabelFeatureFlag.setBounds(new java.awt.Rectangle(15, 85, 140, 20));\r
             jLabelFeatureFlag.setText("Feature Flag");\r


@@ -404,9 +404,9 @@ public class LibraryClassDefsDlg extends IDialog {
             jContentPane.add(getJTextFieldFeatureFlag(), null);\r
             jContentPane.add(jLabelArch, null);\r
             jStarLabel1 = new StarLabel();\r
             jContentPane.add(getJTextFieldFeatureFlag(), null);\r
             jContentPane.add(jLabelArch, null);\r
             jStarLabel1 = new StarLabel();\r

-            jStarLabel1.setLocation(new java.awt.Point(0, 10));\r
+            jStarLabel1.setLocation(new java.awt.Point(2, 10));\r

             jStarLabel2 = new StarLabel();\r
             jStarLabel2 = new StarLabel();\r

-            jStarLabel2.setLocation(new java.awt.Point(0, 35));\r
+            jStarLabel2.setLocation(new java.awt.Point(2, 35));\r

 \r
             jContentPane.add(jStarLabel1, null);\r
             jContentPane.add(jStarLabel2, null);\r
 \r
             jContentPane.add(jStarLabel1, null);\r
             jContentPane.add(jStarLabel2, null);\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PackageDepDlg.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PackageDepDlg.java
index 922560247da898eab127afec3d3f21d707563272..15acd94f8c264e51503de6eef68e22a543ced22a 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PackageDepDlg.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PackageDepDlg.java
@@ -38,83 +38,82 @@ import org.tianocore.frameworkwizard.packaging.PackageIdentification;
 import org.tianocore.frameworkwizard.workspace.WorkspaceTools;\r
 \r
 /**\r
 import org.tianocore.frameworkwizard.workspace.WorkspaceTools;\r
 \r
 /**\r

- The class is used to create, update Include of MSA/MBD file\r
- It extends IInternalFrame\r
- \r
-\r
-\r
- **/\r
+ * The class is used to create, update Include of MSA/MBD file It extends\r
+ * IInternalFrame\r
+ * \r
+ * \r
+ * \r
+ */\r

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

+  // /\r
+  // / Define class Serial Version UID\r
+  // /\r
+  private static final long serialVersionUID = 3465193035145152131L;\r

 \r
 \r

-    ///\r
-    /// Define class Serial Version UID\r
-    ///\r
-    private static final long serialVersionUID = 3465193035145152131L;\r
-\r
-    //\r
-    //Define class members\r
-    //\r
-    private JPanel jContentPane = null;\r
+  //\r
+  // Define class members\r
+  //\r
+  private JPanel jContentPane = null;\r

 \r
 \r

-    private JLabel jLabelPackageName = null;\r
+  private JLabel jLabelPackageName = null;\r

 \r
 \r

-    private StarLabel jStarLabel1 = null;\r
+  private StarLabel jStarLabel1 = null;\r

 \r
 \r

-    private JComboBox jComboBoxPackageName = null;\r
+  private JComboBox jComboBoxPackageName = null;\r

 \r
 \r

-    private JLabel jLabelPackageGuid = null;\r
+  private JLabel jLabelPackageGuid = null;\r

 \r
 \r

-    private JTextField jTextFieldPackageGuid = null;\r
+  private JTextField jTextFieldPackageGuid = null;\r

 \r
 \r

-    private JButton jButtonGenerateGuid = null;\r
+  private JButton jButtonGenerateGuid = null;\r

 \r
 \r

-    private JLabel jLabelPackageVersion = null;\r
+  private JLabel jLabelPackageVersion = null;\r

 \r
 \r

-    private JTextField jTextFieldPackageVersion = null;\r
+  private JTextField jTextFieldPackageVersion = null;\r

 \r
 \r

-    private JLabel jLabelFeatureFlag = null;\r
+  private JLabel jLabelFeatureFlag = null;\r

 \r
 \r

-    private JTextField jTextFieldFeatureFlag = null;\r
+  private JTextField jTextFieldFeatureFlag = null;\r

 \r
 \r

-    private JScrollPane jScrollPane = null;\r
+  private JScrollPane jScrollPane = null;\r

 \r
 \r

-    private JLabel jLabelArch = null;\r
+  private JLabel jLabelArch = null;\r

 \r
 \r

-    private ArchCheckBox jArchCheckBox = null;\r
+  private ArchCheckBox jArchCheckBox = null;\r

 \r
 \r

-    private JButton jButtonOk = null;\r
+  private JButton jButtonOk = null;\r

 \r
 \r

-    private JButton jButtonCancel = null;\r
+  private JButton jButtonCancel = null;\r

 \r
 \r

-    //\r
-    // Not used by UI\r
-    //\r
-    private PackageDependenciesIdentification pdid = null;\r
+  //\r
+  // Not used by UI\r
+  //\r
+  private PackageDependenciesIdentification pdid = null;\r

 \r
 \r

-    private WorkspaceTools wt = new WorkspaceTools();\r
+  private WorkspaceTools wt = new WorkspaceTools();\r

 \r
 \r

-    private Vector<PackageIdentification> vPackage = wt.getAllPackages();\r
+  private Vector<PackageIdentification> vPackage = wt.getAllPackages();\r

 \r
 \r

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

     private JComboBox getJComboBoxPackageName() {\r
     private JComboBox getJComboBoxPackageName() {\r

-        if (jComboBoxPackageName == null) {\r
-            jComboBoxPackageName = new JComboBox();\r
-            jComboBoxPackageName.setBounds(new java.awt.Rectangle(160, 10, 320, 20));\r
-            jComboBoxPackageName.setPreferredSize(new java.awt.Dimension(320, 20));\r
-            jComboBoxPackageName.setToolTipText("If your Module requires a package list that here.");\r
-            jComboBoxPackageName.addItemListener(this);\r
-        }\r
-        return jComboBoxPackageName;\r
+      if (jComboBoxPackageName == null) {\r
+        jComboBoxPackageName = new JComboBox();\r
+        jComboBoxPackageName.setBounds(new java.awt.Rectangle(160, 10, 320, 20));\r
+        jComboBoxPackageName.setPreferredSize(new java.awt.Dimension(320, 20));\r
+        jComboBoxPackageName.setToolTipText("If your Module requires a package list that here.");\r
+        jComboBoxPackageName.addItemListener(this);\r
+      }\r
+      return jComboBoxPackageName;\r

     }\r
 \r
     /**\r
     }\r
 \r
     /**\r

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

      */\r
     private JTextField getJTextFieldPackageGuid() {\r
         if (jTextFieldPackageGuid == null) {\r
      */\r
     private JTextField getJTextFieldPackageGuid() {\r
         if (jTextFieldPackageGuid == null) {\r


@@ -128,9 +127,9 @@ public class PackageDepDlg extends IDialog implements ItemListener {
     }\r
 \r
     /**\r
     }\r
 \r
     /**\r

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

      */\r
     private JButton getJButtonGenerateGuid() {\r
         if (jButtonGenerateGuid == null) {\r
      */\r
     private JButton getJButtonGenerateGuid() {\r
         if (jButtonGenerateGuid == null) {\r


@@ -145,9 +144,9 @@ public class PackageDepDlg extends IDialog implements ItemListener {
     }\r
 \r
     /**\r
     }\r
 \r
     /**\r

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

      */\r
     private JTextField getJTextFieldPackageVersion() {\r
         if (jTextFieldPackageVersion == null) {\r
      */\r
     private JTextField getJTextFieldPackageVersion() {\r
         if (jTextFieldPackageVersion == null) {\r


@@ -161,9 +160,9 @@ public class PackageDepDlg extends IDialog implements ItemListener {
     }\r
 \r
     /**\r
     }\r
 \r
     /**\r

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

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


@@ -175,9 +174,9 @@ public class PackageDepDlg extends IDialog implements ItemListener {
     }\r
 \r
     /**\r
     }\r
 \r
     /**\r

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

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


@@ -188,11 +187,11 @@ public class PackageDepDlg extends IDialog implements ItemListener {
     }\r
 \r
     /**\r
     }\r
 \r
     /**\r

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

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


@@ -204,11 +203,11 @@ public class PackageDepDlg extends IDialog implements ItemListener {
     }\r
 \r
     /**\r
     }\r
 \r
     /**\r

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

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


@@ -224,9 +223,9 @@ public class PackageDepDlg extends IDialog implements ItemListener {
     }\r
 \r
     /**\r
     }\r
 \r
     /**\r

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

     private void init() {\r
         this.setSize(508, 188);\r
         this.setContentPane(getJScrollPane());\r
     private void init() {\r
         this.setSize(508, 188);\r
         this.setContentPane(getJScrollPane());\r


@@ -237,9 +236,9 @@ public class PackageDepDlg extends IDialog implements ItemListener {
     }\r
 \r
     /**\r
     }\r
 \r
     /**\r

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

     private void init(PackageDependenciesIdentification inPackageDependenciesIdentification) {\r
         init();\r
         this.pdid = inPackageDependenciesIdentification;\r
     private void init(PackageDependenciesIdentification inPackageDependenciesIdentification) {\r
         init();\r
         this.pdid = inPackageDependenciesIdentification;\r


@@ -253,20 +252,21 @@ public class PackageDepDlg extends IDialog implements ItemListener {
     }\r
 \r
     /**\r
     }\r
 \r
     /**\r

-     This is the default constructor\r
-     \r
-     **/\r
+     * This is the default constructor\r
+     * \r
+     */\r

     public PackageDepDlg(PackageDependenciesIdentification inPackageDependenciesIdentification, IFrame iFrame) {\r
         super(iFrame, true);\r
         init(inPackageDependenciesIdentification);\r
     }\r
 \r
     /**\r
     public PackageDepDlg(PackageDependenciesIdentification inPackageDependenciesIdentification, IFrame iFrame) {\r
         super(iFrame, true);\r
         init(inPackageDependenciesIdentification);\r
     }\r
 \r
     /**\r

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

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


@@ -274,52 +274,54 @@ public class PackageDepDlg extends IDialog implements ItemListener {
     }\r
 \r
     /**\r
     }\r
 \r
     /**\r

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

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

-            jArchCheckBox = new ArchCheckBox();\r
-            jArchCheckBox.setBounds(new java.awt.Rectangle(160, 85, 320, 20));\r
-            jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20));\r
-            jLabelArch = new JLabel();\r
-            jLabelArch.setBounds(new java.awt.Rectangle(15, 85, 140, 20));\r
-            jLabelArch.setText("Sup Arch List");\r
-            jLabelPackageVersion = new JLabel();\r
-            jLabelPackageVersion.setBounds(new java.awt.Rectangle(15, 35, 140, 20));\r
-            jLabelPackageVersion.setText("Package Version");\r
-            jLabelPackageGuid = new JLabel();\r
-            jLabelPackageGuid.setBounds(new java.awt.Rectangle(15, 35, 140, 20));\r
-            jLabelPackageGuid.setText("Package Guid");\r
-            jLabelPackageGuid.setVisible(false);\r
-            jLabelPackageName = new JLabel();\r
-            jLabelPackageName.setBounds(new java.awt.Rectangle(15, 10, 140, 20));\r
-            jLabelPackageName.setText("Package Name");\r
+          jStarLabel1 = new StarLabel();\r
+          jStarLabel1.setLocation(new java.awt.Point(2, 10));\r
+          jLabelPackageName = new JLabel();\r
+          jLabelPackageName.setBounds(new java.awt.Rectangle(15, 10, 145, 20));\r
+          jLabelPackageName.setText("Package Name");\r
+\r
+          jLabelPackageVersion = new JLabel();\r
+          jLabelPackageVersion.setBounds(new java.awt.Rectangle(15, 35, 145, 20));\r
+          jLabelPackageVersion.setText("Package Version");\r
+\r
+          jLabelPackageGuid = new JLabel();\r
+          jLabelPackageGuid.setBounds(new java.awt.Rectangle(15, 35, 145, 20));\r
+          jLabelPackageGuid.setText("Package Guid");\r
+          jLabelPackageGuid.setVisible(false);\r
+\r
+          jLabelFeatureFlag = new JLabel();\r
+          jLabelFeatureFlag.setBounds(new java.awt.Rectangle(15, 60, 145, 20));\r
+          jLabelFeatureFlag.setText("Feature Flag Expression");\r
+\r
+          jLabelArch = new JLabel();\r
+          jLabelArch.setBounds(new java.awt.Rectangle(15, 85, 145, 20));\r
+          jLabelArch.setText("Supported Architectures");\r
+          jArchCheckBox = new ArchCheckBox();\r
+          jArchCheckBox.setBounds(new java.awt.Rectangle(160, 85, 320, 20));\r
+          jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20));\r

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

-            jContentPane.setPreferredSize(new java.awt.Dimension(490, 140));\r
-\r
-            jContentPane.add(jLabelPackageName, null);\r
-            jStarLabel1 = new StarLabel();\r
-            jStarLabel1.setLocation(new java.awt.Point(0, 10));\r
-\r
+            jContentPane.setPreferredSize(new java.awt.Dimension(485, 145));\r
+            \r

             jContentPane.add(jStarLabel1, null);\r
             jContentPane.add(jStarLabel1, null);\r

+            jContentPane.add(jLabelPackageName, null);\r

             jContentPane.add(getJComboBoxPackageName(), null);\r
             jContentPane.add(jLabelPackageGuid, null);\r
             jContentPane.add(getJTextFieldPackageGuid(), null);\r
             jContentPane.add(getJComboBoxPackageName(), null);\r
             jContentPane.add(jLabelPackageGuid, null);\r
             jContentPane.add(getJTextFieldPackageGuid(), null);\r

-            jContentPane.add(getJButtonGenerateGuid(), null);\r

             jContentPane.add(jLabelPackageVersion, null);\r
             jContentPane.add(getJTextFieldPackageVersion(), null);\r
             jContentPane.add(jLabelPackageVersion, null);\r
             jContentPane.add(getJTextFieldPackageVersion(), null);\r

-\r
-            jLabelFeatureFlag = new JLabel();\r
-            jLabelFeatureFlag.setBounds(new java.awt.Rectangle(15, 60, 140, 20));\r
-            jLabelFeatureFlag.setText("Feature Flag");\r
+            // LAH Not Used here\r
+            // jContentPane.add(getJButtonGenerateGuid(), null);\r

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

-\r

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


@@ -328,9 +330,11 @@ public class PackageDepDlg extends IDialog implements ItemListener {
         return jContentPane;\r
     }\r
 \r
         return jContentPane;\r
     }\r
 \r

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

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

-     *\r
+     * \r

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


@@ -350,9 +354,9 @@ public class PackageDepDlg extends IDialog implements ItemListener {
     }\r
 \r
     /**\r
     }\r
 \r
     /**\r

-     This method initializes Usage type, Package type and Arch type\r
-     \r
-     **/\r
+     * This method initializes Usage type, Package type and Arch type\r
+     * \r
+     */\r

     private void initFrame() {\r
         for (int index = 0; index < vPackage.size(); index++) {\r
             jComboBoxPackageName.addItem(vPackage.elementAt(index).getName());\r
     private void initFrame() {\r
         for (int index = 0; index < vPackage.size(); index++) {\r
             jComboBoxPackageName.addItem(vPackage.elementAt(index).getName());\r


@@ -360,29 +364,29 @@ public class PackageDepDlg extends IDialog implements ItemListener {
     }\r
 \r
     /**\r
     }\r
 \r
     /**\r

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

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

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

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

-        // Check PackageGuid \r
+        // Check PackageGuid\r

         //\r
         //\r

-//        if (!isEmpty(this.jTextFieldPackageGuid.getText())) {\r
-//            if (!DataValidation.isGuid(this.jTextFieldPackageGuid.getText())) {\r
-//                Log.err("Incorrect data type for Package Guid");\r
-//                return false;\r
-//            }\r
-//        }\r
+      // if (!isEmpty(this.jTextFieldPackageGuid.getText())) {\r
+// if (!DataValidation.isGuid(this.jTextFieldPackageGuid.getText())) {\r
+// Log.err("Incorrect data type for Package Guid");\r
+// return false;\r
+// }\r
+// }\r

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

-        // Check PackageVersion \r
+        // Check PackageVersion\r

         //\r
         if (!isEmpty(this.jTextFieldPackageVersion.getText())) {\r
             if (!DataValidation.isVersion(this.jTextFieldPackageVersion.getText())) {\r
         //\r
         if (!isEmpty(this.jTextFieldPackageVersion.getText())) {\r
             if (!DataValidation.isVersion(this.jTextFieldPackageVersion.getText())) {\r


@@ -416,9 +420,11 @@ public class PackageDepDlg extends IDialog implements ItemListener {
         return pdid;\r
     }\r
 \r
         return pdid;\r
     }\r
 \r

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

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

-     *\r
+     * \r

      * Reflesh the frame when selected item changed\r
      * \r
      */\r
      * Reflesh the frame when selected item changed\r
      * \r
      */\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PpisDlg.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PpisDlg.java
index c4e4151422832a8d2ebeb1fd3fd6a4c299441ae0..feb38c82ca77edff8804afe0c7d91ed5894745af 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PpisDlg.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PpisDlg.java
@@ -309,7 +309,7 @@ public class PpisDlg extends IDialog implements ItemListener {
       jStarLabel1.setLocation(new java.awt.Point(2, 10));\r
       jLabelPpiType = new JLabel();\r
       jLabelPpiType.setBounds(new java.awt.Rectangle(15, 10, 145, 20));\r
       jStarLabel1.setLocation(new java.awt.Point(2, 10));\r
       jLabelPpiType = new JLabel();\r
       jLabelPpiType.setBounds(new java.awt.Rectangle(15, 10, 145, 20));\r

-      jLabelPpiType.setText("Ppi Type");\r
+      jLabelPpiType.setText("Select Ppi Type");\r

 \r
       jStarLabel2 = new StarLabel();\r
       jStarLabel2.setLocation(new java.awt.Point(2, 35));\r
 \r
       jStarLabel2 = new StarLabel();\r
       jStarLabel2.setLocation(new java.awt.Point(2, 35));\r


@@ -328,12 +328,12 @@ public class PpisDlg extends IDialog implements ItemListener {
       jLabelHelpText.setText("Help Text");\r
 \r
       jLabelFeatureFlag = new JLabel();\r
       jLabelHelpText.setText("Help Text");\r
 \r
       jLabelFeatureFlag = new JLabel();\r

-      jLabelFeatureFlag.setText("Feature Flag");\r
+      jLabelFeatureFlag.setText("Feature Flag Expression");\r

       jLabelFeatureFlag.setBounds(new java.awt.Rectangle(15, 130, 145, 20));\r
 \r
       jLabelArch = new JLabel();\r
       jLabelArch.setBounds(new java.awt.Rectangle(15, 155, 145, 20));\r
       jLabelFeatureFlag.setBounds(new java.awt.Rectangle(15, 130, 145, 20));\r
 \r
       jLabelArch = new JLabel();\r
       jLabelArch.setBounds(new java.awt.Rectangle(15, 155, 145, 20));\r

-      jLabelArch.setText("Arch");\r
+      jLabelArch.setText("Supported Architectures");\r

       jArchCheckBox = new ArchCheckBox();\r
       jArchCheckBox.setBounds(new java.awt.Rectangle(160, 155, 320, 20));\r
       jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20));\r
       jArchCheckBox = new ArchCheckBox();\r
       jArchCheckBox.setBounds(new java.awt.Rectangle(160, 155, 320, 20));\r
       jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20));\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 5e171edc8f53183fa66f2dcc80081ba930c7c350..8b303dee0d7ce4f1c8cbc21a839abcda55c7452b 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
@@ -41,8 +41,9 @@ import org.tianocore.frameworkwizard.module.Identifications.Protocols.ProtocolsI
 import org.tianocore.frameworkwizard.workspace.WorkspaceTools;\r
 \r
 /**\r
 import org.tianocore.frameworkwizard.workspace.WorkspaceTools;\r
 \r
 /**\r

- * The class is used to create, update Protocol of MSA/MBD file \r
- * It extends JDialog\r
+ * The class is used to create, update Protocol of MSA file\r
+ * \r
+ * It extends IDialog\r

  * \r
  */\r
 public class ProtocolsDlg extends IDialog implements ItemListener {\r
  * \r
  */\r
 public class ProtocolsDlg extends IDialog implements ItemListener {\r


@@ -134,7 +135,15 @@ public class ProtocolsDlg extends IDialog implements ItemListener {
       jComboBoxUsage.setBounds(new java.awt.Rectangle(160, 60, 320, 20));\r
       jComboBoxUsage.setPreferredSize(new java.awt.Dimension(320, 20));\r
       jComboBoxUsage\r
       jComboBoxUsage.setBounds(new java.awt.Rectangle(160, 60, 320, 20));\r
       jComboBoxUsage.setPreferredSize(new java.awt.Dimension(320, 20));\r
       jComboBoxUsage\r

-          .setToolTipText("<html><table><tr><td colspan=2>Protocol</td></tr><tr><td>ALWAYS_CONSUMED</td><td>Module always consumes the protocol</td></tr><tr><td>SOMETIMES_CONSUMES</td><td>Module sometimes consumes the protocol</td></tr><tr><td>ALWAYS_PRODUCED</td><td>Module always produces the protocol</td></tr><tr><td>SOMETIMES_PRODUCED</td><td>Module sometimes produces the protocol</td></tr><tr><td>TO_START</td><td>The protocol is consumed by a Driver Binding protocol <b>Start</b><br>function.  The protocol is used in EFI 1.10 driver model</td></tr><tr><td>BY_START</td><td>Protocol is produced by a Driver Binding protocol <b>Start</b><br>function. The protocol is used in EFI 1.10 driver model</td></tr><tr><td colspan=2>Protocol Notify</td></tr><tr><td>SOMETIMES_CONSUMED</td><td>Module will consume the protocol if it is produced.<br>Consumption is defined by executing the protocol notify<br>function.</td></tr></table></html>");\r
+          .setToolTipText("<html><table><tr><td colspan=2 align=center><b>Protocol</b></td></tr>"\r
+              + "<tr><td>ALWAYS_CONSUMED</td><td>Module always consumes the protocol</td></tr>"\r
+              + "<tr><td>SOMETIMES_CONSUMES</td><td>Module sometimes consumes the protocol</td></tr>"\r
+              + "<tr><td>ALWAYS_PRODUCED</td><td>Module always produces the protocol</td></tr>"\r
+              + "<tr><td>SOMETIMES_PRODUCED</td><td>Module sometimes produces the protocol</td></tr>"\r
+              + "<tr><td>TO_START</td><td>The protocol is consumed by a Driver Binding protocol <b>Start</b><br>function.  The protocol is used in EFI 1.10 driver model</td></tr>"\r
+              + "<tr><td>BY_START</td><td>Protocol is produced by a Driver Binding protocol <b>Start</b><br>function. The protocol is used in EFI 1.10 driver model</td></tr>"\r
+              + "<tr><td colspan=2 align=center><b>Protocol Notify</b></td></tr>"\r
+              + "<tr><td>SOMETIMES_CONSUMED</td><td>Module will consume the protocol if it is produced.<br>Consumption is defined by executing the protocol notify<br>function.</td></tr></table></html>");\r

     }\r
     return jComboBoxUsage;\r
   }\r
     }\r
     return jComboBoxUsage;\r
   }\r


@@ -464,8 +473,8 @@ public class ProtocolsDlg extends IDialog implements ItemListener {
     String arg5 = this.jTextAreaHelpText.getText();\r
     id = new ProtocolsIdentification(arg0, arg1, arg2, arg3, arg4, arg5);\r
     return id;\r
     String arg5 = this.jTextAreaHelpText.getText();\r
     id = new ProtocolsIdentification(arg0, arg1, arg2, arg3, arg4, arg5);\r
     return id;\r

-  } \r
-\r
+  }\r
+  \r

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

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/SourceFilesDlg.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/SourceFilesDlg.java
index 0be868f54ed52753fe3a3075e986d498b7f15588..f5c321df8ef0cbaeaec23c74c950e046eecdc8f8 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/SourceFilesDlg.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/SourceFilesDlg.java
@@ -307,7 +307,7 @@ public class SourceFilesDlg extends IDialog {
             jArchCheckBox.setPreferredSize(new java.awt.Dimension(340, 20));\r
             jLabelFeatureFlag = new JLabel();\r
             jLabelFeatureFlag.setBounds(new java.awt.Rectangle(15, 110, 120, 20));\r
             jArchCheckBox.setPreferredSize(new java.awt.Dimension(340, 20));\r
             jLabelFeatureFlag = new JLabel();\r
             jLabelFeatureFlag.setBounds(new java.awt.Rectangle(15, 110, 120, 20));\r

-            jLabelFeatureFlag.setText("Feature Flag");\r
+            jLabelFeatureFlag.setText("Feature Flag Expression");\r

             jLabelToolCode = new JLabel();\r
             jLabelToolCode.setBounds(new java.awt.Rectangle(15, 60, 120, 20));\r
             jLabelToolCode.setText("Tool Code");\r
             jLabelToolCode = new JLabel();\r
             jLabelToolCode.setBounds(new java.awt.Rectangle(15, 60, 120, 20));\r
             jLabelToolCode.setText("Tool Code");\r


@@ -316,7 +316,7 @@ public class SourceFilesDlg extends IDialog {
             jLabelTagName.setText("Tag Name");\r
             jLabelArch = new JLabel();\r
             jLabelArch.setBounds(new java.awt.Rectangle(15, 135, 120, 20));\r
             jLabelTagName.setText("Tag Name");\r
             jLabelArch = new JLabel();\r
             jLabelArch.setBounds(new java.awt.Rectangle(15, 135, 120, 20));\r

-            jLabelArch.setText("Sup Arch List");\r
+            jLabelArch.setText("Supported Architectures");\r

             jLabelToolChainFamily = new JLabel();\r
             jLabelToolChainFamily.setBounds(new java.awt.Rectangle(15, 85, 120, 20));\r
             jLabelToolChainFamily.setText("Tool Chain Family");\r
             jLabelToolChainFamily = new JLabel();\r
             jLabelToolChainFamily.setBounds(new java.awt.Rectangle(15, 85, 120, 20));\r
             jLabelToolChainFamily.setText("Tool Chain Family");\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/VariablesDlg.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/VariablesDlg.java
index 4394112bbe681f7e78b7159c906df107f20cd893..9323ac389809abf1f0ca8d2bf4f24e18f418f958 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/VariablesDlg.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/VariablesDlg.java
@@ -24,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.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
 \r
 import org.tianocore.frameworkwizard.common.DataType;\r
 import org.tianocore.frameworkwizard.common.DataValidation;\r


@@ -38,402 +39,438 @@ import org.tianocore.frameworkwizard.module.Identifications.Variables.VariablesI
 import org.tianocore.frameworkwizard.workspace.WorkspaceTools;\r
 \r
 /**\r
 import org.tianocore.frameworkwizard.workspace.WorkspaceTools;\r
 \r
 /**\r

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

 public class VariablesDlg extends IDialog {\r
 \r
 public class VariablesDlg extends IDialog {\r
 \r

-    ///\r
-    /// Define class Serial Version UID\r
-    ///\r
-    private static final long serialVersionUID = -6998982978030439446L;\r
+  // /\r
+  // / Define class Serial Version UID\r
+  // /\r
+  private static final long serialVersionUID = -6998982978030439446L;\r

 \r
 \r

-    //\r
-    //Define class members\r
-    //\r
-    private JPanel jContentPane = null;\r
+  //\r
+  // Define class members\r
+  //\r
+  private JPanel jContentPane = null;\r

 \r
 \r

-    private JLabel jLabelVariableName = null;\r
+  private JLabel jLabelVariableName = null;\r

 \r
 \r

-    private JTextField jTextFieldVariableName = null;\r
+  private JTextField jTextFieldVariableName = null;\r

 \r
 \r

-    private JLabel jLabelUsage = null;\r
+  private JLabel jLabelUsage = null;\r

 \r
 \r

-    private JComboBox jComboBoxUsage = null;\r
+  private JComboBox jComboBoxUsage = null;\r

 \r
 \r

-    private StarLabel jStarLabel1 = null;\r
+  private StarLabel jStarLabel1 = null;\r

 \r
 \r

-    private StarLabel jStarLabel2 = null;\r
+  private StarLabel jStarLabel2 = null;\r
+  \r
+  private StarLabel jStarLabel3 = null;\r

 \r
 \r

-    private JScrollPane jScrollPane = null;\r
+  private JScrollPane jScrollPane = null;\r

 \r
 \r

-    private JLabel jLabelGuidCName = null;\r
+  private JLabel jLabelGuidCName = null;\r

 \r
 \r

-    private JComboBox jComboBoxGuidC_Name = null;\r
+  private JComboBox jComboBoxGuidC_Name = null;\r

 \r
 \r

-    private JTextField jTextFieldFeatureFlag = null;\r
+  private JTextField jTextFieldFeatureFlag = null;\r

 \r
 \r

-    private JLabel jLabelFeatureFlag = null;\r
+  private JLabel jLabelFeatureFlag = null;\r

 \r
 \r

-    private JLabel jLabelArch = null;\r
+  private JLabel jLabelArch = null;\r

 \r
 \r

-    private JLabel jLabelHelpText = null;\r
+  private JLabel jLabelHelpText = null;\r

 \r
 \r

-    private JTextField jTextFieldHelpText = null;\r
+  private JTextArea jTextAreaHelpText = null;\r

 \r
 \r

-    private ArchCheckBox jArchCheckBox = null;\r
+  private JScrollPane jScrollPaneHelpText = null;\r

 \r
 \r

-    private JButton jButtonOk = null;\r
+  private ArchCheckBox jArchCheckBox = null;\r

 \r
 \r

-    private JButton jButtonCancel = null;\r
+  private JButton jButtonOk = null;\r

 \r
 \r

-    //\r
-    // Not used by UI\r
-    //\r
-    private VariablesIdentification id = null;\r
-\r
-    private EnumerationData ed = new EnumerationData();\r
-\r
-    private WorkspaceTools wt = new WorkspaceTools();\r
-\r
-    /**\r
-     This method initializes jTextFieldString \r
-     \r
-     @return javax.swing.JTextField jTextFieldString\r
-     \r
-     **/\r
-    private JTextField getJTextFieldString() {\r
-        if (jTextFieldVariableName == null) {\r
-            jTextFieldVariableName = new JTextField();\r
-            jTextFieldVariableName.setSize(new java.awt.Dimension(320, 20));\r
-            jTextFieldVariableName.setPreferredSize(new java.awt.Dimension(320, 20));\r
-            jTextFieldVariableName.setLocation(new java.awt.Point(160, 10));\r
-            jTextFieldVariableName\r
-            .setToolTipText("Enter a Hex Word Array, you must provide leading Zeros. 0x000a, 0x0010, 0x00FF");\r
-        }\r
-        return jTextFieldVariableName;\r
-    }\r
+  private JButton jButtonCancel = null;\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, 60, 320, 20));\r
-            jComboBoxUsage.setPreferredSize(new java.awt.Dimension(320, 20));\r
-        }\r
-        return jComboBoxUsage;\r
-    }\r
+  //\r
+  // Not used by UI\r
+  //\r
+  private VariablesIdentification id = null;\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
-    }\r
+  private EnumerationData ed = new EnumerationData();\r

 \r
 \r

-    /**\r
-     This method initializes jTextFieldFeatureFlag \r
-     \r
-     @return javax.swing.JTextField jTextFieldFeatureFlag\r
-     \r
-     **/\r
-    private JTextField getJTextFieldFeatureFlag() {\r
-        if (jTextFieldFeatureFlag == null) {\r
-            jTextFieldFeatureFlag = new JTextField();\r
-            jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(160, 110, 320, 20));\r
-            jTextFieldFeatureFlag.setPreferredSize(new java.awt.Dimension(320, 20));\r
-        }\r
-        return jTextFieldFeatureFlag;\r
-    }\r
+  private WorkspaceTools wt = new WorkspaceTools();\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, 85, 320, 20));\r
-            jTextFieldHelpText.setPreferredSize(new java.awt.Dimension(320, 20));\r
-            jTextFieldHelpText.setToolTipText("Enter information on how to use this Variable.");\r
-        }\r
-        return jTextFieldHelpText;\r
+  /**\r
+   * This method initializes jTextFieldString\r
+   * \r
+   * @return javax.swing.JTextField jTextFieldString\r
+   * \r
+   */\r
+  private JTextField getJTextFieldString() {\r
+    if (jTextFieldVariableName == null) {\r
+      jTextFieldVariableName = new JTextField();\r
+      jTextFieldVariableName.setSize(new java.awt.Dimension(320, 20));\r
+      jTextFieldVariableName.setPreferredSize(new java.awt.Dimension(320, 20));\r
+      jTextFieldVariableName.setLocation(new java.awt.Point(160, 10));\r
+      jTextFieldVariableName\r
+          .setToolTipText("Enter a Hex Word Array, you must provide leading Zeros. 0x000a, 0x0010, 0x00FF");\r

     }\r
     }\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, 35, 320, 20));\r
-            jComboBoxGuidC_Name.setPreferredSize(new java.awt.Dimension(320, 20));\r
-            jComboBoxGuidC_Name.setToolTipText("Select the GUID C Name of the Variable.");\r
-        }\r
-        return jComboBoxGuidC_Name;\r
+    return jTextFieldVariableName;\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, 60, 320, 20));\r
+      jComboBoxUsage.setPreferredSize(new java.awt.Dimension(320, 20));\r
+      jComboBoxUsage\r
+          .setToolTipText("<html><table><tr><td>ALWAYS_CONSUMED</td><td>The module requires the variable entry to be set</td></tr>"\r
+              + "<tr><td>SOMETIMES_CONSUMED</td><td>The module will use the variable entry if it’s set.</td></tr>"\r
+              + "<tr><td>ALWAYS_PRODUCED</td><td>The module will always write the variable.</td></tr>"\r
+              + "<tr><td>SOMETIMES_PRODUCED</td><td>The module will sometimes write the variable.</td></tr></table></html>");\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, 165, 90, 20));\r
-            jButtonOk.setText("Ok");\r
-            jButtonOk.addActionListener(this);\r
-        }\r
-        return jButtonOk;\r
+    return jComboBoxUsage;\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
-    /**\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, 165, 90, 20));\r
-            jButtonCancel.setText("Cancel");\r
-            jButtonCancel.addActionListener(this);\r
-        }\r
-        return jButtonCancel;\r
+    return jScrollPane;\r
+  }\r
+\r
+  /**\r
+   * This method initializes jTextFieldFeatureFlag\r
+   * \r
+   * @return javax.swing.JTextField jTextFieldFeatureFlag\r
+   * \r
+   */\r
+  private JTextField getJTextFieldFeatureFlag() {\r
+    if (jTextFieldFeatureFlag == null) {\r
+      jTextFieldFeatureFlag = new JTextField();\r
+      jTextFieldFeatureFlag\r
+          .setBounds(new java.awt.Rectangle(160, 130, 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
-    public static void main(String[] args) {\r
-\r
+    return jTextFieldFeatureFlag;\r
+  }\r
+\r
+  /**\r
+   * This method initializes jTextFieldHelpText\r
+   * \r
+   * @return javax.swing.JTextField\r
+   * \r
+   */\r
+  private JTextArea getJTextAreaHelpText() {\r
+    if (jTextAreaHelpText == null) {\r
+      jTextAreaHelpText = new JTextArea();\r
+      jTextAreaHelpText.setLineWrap(true);\r
+      jTextAreaHelpText.setWrapStyleWord(true);\r
+      jTextAreaHelpText\r
+          .setToolTipText("Enter information on how to use this Variable.");\r

     }\r
     }\r

-\r
-    /**\r
-     This method initializes this\r
-     \r
-     **/\r
-    private void init() {\r
-        this.setSize(510, 240);\r
-        this.setContentPane(getJScrollPane());\r
-        this.setTitle("Variables");\r
-        initFrame();\r
-        this.setViewMode(false);\r
-        this.centerWindow();\r
+    return jTextAreaHelpText;\r
+  }\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,85));\r
+      jScrollPaneHelpText.setViewportView(getJTextAreaHelpText());\r

     }\r
     }\r

-\r
-    /**\r
-     This method initializes this\r
-     Fill values to all fields if these values are not empty\r
-     \r
-     @param inVariablesId\r
-\r
-     **/\r
-    private void init(VariablesIdentification inVariablesId) {\r
-        init();\r
-        this.id = inVariablesId;\r
-\r
-        if (this.id != null) {\r
-            this.jTextFieldVariableName.setText(id.getName());\r
-            this.jComboBoxGuidC_Name.setSelectedItem(id.getGuid());\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 jScrollPaneHelpText;\r
+  }\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, 35, 320, 20));\r
+      jComboBoxGuidC_Name.setPreferredSize(new java.awt.Dimension(320, 20));\r
+      jComboBoxGuidC_Name\r
+          .setToolTipText("Select the GUID C Name of the Variable.");\r

     }\r
     }\r

-\r
-    /**\r
-     This is the override edit constructor\r
-     \r
-     @param inVariablesIdentification\r
-     @param iFrame\r
-     \r
-     **/\r
-    public VariablesDlg(VariablesIdentification inVariablesIdentification, IFrame iFrame) {\r
-        super(iFrame, true);\r
-        init(inVariablesIdentification);\r
+    return jComboBoxGuidC_Name;\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, 182, 90, 20));\r
+      jButtonOk.setText("Ok");\r
+      jButtonOk.addActionListener(this);\r

     }\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.jTextFieldVariableName.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, 182, 90, 20));\r
+      jButtonCancel.setText("Cancel");\r
+      jButtonCancel.addActionListener(this);\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, 135, 320, 20));\r
-            jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20));\r
-            jLabelGuidCName = new JLabel();\r
-            jLabelGuidCName.setBounds(new java.awt.Rectangle(15, 35, 140, 20));\r
-            jLabelGuidCName.setText("Guid C Name");\r
-            jLabelUsage = new JLabel();\r
-            jLabelUsage.setText("Usage");\r
-            jLabelUsage.setBounds(new java.awt.Rectangle(15, 60, 140, 20));\r
-            jLabelVariableName = new JLabel();\r
-            jLabelVariableName.setText("Variable Name");\r
-            jLabelVariableName.setLocation(new java.awt.Point(15, 10));\r
-            jLabelVariableName.setSize(new java.awt.Dimension(140, 20));\r
-            jLabelArch = new JLabel();\r
-            jLabelArch.setBounds(new java.awt.Rectangle(15, 135, 140, 20));\r
-            jLabelArch.setText("Arch");\r
-            jLabelFeatureFlag = new JLabel();\r
-            jLabelFeatureFlag.setText("Feature Flag");\r
-            jLabelFeatureFlag.setBounds(new java.awt.Rectangle(15, 110, 140, 20));\r
-\r
-            jContentPane = new JPanel();\r
-            jContentPane.setLayout(null);\r
-            jContentPane.setPreferredSize(new java.awt.Dimension(490, 190));\r
-\r
-            jContentPane.add(jLabelVariableName, null);\r
-            jContentPane.add(jLabelGuidCName, null);\r
-            jContentPane.add(getJComboBoxGuidC_Name(), null);\r
-            jContentPane.add(getJTextFieldString(), null);\r
-            jContentPane.add(jLabelUsage, null);\r
-            jContentPane.add(getJComboBoxUsage(), null);\r
-            jStarLabel1 = new StarLabel();\r
-            jStarLabel1.setLocation(new java.awt.Point(0, 10));\r
-            jStarLabel2 = new StarLabel();\r
-            jStarLabel2.setLocation(new java.awt.Point(0, 35));\r
-            jLabelHelpText = new JLabel();\r
-            jLabelHelpText.setBounds(new java.awt.Rectangle(14, 85, 140, 20));\r
-            jLabelHelpText.setText("Help Text");\r
-\r
-            jContentPane.add(jStarLabel1, null);\r
-            jContentPane.add(jStarLabel2, null);\r
-\r
-            jContentPane.add(jLabelArch, null);\r
-            jContentPane.add(jLabelFeatureFlag, null);\r
-            jContentPane.add(getJTextFieldFeatureFlag(), null);\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 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, 255);\r
+    this.setContentPane(getJScrollPane());\r
+    this.setTitle("Variables");\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 inVariablesId\r
+   * \r
+   */\r
+  private void init(VariablesIdentification inVariablesId) {\r
+    init();\r
+    this.id = inVariablesId;\r
+\r
+    if (this.id != null) {\r
+      this.jTextFieldVariableName.setText(id.getName());\r
+      this.jComboBoxGuidC_Name.setSelectedItem(id.getGuid());\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
-    /* (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
-                getCurrentVariables();\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 is the override edit constructor\r
+   * \r
+   * @param inVariablesIdentification\r
+   * @param iFrame\r
+   * \r
+   */\r
+  public VariablesDlg(VariablesIdentification inVariablesIdentification,\r
+      IFrame iFrame) {\r
+    super(iFrame, true);\r
+    init(inVariablesIdentification);\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.jTextFieldVariableName.setEnabled(!isView);\r
+      this.jComboBoxUsage.setEnabled(!isView);\r

     }\r
     }\r

-\r
-    /**\r
-     This method initializes Usage type\r
-     \r
-     **/\r
-    private void initFrame() {\r
-        Tools.generateComboBoxByVector(jComboBoxUsage, ed.getVPpiUsage());\r
-        Tools.generateComboBoxByVector(jComboBoxGuidC_Name, wt.getAllGuidDeclarationsFromWorkspace());\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
+      jLabelVariableName = new JLabel();\r
+      jLabelVariableName.setText("Variable Name");\r
+      jLabelVariableName.setBounds(new java.awt.Rectangle(15, 10, 145, 20));\r
+      \r
+      jStarLabel2 = new StarLabel();\r
+      jStarLabel2.setLocation(new java.awt.Point(2, 35));\r
+      jLabelGuidCName = new JLabel();\r
+      jLabelGuidCName.setBounds(new java.awt.Rectangle(15, 35, 145, 20));\r
+      jLabelGuidCName.setText("Variable Guid C Name");\r
+\r
+      jStarLabel3 = new StarLabel();\r
+      jStarLabel3.setLocation(new java.awt.Point(2, 60));\r
+      jLabelUsage = new JLabel();\r
+      jLabelUsage.setText("Usage");\r
+      jLabelUsage.setBounds(new java.awt.Rectangle(15, 60, 145, 20));\r
+\r
+      jLabelHelpText = new JLabel();\r
+      jLabelHelpText.setBounds(new java.awt.Rectangle(14, 85, 145, 20));\r
+      jLabelHelpText.setText("Help Text");\r
+\r
+      jLabelFeatureFlag = new JLabel();\r
+      jLabelFeatureFlag.setText("Feature Flag Expression");\r
+      jLabelFeatureFlag.setBounds(new java.awt.Rectangle(15, 130, 145, 20));\r
+\r
+      jLabelArch = new JLabel();\r
+      jLabelArch.setBounds(new java.awt.Rectangle(15, 155, 145, 20));\r
+      jLabelArch.setText("Supported Architectures");\r
+      jArchCheckBox = new ArchCheckBox();\r
+      jArchCheckBox.setBounds(new java.awt.Rectangle(160, 155, 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, 210));\r
+\r
+      jContentPane.add(jStarLabel1, null);\r
+      jContentPane.add(jLabelVariableName, null);\r
+      jContentPane.add(getJTextFieldString(), null);\r
+      jContentPane.add(jStarLabel2, null);\r
+      jContentPane.add(jLabelGuidCName, null);\r
+      jContentPane.add(getJComboBoxGuidC_Name(), null);\r
+      jContentPane.add(jStarLabel3, 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
-    /**\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 VariableName \r
-        //\r
-        if (isEmpty(this.jTextFieldVariableName.getText())) {\r
-            Log.wrn("Update Variables", "Variable Name couldn't be empty");\r
-            return false;\r
-        }\r
-\r
-        if (!isEmpty(this.jTextFieldVariableName.getText())) {\r
-            if (!DataValidation.isHexWordArrayType(this.jTextFieldVariableName.getText())) {\r
-                Log.wrn("Update Variables", "Incorrect data type for Variable 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 Variables", "Incorrect data type for Feature Flag");\r
-                return false;\r
-            }\r
-        }\r
-\r
-        return true;\r
+    return jContentPane;\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
+        getCurrentVariables();\r
+        this.returnType = DataType.RETURN_TYPE_OK;\r
+        this.setVisible(false);\r
+      }\r

     }\r
 \r
     }\r
 \r

-    private VariablesIdentification getCurrentVariables() {\r
-        String arg0 = this.jTextFieldVariableName.getText();\r
-        String arg1 = this.jComboBoxGuidC_Name.getSelectedItem().toString();\r
-        String arg2 = this.jComboBoxUsage.getSelectedItem().toString();\r
-\r
-        String arg3 = this.jTextFieldFeatureFlag.getText();\r
-        Vector<String> arg4 = this.jArchCheckBox.getSelectedItemsVector();\r
-        String arg5 = this.jTextFieldHelpText.getText();\r
+    if (arg0.getSource() == jButtonCancel) {\r
+      this.returnType = DataType.RETURN_TYPE_CANCEL;\r
+      this.setVisible(false);\r
+    }\r
+  }\r
+\r
+  /**\r
+   * This method initializes Usage type\r
+   * \r
+   */\r
+  private void initFrame() {\r
+    Tools.generateComboBoxByVector(jComboBoxUsage, ed.getVPpiUsage());\r
+    Tools.generateComboBoxByVector(jComboBoxGuidC_Name, wt\r
+        .getAllGuidDeclarationsFromWorkspace());\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

-        id = new VariablesIdentification(arg0, arg1, arg2, arg3, arg4, arg5);\r
-        return id;\r
+    //\r
+    // Check VariableName\r
+    //\r
+    if (isEmpty(this.jTextFieldVariableName.getText())) {\r
+      Log.wrn("Update Variables", "Variable Name must not be empty");\r
+      return false;\r

     }\r
 \r
     }\r
 \r

-    public VariablesIdentification getId() {\r
-        return id;\r
+    if (!isEmpty(this.jTextFieldVariableName.getText())) {\r
+      if (!DataValidation.isHexWordArrayType(this.jTextFieldVariableName\r
+          .getText())) {\r
+        Log.wrn("Update Variables", "Incorrect data type for Variable Name");\r
+        return false;\r
+      }\r

     }\r
 \r
     }\r
 \r

-    public void setId(VariablesIdentification id) {\r
-        this.id = id;\r
+    //\r
+    // Check FeatureFlag\r
+    //\r
+    if (!isEmpty(this.jTextFieldFeatureFlag.getText())) {\r
+      if (!DataValidation.isFeatureFlag(this.jTextFieldFeatureFlag.getText())) {\r
+        Log.wrn("Update Variables", "Incorrect data type for Feature Flag");\r
+        return false;\r
+      }\r

     }\r
     }\r

+\r
+    return true;\r
+  }\r
+\r
+  private VariablesIdentification getCurrentVariables() {\r
+    String arg0 = this.jTextFieldVariableName.getText();\r
+    String arg1 = this.jComboBoxGuidC_Name.getSelectedItem().toString();\r
+    String arg2 = this.jComboBoxUsage.getSelectedItem().toString();\r
+\r
+    String arg3 = this.jTextFieldFeatureFlag.getText();\r
+    Vector<String> arg4 = this.jArchCheckBox.getSelectedItemsVector();\r
+    String arg5 = this.jTextAreaHelpText.getText();\r
+\r
+    id = new VariablesIdentification(arg0, arg1, arg2, arg3, arg4, arg5);\r
+    return id;\r
+  }\r
+  \r
+  public VariablesIdentification getId() {\r
+    return id;\r
+  }\r
+\r
+  public void setId(VariablesIdentification id) {\r
+    this.id = id;\r
+  }\r

 }\r
 }\r