1. Fix EDKT528: Framework wizard should not force user to specify a GuidCName for...

[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 73a1869a7f15e85c4b4c692ce6594310bddc48b7..caf1649984271f3eca291d270e89dd8b0fe41183 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
@@ -310,10 +310,16 @@ public class HobsDlg extends IDialog {
         Tools\r
              .generateComboBoxByVector(iComboBoxGuidC_Name,\r
                                        wt.getAllGuidDeclarationsFromPackages(vpid, EnumerationData.GUID_TYPE_HOB));\r
+        this.iComboBoxGuidC_Name.insertItemAt(DataType.EMPTY_SELECT_ITEM, 0);\r
+        this.iComboBoxGuidC_Name.setSelectedIndex(0);\r
 \r
 \r
         if (this.id != null) {\r
-            this.iComboBoxGuidC_Name.setSelectedItem(id.getName());\r
+            String tmpName = id.getName();\r
+            if (isEmpty(tmpName)) {\r
+                tmpName = DataType.EMPTY_SELECT_ITEM;\r
+            }\r
+            this.iComboBoxGuidC_Name.setSelectedItem(tmpName);    \r
             this.jComboBoxHobType.setSelectedItem(id.getType());\r
             this.jComboBoxUsage.setSelectedItem(id.getUsage());\r
             this.jTextAreaHelpText.setText(id.getHelp());\r
@@ -395,7 +401,6 @@ public class HobsDlg extends IDialog {
             jContentPane.setLayout(null);\r
             jContentPane.setPreferredSize(new java.awt.Dimension(485, 215));\r
 \r
-            jContentPane.add(jStarLabel1, null);\r
             jContentPane.add(jLabelC_Name, null);\r
             jContentPane.add(getIComboBoxGuidC_Name(), null);\r
             jContentPane.add(jStarLabel2, null);\r
@@ -463,19 +468,8 @@ public class HobsDlg extends IDialog {
         //\r
         // Check Name\r
         //\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.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.iComboBoxGuidC_Name.getSelectedItem().toString())) {\r
+        String tmpName = this.iComboBoxGuidC_Name.getSelectedItem().toString();\r
+        if (!tmpName.equals(DataType.EMPTY_SELECT_ITEM) && isEmpty(tmpName)) {\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