Adjusted sizes to accommodate Windows, iMac and Linux GUI

author lhauch <lhauch@6f19259b-4bc3-4df7-8a09-765794883524>

Fri, 28 Jul 2006 23:09:53 +0000 (23:09 +0000)

committer lhauch <lhauch@6f19259b-4bc3-4df7-8a09-765794883524>

Fri, 28 Jul 2006 23:09:53 +0000 (23:09 +0000)
author lhauch <lhauch@6f19259b-4bc3-4df7-8a09-765794883524>
Fri, 28 Jul 2006 23:09:53 +0000 (23:09 +0000)
committer lhauch <lhauch@6f19259b-4bc3-4df7-8a09-765794883524>
Fri, 28 Jul 2006 23:09:53 +0000 (23:09 +0000)
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 f7cc1a9a45fe41cd3a80f8ac89e251be28cc2072..937b8b6361ee9fee1a09b93ce0851e57816fdf20 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
@@ -59,7 +59,7 @@ public class BootModesDlg extends IDialog {
      // Define class members\r
      //\r
      private JPanel jContentPane = null;\r
      // Define class members\r
      //\r
      private JPanel jContentPane = null;\r
-\r
+private JLabel jLabelTest = null;\r
      private JLabel jLabelBootModeName = null;\r
  \r
      private JComboBox jComboBoxBootModeName = null;\r
      private JLabel jLabelBootModeName = null;\r
  \r
      private JComboBox jComboBoxBootModeName = null;\r
@@ -108,7 +108,7 @@ public class BootModesDlg extends IDialog {
      private JComboBox getJComboBoxBootModeName() {\r
          if (jComboBoxBootModeName == null) {\r
              jComboBoxBootModeName = new JComboBox();\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.setBounds(new java.awt.Rectangle(168, 12, 320, 20));\r
              jComboBoxBootModeName.setPreferredSize(new java.awt.Dimension(320, 20));\r
              jComboBoxBootModeName\r
                                   .setToolTipText("<html><table>"\r
              jComboBoxBootModeName.setPreferredSize(new java.awt.Dimension(320, 20));\r
              jComboBoxBootModeName\r
                                   .setToolTipText("<html><table>"\r
@@ -134,7 +134,7 @@ public class BootModesDlg extends IDialog {
      private JComboBox getJComboBoxUsage() {\r
          if (jComboBoxUsage == null) {\r
              jComboBoxUsage = new JComboBox();\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.setBounds(new java.awt.Rectangle(168, 37, 320, 20));\r
              jComboBoxUsage.setPreferredSize(new java.awt.Dimension(320, 20));\r
              jComboBoxUsage\r
                            .setToolTipText("<html><table>"\r
              jComboBoxUsage.setPreferredSize(new java.awt.Dimension(320, 20));\r
              jComboBoxUsage\r
                            .setToolTipText("<html><table>"\r
@@ -155,7 +155,7 @@ public class BootModesDlg extends IDialog {
      private JTextField getJTextFieldFeatureFlag() {\r
          if (jTextFieldFeatureFlag == null) {\r
              jTextFieldFeatureFlag = new JTextField();\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.setBounds(new java.awt.Rectangle(168, 107, 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
              jTextFieldFeatureFlag.setPreferredSize(new java.awt.Dimension(320, 20));\r
              jTextFieldFeatureFlag.setToolTipText("Postfix expression that must evaluate to TRUE or FALSE");\r
          }\r
@@ -202,7 +202,7 @@ public class BootModesDlg extends IDialog {
              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.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.setLocation(new java.awt.Point(168, 62));\r
              jScrollPaneHelpText.setViewportView(getJTextAreaHelpText());\r
          }\r
          return jScrollPaneHelpText;\r
              jScrollPaneHelpText.setViewportView(getJTextAreaHelpText());\r
          }\r
          return jScrollPaneHelpText;\r
@@ -217,7 +217,7 @@ public class BootModesDlg extends IDialog {
      private JButton getJButtonOk() {\r
          if (jButtonOk == null) {\r
              jButtonOk = new JButton();\r
      private JButton getJButtonOk() {\r
          if (jButtonOk == null) {\r
              jButtonOk = new JButton();\r
-            jButtonOk.setBounds(new java.awt.Rectangle(290, 157, 90, 20));\r
+            jButtonOk.setBounds(new java.awt.Rectangle(290, 162, 90, 20));\r
              jButtonOk.setText("Ok");\r
              jButtonOk.addActionListener(this);\r
          }\r
              jButtonOk.setText("Ok");\r
              jButtonOk.addActionListener(this);\r
          }\r
@@ -233,7 +233,7 @@ public class BootModesDlg extends IDialog {
      private JButton getJButtonCancel() {\r
          if (jButtonCancel == null) {\r
              jButtonCancel = new JButton();\r
      private JButton getJButtonCancel() {\r
          if (jButtonCancel == null) {\r
              jButtonCancel = new JButton();\r
-            jButtonCancel.setBounds(new java.awt.Rectangle(390, 157, 90, 20));\r
+            jButtonCancel.setBounds(new java.awt.Rectangle(390, 162, 90, 20));\r
              jButtonCancel.setText("Cancel");\r
              jButtonCancel.addActionListener(this);\r
          }\r
              jButtonCancel.setText("Cancel");\r
              jButtonCancel.addActionListener(this);\r
          }\r
@@ -248,7 +248,7 @@ public class BootModesDlg extends IDialog {
       * \r
       */\r
      private void init() {\r
       * \r
       */\r
      private void init() {\r
-        this.setSize(500, 230);\r
+        this.setSize(505, 235);\r
          this.setContentPane(getJScrollPane());\r
          this.setTitle("Boot Modes");\r
          initFrame();\r
          this.setContentPane(getJScrollPane());\r
          this.setTitle("Boot Modes");\r
          initFrame();\r
@@ -311,31 +311,31 @@ public class BootModesDlg extends IDialog {
      private JPanel getJContentPane() {\r
          if (jContentPane == null) {\r
              jStarLabel1 = new StarLabel();\r
      private JPanel getJContentPane() {\r
          if (jContentPane == null) {\r
              jStarLabel1 = new StarLabel();\r
-            jStarLabel1.setLocation(new java.awt.Point(2, 10));\r
+            jStarLabel1.setLocation(new java.awt.Point(2, 12));\r
              jLabelBootModeName = new JLabel();\r
              jLabelBootModeName.setText("Boot Mode Name");\r
              jLabelBootModeName = new JLabel();\r
              jLabelBootModeName.setText("Boot Mode Name");\r
-            jLabelBootModeName.setBounds(new java.awt.Rectangle(15, 10, 145, 20));\r
+            jLabelBootModeName.setBounds(new java.awt.Rectangle(12, 12, 155, 20));\r
              jStarLabel2 = new StarLabel();\r
              jStarLabel2 = new StarLabel();\r
-            jStarLabel2.setLocation(new java.awt.Point(2, 35));\r
+            jStarLabel2.setLocation(new java.awt.Point(2, 37));\r
              jLabelUsage = new JLabel();\r
              jLabelUsage.setText("Usage");\r
              jLabelUsage = new JLabel();\r
              jLabelUsage.setText("Usage");\r
-            jLabelUsage.setBounds(new java.awt.Rectangle(15, 35, 145, 20));\r
+            jLabelUsage.setBounds(new java.awt.Rectangle(12, 37, 155, 20));\r
              jLabelHelpText = new JLabel();\r
              jLabelHelpText = new JLabel();\r
-            jLabelHelpText.setBounds(new java.awt.Rectangle(15, 60, 145, 20));\r
+            jLabelHelpText.setBounds(new java.awt.Rectangle(12, 62, 155, 20));\r
              jLabelHelpText.setText("Help Text");\r
              jLabelFeatureFlag = new JLabel();\r
              jLabelHelpText.setText("Help Text");\r
              jLabelFeatureFlag = new JLabel();\r
-            jLabelFeatureFlag.setBounds(new java.awt.Rectangle(15, 105, 145, 20));\r
+            jLabelFeatureFlag.setBounds(new java.awt.Rectangle(12, 107, 155, 20));\r
              jLabelFeatureFlag.setText("Feature Flag Expression");\r
              jLabelArch = new JLabel();\r
              jLabelFeatureFlag.setText("Feature Flag Expression");\r
              jLabelArch = new JLabel();\r
-            jLabelArch.setBounds(new java.awt.Rectangle(15, 130, 145, 20));\r
+            jLabelArch.setBounds(new java.awt.Rectangle(12, 132, 155, 20));\r
              jLabelArch.setText("Supported Archectures");\r
              jArchCheckBox = new ArchCheckBox();\r
              jLabelArch.setText("Supported Archectures");\r
              jArchCheckBox = new ArchCheckBox();\r
-            jArchCheckBox.setBounds(new java.awt.Rectangle(160, 130, 320, 20));\r
+            jArchCheckBox.setBounds(new java.awt.Rectangle(168, 132, 320, 20));\r
              jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20));\r
  \r
              jContentPane = new JPanel();\r
              jContentPane.setLayout(null);\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
+            jContentPane.setPreferredSize(new java.awt.Dimension(480, 180));\r
  \r
              jContentPane.add(jLabelBootModeName, null);\r
              jContentPane.add(getJComboBoxBootModeName(), null);\r
  \r
              jContentPane.add(jLabelBootModeName, null);\r
              jContentPane.add(getJComboBoxBootModeName(), null);\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 05bd139257dabcc38810f072a9e8e78911e94501..b5238d97070020d131313d3cbeb18f125ba17968 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
@@ -108,7 +108,7 @@ public class DataHubsDlg extends IDialog {
      private JTextField getJTextFieldDataHubRecord() {\r
          if (jTextFieldDataHubRecord == null) {\r
              jTextFieldDataHubRecord = new JTextField();\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.setBounds(new java.awt.Rectangle(168, 12, 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
              jTextFieldDataHubRecord.setPreferredSize(new java.awt.Dimension(320, 20));\r
              jTextFieldDataHubRecord.setToolTipText("Enter the C Name of the Data Hub Record");\r
          }\r
@@ -124,7 +124,7 @@ public class DataHubsDlg extends IDialog {
      private JComboBox getJComboBoxUsage() {\r
          if (jComboBoxUsage == null) {\r
              jComboBoxUsage = new JComboBox();\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.setBounds(new java.awt.Rectangle(168, 37, 320, 20));\r
              jComboBoxUsage.setPreferredSize(new java.awt.Dimension(320, 20));\r
              jComboBoxUsage\r
                            .setToolTipText("<html><table>"\r
              jComboBoxUsage.setPreferredSize(new java.awt.Dimension(320, 20));\r
              jComboBoxUsage\r
                            .setToolTipText("<html><table>"\r
@@ -145,7 +145,7 @@ public class DataHubsDlg extends IDialog {
      private JTextField getJTextFieldFeatureFlag() {\r
          if (jTextFieldFeatureFlag == null) {\r
              jTextFieldFeatureFlag = new JTextField();\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.setBounds(new java.awt.Rectangle(168, 107, 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
              jTextFieldFeatureFlag.setPreferredSize(new java.awt.Dimension(320, 20));\r
              jTextFieldFeatureFlag.setToolTipText("Postfix expression that must evaluate to TRUE or FALSE");\r
          }\r
@@ -192,7 +192,7 @@ public class DataHubsDlg extends IDialog {
              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.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.setLocation(new java.awt.Point(168, 62));\r
              jScrollPaneHelpText.setViewportView(getJTextAreaHelpText());\r
          }\r
          return jScrollPaneHelpText;\r
              jScrollPaneHelpText.setViewportView(getJTextAreaHelpText());\r
          }\r
          return jScrollPaneHelpText;\r
@@ -207,7 +207,7 @@ public class DataHubsDlg extends IDialog {
      private JButton getJButtonOk() {\r
          if (jButtonOk == null) {\r
              jButtonOk = new JButton();\r
      private JButton getJButtonOk() {\r
          if (jButtonOk == null) {\r
              jButtonOk = new JButton();\r
-            jButtonOk.setBounds(new java.awt.Rectangle(290, 157, 90, 20));\r
+            jButtonOk.setBounds(new java.awt.Rectangle(290, 162, 90, 20));\r
              jButtonOk.setText("Ok");\r
              jButtonOk.addActionListener(this);\r
          }\r
              jButtonOk.setText("Ok");\r
              jButtonOk.addActionListener(this);\r
          }\r
@@ -223,7 +223,7 @@ public class DataHubsDlg extends IDialog {
      private JButton getJButtonCancel() {\r
          if (jButtonCancel == null) {\r
              jButtonCancel = new JButton();\r
      private JButton getJButtonCancel() {\r
          if (jButtonCancel == null) {\r
              jButtonCancel = new JButton();\r
-            jButtonCancel.setBounds(new java.awt.Rectangle(390, 157, 90, 20));\r
+            jButtonCancel.setBounds(new java.awt.Rectangle(390, 162, 90, 20));\r
              jButtonCancel.setText("Cancel");\r
              jButtonCancel.addActionListener(this);\r
          }\r
              jButtonCancel.setText("Cancel");\r
              jButtonCancel.addActionListener(this);\r
          }\r
@@ -239,7 +239,7 @@ public class DataHubsDlg extends IDialog {
       * \r
       */\r
      private void init() {\r
       * \r
       */\r
      private void init() {\r
-        this.setSize(500, 230);\r
+        this.setSize(505, 235);\r
          this.setContentPane(getJScrollPane());\r
          this.setTitle("Data Hubs");\r
          initFrame();\r
          this.setContentPane(getJScrollPane());\r
          this.setTitle("Data Hubs");\r
          initFrame();\r
@@ -302,31 +302,31 @@ public class DataHubsDlg extends IDialog {
      private JPanel getJContentPane() {\r
          if (jContentPane == null) {\r
              jStarLabel1 = new StarLabel();\r
      private JPanel getJContentPane() {\r
          if (jContentPane == null) {\r
              jStarLabel1 = new StarLabel();\r
-            jStarLabel1.setLocation(new java.awt.Point(2, 10));\r
+            jStarLabel1.setLocation(new java.awt.Point(2, 12));\r
              jLabelDataHubRecord = new JLabel();\r
              jLabelDataHubRecord = new JLabel();\r
-            jLabelDataHubRecord.setBounds(new java.awt.Rectangle(15, 10, 145, 20));\r
+            jLabelDataHubRecord.setBounds(new java.awt.Rectangle(12, 12, 155, 20));\r
              jLabelDataHubRecord.setText("Data Hub Record");\r
              jStarLabel2 = new StarLabel();\r
              jLabelDataHubRecord.setText("Data Hub Record");\r
              jStarLabel2 = new StarLabel();\r
-            jStarLabel2.setLocation(new java.awt.Point(2, 35));\r
+            jStarLabel2.setLocation(new java.awt.Point(2, 37));\r
              jLabelUsage = new JLabel();\r
              jLabelUsage.setText("Usage");\r
              jLabelUsage = new JLabel();\r
              jLabelUsage.setText("Usage");\r
-            jLabelUsage.setBounds(new java.awt.Rectangle(15, 35, 145, 20));\r
+            jLabelUsage.setBounds(new java.awt.Rectangle(12, 37, 155, 20));\r
              jLabelHelpText = new JLabel();\r
              jLabelHelpText = new JLabel();\r
-            jLabelHelpText.setBounds(new java.awt.Rectangle(14, 60, 145, 20));\r
+            jLabelHelpText.setBounds(new java.awt.Rectangle(12, 62, 155, 20));\r
              jLabelHelpText.setText("Help Text");\r
              jLabelFeatureFlag = new JLabel();\r
              jLabelHelpText.setText("Help Text");\r
              jLabelFeatureFlag = new JLabel();\r
-            jLabelFeatureFlag.setBounds(new java.awt.Rectangle(15, 105, 145, 20));\r
+            jLabelFeatureFlag.setBounds(new java.awt.Rectangle(12, 107, 155, 20));\r
              jLabelFeatureFlag.setText("Feature Flag Expression");\r
              jLabelArch = new JLabel();\r
              jLabelFeatureFlag.setText("Feature Flag Expression");\r
              jLabelArch = new JLabel();\r
-            jLabelArch.setBounds(new java.awt.Rectangle(15, 130, 145, 20));\r
+            jLabelArch.setBounds(new java.awt.Rectangle(12, 132, 155, 20));\r
              jLabelArch.setText("Supported Architectures");\r
              jArchCheckBox = new ArchCheckBox();\r
              jLabelArch.setText("Supported Architectures");\r
              jArchCheckBox = new ArchCheckBox();\r
-            jArchCheckBox.setBounds(new java.awt.Rectangle(160, 130, 320, 20));\r
+            jArchCheckBox.setBounds(new java.awt.Rectangle(168, 132, 320, 20));\r
              jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20));\r
  \r
              jContentPane = new JPanel();\r
              jContentPane.setLayout(null);\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
+            jContentPane.setPreferredSize(new java.awt.Dimension(480, 180));\r
  \r
              jContentPane.add(jLabelDataHubRecord, null);\r
              jContentPane.add(jLabelUsage, null);\r
  \r
              jContentPane.add(jLabelDataHubRecord, null);\r
              jContentPane.add(jLabelUsage, null);\r
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 00938840a8f9d8b634e13adbe406b1220fa48682..624fae71df2eedf8fc2820d8930fd7f25128a5d3 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
@@ -1,6 +1,6 @@
  /** @file\r
   \r
  /** @file\r
   \r
- The file is used to create, update Event of MSA/MBD file\r
+ The file is used to create, update Events section of the MSA file\r
   \r
   Copyright (c) 2006, Intel Corporation\r
   All rights reserved. This program and the accompanying materials\r
   \r
   Copyright (c) 2006, Intel Corporation\r
   All rights reserved. This program and the accompanying materials\r
@@ -38,8 +38,8 @@ import org.tianocore.frameworkwizard.module.Identifications.Events.EventsIdentif
  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 Event of MSA/MBD file It extends\r
- * IInternalFrame\r
+ * The class is used to create, update Events section of the MSA file \r
+ * It extends IDialog\r
   * \r
   * @since ModuleEditor 1.0\r
   * \r
   * \r
   * @since ModuleEditor 1.0\r
   * \r
@@ -118,12 +118,12 @@ public class EventsDlg extends IDialog {
      private JComboBox getJComboBoxEventsType() {\r
          if (jComboBoxEventsType == null) {\r
              jComboBoxEventsType = new JComboBox();\r
      private JComboBox getJComboBoxEventsType() {\r
          if (jComboBoxEventsType == null) {\r
              jComboBoxEventsType = new JComboBox();\r
-            jComboBoxEventsType.setBounds(new java.awt.Rectangle(160, 10, 320, 20));\r
+            jComboBoxEventsType.setBounds(new java.awt.Rectangle(168, 12, 320, 20));\r
              jComboBoxEventsType.setPreferredSize(new java.awt.Dimension(320, 20));\r
              jComboBoxEventsType\r
              jComboBoxEventsType.setPreferredSize(new java.awt.Dimension(320, 20));\r
              jComboBoxEventsType\r
-                               .setToolTipText("<html>Select CreateEvents if the Module has an event that is waiting to be signaled.<br>"\r
-                                               + "Select SignalEvents if the Module will signal all events in an event group.<br>"\r
-                                               + "NOTE: Signal events are named by GUID.</html>");\r
+              .setToolTipText("<html>Select CreateEvents if the Module has an event that is waiting to be signaled.<br>"\r
+                + "Select SignalEvents if the Module will signal all events in an event group.<br>"\r
+                + "NOTE: Signal events are named by GUID.</html>");\r
          }\r
          return jComboBoxEventsType;\r
      }\r
          }\r
          return jComboBoxEventsType;\r
      }\r
@@ -137,7 +137,7 @@ public class EventsDlg extends IDialog {
      private JComboBox getJComboBoxGuidC_Name() {\r
          if (jComboBoxGuidC_Name == null) {\r
              jComboBoxGuidC_Name = new JComboBox();\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.setBounds(new java.awt.Rectangle(168, 37, 320, 20));\r
              jComboBoxGuidC_Name.setPreferredSize(new java.awt.Dimension(320, 20));\r
              jComboBoxGuidC_Name.setToolTipText("Select the GUID C Name of the Event");\r
          }\r
              jComboBoxGuidC_Name.setPreferredSize(new java.awt.Dimension(320, 20));\r
              jComboBoxGuidC_Name.setToolTipText("Select the GUID C Name of the Event");\r
          }\r
@@ -152,7 +152,7 @@ public class EventsDlg extends IDialog {
      private JComboBox getJComboBoxEventGroup() {\r
          if (jComboBoxEventGroup == null) {\r
              jComboBoxEventGroup = new JComboBox();\r
      private JComboBox getJComboBoxEventGroup() {\r
          if (jComboBoxEventGroup == null) {\r
              jComboBoxEventGroup = new JComboBox();\r
-            jComboBoxEventGroup.setBounds(new java.awt.Rectangle(160, 60, 320, 20));\r
+            jComboBoxEventGroup.setBounds(new java.awt.Rectangle(168, 62, 320, 20));\r
              jComboBoxEventGroup.setPreferredSize(new java.awt.Dimension(320, 20));\r
              jComboBoxEventGroup.setToolTipText("Select Type of Event: Guid or Timer.");\r
  \r
              jComboBoxEventGroup.setPreferredSize(new java.awt.Dimension(320, 20));\r
              jComboBoxEventGroup.setToolTipText("Select Type of Event: Guid or Timer.");\r
  \r
@@ -169,18 +169,18 @@ public class EventsDlg extends IDialog {
      private JComboBox getJComboBoxUsage() {\r
          if (jComboBoxUsage == null) {\r
              jComboBoxUsage = new JComboBox();\r
      private JComboBox getJComboBoxUsage() {\r
          if (jComboBoxUsage == null) {\r
              jComboBoxUsage = new JComboBox();\r
-            jComboBoxUsage.setBounds(new java.awt.Rectangle(160, 85, 320, 20));\r
+            jComboBoxUsage.setBounds(new java.awt.Rectangle(168, 87, 320, 20));\r
              jComboBoxUsage.setPreferredSize(new java.awt.Dimension(320, 20));\r
              jComboBoxUsage\r
              jComboBoxUsage.setPreferredSize(new java.awt.Dimension(320, 20));\r
              jComboBoxUsage\r
-                          .setToolTipText("<html><table>"\r
-                                          + "<tr><td colspan=2 align=center><b>Create Events</b></td></tr>"\r
-                                          + "<tr><td>ALWAYS_CONSUMED</td><td>Module registers a notification function and REQUIRES that it be<br>"\r
-                                          + "executed for the module to fully function.</td></tr>"\r
-                                          + "<tr><td>SOMETIMES_CONSUMED</td><td>Module registers a notification function and calls the function<br>"\r
-                                          + "when it is signaled</td></tr><tr><td colspan=2 align=center><b>Signal Events</b></td></tr>"\r
-                                          + "<tr><td>ALWAYS_PRODUCED</td><td>Module will Always signal the event</td></tr>"\r
-                                          + "<tr><td>SOMETIMES_PRODUCED</td><td>Module will sometimes signal the event</td></tr>"\r
-                                          + "</table></html>");\r
+              .setToolTipText("<html><table>"\r
+                + "<tr><td colspan=2 align=center><b>Create Events</b></td></tr>"\r
+                + "<tr><td>ALWAYS_CONSUMED</td><td>Module registers a notification function and REQUIRES that it be<br>"\r
+                + "executed for the module to fully function.</td></tr>"\r
+                + "<tr><td>SOMETIMES_CONSUMED</td><td>Module registers a notification function and calls the function<br>"\r
+                + "when it is signaled</td></tr><tr><td colspan=2 align=center><b>Signal Events</b></td></tr>"\r
+                + "<tr><td>ALWAYS_PRODUCED</td><td>Module will Always signal the event</td></tr>"\r
+                + "<tr><td>SOMETIMES_PRODUCED</td><td>Module will sometimes signal the event</td></tr>"\r
+                + "</table></html>");\r
          }\r
          return jComboBoxUsage;\r
      }\r
          }\r
          return jComboBoxUsage;\r
      }\r
@@ -206,7 +206,7 @@ public class EventsDlg extends IDialog {
      private JTextField getJTextFieldFeatureFlag() {\r
          if (jTextFieldFeatureFlag == null) {\r
              jTextFieldFeatureFlag = new JTextField();\r
      private JTextField getJTextFieldFeatureFlag() {\r
          if (jTextFieldFeatureFlag == null) {\r
              jTextFieldFeatureFlag = new JTextField();\r
-            jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(160, 155, 320, 20));\r
+            jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(168, 157, 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
              jTextFieldFeatureFlag.setPreferredSize(new java.awt.Dimension(320, 20));\r
              jTextFieldFeatureFlag.setToolTipText("Postfix expression that must evaluate to TRUE or FALSE");\r
          }\r
@@ -240,7 +240,7 @@ public class EventsDlg extends IDialog {
              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.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, 110));\r
+            jScrollPaneHelpText.setLocation(new java.awt.Point(168, 112));\r
              jScrollPaneHelpText.setViewportView(getJTextAreaHelpText());\r
          }\r
          return jScrollPaneHelpText;\r
              jScrollPaneHelpText.setViewportView(getJTextAreaHelpText());\r
          }\r
          return jScrollPaneHelpText;\r
@@ -255,7 +255,7 @@ public class EventsDlg extends IDialog {
      private JButton getJButtonOk() {\r
          if (jButtonOk == null) {\r
              jButtonOk = new JButton();\r
      private JButton getJButtonOk() {\r
          if (jButtonOk == null) {\r
              jButtonOk = new JButton();\r
-            jButtonOk.setBounds(new java.awt.Rectangle(290, 202, 90, 20));\r
+            jButtonOk.setBounds(new java.awt.Rectangle(290, 212, 90, 20));\r
              jButtonOk.setText("Ok");\r
              jButtonOk.addActionListener(this);\r
          }\r
              jButtonOk.setText("Ok");\r
              jButtonOk.addActionListener(this);\r
          }\r
@@ -271,7 +271,7 @@ public class EventsDlg extends IDialog {
      private JButton getJButtonCancel() {\r
          if (jButtonCancel == null) {\r
              jButtonCancel = new JButton();\r
      private JButton getJButtonCancel() {\r
          if (jButtonCancel == null) {\r
              jButtonCancel = new JButton();\r
-            jButtonCancel.setBounds(new java.awt.Rectangle(390, 202, 90, 20));\r
+            jButtonCancel.setBounds(new java.awt.Rectangle(390, 212, 90, 20));\r
              jButtonCancel.setText("Cancel");\r
              jButtonCancel.addActionListener(this);\r
          }\r
              jButtonCancel.setText("Cancel");\r
              jButtonCancel.addActionListener(this);\r
          }\r
@@ -287,7 +287,7 @@ public class EventsDlg extends IDialog {
       * \r
       */\r
      private void init() {\r
       * \r
       */\r
      private void init() {\r
-        this.setSize(500, 275);\r
+        this.setSize(505, 280);\r
          this.setContentPane(getJScrollPane());\r
          this.setTitle("Events");\r
          initFrame();\r
          this.setContentPane(getJScrollPane());\r
          this.setTitle("Events");\r
          initFrame();\r
@@ -353,47 +353,47 @@ public class EventsDlg extends IDialog {
      private JPanel getJContentPane() {\r
          if (jContentPane == null) {\r
              jStarLabel1 = new StarLabel();\r
      private JPanel getJContentPane() {\r
          if (jContentPane == null) {\r
              jStarLabel1 = new StarLabel();\r
-            jStarLabel1.setLocation(new java.awt.Point(2, 10));\r
+            jStarLabel1.setLocation(new java.awt.Point(2, 12));\r
              jLabelEventType = new JLabel();\r
              jLabelEventType.setText("Select Event Type");\r
              jLabelEventType = new JLabel();\r
              jLabelEventType.setText("Select Event Type");\r
-            jLabelEventType.setBounds(new java.awt.Rectangle(15, 10, 145, 20));\r
+            jLabelEventType.setBounds(new java.awt.Rectangle(12, 12, 168, 20));\r
  \r
              jStarLabel2 = new StarLabel();\r
  \r
              jStarLabel2 = new StarLabel();\r
-            jStarLabel2.setLocation(new java.awt.Point(2, 35));\r
+            jStarLabel2.setLocation(new java.awt.Point(2, 37));\r
              jLabelC_Name = new JLabel();\r
              jLabelC_Name.setText("Guid C Name");\r
              jLabelC_Name = new JLabel();\r
              jLabelC_Name.setText("Guid C Name");\r
-            jLabelC_Name.setBounds(new java.awt.Rectangle(15, 35, 145, 20));\r
+            jLabelC_Name.setBounds(new java.awt.Rectangle(12, 37, 168, 20));\r
  \r
              jStarLabel3 = new StarLabel();\r
  \r
              jStarLabel3 = new StarLabel();\r
-            jStarLabel3.setLocation(new java.awt.Point(2, 60));\r
+            jStarLabel3.setLocation(new java.awt.Point(2, 62));\r
              jLabelGroup = new JLabel();\r
              jLabelGroup.setText("Event Group Type");\r
              jLabelGroup = new JLabel();\r
              jLabelGroup.setText("Event Group Type");\r
-            jLabelGroup.setBounds(new java.awt.Rectangle(15, 60, 145, 20));\r
+            jLabelGroup.setBounds(new java.awt.Rectangle(12, 62, 168, 20));\r
  \r
              jStarLabel4 = new StarLabel();\r
  \r
              jStarLabel4 = new StarLabel();\r
-            jStarLabel4.setLocation(new java.awt.Point(2, 85));\r
+            jStarLabel4.setLocation(new java.awt.Point(2, 87));\r
              jLabelUsage = new JLabel();\r
              jLabelUsage.setText("Usage");\r
              jLabelUsage = new JLabel();\r
              jLabelUsage.setText("Usage");\r
-            jLabelUsage.setBounds(new java.awt.Rectangle(15, 85, 140, 20));\r
+            jLabelUsage.setBounds(new java.awt.Rectangle(12, 87, 168, 20));\r
  \r
              jLabelHelpText = new JLabel();\r
  \r
              jLabelHelpText = new JLabel();\r
-            jLabelHelpText.setBounds(new java.awt.Rectangle(15, 110, 145, 20));\r
+            jLabelHelpText.setBounds(new java.awt.Rectangle(12, 112, 168, 20));\r
              jLabelHelpText.setText("Help Text");\r
  \r
              jLabelFeatureFlag = new JLabel();\r
              jLabelHelpText.setText("Help Text");\r
  \r
              jLabelFeatureFlag = new JLabel();\r
-            jLabelFeatureFlag.setBounds(new java.awt.Rectangle(15, 155, 145, 20));\r
+            jLabelFeatureFlag.setBounds(new java.awt.Rectangle(12, 157, 168, 20));\r
              jLabelFeatureFlag.setText("Feature Flag Expression");\r
  \r
              jLabelArch = new JLabel();\r
              jLabelFeatureFlag.setText("Feature Flag Expression");\r
  \r
              jLabelArch = new JLabel();\r
-            jLabelArch.setBounds(new java.awt.Rectangle(15, 180, 145, 20));\r
+            jLabelArch.setBounds(new java.awt.Rectangle(12, 182, 168, 20));\r
              jLabelArch.setText("Supported Architectures");\r
              jArchCheckBox = new ArchCheckBox();\r
              jLabelArch.setText("Supported Architectures");\r
              jArchCheckBox = new ArchCheckBox();\r
-            jArchCheckBox.setBounds(new java.awt.Rectangle(160, 180, 320, 20));\r
+            jArchCheckBox.setBounds(new java.awt.Rectangle(168, 182, 320, 20));\r
              jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20));\r
  \r
              jContentPane = new JPanel();\r
              jContentPane.setLayout(null);\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, 230));\r
+            jContentPane.setPreferredSize(new java.awt.Dimension(485, 235));\r
  \r
              jContentPane.add(jStarLabel1, null);\r
              jContentPane.add(jLabelEventType, null);\r
  \r
              jContentPane.add(jStarLabel1, null);\r
              jContentPane.add(jLabelEventType, null);\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 7b42c44ad5c04600a07c22544501ccda1b2094de..3c1e37037f9d0285a463cd64eb2472f93bf5bb4c 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
@@ -104,7 +104,7 @@ public class GuidsDlg extends IDialog {
      private JComboBox getJComboBoxCName() {\r
          if (jComboBoxCName == null) {\r
              jComboBoxCName = new JComboBox();\r
      private JComboBox getJComboBoxCName() {\r
          if (jComboBoxCName == null) {\r
              jComboBoxCName = new JComboBox();\r
-            jComboBoxCName.setBounds(new java.awt.Rectangle(160, 10, 320, 20));\r
+            jComboBoxCName.setBounds(new java.awt.Rectangle(168, 12, 320, 20));\r
              jComboBoxCName.setPreferredSize(new java.awt.Dimension(320, 20));\r
              jComboBoxCName.setToolTipText("Select the C Name of the GUID");\r
          }\r
              jComboBoxCName.setPreferredSize(new java.awt.Dimension(320, 20));\r
              jComboBoxCName.setToolTipText("Select the C Name of the GUID");\r
          }\r
@@ -120,7 +120,7 @@ public class GuidsDlg extends IDialog {
      private JComboBox getJComboBoxUsage() {\r
          if (jComboBoxUsage == null) {\r
              jComboBoxUsage = new JComboBox();\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.setBounds(new java.awt.Rectangle(168, 37, 320, 20));\r
              jComboBoxUsage.setPreferredSize(new java.awt.Dimension(320, 20));\r
              jComboBoxUsage\r
                            .setToolTipText("<html><table>"\r
              jComboBoxUsage.setPreferredSize(new java.awt.Dimension(320, 20));\r
              jComboBoxUsage\r
                            .setToolTipText("<html><table>"\r
@@ -143,7 +143,7 @@ public class GuidsDlg extends IDialog {
      private JTextField getJTextFieldFeatureFlag() {\r
          if (jTextFieldFeatureFlag == null) {\r
              jTextFieldFeatureFlag = new JTextField();\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.setBounds(new java.awt.Rectangle(168, 107, 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
              jTextFieldFeatureFlag.setPreferredSize(new java.awt.Dimension(320, 20));\r
              jTextFieldFeatureFlag.setToolTipText("Postfix expression that must evaluate to TRUE or FALSE");\r
          }\r
@@ -190,7 +190,7 @@ public class GuidsDlg extends IDialog {
              jScrollPaneHelpText = new JScrollPane();\r
              jScrollPaneHelpText.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);\r
              jScrollPaneHelpText.setSize(new java.awt.Dimension(320, 40));\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.setLocation(new java.awt.Point(168, 62));\r
              jScrollPaneHelpText.setViewportView(getJTextAreaHelpText());\r
          }\r
          return jScrollPaneHelpText;\r
              jScrollPaneHelpText.setViewportView(getJTextAreaHelpText());\r
          }\r
          return jScrollPaneHelpText;\r
@@ -205,7 +205,7 @@ public class GuidsDlg extends IDialog {
      private JButton getJButtonOk() {\r
          if (jButtonOk == null) {\r
              jButtonOk = new JButton();\r
      private JButton getJButtonOk() {\r
          if (jButtonOk == null) {\r
              jButtonOk = new JButton();\r
-            jButtonOk.setBounds(new java.awt.Rectangle(290, 157, 90, 20));\r
+            jButtonOk.setBounds(new java.awt.Rectangle(290, 162, 90, 20));\r
              jButtonOk.setText("Ok");\r
              jButtonOk.addActionListener(this);\r
          }\r
              jButtonOk.setText("Ok");\r
              jButtonOk.addActionListener(this);\r
          }\r
@@ -221,7 +221,7 @@ public class GuidsDlg extends IDialog {
      private JButton getJButtonCancel() {\r
          if (jButtonCancel == null) {\r
              jButtonCancel = new JButton();\r
      private JButton getJButtonCancel() {\r
          if (jButtonCancel == null) {\r
              jButtonCancel = new JButton();\r
-            jButtonCancel.setBounds(new java.awt.Rectangle(390, 157, 90, 20));\r
+            jButtonCancel.setBounds(new java.awt.Rectangle(390, 162, 90, 20));\r
              jButtonCancel.setText("Cancel");\r
              jButtonCancel.addActionListener(this);\r
          }\r
              jButtonCancel.setText("Cancel");\r
              jButtonCancel.addActionListener(this);\r
          }\r
@@ -238,7 +238,7 @@ public class GuidsDlg extends IDialog {
       * \r
       */\r
      private void init() {\r
       * \r
       */\r
      private void init() {\r
-        this.setSize(500, 230);\r
+        this.setSize(505, 235);\r
          this.setContentPane(getJScrollPane());\r
          this.setTitle("Guids");\r
          initFrame();\r
          this.setContentPane(getJScrollPane());\r
          this.setTitle("Guids");\r
          initFrame();\r
@@ -301,35 +301,35 @@ public class GuidsDlg extends IDialog {
      private JPanel getJContentPane() {\r
          if (jContentPane == null) {\r
              jStarLabel1 = new StarLabel();\r
      private JPanel getJContentPane() {\r
          if (jContentPane == null) {\r
              jStarLabel1 = new StarLabel();\r
-            jStarLabel1.setLocation(new java.awt.Point(2, 10));\r
+            jStarLabel1.setLocation(new java.awt.Point(2, 12));\r
              jLabelC_Name = new JLabel();\r
              jLabelC_Name.setText("Select GUID's C Name");\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
+            jLabelC_Name.setBounds(new java.awt.Rectangle(12, 12, 155, 20));\r
  \r
              jStarLabel2 = new StarLabel();\r
  \r
              jStarLabel2 = new StarLabel();\r
-            jStarLabel2.setLocation(new java.awt.Point(2, 35));\r
+            jStarLabel2.setLocation(new java.awt.Point(2, 37));\r
              jLabelUsage = new JLabel();\r
              jLabelUsage.setText("Usage");\r
              jLabelUsage = new JLabel();\r
              jLabelUsage.setText("Usage");\r
-            jLabelUsage.setBounds(new java.awt.Rectangle(15, 35, 145, 20));\r
+            jLabelUsage.setBounds(new java.awt.Rectangle(12, 37, 155, 20));\r
  \r
              jLabelHelpText = new JLabel();\r
  \r
              jLabelHelpText = new JLabel();\r
-            jLabelHelpText.setBounds(new java.awt.Rectangle(14, 60, 145, 20));\r
+            jLabelHelpText.setBounds(new java.awt.Rectangle(12, 62, 155, 20));\r
              jLabelHelpText.setText("Help Text");\r
  \r
              jLabelFeatureFlag = new JLabel();\r
              jLabelHelpText.setText("Help Text");\r
  \r
              jLabelFeatureFlag = new JLabel();\r
-            jLabelFeatureFlag.setBounds(new java.awt.Rectangle(15, 105, 145, 20));\r
+            jLabelFeatureFlag.setBounds(new java.awt.Rectangle(12, 107, 155, 20));\r
              jLabelFeatureFlag.setText("Feature Flag Expression");\r
  \r
              jLabelArch = new JLabel();\r
              jLabelFeatureFlag.setText("Feature Flag Expression");\r
  \r
              jLabelArch = new JLabel();\r
-            jLabelArch.setBounds(new java.awt.Rectangle(15, 130, 145, 20));\r
+            jLabelArch.setBounds(new java.awt.Rectangle(12, 132, 155, 20));\r
              jLabelArch.setText("Supported Architectures");\r
              jArchCheckBox = new ArchCheckBox();\r
              jLabelArch.setText("Supported Architectures");\r
              jArchCheckBox = new ArchCheckBox();\r
-            jArchCheckBox.setBounds(new java.awt.Rectangle(160, 130, 320, 20));\r
+            jArchCheckBox.setBounds(new java.awt.Rectangle(168, 132, 320, 20));\r
              jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20));\r
  \r
              jContentPane = new JPanel();\r
              jContentPane.setLayout(null);\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
+            jContentPane.setPreferredSize(new java.awt.Dimension(480, 180));\r
  \r
              jContentPane.add(jStarLabel1, null);\r
              jContentPane.add(jLabelC_Name, null);\r
  \r
              jContentPane.add(jStarLabel1, null);\r
              jContentPane.add(jLabelC_Name, null);\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 1997ab4c8a68f12f558f5358ef0c74e85f80fa97..a3c4b96fdcd2e0a3313510064b80183c76e69f62 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
@@ -1,6 +1,6 @@
  /** @file\r
   \r
  /** @file\r
   \r
- The file is used to create, update Formset of MSA/MBD file\r
+ The file is used to create, update Hii Packages section of the  MSA file\r
   \r
   Copyright (c) 2006, Intel Corporation\r
   All rights reserved. This program and the accompanying materials\r
   \r
   Copyright (c) 2006, Intel Corporation\r
   All rights reserved. This program and the accompanying materials\r
@@ -103,7 +103,7 @@ public class HiiPackagesDlg extends IDialog {
      private JTextField getJTextFieldName() {\r
          if (jTextFieldName == null) {\r
              jTextFieldName = new JTextField();\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.setBounds(new java.awt.Rectangle(168, 12, 320, 20));\r
              jTextFieldName.setPreferredSize(new java.awt.Dimension(320, 20));\r
              jTextFieldName.setToolTipText("Enter the C Name of the HII Package");\r
          }\r
              jTextFieldName.setPreferredSize(new java.awt.Dimension(320, 20));\r
              jTextFieldName.setToolTipText("Enter the C Name of the HII Package");\r
          }\r
@@ -120,7 +120,7 @@ public class HiiPackagesDlg extends IDialog {
      private JComboBox getJComboBoxUsage() {\r
          if (jComboBoxUsage == null) {\r
              jComboBoxUsage = new JComboBox();\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.setBounds(new java.awt.Rectangle(168, 37, 320, 20));\r
              jComboBoxUsage.setPreferredSize(new java.awt.Dimension(320, 20));\r
              jComboBoxUsage\r
                            .setToolTipText("<html><table>"\r
              jComboBoxUsage.setPreferredSize(new java.awt.Dimension(320, 20));\r
              jComboBoxUsage\r
                            .setToolTipText("<html><table>"\r
@@ -140,7 +140,7 @@ public class HiiPackagesDlg extends IDialog {
      private JTextField getJTextFieldFeatureFlag() {\r
          if (jTextFieldFeatureFlag == null) {\r
              jTextFieldFeatureFlag = new JTextField();\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.setBounds(new java.awt.Rectangle(168, 107, 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
              jTextFieldFeatureFlag.setPreferredSize(new java.awt.Dimension(320, 20));\r
              jTextFieldFeatureFlag.setToolTipText("Postfix expression that must evaluate to TRUE or FALSE");\r
          }\r
@@ -191,7 +191,7 @@ public class HiiPackagesDlg extends IDialog {
              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.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.setLocation(new java.awt.Point(168, 62));\r
              jScrollPaneHelpText.setViewportView(getJTextAreaHelpText());\r
          }\r
          return jScrollPaneHelpText;\r
              jScrollPaneHelpText.setViewportView(getJTextAreaHelpText());\r
          }\r
          return jScrollPaneHelpText;\r
@@ -207,7 +207,7 @@ public class HiiPackagesDlg extends IDialog {
      private JButton getJButtonOk() {\r
          if (jButtonOk == null) {\r
              jButtonOk = new JButton();\r
      private JButton getJButtonOk() {\r
          if (jButtonOk == null) {\r
              jButtonOk = new JButton();\r
-            jButtonOk.setBounds(new java.awt.Rectangle(290, 157, 90, 20));\r
+            jButtonOk.setBounds(new java.awt.Rectangle(290, 162, 90, 20));\r
              jButtonOk.setText("Ok");\r
              jButtonOk.addActionListener(this);\r
          }\r
              jButtonOk.setText("Ok");\r
              jButtonOk.addActionListener(this);\r
          }\r
@@ -224,7 +224,7 @@ public class HiiPackagesDlg extends IDialog {
      private JButton getJButtonCancel() {\r
          if (jButtonCancel == null) {\r
              jButtonCancel = new JButton();\r
      private JButton getJButtonCancel() {\r
          if (jButtonCancel == null) {\r
              jButtonCancel = new JButton();\r
-            jButtonCancel.setBounds(new java.awt.Rectangle(390, 157, 90, 20));\r
+            jButtonCancel.setBounds(new java.awt.Rectangle(390, 162, 90, 20));\r
              jButtonCancel.setText("Cancel");\r
              jButtonCancel.addActionListener(this);\r
          }\r
              jButtonCancel.setText("Cancel");\r
              jButtonCancel.addActionListener(this);\r
          }\r
@@ -241,7 +241,7 @@ public class HiiPackagesDlg extends IDialog {
       * \r
       **/\r
      private void init() {\r
       * \r
       **/\r
      private void init() {\r
-        this.setSize(500, 230);\r
+        this.setSize(505, 235);\r
          this.setContentPane(getJScrollPane());\r
          this.setTitle("Hii Packages");\r
          initFrame();\r
          this.setContentPane(getJScrollPane());\r
          this.setTitle("Hii Packages");\r
          initFrame();\r
@@ -306,31 +306,31 @@ public class HiiPackagesDlg extends IDialog {
      private JPanel getJContentPane() {\r
          if (jContentPane == null) {\r
              jStarLabel1 = new StarLabel();\r
      private JPanel getJContentPane() {\r
          if (jContentPane == null) {\r
              jStarLabel1 = new StarLabel();\r
-            jStarLabel1.setLocation(new java.awt.Point(2, 10));\r
+            jStarLabel1.setLocation(new java.awt.Point(2, 12));\r
              jLabelName = new JLabel();\r
              jLabelName.setText("Hii Package C Name");\r
              jLabelName = new JLabel();\r
              jLabelName.setText("Hii Package C Name");\r
-            jLabelName.setBounds(new java.awt.Rectangle(15, 10, 145, 20));\r
+            jLabelName.setBounds(new java.awt.Rectangle(12, 12, 155, 20));\r
              jStarLabel2 = new StarLabel();\r
              jStarLabel2 = new StarLabel();\r
-            jStarLabel2.setLocation(new java.awt.Point(2, 35));\r
+            jStarLabel2.setLocation(new java.awt.Point(2, 37));\r
              jLabelUsage = new JLabel();\r
              jLabelUsage.setText("Usage");\r
              jLabelUsage = new JLabel();\r
              jLabelUsage.setText("Usage");\r
-            jLabelUsage.setBounds(new java.awt.Rectangle(15, 35, 145, 20));\r
+            jLabelUsage.setBounds(new java.awt.Rectangle(12, 37, 155, 20));\r
              jLabelHelpText = new JLabel();\r
              jLabelHelpText = new JLabel();\r
-            jLabelHelpText.setBounds(new java.awt.Rectangle(14, 60, 145, 20));\r
+            jLabelHelpText.setBounds(new java.awt.Rectangle(12, 62, 155, 20));\r
              jLabelHelpText.setText("Help Text");\r
              jLabelFeatureFlag = new JLabel();\r
              jLabelHelpText.setText("Help Text");\r
              jLabelFeatureFlag = new JLabel();\r
-            jLabelFeatureFlag.setBounds(new java.awt.Rectangle(15, 105, 145, 20));\r
+            jLabelFeatureFlag.setBounds(new java.awt.Rectangle(12, 107, 155, 20));\r
              jLabelFeatureFlag.setText("Feature Flag Expression");\r
              jLabelArch = new JLabel();\r
              jLabelFeatureFlag.setText("Feature Flag Expression");\r
              jLabelArch = new JLabel();\r
-            jLabelArch.setBounds(new java.awt.Rectangle(15, 130, 145, 20));\r
+            jLabelArch.setBounds(new java.awt.Rectangle(12, 132, 155, 20));\r
              jLabelArch.setText("Supported Architectures");\r
              jArchCheckBox = new ArchCheckBox();\r
              jLabelArch.setText("Supported Architectures");\r
              jArchCheckBox = new ArchCheckBox();\r
-            jArchCheckBox.setBounds(new java.awt.Rectangle(160, 130, 320, 20));\r
+            jArchCheckBox.setBounds(new java.awt.Rectangle(168, 132, 320, 20));\r
              jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20));\r
  \r
              jContentPane = new JPanel();\r
              jContentPane.setLayout(null);\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
+            jContentPane.setPreferredSize(new java.awt.Dimension(480, 180));\r
  \r
              jContentPane.add(jStarLabel1, null);\r
              jContentPane.add(jLabelName, null);\r
  \r
              jContentPane.add(jStarLabel1, null);\r
              jContentPane.add(jLabelName, null);\r
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/HobsDlg.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/HobsDlg.java

index a3209692925b4173f1320804ecc150111259f35b..d46958be1b730ae34c8cd9742b4a8b4c5cc58faa 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/HobsDlg.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/HobsDlg.java
@@ -109,7 +109,7 @@ public class HobsDlg extends IDialog {
      private JComboBox getJComboBoxGuidC_Name() {\r
          if (jComboBoxGuidC_Name == null) {\r
              jComboBoxGuidC_Name = new JComboBox();\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.setBounds(new java.awt.Rectangle(168, 12, 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
              jComboBoxGuidC_Name.setPreferredSize(new java.awt.Dimension(320, 20));\r
              jComboBoxGuidC_Name.setToolTipText("Select the GUID C Name of the Hob");\r
          }\r
@@ -125,7 +125,7 @@ public class HobsDlg extends IDialog {
      private JComboBox getJComboBoxHobType() {\r
          if (jComboBoxHobType == null) {\r
              jComboBoxHobType = new JComboBox();\r
      private JComboBox getJComboBoxHobType() {\r
          if (jComboBoxHobType == null) {\r
              jComboBoxHobType = new JComboBox();\r
-            jComboBoxHobType.setBounds(new java.awt.Rectangle(160, 35, 320, 20));\r
+            jComboBoxHobType.setBounds(new java.awt.Rectangle(168, 37, 320, 20));\r
              jComboBoxHobType.setPreferredSize(new java.awt.Dimension(320, 20));\r
              jComboBoxHobType\r
                              .setToolTipText("<html><table>"\r
              jComboBoxHobType.setPreferredSize(new java.awt.Dimension(320, 20));\r
              jComboBoxHobType\r
                              .setToolTipText("<html><table>"\r
@@ -151,7 +151,7 @@ public class HobsDlg extends IDialog {
      private JComboBox getJComboBoxUsage() {\r
          if (jComboBoxUsage == null) {\r
              jComboBoxUsage = new JComboBox();\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.setBounds(new java.awt.Rectangle(168, 62, 320, 20));\r
              jComboBoxUsage.setPreferredSize(new java.awt.Dimension(320, 20));\r
              jComboBoxUsage\r
                            .setToolTipText("<html><table>"\r
              jComboBoxUsage.setPreferredSize(new java.awt.Dimension(320, 20));\r
              jComboBoxUsage\r
                            .setToolTipText("<html><table>"\r
@@ -185,7 +185,7 @@ public class HobsDlg extends IDialog {
      private JTextField getJTextFieldFeatureFlag() {\r
          if (jTextFieldFeatureFlag == null) {\r
              jTextFieldFeatureFlag = new JTextField();\r
      private JTextField getJTextFieldFeatureFlag() {\r
          if (jTextFieldFeatureFlag == null) {\r
              jTextFieldFeatureFlag = new JTextField();\r
-            jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(160, 130, 320, 20));\r
+            jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(168, 132, 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
              jTextFieldFeatureFlag.setPreferredSize(new java.awt.Dimension(320, 20));\r
              jTextFieldFeatureFlag.setToolTipText("Postfix expression that must evaluate to TRUE or FALSE");\r
          }\r
@@ -218,7 +218,7 @@ public class HobsDlg extends IDialog {
              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.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.setLocation(new java.awt.Point(168, 87));\r
              jScrollPaneHelpText.setViewportView(getJTextAreaHelpText());\r
          }\r
          return jScrollPaneHelpText;\r
              jScrollPaneHelpText.setViewportView(getJTextAreaHelpText());\r
          }\r
          return jScrollPaneHelpText;\r
@@ -233,7 +233,7 @@ public class HobsDlg extends IDialog {
      private JButton getJButtonOk() {\r
          if (jButtonOk == null) {\r
              jButtonOk = new JButton();\r
      private JButton getJButtonOk() {\r
          if (jButtonOk == null) {\r
              jButtonOk = new JButton();\r
-            jButtonOk.setBounds(new java.awt.Rectangle(290, 182, 90, 20));\r
+            jButtonOk.setBounds(new java.awt.Rectangle(290, 187, 90, 20));\r
              jButtonOk.setText("Ok");\r
              jButtonOk.addActionListener(this);\r
          }\r
              jButtonOk.setText("Ok");\r
              jButtonOk.addActionListener(this);\r
          }\r
@@ -249,7 +249,7 @@ public class HobsDlg extends IDialog {
      private JButton getJButtonCancel() {\r
          if (jButtonCancel == null) {\r
              jButtonCancel = new JButton();\r
      private JButton getJButtonCancel() {\r
          if (jButtonCancel == null) {\r
              jButtonCancel = new JButton();\r
-            jButtonCancel.setBounds(new java.awt.Rectangle(390, 182, 90, 20));\r
+            jButtonCancel.setBounds(new java.awt.Rectangle(390, 187, 90, 20));\r
              jButtonCancel.setText("Cancel");\r
              jButtonCancel.addActionListener(this);\r
          }\r
              jButtonCancel.setText("Cancel");\r
              jButtonCancel.addActionListener(this);\r
          }\r
@@ -265,7 +265,7 @@ public class HobsDlg extends IDialog {
       * \r
       */\r
      private void init() {\r
       * \r
       */\r
      private void init() {\r
-        this.setSize(500, 255);\r
+        this.setSize(505, 260);\r
          this.setContentPane(getJScrollPane());\r
          this.setTitle("Hobs");\r
          initFrame();\r
          this.setContentPane(getJScrollPane());\r
          this.setTitle("Hobs");\r
          initFrame();\r
@@ -330,41 +330,41 @@ public class HobsDlg extends IDialog {
      public JPanel getJContentPane() {\r
          if (jContentPane == null) {\r
              jStarLabel1 = new StarLabel();\r
      public JPanel getJContentPane() {\r
          if (jContentPane == null) {\r
              jStarLabel1 = new StarLabel();\r
-            jStarLabel1.setLocation(new java.awt.Point(2, 10));\r
+            jStarLabel1.setLocation(new java.awt.Point(2, 12));\r
              jLabelC_Name = new JLabel();\r
              jLabelC_Name.setText("Hob's Guid C Name");\r
              jLabelC_Name = new JLabel();\r
              jLabelC_Name.setText("Hob's Guid C Name");\r
-            jLabelC_Name.setBounds(new java.awt.Rectangle(15, 10, 145, 20));\r
+            jLabelC_Name.setBounds(new java.awt.Rectangle(12, 12, 155, 20));\r
  \r
              jStarLabel2 = new StarLabel();\r
  \r
              jStarLabel2 = new StarLabel();\r
-            jStarLabel2.setLocation(new java.awt.Point(2, 35));\r
+            jStarLabel2.setLocation(new java.awt.Point(2, 37));\r
              jLabelHobType = new JLabel();\r
              jLabelHobType.setText("Hob Type");\r
              jLabelHobType = new JLabel();\r
              jLabelHobType.setText("Hob Type");\r
-            jLabelHobType.setBounds(new java.awt.Rectangle(15, 35, 145, 20));\r
+            jLabelHobType.setBounds(new java.awt.Rectangle(12, 37, 155, 20));\r
  \r
              jStarLabel3 = new StarLabel();\r
  \r
              jStarLabel3 = new StarLabel();\r
-            jStarLabel3.setLocation(new java.awt.Point(2, 60));\r
+            jStarLabel3.setLocation(new java.awt.Point(2, 62));\r
              jLabelUsage = new JLabel();\r
              jLabelUsage.setText("Usage");\r
              jLabelUsage = new JLabel();\r
              jLabelUsage.setText("Usage");\r
-            jLabelUsage.setBounds(new java.awt.Rectangle(15, 60, 145, 20));\r
+            jLabelUsage.setBounds(new java.awt.Rectangle(12, 62, 155, 20));\r
  \r
              jLabelHelpText = new JLabel();\r
  \r
              jLabelHelpText = new JLabel();\r
-            jLabelHelpText.setBounds(new java.awt.Rectangle(15, 85, 145, 20));\r
+            jLabelHelpText.setBounds(new java.awt.Rectangle(12, 87, 155, 20));\r
              jLabelHelpText.setText("Help Text");\r
  \r
              jLabelFeatureFlag = new JLabel();\r
              jLabelHelpText.setText("Help Text");\r
  \r
              jLabelFeatureFlag = new JLabel();\r
-            jLabelFeatureFlag.setBounds(new java.awt.Rectangle(15, 130, 145, 20));\r
+            jLabelFeatureFlag.setBounds(new java.awt.Rectangle(12, 132, 155, 20));\r
              jLabelFeatureFlag.setText("Feature Flag Expression");\r
  \r
              jLabelArch = new JLabel();\r
              jLabelFeatureFlag.setText("Feature Flag Expression");\r
  \r
              jLabelArch = new JLabel();\r
-            jLabelArch.setBounds(new java.awt.Rectangle(15, 155, 145, 20));\r
+            jLabelArch.setBounds(new java.awt.Rectangle(12, 157, 155, 20));\r
              jLabelArch.setText("Supported Architectures");\r
              jArchCheckBox = new ArchCheckBox();\r
              jLabelArch.setText("Supported Architectures");\r
              jArchCheckBox = new ArchCheckBox();\r
-            jArchCheckBox.setBounds(new java.awt.Rectangle(160, 155, 320, 20));\r
+            jArchCheckBox.setBounds(new java.awt.Rectangle(168, 157, 320, 20));\r
              jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20));\r
  \r
              jContentPane = new JPanel();\r
              jContentPane.setLayout(null);\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
+            jContentPane.setPreferredSize(new java.awt.Dimension(485, 215));\r
  \r
              jContentPane.add(jStarLabel1, null);\r
              jContentPane.add(jLabelC_Name, null);\r
  \r
              jContentPane.add(jStarLabel1, null);\r
              jContentPane.add(jLabelC_Name, null);\r
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PCDsDlg.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PCDsDlg.java

index b2a2f6dc6d1f46940fe10164ada77f9fd700cfa3..9e0f120a194fc9f63c1ddf0d5d6d42219fd80b3a 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PCDsDlg.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PCDsDlg.java
@@ -123,7 +123,7 @@ public class PCDsDlg extends IDialog implements ItemListener {
      private JComboBox getJComboBoxItemType() {\r
          if (jComboBoxItemType == null) {\r
              jComboBoxItemType = new JComboBox();\r
      private JComboBox getJComboBoxItemType() {\r
          if (jComboBoxItemType == null) {\r
              jComboBoxItemType = new JComboBox();\r
-            jComboBoxItemType.setBounds(new java.awt.Rectangle(160, 35, 320, 20));\r
+            jComboBoxItemType.setBounds(new java.awt.Rectangle(168, 37, 320, 20));\r
              jComboBoxItemType.setPreferredSize(new java.awt.Dimension(320, 20));\r
          }\r
          return jComboBoxItemType;\r
              jComboBoxItemType.setPreferredSize(new java.awt.Dimension(320, 20));\r
          }\r
          return jComboBoxItemType;\r
@@ -138,7 +138,7 @@ public class PCDsDlg extends IDialog implements ItemListener {
      private JComboBox getJComboBoxCName() {\r
          if (jComboBoxCName == null) {\r
              jComboBoxCName = new JComboBox();\r
      private JComboBox getJComboBoxCName() {\r
          if (jComboBoxCName == null) {\r
              jComboBoxCName = new JComboBox();\r
-            jComboBoxCName.setBounds(new java.awt.Rectangle(160, 10, 320, 20));\r
+            jComboBoxCName.setBounds(new java.awt.Rectangle(168, 12, 320, 20));\r
              jComboBoxCName.setPreferredSize(new java.awt.Dimension(320, 20));\r
              jComboBoxCName.addItemListener(this);\r
          }\r
              jComboBoxCName.setPreferredSize(new java.awt.Dimension(320, 20));\r
              jComboBoxCName.addItemListener(this);\r
          }\r
@@ -154,7 +154,7 @@ public class PCDsDlg extends IDialog implements ItemListener {
      private JTextField getJTextFieldDefaultValue() {\r
          if (jTextFieldDefaultValue == null) {\r
              jTextFieldDefaultValue = new JTextField();\r
      private JTextField getJTextFieldDefaultValue() {\r
          if (jTextFieldDefaultValue == null) {\r
              jTextFieldDefaultValue = new JTextField();\r
-            jTextFieldDefaultValue.setBounds(new java.awt.Rectangle(160, 60, 320, 20));\r
+            jTextFieldDefaultValue.setBounds(new java.awt.Rectangle(168, 62, 320, 20));\r
              jTextFieldDefaultValue.setPreferredSize(new java.awt.Dimension(320, 20));\r
          }\r
          return jTextFieldDefaultValue;\r
              jTextFieldDefaultValue.setPreferredSize(new java.awt.Dimension(320, 20));\r
          }\r
          return jTextFieldDefaultValue;\r
@@ -186,7 +186,7 @@ public class PCDsDlg extends IDialog implements ItemListener {
              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.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, 110));\r
+            jScrollPaneHelpText.setLocation(new java.awt.Point(168, 112));\r
              jScrollPaneHelpText.setViewportView(getJTextAreaHelpText());\r
          }\r
          return jScrollPaneHelpText;\r
              jScrollPaneHelpText.setViewportView(getJTextAreaHelpText());\r
          }\r
          return jScrollPaneHelpText;\r
@@ -213,7 +213,7 @@ public class PCDsDlg extends IDialog implements ItemListener {
      private JTextField getJTextFieldTokenSpaceGuid() {\r
          if (jTextFieldTokenSpaceGuid == null) {\r
              jTextFieldTokenSpaceGuid = new JTextField();\r
      private JTextField getJTextFieldTokenSpaceGuid() {\r
          if (jTextFieldTokenSpaceGuid == null) {\r
              jTextFieldTokenSpaceGuid = new JTextField();\r
-            jTextFieldTokenSpaceGuid.setBounds(new java.awt.Rectangle(160, 60, 320, 20));\r
+            jTextFieldTokenSpaceGuid.setBounds(new java.awt.Rectangle(168, 62, 320, 20));\r
              jTextFieldTokenSpaceGuid.setPreferredSize(new java.awt.Dimension(320, 20));\r
              jTextFieldTokenSpaceGuid.setVisible(false);\r
          }\r
              jTextFieldTokenSpaceGuid.setPreferredSize(new java.awt.Dimension(320, 20));\r
              jTextFieldTokenSpaceGuid.setVisible(false);\r
          }\r
@@ -228,7 +228,7 @@ public class PCDsDlg extends IDialog implements ItemListener {
      private JTextField getJTextFieldFeatureFlag() {\r
          if (jTextFieldFeatureFlag == null) {\r
              jTextFieldFeatureFlag = new JTextField();\r
      private JTextField getJTextFieldFeatureFlag() {\r
          if (jTextFieldFeatureFlag == null) {\r
              jTextFieldFeatureFlag = new JTextField();\r
-            jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(160, 155, 320, 20));\r
+            jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(168, 157, 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
              jTextFieldFeatureFlag.setPreferredSize(new java.awt.Dimension(320, 20));\r
              jTextFieldFeatureFlag.setToolTipText("Postfix expression that must evaluate to TRUE or FALSE");\r
          }\r
@@ -244,7 +244,7 @@ public class PCDsDlg extends IDialog implements ItemListener {
      private JButton getJButtonOk() {\r
          if (jButtonOk == null) {\r
              jButtonOk = new JButton();\r
      private JButton getJButtonOk() {\r
          if (jButtonOk == null) {\r
              jButtonOk = new JButton();\r
-            jButtonOk.setBounds(new java.awt.Rectangle(290, 205, 90, 20));\r
+            jButtonOk.setBounds(new java.awt.Rectangle(290, 212, 90, 20));\r
              jButtonOk.setText("Ok");\r
              jButtonOk.addActionListener(this);\r
          }\r
              jButtonOk.setText("Ok");\r
              jButtonOk.addActionListener(this);\r
          }\r
@@ -260,7 +260,7 @@ public class PCDsDlg extends IDialog implements ItemListener {
      private JButton getJButtonCancel() {\r
          if (jButtonCancel == null) {\r
              jButtonCancel = new JButton();\r
      private JButton getJButtonCancel() {\r
          if (jButtonCancel == null) {\r
              jButtonCancel = new JButton();\r
-            jButtonCancel.setBounds(new java.awt.Rectangle(390, 205, 90, 20));\r
+            jButtonCancel.setBounds(new java.awt.Rectangle(390, 212, 90, 20));\r
              jButtonCancel.setText("Cancel");\r
              jButtonCancel.addActionListener(this);\r
          }\r
              jButtonCancel.setText("Cancel");\r
              jButtonCancel.addActionListener(this);\r
          }\r
@@ -275,7 +275,7 @@ public class PCDsDlg extends IDialog implements ItemListener {
      private JComboBox getJComboBoxUsage() {\r
          if (jComboBoxUsage == null) {\r
              jComboBoxUsage = new JComboBox();\r
      private JComboBox getJComboBoxUsage() {\r
          if (jComboBoxUsage == null) {\r
              jComboBoxUsage = new JComboBox();\r
-            jComboBoxUsage.setBounds(new java.awt.Rectangle(160, 85, 320, 20));\r
+            jComboBoxUsage.setBounds(new java.awt.Rectangle(168, 87, 320, 20));\r
              jComboBoxUsage.setPreferredSize(new java.awt.Dimension(320, 20));\r
          }\r
          return jComboBoxUsage;\r
              jComboBoxUsage.setPreferredSize(new java.awt.Dimension(320, 20));\r
          }\r
          return jComboBoxUsage;\r
@@ -290,7 +290,7 @@ public class PCDsDlg extends IDialog implements ItemListener {
       * \r
       */\r
      private void init() {\r
       * \r
       */\r
      private void init() {\r
-        this.setSize(500, 270);\r
+        this.setSize(505, 280);\r
          this.setContentPane(getJScrollPane());\r
          this.setTitle("Pcd Coded");\r
          initFrame();\r
          this.setContentPane(getJScrollPane());\r
          this.setTitle("Pcd Coded");\r
          initFrame();\r
@@ -356,33 +356,33 @@ public class PCDsDlg extends IDialog implements ItemListener {
      private JPanel getJContentPane() {\r
          if (jContentPane == null) {\r
              jLabelUsage = new JLabel();\r
      private JPanel getJContentPane() {\r
          if (jContentPane == null) {\r
              jLabelUsage = new JLabel();\r
-            jLabelUsage.setBounds(new java.awt.Rectangle(15, 85, 140, 20));\r
+            jLabelUsage.setBounds(new java.awt.Rectangle(12, 87, 168, 20));\r
              jLabelUsage.setText("Usge");\r
              jStarLabel1 = new StarLabel();\r
              jLabelUsage.setText("Usge");\r
              jStarLabel1 = new StarLabel();\r
-            jStarLabel1.setLocation(new java.awt.Point(2, 10));\r
+            jStarLabel1.setLocation(new java.awt.Point(2, 12));\r
              jLabelC_Name = new JLabel();\r
              jLabelC_Name.setText("PCD C Name");\r
              jLabelC_Name = new JLabel();\r
              jLabelC_Name.setText("PCD C Name");\r
-            jLabelC_Name.setBounds(new java.awt.Rectangle(15, 10, 145, 20));\r
+            jLabelC_Name.setBounds(new java.awt.Rectangle(12, 12, 168, 20));\r
  \r
              jStarLabel2 = new StarLabel();\r
  \r
              jStarLabel2 = new StarLabel();\r
-            jStarLabel2.setLocation(new java.awt.Point(2, 35));\r
+            jStarLabel2.setLocation(new java.awt.Point(2, 37));\r
              jLabelItemType = new JLabel();\r
              jLabelItemType.setText("PCD Item Type");\r
              jLabelItemType = new JLabel();\r
              jLabelItemType.setText("PCD Item Type");\r
-            jLabelItemType.setBounds(new java.awt.Rectangle(15, 35, 145, 20));\r
+            jLabelItemType.setBounds(new java.awt.Rectangle(12, 37, 168, 20));\r
  \r
              jLabelDefaultValue = new JLabel();\r
              jLabelDefaultValue.setText("Default Value");\r
  \r
              jLabelDefaultValue = new JLabel();\r
              jLabelDefaultValue.setText("Default Value");\r
-            jLabelDefaultValue.setBounds(new java.awt.Rectangle(15, 60, 145, 20));\r
+            jLabelDefaultValue.setBounds(new java.awt.Rectangle(12, 62, 168, 20));\r
  \r
              jStarLabel3 = new StarLabel();\r
  \r
              jStarLabel3 = new StarLabel();\r
-            jStarLabel3.setLocation(new java.awt.Point(2, 110));\r
+            jStarLabel3.setLocation(new java.awt.Point(2, 112));\r
              jLabelHelpText = new JLabel();\r
              jLabelHelpText.setText("Help Text");\r
              jLabelHelpText = new JLabel();\r
              jLabelHelpText.setText("Help Text");\r
-            jLabelHelpText.setBounds(new java.awt.Rectangle(15, 110, 145, 20));\r
+            jLabelHelpText.setBounds(new java.awt.Rectangle(12, 112, 168, 20));\r
  \r
              jLabelFeatureFlag = new JLabel();\r
              jLabelFeatureFlag.setText("Feature Flag Expression");\r
  \r
              jLabelFeatureFlag = new JLabel();\r
              jLabelFeatureFlag.setText("Feature Flag Expression");\r
-            jLabelFeatureFlag.setBounds(new java.awt.Rectangle(15, 155, 140, 20));\r
+            jLabelFeatureFlag.setBounds(new java.awt.Rectangle(12, 157, 168, 20));\r
  \r
              jLabelTokenSpaceGuid = new JLabel();\r
              jLabelTokenSpaceGuid.setText("Token Space C Name");\r
  \r
              jLabelTokenSpaceGuid = new JLabel();\r
              jLabelTokenSpaceGuid.setText("Token Space C Name");\r
@@ -390,13 +390,13 @@ public class PCDsDlg extends IDialog implements ItemListener {
  \r
              jLabelArch = new JLabel();\r
              jLabelArch.setText("Supported Architectures");\r
  \r
              jLabelArch = new JLabel();\r
              jLabelArch.setText("Supported Architectures");\r
-            jLabelArch.setBounds(new java.awt.Rectangle(15, 180, 145, 20));\r
+            jLabelArch.setBounds(new java.awt.Rectangle(12, 182, 168, 20));\r
              jArchCheckBox = new ArchCheckBox();\r
              jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20));\r
              jArchCheckBox = new ArchCheckBox();\r
              jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20));\r
-            jArchCheckBox.setBounds(new java.awt.Rectangle(160, 180, 320, 20));\r
+            jArchCheckBox.setBounds(new java.awt.Rectangle(168, 182, 320, 20));\r
  \r
              // Hidden field\r
  \r
              // Hidden field\r
-            jLabelTokenSpaceGuid.setBounds(new java.awt.Rectangle(15, 60, 140, 20));\r
+            jLabelTokenSpaceGuid.setBounds(new java.awt.Rectangle(12, 62, 140, 20));\r
  \r
              jContentPane = new JPanel();\r
              jContentPane.setLayout(null);\r
  \r
              jContentPane = new JPanel();\r
              jContentPane.setLayout(null);\r
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 1e937e0b3cb04063247a196d7708caf41566cea9..2a2d2d399f6824acaa928058e7ed13cb389348cc 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
@@ -1,6 +1,6 @@
  /** @file\r
   \r
  /** @file\r
   \r
- The file is used to create, update Ppi of MSA/MBD file\r
+ The file is used to create, update Ppi section of the MSA file\r
   \r
   Copyright (c) 2006, Intel Corporation\r
   All rights reserved. This program and the accompanying materials\r
   \r
   Copyright (c) 2006, Intel Corporation\r
   All rights reserved. This program and the accompanying materials\r
@@ -111,7 +111,7 @@ public class PpisDlg extends IDialog implements ItemListener {
      private JComboBox getJComboBoxPpiType() {\r
          if (jComboBoxPpiType == null) {\r
              jComboBoxPpiType = new JComboBox();\r
      private JComboBox getJComboBoxPpiType() {\r
          if (jComboBoxPpiType == null) {\r
              jComboBoxPpiType = new JComboBox();\r
-            jComboBoxPpiType.setBounds(new java.awt.Rectangle(160, 10, 320, 20));\r
+            jComboBoxPpiType.setBounds(new java.awt.Rectangle(168, 12, 320, 20));\r
              jComboBoxPpiType.setPreferredSize(new java.awt.Dimension(320, 20));\r
              jComboBoxPpiType.addItemListener(this);\r
              jComboBoxPpiType\r
              jComboBoxPpiType.setPreferredSize(new java.awt.Dimension(320, 20));\r
              jComboBoxPpiType.addItemListener(this);\r
              jComboBoxPpiType\r
@@ -129,7 +129,7 @@ public class PpisDlg extends IDialog implements ItemListener {
      private JComboBox getJComboBoxCName() {\r
          if (jComboBoxCName == null) {\r
              jComboBoxCName = new JComboBox();\r
      private JComboBox getJComboBoxCName() {\r
          if (jComboBoxCName == null) {\r
              jComboBoxCName = new JComboBox();\r
-            jComboBoxCName.setBounds(new java.awt.Rectangle(160, 35, 320, 20));\r
+            jComboBoxCName.setBounds(new java.awt.Rectangle(168, 37, 320, 20));\r
              jComboBoxCName.setPreferredSize(new java.awt.Dimension(320, 20));\r
              jComboBoxCName.setToolTipText("Select Guid C Name of PPI");\r
          }\r
              jComboBoxCName.setPreferredSize(new java.awt.Dimension(320, 20));\r
              jComboBoxCName.setToolTipText("Select Guid C Name of PPI");\r
          }\r
@@ -145,7 +145,7 @@ public class PpisDlg extends IDialog implements ItemListener {
      private JComboBox getJComboBoxUsage() {\r
          if (jComboBoxUsage == null) {\r
              jComboBoxUsage = new JComboBox();\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.setBounds(new java.awt.Rectangle(168, 62, 320, 20));\r
              jComboBoxUsage.setPreferredSize(new java.awt.Dimension(320, 20));\r
              jComboBoxUsage\r
                            .setToolTipText("<html><table><tr><td colspan=2 align=center><b>PPI</b></td></tr><tr><td>ALWAYS_CONSUMED</td><td>Module always consumes the PPI</td></tr><tr><td>SOMETIMES_CONSUMED</td><td>Module sometimes consumes the PPI</td></tr><tr><td>ALWAYS_PRODUCED</td><td>Module always produces the PPI</td></tr><tr><td>SOMETIMES_PRODUCED</td><td>Module sometimes produces the PPI</td></tr><tr><td colspan=2 align=center><b>PPI Notify</b></td></tr><tr><td>SOMETIMES_CONSUMED</td><td>Module will consume the PPI if it is produced. Consumption<br>is defined by executing the PPI notify function</td></tr></table></html>");\r
              jComboBoxUsage.setPreferredSize(new java.awt.Dimension(320, 20));\r
              jComboBoxUsage\r
                            .setToolTipText("<html><table><tr><td colspan=2 align=center><b>PPI</b></td></tr><tr><td>ALWAYS_CONSUMED</td><td>Module always consumes the PPI</td></tr><tr><td>SOMETIMES_CONSUMED</td><td>Module sometimes consumes the PPI</td></tr><tr><td>ALWAYS_PRODUCED</td><td>Module always produces the PPI</td></tr><tr><td>SOMETIMES_PRODUCED</td><td>Module sometimes produces the PPI</td></tr><tr><td colspan=2 align=center><b>PPI Notify</b></td></tr><tr><td>SOMETIMES_CONSUMED</td><td>Module will consume the PPI if it is produced. Consumption<br>is defined by executing the PPI notify function</td></tr></table></html>");\r
@@ -162,7 +162,7 @@ public class PpisDlg extends IDialog implements ItemListener {
      private JTextField getJTextFieldFeatureFlag() {\r
          if (jTextFieldFeatureFlag == null) {\r
              jTextFieldFeatureFlag = new JTextField();\r
      private JTextField getJTextFieldFeatureFlag() {\r
          if (jTextFieldFeatureFlag == null) {\r
              jTextFieldFeatureFlag = new JTextField();\r
-            jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(160, 130, 320, 20));\r
+            jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(168, 132, 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
              jTextFieldFeatureFlag.setPreferredSize(new java.awt.Dimension(320, 20));\r
              jTextFieldFeatureFlag.setToolTipText("Postfix expression that must evaluate to TRUE or FALSE");\r
          }\r
@@ -209,7 +209,7 @@ public class PpisDlg extends IDialog implements ItemListener {
              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.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.setLocation(new java.awt.Point(168, 87));\r
              jScrollPaneHelpText.setViewportView(getJTextAreaHelpText());\r
          }\r
          return jScrollPaneHelpText;\r
              jScrollPaneHelpText.setViewportView(getJTextAreaHelpText());\r
          }\r
          return jScrollPaneHelpText;\r
@@ -224,7 +224,7 @@ public class PpisDlg extends IDialog implements ItemListener {
      private JButton getJButtonOk() {\r
          if (jButtonOk == null) {\r
              jButtonOk = new JButton();\r
      private JButton getJButtonOk() {\r
          if (jButtonOk == null) {\r
              jButtonOk = new JButton();\r
-            jButtonOk.setBounds(new java.awt.Rectangle(290, 182, 90, 20));\r
+            jButtonOk.setBounds(new java.awt.Rectangle(290, 187, 90, 20));\r
              jButtonOk.setText("Ok");\r
              jButtonOk.addActionListener(this);\r
          }\r
              jButtonOk.setText("Ok");\r
              jButtonOk.addActionListener(this);\r
          }\r
@@ -240,7 +240,7 @@ public class PpisDlg extends IDialog implements ItemListener {
      private JButton getJButtonCancel() {\r
          if (jButtonCancel == null) {\r
              jButtonCancel = new JButton();\r
      private JButton getJButtonCancel() {\r
          if (jButtonCancel == null) {\r
              jButtonCancel = new JButton();\r
-            jButtonCancel.setBounds(new java.awt.Rectangle(390, 182, 90, 20));\r
+            jButtonCancel.setBounds(new java.awt.Rectangle(390, 187, 90, 20));\r
              jButtonCancel.setText("Cancel");\r
              jButtonCancel.addActionListener(this);\r
          }\r
              jButtonCancel.setText("Cancel");\r
              jButtonCancel.addActionListener(this);\r
          }\r
@@ -256,7 +256,7 @@ public class PpisDlg extends IDialog implements ItemListener {
       * \r
       */\r
      private void init() {\r
       * \r
       */\r
      private void init() {\r
-        this.setSize(500, 255);\r
+        this.setSize(505, 260);\r
          this.setContentPane(getJScrollPane());\r
          this.setTitle("PPI Definitions");\r
          initFrame();\r
          this.setContentPane(getJScrollPane());\r
          this.setTitle("PPI Definitions");\r
          initFrame();\r
@@ -305,41 +305,41 @@ public class PpisDlg extends IDialog implements ItemListener {
      private JPanel getJContentPane() {\r
          if (jContentPane == null) {\r
              jStarLabel1 = new StarLabel();\r
      private JPanel getJContentPane() {\r
          if (jContentPane == null) {\r
              jStarLabel1 = new StarLabel();\r
-            jStarLabel1.setLocation(new java.awt.Point(2, 10));\r
+            jStarLabel1.setLocation(new java.awt.Point(2, 12));\r
              jLabelPpiType = new JLabel();\r
              jLabelPpiType = new JLabel();\r
-            jLabelPpiType.setBounds(new java.awt.Rectangle(15, 10, 145, 20));\r
+            jLabelPpiType.setBounds(new java.awt.Rectangle(12, 12, 168, 20));\r
              jLabelPpiType.setText("Select Ppi Type");\r
  \r
              jStarLabel2 = new StarLabel();\r
              jLabelPpiType.setText("Select Ppi Type");\r
  \r
              jStarLabel2 = new StarLabel();\r
-            jStarLabel2.setLocation(new java.awt.Point(2, 35));\r
+            jStarLabel2.setLocation(new java.awt.Point(2, 37));\r
              jLabelC_Name = new JLabel();\r
              jLabelC_Name.setText("PPI GUID C Name");\r
              jLabelC_Name = new JLabel();\r
              jLabelC_Name.setText("PPI GUID C Name");\r
-            jLabelC_Name.setBounds(new java.awt.Rectangle(15, 35, 145, 20));\r
+            jLabelC_Name.setBounds(new java.awt.Rectangle(12, 37, 168, 20));\r
  \r
              jStarLabel3 = new StarLabel();\r
  \r
              jStarLabel3 = new StarLabel();\r
-            jStarLabel3.setLocation(new java.awt.Point(2, 60));\r
+            jStarLabel3.setLocation(new java.awt.Point(2, 62));\r
              jLabelUsage = new JLabel();\r
              jLabelUsage.setText("Usage");\r
              jLabelUsage = new JLabel();\r
              jLabelUsage.setText("Usage");\r
-            jLabelUsage.setBounds(new java.awt.Rectangle(15, 60, 145, 20));\r
+            jLabelUsage.setBounds(new java.awt.Rectangle(12, 62, 168, 20));\r
  \r
              jLabelHelpText = new JLabel();\r
  \r
              jLabelHelpText = new JLabel();\r
-            jLabelHelpText.setBounds(new java.awt.Rectangle(14, 85, 145, 20));\r
+            jLabelHelpText.setBounds(new java.awt.Rectangle(14, 87, 168, 20));\r
              jLabelHelpText.setText("Help Text");\r
  \r
              jLabelFeatureFlag = new JLabel();\r
              jLabelFeatureFlag.setText("Feature Flag Expression");\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
+            jLabelFeatureFlag.setBounds(new java.awt.Rectangle(12, 132, 168, 20));\r
  \r
              jLabelArch = new JLabel();\r
  \r
              jLabelArch = new JLabel();\r
-            jLabelArch.setBounds(new java.awt.Rectangle(15, 155, 145, 20));\r
+            jLabelArch.setBounds(new java.awt.Rectangle(12, 157, 168, 20));\r
              jLabelArch.setText("Supported Architectures");\r
              jArchCheckBox = new ArchCheckBox();\r
              jLabelArch.setText("Supported Architectures");\r
              jArchCheckBox = new ArchCheckBox();\r
-            jArchCheckBox.setBounds(new java.awt.Rectangle(160, 155, 320, 20));\r
+            jArchCheckBox.setBounds(new java.awt.Rectangle(168, 157, 320, 20));\r
              jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20));\r
  \r
              jContentPane = new JPanel();\r
              jContentPane.setLayout(null);\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
+            jContentPane.setPreferredSize(new java.awt.Dimension(485, 215));\r
  \r
              jContentPane.add(jStarLabel1, null);\r
              jContentPane.add(jLabelPpiType, null);\r
  \r
              jContentPane.add(jStarLabel1, null);\r
              jContentPane.add(jLabelPpiType, null);\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 894955188c274fc9f3ba9d183ec57d1818d8d044..0bd5b5fcd1d6ce0395d00fcdb7387722262bdd32 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
@@ -1,6 +1,6 @@
  /** @file\r
   \r
  /** @file\r
   \r
- The file is used to create, update Protocol of MSA/MBD file\r
+ The file is used to create, update Protocol of section of the  MSA file\r
   \r
   Copyright (c) 2006, Intel Corporation\r
   All rights reserved. This program and the accompanying materials\r
   \r
   Copyright (c) 2006, Intel Corporation\r
   All rights reserved. This program and the accompanying materials\r
@@ -114,7 +114,7 @@ public class ProtocolsDlg extends IDialog implements ItemListener {
      private JTextField getJTextFieldFeatureFlag() {\r
          if (jTextFieldFeatureFlag == null) {\r
              jTextFieldFeatureFlag = new JTextField();\r
      private JTextField getJTextFieldFeatureFlag() {\r
          if (jTextFieldFeatureFlag == null) {\r
              jTextFieldFeatureFlag = new JTextField();\r
-            jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(160, 130, 320, 20));\r
+            jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(168, 132, 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
              jTextFieldFeatureFlag.setPreferredSize(new java.awt.Dimension(320, 20));\r
              jTextFieldFeatureFlag.setToolTipText("Postfix expression that must evaluate to TRUE or FALSE");\r
          }\r
@@ -130,7 +130,7 @@ public class ProtocolsDlg extends IDialog implements ItemListener {
      private JComboBox getJComboBoxProtocolUsage() {\r
          if (jComboBoxUsage == null) {\r
              jComboBoxUsage = new JComboBox();\r
      private JComboBox getJComboBoxProtocolUsage() {\r
          if (jComboBoxUsage == null) {\r
              jComboBoxUsage = new JComboBox();\r
-            jComboBoxUsage.setBounds(new java.awt.Rectangle(160, 60, 320, 20));\r
+            jComboBoxUsage.setBounds(new java.awt.Rectangle(168, 62, 320, 20));\r
              jComboBoxUsage.setPreferredSize(new java.awt.Dimension(320, 20));\r
              jComboBoxUsage\r
                            .setToolTipText("<html><table><tr><td colspan=2 align=center><b>Protocol</b></td></tr>"\r
              jComboBoxUsage.setPreferredSize(new java.awt.Dimension(320, 20));\r
              jComboBoxUsage\r
                            .setToolTipText("<html><table><tr><td colspan=2 align=center><b>Protocol</b></td></tr>"\r
@@ -167,7 +167,7 @@ public class ProtocolsDlg extends IDialog implements ItemListener {
      private JComboBox getJComboBoxProtocolType() {\r
          if (jComboBoxProtocolType == null) {\r
              jComboBoxProtocolType = new JComboBox();\r
      private JComboBox getJComboBoxProtocolType() {\r
          if (jComboBoxProtocolType == null) {\r
              jComboBoxProtocolType = new JComboBox();\r
-            jComboBoxProtocolType.setBounds(new java.awt.Rectangle(160, 10, 320, 20));\r
+            jComboBoxProtocolType.setBounds(new java.awt.Rectangle(168, 12, 320, 20));\r
              jComboBoxProtocolType.setPreferredSize(new java.awt.Dimension(320, 20));\r
              jComboBoxProtocolType.addItemListener(this);\r
              jComboBoxProtocolType\r
              jComboBoxProtocolType.setPreferredSize(new java.awt.Dimension(320, 20));\r
              jComboBoxProtocolType.addItemListener(this);\r
              jComboBoxProtocolType\r
@@ -184,7 +184,7 @@ public class ProtocolsDlg extends IDialog implements ItemListener {
      private JComboBox getJComboBoxCName() {\r
          if (jComboBoxCName == null) {\r
              jComboBoxCName = new JComboBox();\r
      private JComboBox getJComboBoxCName() {\r
          if (jComboBoxCName == null) {\r
              jComboBoxCName = new JComboBox();\r
-            jComboBoxCName.setBounds(new java.awt.Rectangle(160, 35, 320, 20));\r
+            jComboBoxCName.setBounds(new java.awt.Rectangle(168, 37, 320, 20));\r
              jComboBoxCName.setPreferredSize(new java.awt.Dimension(320, 20));\r
              jComboBoxCName.setToolTipText("Select Guid C Name of the Protocol");\r
  \r
              jComboBoxCName.setPreferredSize(new java.awt.Dimension(320, 20));\r
              jComboBoxCName.setToolTipText("Select Guid C Name of the Protocol");\r
  \r
@@ -219,7 +219,7 @@ public class ProtocolsDlg extends IDialog implements ItemListener {
              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.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.setLocation(new java.awt.Point(168, 87));\r
              jScrollPaneHelpText.setViewportView(getJTextAreaHelpText());\r
          }\r
          return jScrollPaneHelpText;\r
              jScrollPaneHelpText.setViewportView(getJTextAreaHelpText());\r
          }\r
          return jScrollPaneHelpText;\r
@@ -234,7 +234,7 @@ public class ProtocolsDlg extends IDialog implements ItemListener {
      private JButton getJButtonOk() {\r
          if (jButtonOk == null) {\r
              jButtonOk = new JButton();\r
      private JButton getJButtonOk() {\r
          if (jButtonOk == null) {\r
              jButtonOk = new JButton();\r
-            jButtonOk.setBounds(new java.awt.Rectangle(290, 182, 90, 20));\r
+            jButtonOk.setBounds(new java.awt.Rectangle(290, 187, 90, 20));\r
              jButtonOk.setText("Ok");\r
              jButtonOk.addActionListener(this);\r
          }\r
              jButtonOk.setText("Ok");\r
              jButtonOk.addActionListener(this);\r
          }\r
@@ -250,7 +250,7 @@ public class ProtocolsDlg extends IDialog implements ItemListener {
      private JButton getJButtonCancel() {\r
          if (jButtonCancel == null) {\r
              jButtonCancel = new JButton();\r
      private JButton getJButtonCancel() {\r
          if (jButtonCancel == null) {\r
              jButtonCancel = new JButton();\r
-            jButtonCancel.setBounds(new java.awt.Rectangle(390, 182, 90, 20));\r
+            jButtonCancel.setBounds(new java.awt.Rectangle(390, 187, 90, 20));\r
              jButtonCancel.setText("Cancel");\r
              jButtonCancel.addActionListener(this);\r
          }\r
              jButtonCancel.setText("Cancel");\r
              jButtonCancel.addActionListener(this);\r
          }\r
@@ -266,7 +266,9 @@ public class ProtocolsDlg extends IDialog implements ItemListener {
       * \r
       */\r
      private void init() {\r
       * \r
       */\r
      private void init() {\r
-        this.setSize(500, 255);\r
+        // Width must be 20 larger than Content Pane PreferredSize width for MSFT\r
+        // Height must be 45 larger than ContentPane PreferredSize height for MSFT\r
+        this.setSize(505, 260);\r
          this.setContentPane(getJScrollPane());\r
          this.setTitle("Protocols");\r
          initFrame();\r
          this.setContentPane(getJScrollPane());\r
          this.setTitle("Protocols");\r
          initFrame();\r
@@ -330,41 +332,41 @@ public class ProtocolsDlg extends IDialog implements ItemListener {
      private JPanel getJContentPane() {\r
          if (jContentPane == null) {\r
              jStarLabel1 = new StarLabel();\r
      private JPanel getJContentPane() {\r
          if (jContentPane == null) {\r
              jStarLabel1 = new StarLabel();\r
-            jStarLabel1.setLocation(new java.awt.Point(2, 10));\r
+            jStarLabel1.setLocation(new java.awt.Point(2, 12));\r
              jLabelProtocolType = new JLabel();\r
              jLabelProtocolType = new JLabel();\r
-            jLabelProtocolType.setBounds(new java.awt.Rectangle(15, 10, 145, 20));\r
+            jLabelProtocolType.setBounds(new java.awt.Rectangle(12, 12, 155, 20));\r
              jLabelProtocolType.setText("Select Protocol Type");\r
  \r
              jStarLabel2 = new StarLabel();\r
              jLabelProtocolType.setText("Select Protocol Type");\r
  \r
              jStarLabel2 = new StarLabel();\r
-            jStarLabel2.setLocation(new java.awt.Point(2, 35));\r
+            jStarLabel2.setLocation(new java.awt.Point(2, 37));\r
              jLabelC_Name = new JLabel();\r
              jLabelC_Name.setText("Protocol Guid C Name");\r
              jLabelC_Name = new JLabel();\r
              jLabelC_Name.setText("Protocol Guid C Name");\r
-            jLabelC_Name.setBounds(new java.awt.Rectangle(15, 35, 145, 20));\r
+            jLabelC_Name.setBounds(new java.awt.Rectangle(12, 37, 155, 20));\r
  \r
              jStarLabel3 = new StarLabel();\r
  \r
              jStarLabel3 = new StarLabel();\r
-            jStarLabel3.setLocation(new java.awt.Point(2, 60));\r
+            jStarLabel3.setLocation(new java.awt.Point(2, 62));\r
              jLabelUsage = new JLabel();\r
              jLabelUsage.setText("Usage");\r
              jLabelUsage = new JLabel();\r
              jLabelUsage.setText("Usage");\r
-            jLabelUsage.setBounds(new java.awt.Rectangle(15, 60, 145, 20));\r
+            jLabelUsage.setBounds(new java.awt.Rectangle(12, 62, 155, 20));\r
  \r
              jLabelHelpText = new JLabel();\r
  \r
              jLabelHelpText = new JLabel();\r
-            jLabelHelpText.setBounds(new java.awt.Rectangle(15, 85, 145, 20));\r
+            jLabelHelpText.setBounds(new java.awt.Rectangle(12, 87, 155, 20));\r
              jLabelHelpText.setText("Help Text");\r
  \r
              jLabelFeatureFlag = new JLabel();\r
              jLabelFeatureFlag.setText("Feature Flag Expression");\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
+            jLabelFeatureFlag.setBounds(new java.awt.Rectangle(12, 132, 155, 20));\r
  \r
              jLabelArch = new JLabel();\r
  \r
              jLabelArch = new JLabel();\r
-            jLabelArch.setBounds(new java.awt.Rectangle(15, 155, 145, 20));\r
+            jLabelArch.setBounds(new java.awt.Rectangle(12, 157, 155, 20));\r
              jLabelArch.setText("Supported Architectures");\r
              jArchCheckBox = new ArchCheckBox();\r
              jLabelArch.setText("Supported Architectures");\r
              jArchCheckBox = new ArchCheckBox();\r
-            jArchCheckBox.setBounds(new java.awt.Rectangle(160, 155, 320, 20));\r
+            jArchCheckBox.setBounds(new java.awt.Rectangle(168, 157, 320, 20));\r
              jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20));\r
  \r
              jContentPane = new JPanel();\r
              jContentPane.setLayout(null);\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
+            jContentPane.setPreferredSize(new java.awt.Dimension(485, 215));\r
  \r
              jContentPane.add(jStarLabel1, null);\r
              jContentPane.add(jLabelProtocolType, null);\r
  \r
              jContentPane.add(jStarLabel1, null);\r
              jContentPane.add(jLabelProtocolType, null);\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 f2b92ba7ef7f743246cae73c243ed683169cabd4..8919552e7fe5a2b977062d7c47f0d05288a0ea69 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
@@ -39,8 +39,8 @@ import org.tianocore.frameworkwizard.module.Identifications.SystemTables.SystemT
  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 SystemTable of MSA/MBD file It extends\r
- * IInternalFrame\r
+ * The class is used to create, update SystemTable of MSA/MBD file \r
+ * It extends IDialog\r
   * \r
   * \r
   * \r
   * \r
   * \r
   * \r
@@ -107,7 +107,7 @@ public class SystemTablesDlg extends IDialog {
      private JComboBox getJComboBoxGuidC_Name() {\r
          if (jComboBoxGuidC_Name == null) {\r
              jComboBoxGuidC_Name = new JComboBox();\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.setBounds(new java.awt.Rectangle(168, 12, 320, 20));\r
              jComboBoxGuidC_Name.setPreferredSize(new java.awt.Dimension(320, 20));\r
              jComboBoxGuidC_Name.setToolTipText("Select the GUID C Name of the System Table");\r
          }\r
              jComboBoxGuidC_Name.setPreferredSize(new java.awt.Dimension(320, 20));\r
              jComboBoxGuidC_Name.setToolTipText("Select the GUID C Name of the System Table");\r
          }\r
@@ -123,7 +123,7 @@ public class SystemTablesDlg extends IDialog {
      private JComboBox getJComboBoxUsage() {\r
          if (jComboBoxUsage == null) {\r
              jComboBoxUsage = new JComboBox();\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.setBounds(new java.awt.Rectangle(168, 37, 320, 20));\r
              jComboBoxUsage.setPreferredSize(new java.awt.Dimension(320, 20));\r
              jComboBoxUsage\r
                            .setToolTipText("<html><table>"\r
              jComboBoxUsage.setPreferredSize(new java.awt.Dimension(320, 20));\r
              jComboBoxUsage\r
                            .setToolTipText("<html><table>"\r
@@ -144,7 +144,7 @@ public class SystemTablesDlg extends IDialog {
      private JTextField getJTextFieldFeatureFlag() {\r
          if (jTextFieldFeatureFlag == null) {\r
              jTextFieldFeatureFlag = new JTextField();\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.setBounds(new java.awt.Rectangle(168, 107, 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
              jTextFieldFeatureFlag.setPreferredSize(new java.awt.Dimension(320, 20));\r
              jTextFieldFeatureFlag.setToolTipText("Postfix expression that must evaluate to TRUE or FALSE");\r
          }\r
@@ -190,7 +190,7 @@ public class SystemTablesDlg extends IDialog {
              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.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.setLocation(new java.awt.Point(168, 62));\r
              jScrollPaneHelpText.setViewportView(getJTextAreaHelpText());\r
          }\r
          return jScrollPaneHelpText;\r
              jScrollPaneHelpText.setViewportView(getJTextAreaHelpText());\r
          }\r
          return jScrollPaneHelpText;\r
@@ -205,7 +205,7 @@ public class SystemTablesDlg extends IDialog {
      private JButton getJButtonOk() {\r
          if (jButtonOk == null) {\r
              jButtonOk = new JButton();\r
      private JButton getJButtonOk() {\r
          if (jButtonOk == null) {\r
              jButtonOk = new JButton();\r
-            jButtonOk.setBounds(new java.awt.Rectangle(290, 157, 90, 20));\r
+            jButtonOk.setBounds(new java.awt.Rectangle(290, 162, 90, 20));\r
              jButtonOk.setText("Ok");\r
              jButtonOk.addActionListener(this);\r
          }\r
              jButtonOk.setText("Ok");\r
              jButtonOk.addActionListener(this);\r
          }\r
@@ -221,7 +221,7 @@ public class SystemTablesDlg extends IDialog {
      private JButton getJButtonCancel() {\r
          if (jButtonCancel == null) {\r
              jButtonCancel = new JButton();\r
      private JButton getJButtonCancel() {\r
          if (jButtonCancel == null) {\r
              jButtonCancel = new JButton();\r
-            jButtonCancel.setBounds(new java.awt.Rectangle(390, 157, 90, 20));\r
+            jButtonCancel.setBounds(new java.awt.Rectangle(390, 162, 90, 20));\r
              jButtonCancel.setText("Cancel");\r
              jButtonCancel.addActionListener(this);\r
          }\r
              jButtonCancel.setText("Cancel");\r
              jButtonCancel.addActionListener(this);\r
          }\r
@@ -237,7 +237,7 @@ public class SystemTablesDlg extends IDialog {
       * \r
       */\r
      private void init() {\r
       * \r
       */\r
      private void init() {\r
-        this.setSize(500, 230);\r
+        this.setSize(505, 235);\r
          this.setContentPane(getJScrollPane());\r
          this.setTitle("System Tables");\r
          initFrame();\r
          this.setContentPane(getJScrollPane());\r
          this.setTitle("System Tables");\r
          initFrame();\r
@@ -299,31 +299,31 @@ public class SystemTablesDlg extends IDialog {
      private JPanel getJContentPane() {\r
          if (jContentPane == null) {\r
              jStarLabel1 = new StarLabel();\r
      private JPanel getJContentPane() {\r
          if (jContentPane == null) {\r
              jStarLabel1 = new StarLabel();\r
-            jStarLabel1.setLocation(new java.awt.Point(2, 10));\r
+            jStarLabel1.setLocation(new java.awt.Point(2, 12));\r
              jLabelEntry = new JLabel();\r
              jLabelEntry.setText("Table's GUID C Name");\r
              jLabelEntry = new JLabel();\r
              jLabelEntry.setText("Table's GUID C Name");\r
-            jLabelEntry.setBounds(new java.awt.Rectangle(15, 10, 145, 20));\r
+            jLabelEntry.setBounds(new java.awt.Rectangle(12, 12, 155, 20));\r
              jStarLabel2 = new StarLabel();\r
              jStarLabel2 = new StarLabel();\r
-            jStarLabel2.setLocation(new java.awt.Point(2, 35));\r
+            jStarLabel2.setLocation(new java.awt.Point(2, 37));\r
              jLabelUsage = new JLabel();\r
              jLabelUsage.setText("Usage");\r
              jLabelUsage = new JLabel();\r
              jLabelUsage.setText("Usage");\r
-            jLabelUsage.setBounds(new java.awt.Rectangle(15, 35, 145, 20));\r
+            jLabelUsage.setBounds(new java.awt.Rectangle(12, 37, 155, 20));\r
              jLabelHelpText = new JLabel();\r
              jLabelHelpText = new JLabel();\r
-            jLabelHelpText.setBounds(new java.awt.Rectangle(14, 60, 145, 20));\r
+            jLabelHelpText.setBounds(new java.awt.Rectangle(12, 62, 155, 20));\r
              jLabelHelpText.setText("Help Text");\r
              jLabelFeatureFlag = new JLabel();\r
              jLabelHelpText.setText("Help Text");\r
              jLabelFeatureFlag = new JLabel();\r
-            jLabelFeatureFlag.setBounds(new java.awt.Rectangle(15, 105, 140, 20));\r
+            jLabelFeatureFlag.setBounds(new java.awt.Rectangle(12, 107, 155, 20));\r
              jLabelFeatureFlag.setText("Feature Flag Expression");\r
              jLabelArch = new JLabel();\r
              jLabelFeatureFlag.setText("Feature Flag Expression");\r
              jLabelArch = new JLabel();\r
-            jLabelArch.setBounds(new java.awt.Rectangle(15, 130, 145, 20));\r
+            jLabelArch.setBounds(new java.awt.Rectangle(12, 130, 155, 20));\r
              jLabelArch.setText("Supported Architectures");\r
              jArchCheckBox = new ArchCheckBox();\r
              jLabelArch.setText("Supported Architectures");\r
              jArchCheckBox = new ArchCheckBox();\r
-            jArchCheckBox.setBounds(new java.awt.Rectangle(160, 130, 320, 20));\r
+            jArchCheckBox.setBounds(new java.awt.Rectangle(168, 130, 320, 20));\r
              jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20));\r
  \r
              jContentPane = new JPanel();\r
              jContentPane.setLayout(null);\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
+            jContentPane.setPreferredSize(new java.awt.Dimension(480, 180));\r
  \r
              jContentPane.add(jLabelEntry, null);\r
              jContentPane.add(jLabelFeatureFlag, null);\r
  \r
              jContentPane.add(jLabelEntry, null);\r
              jContentPane.add(jLabelFeatureFlag, null);\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 0761d30693f5b3ad6d512c8f22d53329746296e7..ca8a5839fe857999b6a5059a96d6c0bd61d78eeb 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
@@ -1,6 +1,6 @@
  /** @file\r
   \r
  /** @file\r
   \r
- The file is used to create, update Variable of MSA/MBD file\r
+ The file is used to create, update Variables section of the MSA file\r
   \r
   Copyright (c) 2006, Intel Corporation\r
   All rights reserved. This program and the accompanying materials\r
   \r
   Copyright (c) 2006, Intel Corporation\r
   All rights reserved. This program and the accompanying materials\r
@@ -39,8 +39,8 @@ 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 It extends\r
- * IDialog\r
+ * The class is used to create, update Variables section of the MSA file \r
+ * It extends IDialog\r
   * \r
   */\r
  public class VariablesDlg extends IDialog {\r
   * \r
   */\r
  public class VariablesDlg extends IDialog {\r
@@ -113,7 +113,7 @@ public class VariablesDlg extends IDialog {
              jTextFieldVariableName = new JTextField();\r
              jTextFieldVariableName.setSize(new java.awt.Dimension(320, 20));\r
              jTextFieldVariableName.setPreferredSize(new java.awt.Dimension(320, 20));\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.setLocation(new java.awt.Point(168, 12));\r
              jTextFieldVariableName\r
                                    .setToolTipText("Enter a Hex Word Array, you must provide leading Zeros. 0x000a, 0x0010, 0x00FF");\r
          }\r
              jTextFieldVariableName\r
                                    .setToolTipText("Enter a Hex Word Array, you must provide leading Zeros. 0x000a, 0x0010, 0x00FF");\r
          }\r
@@ -129,15 +129,15 @@ public class VariablesDlg extends IDialog {
      private JComboBox getJComboBoxUsage() {\r
          if (jComboBoxUsage == null) {\r
              jComboBoxUsage = new JComboBox();\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.setBounds(new java.awt.Rectangle(168, 62, 320, 20));\r
              jComboBoxUsage.setPreferredSize(new java.awt.Dimension(320, 20));\r
              jComboBoxUsage\r
              jComboBoxUsage.setPreferredSize(new java.awt.Dimension(320, 20));\r
              jComboBoxUsage\r
-                          .setToolTipText("<html><table>"\r
-                                          + "<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 is 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>"\r
-                                          + "</table></html>");\r
+              .setToolTipText("<html><table>"\r
+                + "<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 is 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>"\r
+                + "</table></html>");\r
          }\r
          return jComboBoxUsage;\r
      }\r
          }\r
          return jComboBoxUsage;\r
      }\r
@@ -164,7 +164,7 @@ public class VariablesDlg extends IDialog {
      private JTextField getJTextFieldFeatureFlag() {\r
          if (jTextFieldFeatureFlag == null) {\r
              jTextFieldFeatureFlag = new JTextField();\r
      private JTextField getJTextFieldFeatureFlag() {\r
          if (jTextFieldFeatureFlag == null) {\r
              jTextFieldFeatureFlag = new JTextField();\r
-            jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(160, 130, 320, 20));\r
+            jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(168, 132, 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
              jTextFieldFeatureFlag.setPreferredSize(new java.awt.Dimension(320, 20));\r
              jTextFieldFeatureFlag.setToolTipText("Postfix expression that must evaluate to TRUE or FALSE");\r
          }\r
@@ -193,7 +193,7 @@ public class VariablesDlg extends IDialog {
              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.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.setLocation(new java.awt.Point(168, 87));\r
              jScrollPaneHelpText.setViewportView(getJTextAreaHelpText());\r
          }\r
          return jScrollPaneHelpText;\r
              jScrollPaneHelpText.setViewportView(getJTextAreaHelpText());\r
          }\r
          return jScrollPaneHelpText;\r
@@ -208,7 +208,7 @@ public class VariablesDlg extends IDialog {
      private JComboBox getJComboBoxGuidC_Name() {\r
          if (jComboBoxGuidC_Name == null) {\r
              jComboBoxGuidC_Name = new JComboBox();\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.setBounds(new java.awt.Rectangle(168, 37, 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
              jComboBoxGuidC_Name.setPreferredSize(new java.awt.Dimension(320, 20));\r
              jComboBoxGuidC_Name.setToolTipText("Select the GUID C Name of the Variable.");\r
          }\r
@@ -224,7 +224,7 @@ public class VariablesDlg extends IDialog {
      private JButton getJButtonOk() {\r
          if (jButtonOk == null) {\r
              jButtonOk = new JButton();\r
      private JButton getJButtonOk() {\r
          if (jButtonOk == null) {\r
              jButtonOk = new JButton();\r
-            jButtonOk.setBounds(new java.awt.Rectangle(290, 182, 90, 20));\r
+            jButtonOk.setBounds(new java.awt.Rectangle(290, 187, 90, 20));\r
              jButtonOk.setText("Ok");\r
              jButtonOk.addActionListener(this);\r
          }\r
              jButtonOk.setText("Ok");\r
              jButtonOk.addActionListener(this);\r
          }\r
@@ -240,7 +240,7 @@ public class VariablesDlg extends IDialog {
      private JButton getJButtonCancel() {\r
          if (jButtonCancel == null) {\r
              jButtonCancel = new JButton();\r
      private JButton getJButtonCancel() {\r
          if (jButtonCancel == null) {\r
              jButtonCancel = new JButton();\r
-            jButtonCancel.setBounds(new java.awt.Rectangle(390, 182, 90, 20));\r
+            jButtonCancel.setBounds(new java.awt.Rectangle(390, 187, 90, 20));\r
              jButtonCancel.setText("Cancel");\r
              jButtonCancel.addActionListener(this);\r
          }\r
              jButtonCancel.setText("Cancel");\r
              jButtonCancel.addActionListener(this);\r
          }\r
@@ -256,7 +256,7 @@ public class VariablesDlg extends IDialog {
       * \r
       */\r
      private void init() {\r
       * \r
       */\r
      private void init() {\r
-        this.setSize(500, 255);\r
+        this.setSize(505, 260);\r
          this.setContentPane(getJScrollPane());\r
          this.setTitle("Variables");\r
          initFrame();\r
          this.setContentPane(getJScrollPane());\r
          this.setTitle("Variables");\r
          initFrame();\r
@@ -320,41 +320,41 @@ public class VariablesDlg extends IDialog {
      private JPanel getJContentPane() {\r
          if (jContentPane == null) {\r
              jStarLabel1 = new StarLabel();\r
      private JPanel getJContentPane() {\r
          if (jContentPane == null) {\r
              jStarLabel1 = new StarLabel();\r
-            jStarLabel1.setLocation(new java.awt.Point(2, 10));\r
+            jStarLabel1.setLocation(new java.awt.Point(2, 12));\r
              jLabelVariableName = new JLabel();\r
              jLabelVariableName.setText("Variable Name");\r
              jLabelVariableName = new JLabel();\r
              jLabelVariableName.setText("Variable Name");\r
-            jLabelVariableName.setBounds(new java.awt.Rectangle(15, 10, 145, 20));\r
+            jLabelVariableName.setBounds(new java.awt.Rectangle(12, 12, 168, 20));\r
  \r
              jStarLabel2 = new StarLabel();\r
  \r
              jStarLabel2 = new StarLabel();\r
-            jStarLabel2.setLocation(new java.awt.Point(2, 35));\r
+            jStarLabel2.setLocation(new java.awt.Point(2, 37));\r
              jLabelGuidCName = new JLabel();\r
              jLabelGuidCName = new JLabel();\r
-            jLabelGuidCName.setBounds(new java.awt.Rectangle(15, 35, 145, 20));\r
+            jLabelGuidCName.setBounds(new java.awt.Rectangle(12, 37, 168, 20));\r
              jLabelGuidCName.setText("Variable Guid C Name");\r
  \r
              jStarLabel3 = new StarLabel();\r
              jLabelGuidCName.setText("Variable Guid C Name");\r
  \r
              jStarLabel3 = new StarLabel();\r
-            jStarLabel3.setLocation(new java.awt.Point(2, 60));\r
+            jStarLabel3.setLocation(new java.awt.Point(2, 62));\r
              jLabelUsage = new JLabel();\r
              jLabelUsage.setText("Usage");\r
              jLabelUsage = new JLabel();\r
              jLabelUsage.setText("Usage");\r
-            jLabelUsage.setBounds(new java.awt.Rectangle(15, 60, 145, 20));\r
+            jLabelUsage.setBounds(new java.awt.Rectangle(12, 62, 168, 20));\r
  \r
              jLabelHelpText = new JLabel();\r
  \r
              jLabelHelpText = new JLabel();\r
-            jLabelHelpText.setBounds(new java.awt.Rectangle(14, 85, 145, 20));\r
+            jLabelHelpText.setBounds(new java.awt.Rectangle(12, 87, 168, 20));\r
              jLabelHelpText.setText("Help Text");\r
  \r
              jLabelFeatureFlag = new JLabel();\r
              jLabelFeatureFlag.setText("Feature Flag Expression");\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
+            jLabelFeatureFlag.setBounds(new java.awt.Rectangle(12, 132, 168, 20));\r
  \r
              jLabelArch = new JLabel();\r
  \r
              jLabelArch = new JLabel();\r
-            jLabelArch.setBounds(new java.awt.Rectangle(15, 155, 145, 20));\r
+            jLabelArch.setBounds(new java.awt.Rectangle(12, 157, 168, 20));\r
              jLabelArch.setText("Supported Architectures");\r
              jArchCheckBox = new ArchCheckBox();\r
              jLabelArch.setText("Supported Architectures");\r
              jArchCheckBox = new ArchCheckBox();\r
-            jArchCheckBox.setBounds(new java.awt.Rectangle(160, 155, 320, 20));\r
+            jArchCheckBox.setBounds(new java.awt.Rectangle(168, 157, 320, 20));\r
              jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20));\r
  \r
              jContentPane = new JPanel();\r
              jContentPane.setLayout(null);\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
+            jContentPane.setPreferredSize(new java.awt.Dimension(485, 215));\r
  \r
              jContentPane.add(jStarLabel1, null);\r
              jContentPane.add(jLabelVariableName, null);\r
  \r
              jContentPane.add(jStarLabel1, null);\r
              jContentPane.add(jLabelVariableName, null);\r
author	lhauch <lhauch@6f19259b-4bc3-4df7-8a09-765794883524>
	Fri, 28 Jul 2006 23:09:53 +0000 (23:09 +0000)
committer	lhauch <lhauch@6f19259b-4bc3-4df7-8a09-765794883524>
	Fri, 28 Jul 2006 23:09:53 +0000 (23:09 +0000)
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/BootModesDlg.java		patch \| blob \| blame \| history
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/DataHubsDlg.java		patch \| blob \| blame \| history
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/EventsDlg.java		patch \| blob \| blame \| history
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/GuidsDlg.java		patch \| blob \| blame \| history
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/HiiPackagesDlg.java		patch \| blob \| blame \| history
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/HobsDlg.java		patch \| blob \| blame \| history
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PCDsDlg.java		patch \| blob \| blame \| history
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PpisDlg.java		patch \| blob \| blame \| history
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/ProtocolsDlg.java		patch \| blob \| blame \| history
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/SystemTablesDlg.java		patch \| blob \| blame \| history
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/VariablesDlg.java		patch \| blob \| blame \| history