1 files changed, 9 insertions, 15 deletions
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 73a1869a7f..caf1649984 100644
--- 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
              .generateComboBoxByVector(iComboBoxGuidC_Name,
                                        wt.getAllGuidDeclarationsFromPackages(vpid, EnumerationData.GUID_TYPE_HOB));
+        this.iComboBoxGuidC_Name.insertItemAt(DataType.EMPTY_SELECT_ITEM, 0);
+        this.iComboBoxGuidC_Name.setSelectedIndex(0);
 
 
         if (this.id != null) {
-            this.iComboBoxGuidC_Name.setSelectedItem(id.getName());
+            String tmpName = id.getName();
+            if (isEmpty(tmpName)) {
+                tmpName = DataType.EMPTY_SELECT_ITEM;
+            }
+            this.iComboBoxGuidC_Name.setSelectedItem(tmpName);    
             this.jComboBoxHobType.setSelectedItem(id.getType());
             this.jComboBoxUsage.setSelectedItem(id.getUsage());
             this.jTextAreaHelpText.setText(id.getHelp());
@@ -395,7 +401,6 @@ public class HobsDlg extends IDialog {
             jContentPane.setLayout(null);
             jContentPane.setPreferredSize(new java.awt.Dimension(485, 215));
 
-            jContentPane.add(jStarLabel1, null);
             jContentPane.add(jLabelC_Name, null);
             jContentPane.add(getIComboBoxGuidC_Name(), null);
             jContentPane.add(jStarLabel2, null);
@@ -463,19 +468,8 @@ public class HobsDlg extends IDialog {
         //
         // Check Name
         //
-        if (this.iComboBoxGuidC_Name.getSelectedItem() == null) {
-            Log.wrn("Update Guids", "Please select one Hob Name");
-            return false;
-        }
-        //
-        // Check Name
-        //
-        if (isEmpty(this.iComboBoxGuidC_Name.getSelectedItem().toString())) {
-            Log.wrn("Update Hobs", "Hob Guid C Name must be entered!");
-            return false;
-        }
-
-        if (!isEmpty(this.iComboBoxGuidC_Name.getSelectedItem().toString())) {
+        String tmpName = this.iComboBoxGuidC_Name.getSelectedItem().toString();
+        if (!tmpName.equals(DataType.EMPTY_SELECT_ITEM) && isEmpty(tmpName)) {
             if (!DataValidation.isC_NameType(this.iComboBoxGuidC_Name.getSelectedItem().toString())) {
                 Log.wrn("Update Hobs", "Incorrect data type for Hob Name");
                 return false;