1. Fix EDKT496 Framework Wizard should allow user to pick up a Protocol Guid to tag...

[mirror_edk2.git] / Tools / Java / Source / FrameworkWizard / src / org / tianocore / frameworkwizard / module / ui / dialog / HobsDlg.java

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/HobsDlg.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/HobsDlg.java
index 3b76c3c3b948de1f7251d4636c4062027b8cd04b..73a1869a7f15e85c4b4c692ce6594310bddc48b7 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/HobsDlg.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/HobsDlg.java
@@ -31,6 +31,7 @@ import org.tianocore.frameworkwizard.common.EnumerationData;
 import org.tianocore.frameworkwizard.common.Log;\r
 import org.tianocore.frameworkwizard.common.Tools;\r
 import org.tianocore.frameworkwizard.common.ui.ArchCheckBox;\r
+import org.tianocore.frameworkwizard.common.ui.IComboBox;\r
 import org.tianocore.frameworkwizard.common.ui.IDialog;\r
 import org.tianocore.frameworkwizard.common.ui.IFrame;\r
 import org.tianocore.frameworkwizard.common.ui.StarLabel;\r
@@ -59,7 +60,7 @@ public class HobsDlg extends IDialog {
 \r
     private JLabel jLabelC_Name = null;\r
 \r
-    private JComboBox jComboBoxGuidC_Name = null;\r
+    private IComboBox iComboBoxGuidC_Name = null;\r
 \r
     private JLabel jLabelUsage = null;\r
 \r
@@ -110,14 +111,14 @@ public class HobsDlg extends IDialog {
      * @return javax.swing.JTextField jTextFieldC_Name\r
      * \r
      */\r
-    private JComboBox getJComboBoxGuidC_Name() {\r
-        if (jComboBoxGuidC_Name == null) {\r
-            jComboBoxGuidC_Name = new JComboBox();\r
-            jComboBoxGuidC_Name.setBounds(new java.awt.Rectangle(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
+    private IComboBox getIComboBoxGuidC_Name() {\r
+        if (iComboBoxGuidC_Name == null) {\r
+            iComboBoxGuidC_Name = new IComboBox();\r
+            iComboBoxGuidC_Name.setBounds(new java.awt.Rectangle(168, 12, 320, 20));\r
+            iComboBoxGuidC_Name.setPreferredSize(new java.awt.Dimension(320, 20));\r
+            iComboBoxGuidC_Name.setToolTipText("Select the GUID C Name of the Hob");\r
         }\r
-        return jComboBoxGuidC_Name;\r
+        return iComboBoxGuidC_Name;\r
     }\r
 \r
     /**\r
@@ -307,12 +308,12 @@ public class HobsDlg extends IDialog {
         // Init guids drop down list\r
         //\r
         Tools\r
-             .generateComboBoxByVector(jComboBoxGuidC_Name,\r
+             .generateComboBoxByVector(iComboBoxGuidC_Name,\r
                                        wt.getAllGuidDeclarationsFromPackages(vpid, EnumerationData.GUID_TYPE_HOB));\r
 \r
 \r
         if (this.id != null) {\r
-            this.jComboBoxGuidC_Name.setSelectedItem(id.getName());\r
+            this.iComboBoxGuidC_Name.setSelectedItem(id.getName());\r
             this.jComboBoxHobType.setSelectedItem(id.getType());\r
             this.jComboBoxUsage.setSelectedItem(id.getUsage());\r
             this.jTextAreaHelpText.setText(id.getHelp());\r
@@ -342,7 +343,7 @@ public class HobsDlg extends IDialog {
      */\r
     public void setViewMode(boolean isView) {\r
         if (isView) {\r
-            this.jComboBoxGuidC_Name.setEnabled(!isView);\r
+            this.iComboBoxGuidC_Name.setEnabled(!isView);\r
             this.jComboBoxUsage.setEnabled(!isView);\r
             this.jComboBoxHobType.setEnabled(!isView);\r
         }\r
@@ -396,7 +397,7 @@ public class HobsDlg extends IDialog {
 \r
             jContentPane.add(jStarLabel1, null);\r
             jContentPane.add(jLabelC_Name, null);\r
-            jContentPane.add(getJComboBoxGuidC_Name(), null);\r
+            jContentPane.add(getIComboBoxGuidC_Name(), null);\r
             jContentPane.add(jStarLabel2, null);\r
             jContentPane.add(jLabelHobType, null);\r
             jContentPane.add(getJComboBoxHobType(), null);\r
@@ -462,20 +463,20 @@ public class HobsDlg extends IDialog {
         //\r
         // Check Name\r
         //\r
-        if (this.jComboBoxGuidC_Name.getSelectedItem() == null) {\r
+        if (this.iComboBoxGuidC_Name.getSelectedItem() == null) {\r
             Log.wrn("Update Guids", "Please select one Hob Name");\r
             return false;\r
         }\r
         //\r
         // Check Name\r
         //\r
-        if (isEmpty(this.jComboBoxGuidC_Name.getSelectedItem().toString())) {\r
+        if (isEmpty(this.iComboBoxGuidC_Name.getSelectedItem().toString())) {\r
             Log.wrn("Update Hobs", "Hob Guid C Name must be entered!");\r
             return false;\r
         }\r
 \r
-        if (!isEmpty(this.jComboBoxGuidC_Name.getSelectedItem().toString())) {\r
-            if (!DataValidation.isC_NameType(this.jComboBoxGuidC_Name.getSelectedItem().toString())) {\r
+        if (!isEmpty(this.iComboBoxGuidC_Name.getSelectedItem().toString())) {\r
+            if (!DataValidation.isC_NameType(this.iComboBoxGuidC_Name.getSelectedItem().toString())) {\r
                 Log.wrn("Update Hobs", "Incorrect data type for Hob Name");\r
                 return false;\r
             }\r
@@ -495,7 +496,7 @@ public class HobsDlg extends IDialog {
     }\r
 \r
     private HobsIdentification getCurrentHobs() {\r
-        String arg0 = this.jComboBoxGuidC_Name.getSelectedItem().toString();\r
+        String arg0 = this.iComboBoxGuidC_Name.getSelectedItem().toString();\r
         String arg1 = this.jComboBoxHobType.getSelectedItem().toString();\r
         String arg2 = this.jComboBoxUsage.getSelectedItem().toString();\r
 \r