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

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

10 files changed, 191 insertions, 150 deletions

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/ui/IComboBox.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/ui/IComboBox.java
index 68c368e29b..c5a51fd3e6 100644
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/ui/IComboBox.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/ui/IComboBox.java
@@ -192,4 +192,36 @@ public class IComboBox extends JComboBox implements KeyListener, MouseListener,
         this.setEditable(false);

         this.getEditor().setItem("");

     }

+

+    /**

+     Set the input item as selected

+     

+     @param item the item which is needed to be set selected

+     

+     **/

+    public void setSelectedItem(Object item) {

+        boolean isFind = false;

+        //

+        // If the input value is not in the default list, add it to the list

+        //

+        if (item != null) {

+            for (int index = 0; index < this.getItemCount(); index++) {

+                if (this.getItemAt(index).equals(item)) {

+                    isFind = true;

+                    break;

+                }

+            }

+            //

+            // Add this item to IComboBox if not found

+            //

+            if (!isFind && !item.toString().equals("")) {

+                super.addItem(item);

+            }

+        }

+        

+        //

+        // Call super function to set the item selected.

+        //

+        super.setSelectedItem(item);

+    }

 }

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/EventsDlg.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/EventsDlg.java
index 521528aa0d..552a77dd46 100644
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/EventsDlg.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/EventsDlg.java
@@ -31,6 +31,7 @@ import org.tianocore.frameworkwizard.common.EnumerationData;
 import org.tianocore.frameworkwizard.common.Log;

 import org.tianocore.frameworkwizard.common.Tools;

 import org.tianocore.frameworkwizard.common.ui.ArchCheckBox;

+import org.tianocore.frameworkwizard.common.ui.IComboBox;

 import org.tianocore.frameworkwizard.common.ui.IDialog;

 import org.tianocore.frameworkwizard.common.ui.IFrame;

 import org.tianocore.frameworkwizard.common.ui.StarLabel;

@@ -62,7 +63,7 @@ public class EventsDlg extends IDialog {
 

     private JLabel jLabelC_Name = null;

 

-    private JComboBox jComboBoxGuidC_Name = null;

+    private IComboBox iComboBoxGuidC_Name = null;

 

     private JLabel jLabelUsage = null;

 

@@ -136,14 +137,14 @@ public class EventsDlg extends IDialog {
      * @return javax.swing.JTextField jTextFieldC_Name

      * 

      */

-    private JComboBox getJComboBoxGuidC_Name() {

-        if (jComboBoxGuidC_Name == null) {

-            jComboBoxGuidC_Name = new JComboBox();

-            jComboBoxGuidC_Name.setBounds(new java.awt.Rectangle(168, 37, 320, 20));

-            jComboBoxGuidC_Name.setPreferredSize(new java.awt.Dimension(320, 20));

-            jComboBoxGuidC_Name.setToolTipText("Select the GUID C Name of the Event");

+    private IComboBox getIComboBoxGuidC_Name() {

+        if (iComboBoxGuidC_Name == null) {

+            iComboBoxGuidC_Name = new IComboBox();

+            iComboBoxGuidC_Name.setBounds(new java.awt.Rectangle(168, 37, 320, 20));

+            iComboBoxGuidC_Name.setPreferredSize(new java.awt.Dimension(320, 20));

+            iComboBoxGuidC_Name.setToolTipText("Select the GUID C Name of the Event");

         }

-        return jComboBoxGuidC_Name;

+        return iComboBoxGuidC_Name;

     }

 

     /**

@@ -327,11 +328,11 @@ public class EventsDlg extends IDialog {
         // Init guids drop down list

         //

         Tools

-             .generateComboBoxByVector(jComboBoxGuidC_Name,

+             .generateComboBoxByVector(iComboBoxGuidC_Name,

                                        wt.getAllGuidDeclarationsFromPackages(vpid, EnumerationData.GUID_TYPE_EFI_EVENT));

 

         if (this.id != null) {

-            this.jComboBoxGuidC_Name.setSelectedItem(id.getName());

+            this.iComboBoxGuidC_Name.setSelectedItem(id.getName());

             this.jComboBoxEventsType.setSelectedItem(id.getType());

             this.jComboBoxUsage.setSelectedItem(id.getUsage());

             this.jTextAreaHelpText.setText(id.getHelp());

@@ -363,7 +364,7 @@ public class EventsDlg extends IDialog {
      */

     public void setViewMode(boolean isView) {

         if (isView) {

-            this.jComboBoxGuidC_Name.setEnabled(!isView);

+            this.iComboBoxGuidC_Name.setEnabled(!isView);

             this.jComboBoxUsage.setEnabled(!isView);

         }

     }

@@ -425,7 +426,7 @@ public class EventsDlg extends IDialog {
             jContentPane.add(getJComboBoxEventsType(), null);

             jContentPane.add(jStarLabel2, null);

             jContentPane.add(jLabelC_Name, null);

-            jContentPane.add(getJComboBoxGuidC_Name(), null);

+            jContentPane.add(getIComboBoxGuidC_Name(), null);

             jContentPane.add(jStarLabel3, null);

             jContentPane.add(jLabelGroup, null);

             jContentPane.add(getJComboBoxEventGroup(), null);

@@ -493,7 +494,7 @@ public class EventsDlg extends IDialog {
         //

         // Check Name

         //

-        if (this.jComboBoxGuidC_Name.getSelectedItem() == null) {

+        if (this.iComboBoxGuidC_Name.getSelectedItem() == null) {

             Log.wrn("Update Guids", "Please select one Event Name");

             return false;

         }

@@ -501,13 +502,13 @@ public class EventsDlg extends IDialog {
         //

         // Check Name

         //

-        if (isEmpty(this.jComboBoxGuidC_Name.getSelectedItem().toString())) {

+        if (isEmpty(this.iComboBoxGuidC_Name.getSelectedItem().toString())) {

             Log.wrn("Update Events", "Event Name couldn't be empty");

             return false;

         }

 

-        if (!isEmpty(this.jComboBoxGuidC_Name.getSelectedItem().toString())) {

-            if (!DataValidation.isC_NameType(this.jComboBoxGuidC_Name.getSelectedItem().toString())) {

+        if (!isEmpty(this.iComboBoxGuidC_Name.getSelectedItem().toString())) {

+            if (!DataValidation.isC_NameType(this.iComboBoxGuidC_Name.getSelectedItem().toString())) {

                 Log.wrn("Update Events", "Incorrect data type for Event Name");

                 return false;

             }

@@ -527,7 +528,7 @@ public class EventsDlg extends IDialog {
     }

 

     private EventsIdentification getCurrentEvents() {

-        String arg0 = this.jComboBoxGuidC_Name.getSelectedItem().toString();

+        String arg0 = this.iComboBoxGuidC_Name.getSelectedItem().toString();

         String arg1 = this.jComboBoxEventsType.getSelectedItem().toString();

         String arg2 = this.jComboBoxUsage.getSelectedItem().toString();

 

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/GuidsDlg.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/GuidsDlg.java
index d3063beb10..cf22e2c102 100644
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/GuidsDlg.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/GuidsDlg.java
@@ -30,6 +30,7 @@ import org.tianocore.frameworkwizard.common.EnumerationData;
 import org.tianocore.frameworkwizard.common.Log;

 import org.tianocore.frameworkwizard.common.Tools;

 import org.tianocore.frameworkwizard.common.ui.ArchCheckBox;

+import org.tianocore.frameworkwizard.common.ui.IComboBox;

 import org.tianocore.frameworkwizard.common.ui.IDialog;

 import org.tianocore.frameworkwizard.common.ui.IFrame;

 import org.tianocore.frameworkwizard.common.ui.StarLabel;

@@ -58,7 +59,7 @@ public class GuidsDlg extends IDialog {
 

     private JLabel jLabelC_Name = null;

 

-    private JComboBox jComboBoxCName = null;

+    private IComboBox iComboBoxCName = null;

 

     private JLabel jLabelUsage = null;

 

@@ -103,14 +104,14 @@ public class GuidsDlg extends IDialog {
      * @return javax.swing.JTextField jTextFieldC_Name

      * 

      */

-    private JComboBox getJComboBoxCName() {

-        if (jComboBoxCName == null) {

-            jComboBoxCName = new JComboBox();

-            jComboBoxCName.setBounds(new java.awt.Rectangle(168, 12, 320, 20));

-            jComboBoxCName.setPreferredSize(new java.awt.Dimension(320, 20));

-            jComboBoxCName.setToolTipText("Select the C Name of the GUID");

+    private IComboBox getIComboBoxCName() {

+        if (iComboBoxCName == null) {

+            iComboBoxCName = new IComboBox();

+            iComboBoxCName.setBounds(new java.awt.Rectangle(168, 12, 320, 20));

+            iComboBoxCName.setPreferredSize(new java.awt.Dimension(320, 20));

+            iComboBoxCName.setToolTipText("Select the C Name of the GUID");

         }

-        return jComboBoxCName;

+        return iComboBoxCName;

     }

 

     /**

@@ -274,12 +275,13 @@ public class GuidsDlg extends IDialog {
             Log.wrn("Init Guid", "This module hasn't defined any package dependency, so there is no guid can be added");

         }

 

-        Tools.generateComboBoxByVector(this.jComboBoxCName,

+        Tools.generateComboBoxByVector(this.iComboBoxCName,

                                        wt.getAllGuidDeclarationsFromPackages(wt.getPackageDependenciesOfModule(mid),

                                                                              EnumerationData.GUID_TYPE_GUID));

+        

 

         if (this.id != null) {

-            this.jComboBoxCName.setSelectedItem(id.getName());

+            this.iComboBoxCName.setSelectedItem(id.getName());

             this.jComboBoxUsage.setSelectedItem(id.getUsage());

             this.jTextAreaHelpText.setText(id.getHelp());

             this.jTextFieldFeatureFlag.setText(id.getFeatureFlag());

@@ -354,7 +356,7 @@ public class GuidsDlg extends IDialog {
 

             jContentPane.add(jStarLabel1, null);

             jContentPane.add(jLabelC_Name, null);

-            jContentPane.add(getJComboBoxCName(), null);

+            jContentPane.add(getIComboBoxCName(), null);

             jContentPane.add(jStarLabel2, null);

             jContentPane.add(jLabelUsage, null);

             jContentPane.add(getJComboBoxUsage(), null);

@@ -416,13 +418,13 @@ public class GuidsDlg extends IDialog {
         //

         // Check Name

         //

-        if (this.jComboBoxCName.getSelectedItem() == null) {

+        if (this.iComboBoxCName.getSelectedItem() == null) {

             Log.wrn("Update Guids", "Please select one Guid Name");

             return false;

         }

 

-        if (!isEmpty(this.jComboBoxCName.getSelectedItem().toString())) {

-            if (!DataValidation.isC_NameType(this.jComboBoxCName.getSelectedItem().toString())) {

+        if (!isEmpty(this.iComboBoxCName.getSelectedItem().toString())) {

+            if (!DataValidation.isC_NameType(this.iComboBoxCName.getSelectedItem().toString())) {

                 Log.wrn("Update Guids", "Incorrect data type for Guid Name");

                 return false;

             }

@@ -442,7 +444,7 @@ public class GuidsDlg extends IDialog {
     }

 

     private GuidsIdentification getCurrentGuids() {

-        String arg0 = this.jComboBoxCName.getSelectedItem().toString();

+        String arg0 = this.iComboBoxCName.getSelectedItem().toString();

         String arg1 = this.jComboBoxUsage.getSelectedItem().toString();

 

         String arg2 = this.jTextFieldFeatureFlag.getText();

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 3b76c3c3b9..73a1869a7f 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
@@ -31,6 +31,7 @@ import org.tianocore.frameworkwizard.common.EnumerationData;
 import org.tianocore.frameworkwizard.common.Log;

 import org.tianocore.frameworkwizard.common.Tools;

 import org.tianocore.frameworkwizard.common.ui.ArchCheckBox;

+import org.tianocore.frameworkwizard.common.ui.IComboBox;

 import org.tianocore.frameworkwizard.common.ui.IDialog;

 import org.tianocore.frameworkwizard.common.ui.IFrame;

 import org.tianocore.frameworkwizard.common.ui.StarLabel;

@@ -59,7 +60,7 @@ public class HobsDlg extends IDialog {
 

     private JLabel jLabelC_Name = null;

 

-    private JComboBox jComboBoxGuidC_Name = null;

+    private IComboBox iComboBoxGuidC_Name = null;

 

     private JLabel jLabelUsage = null;

 

@@ -110,14 +111,14 @@ public class HobsDlg extends IDialog {
      * @return javax.swing.JTextField jTextFieldC_Name

      * 

      */

-    private JComboBox getJComboBoxGuidC_Name() {

-        if (jComboBoxGuidC_Name == null) {

-            jComboBoxGuidC_Name = new JComboBox();

-            jComboBoxGuidC_Name.setBounds(new java.awt.Rectangle(168, 12, 320, 20));

-            jComboBoxGuidC_Name.setPreferredSize(new java.awt.Dimension(320, 20));

-            jComboBoxGuidC_Name.setToolTipText("Select the GUID C Name of the Hob");

+    private IComboBox getIComboBoxGuidC_Name() {

+        if (iComboBoxGuidC_Name == null) {

+            iComboBoxGuidC_Name = new IComboBox();

+            iComboBoxGuidC_Name.setBounds(new java.awt.Rectangle(168, 12, 320, 20));

+            iComboBoxGuidC_Name.setPreferredSize(new java.awt.Dimension(320, 20));

+            iComboBoxGuidC_Name.setToolTipText("Select the GUID C Name of the Hob");

         }

-        return jComboBoxGuidC_Name;

+        return iComboBoxGuidC_Name;

     }

 

     /**

@@ -307,12 +308,12 @@ public class HobsDlg extends IDialog {
         // Init guids drop down list

         //

         Tools

-             .generateComboBoxByVector(jComboBoxGuidC_Name,

+             .generateComboBoxByVector(iComboBoxGuidC_Name,

                                        wt.getAllGuidDeclarationsFromPackages(vpid, EnumerationData.GUID_TYPE_HOB));

 

 

         if (this.id != null) {

-            this.jComboBoxGuidC_Name.setSelectedItem(id.getName());

+            this.iComboBoxGuidC_Name.setSelectedItem(id.getName());

             this.jComboBoxHobType.setSelectedItem(id.getType());

             this.jComboBoxUsage.setSelectedItem(id.getUsage());

             this.jTextAreaHelpText.setText(id.getHelp());

@@ -342,7 +343,7 @@ public class HobsDlg extends IDialog {
      */

     public void setViewMode(boolean isView) {

         if (isView) {

-            this.jComboBoxGuidC_Name.setEnabled(!isView);

+            this.iComboBoxGuidC_Name.setEnabled(!isView);

             this.jComboBoxUsage.setEnabled(!isView);

             this.jComboBoxHobType.setEnabled(!isView);

         }

@@ -396,7 +397,7 @@ public class HobsDlg extends IDialog {
 

             jContentPane.add(jStarLabel1, null);

             jContentPane.add(jLabelC_Name, null);

-            jContentPane.add(getJComboBoxGuidC_Name(), null);

+            jContentPane.add(getIComboBoxGuidC_Name(), null);

             jContentPane.add(jStarLabel2, null);

             jContentPane.add(jLabelHobType, null);

             jContentPane.add(getJComboBoxHobType(), null);

@@ -462,20 +463,20 @@ public class HobsDlg extends IDialog {
         //

         // Check Name

         //

-        if (this.jComboBoxGuidC_Name.getSelectedItem() == null) {

+        if (this.iComboBoxGuidC_Name.getSelectedItem() == null) {

             Log.wrn("Update Guids", "Please select one Hob Name");

             return false;

         }

         //

         // Check Name

         //

-        if (isEmpty(this.jComboBoxGuidC_Name.getSelectedItem().toString())) {

+        if (isEmpty(this.iComboBoxGuidC_Name.getSelectedItem().toString())) {

             Log.wrn("Update Hobs", "Hob Guid C Name must be entered!");

             return false;

         }

 

-        if (!isEmpty(this.jComboBoxGuidC_Name.getSelectedItem().toString())) {

-            if (!DataValidation.isC_NameType(this.jComboBoxGuidC_Name.getSelectedItem().toString())) {

+        if (!isEmpty(this.iComboBoxGuidC_Name.getSelectedItem().toString())) {

+            if (!DataValidation.isC_NameType(this.iComboBoxGuidC_Name.getSelectedItem().toString())) {

                 Log.wrn("Update Hobs", "Incorrect data type for Hob Name");

                 return false;

             }

@@ -495,7 +496,7 @@ public class HobsDlg extends IDialog {
     }

 

     private HobsIdentification getCurrentHobs() {

-        String arg0 = this.jComboBoxGuidC_Name.getSelectedItem().toString();

+        String arg0 = this.iComboBoxGuidC_Name.getSelectedItem().toString();

         String arg1 = this.jComboBoxHobType.getSelectedItem().toString();

         String arg2 = this.jComboBoxUsage.getSelectedItem().toString();

 

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/LibraryClassDefsDlg.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/LibraryClassDefsDlg.java
index 854c6514d5..5c48303a26 100644
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/LibraryClassDefsDlg.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/LibraryClassDefsDlg.java
@@ -32,6 +32,7 @@ import org.tianocore.frameworkwizard.common.Log;
 import org.tianocore.frameworkwizard.common.Tools;

 import org.tianocore.frameworkwizard.common.find.Find;

 import org.tianocore.frameworkwizard.common.ui.ArchCheckBox;

+import org.tianocore.frameworkwizard.common.ui.IComboBox;

 import org.tianocore.frameworkwizard.common.ui.IDialog;

 import org.tianocore.frameworkwizard.common.ui.IFrame;

 import org.tianocore.frameworkwizard.common.ui.StarLabel;

@@ -60,7 +61,7 @@ public class LibraryClassDefsDlg extends IDialog {
     //

     private JPanel jContentPane = null;

 

-    private JComboBox jComboBoxLibraryClassName = null;

+    private IComboBox iComboBoxLibraryClassName = null;

 

     private JLabel jLabelUsage = null;

 

@@ -121,14 +122,14 @@ public class LibraryClassDefsDlg extends IDialog {
      @return javax.swing.JComboBox jComboBoxSelect

      

      **/

-    private JComboBox getJComboBoxLibraryClassName() {

-        if (jComboBoxLibraryClassName == null) {

-            jComboBoxLibraryClassName = new JComboBox();

-            jComboBoxLibraryClassName.setBounds(new java.awt.Rectangle(168, 12, 320, 20));

-            jComboBoxLibraryClassName.setPreferredSize(new Dimension(320, 20));

-            jComboBoxLibraryClassName.setEnabled(true);

+    private IComboBox getIComboBoxLibraryClassName() {

+        if (iComboBoxLibraryClassName == null) {

+            iComboBoxLibraryClassName = new IComboBox();

+            iComboBoxLibraryClassName.setBounds(new java.awt.Rectangle(168, 12, 320, 20));

+            iComboBoxLibraryClassName.setPreferredSize(new Dimension(320, 20));

+            iComboBoxLibraryClassName.setEnabled(true);

         }

-        return jComboBoxLibraryClassName;

+        return iComboBoxLibraryClassName;

     }

 

     /**

@@ -349,13 +350,13 @@ public class LibraryClassDefsDlg extends IDialog {
 

         Tools

              .generateComboBoxByVector(

-                                       this.jComboBoxLibraryClassName,

+                                       this.iComboBoxLibraryClassName,

                                        wt

                                          .getAllLibraryClassDefinitionsFromPackages(wt

                                                                                       .getPackageDependenciesOfModule(mid)));

 

         if (lcid != null) {

-            this.jComboBoxLibraryClassName.setSelectedItem(lcid.getLibraryClassName());

+            this.iComboBoxLibraryClassName.setSelectedItem(lcid.getLibraryClassName());

             this.jComboBoxUsage.setSelectedItem(lcid.getUsage());

             this.jTextFieldRecommendedInstanceVersion.setText(lcid.getRecommendedInstanceVersion());

             this.jTextFieldRecommendedInstanceGuid.setText(lcid.getRecommendedInstanceGuid());

@@ -375,7 +376,7 @@ public class LibraryClassDefsDlg extends IDialog {
      **/

     public void setViewMode(boolean isView) {

         if (isView) {

-            this.jComboBoxLibraryClassName.setEnabled(!isView);

+            this.iComboBoxLibraryClassName.setEnabled(!isView);

             this.jComboBoxUsage.setEnabled(!isView);

         }

     }

@@ -422,7 +423,7 @@ public class LibraryClassDefsDlg extends IDialog {
             jContentPane.setLayout(null);

             jContentPane.setPreferredSize(new java.awt.Dimension(495, 255));

 

-            jContentPane.add(getJComboBoxLibraryClassName(), null);

+            jContentPane.add(getIComboBoxLibraryClassName(), null);

             jContentPane.add(jLabelUsage, null);

             jContentPane.add(getJComboBoxUsage(), null);

             jContentPane.add(jLabelLibraryClassName, null);

@@ -497,11 +498,11 @@ public class LibraryClassDefsDlg extends IDialog {
         //

         // Check LibraryClass

         //

-        if (this.jComboBoxLibraryClassName.getSelectedItem() == null) {

+        if (this.iComboBoxLibraryClassName.getSelectedItem() == null) {

             Log.wrn("Update Library Class Definitions", "Please select one Library Class");

             return false;

         }

-        if (!DataValidation.isLibraryClass(this.jComboBoxLibraryClassName.getSelectedItem().toString())) {

+        if (!DataValidation.isLibraryClass(this.iComboBoxLibraryClassName.getSelectedItem().toString())) {

             Log.wrn("Update Library Class Definitions", "Incorrect data type for Library Class");

             return false;

         }

@@ -548,7 +549,7 @@ public class LibraryClassDefsDlg extends IDialog {
             boolean isFind = false;

             for (int index = 0; index < v.size(); index++) {

                 LibraryClassIdentification lid = v.getLibraryClass(index);

-                if (lid.getLibraryClassName().equals(this.jComboBoxLibraryClassName.getSelectedItem().toString())) {

+                if (lid.getLibraryClassName().equals(this.iComboBoxLibraryClassName.getSelectedItem().toString())) {

                     if (lid.getUsage().equals(DataType.USAGE_TYPE_ALWAYS_PRODUCED)

                         || lid.getUsage().equals(DataType.USAGE_TYPE_SOMETIMES_PRODUCED)) {

                         isFind = true;

@@ -566,7 +567,7 @@ public class LibraryClassDefsDlg extends IDialog {
     }

 

     private LibraryClassIdentification getCurrentLibraryClass() {

-        String name = this.jComboBoxLibraryClassName.getSelectedItem().toString();

+        String name = this.iComboBoxLibraryClassName.getSelectedItem().toString();

         String usage = this.jComboBoxUsage.getSelectedItem().toString();

         String version = this.jTextFieldRecommendedInstanceVersion.getText();

         String guid = this.jTextFieldRecommendedInstanceGuid.getText();

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PpisDlg.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PpisDlg.java
index 2a24158ef5..c649d13508 100644
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PpisDlg.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PpisDlg.java
@@ -33,6 +33,7 @@ import org.tianocore.frameworkwizard.common.EnumerationData;
 import org.tianocore.frameworkwizard.common.Log;

 import org.tianocore.frameworkwizard.common.Tools;

 import org.tianocore.frameworkwizard.common.ui.ArchCheckBox;

+import org.tianocore.frameworkwizard.common.ui.IComboBox;

 import org.tianocore.frameworkwizard.common.ui.IDialog;

 import org.tianocore.frameworkwizard.common.ui.IFrame;

 import org.tianocore.frameworkwizard.common.ui.StarLabel;

@@ -61,7 +62,7 @@ public class PpisDlg extends IDialog implements ItemListener {
 

     private JLabel jLabelC_Name = null;

 

-    private JComboBox jComboBoxCName = null;

+    private IComboBox iComboBoxCName = null;

 

     private JTextField jTextFieldFeatureFlag = null;

 

@@ -129,14 +130,14 @@ public class PpisDlg extends IDialog implements ItemListener {
      * @return javax.swing.JTextField jTextFieldC_Name

      * 

      */

-    private JComboBox getJComboBoxCName() {

-        if (jComboBoxCName == null) {

-            jComboBoxCName = new JComboBox();

-            jComboBoxCName.setBounds(new java.awt.Rectangle(168, 37, 320, 20));

-            jComboBoxCName.setPreferredSize(new java.awt.Dimension(320, 20));

-            jComboBoxCName.setToolTipText("Select Guid C Name of PPI");

+    private IComboBox getIComboBoxCName() {

+        if (iComboBoxCName == null) {

+            iComboBoxCName = new IComboBox();

+            iComboBoxCName.setBounds(new java.awt.Rectangle(168, 37, 320, 20));

+            iComboBoxCName.setPreferredSize(new java.awt.Dimension(320, 20));

+            iComboBoxCName.setToolTipText("Select Guid C Name of PPI");

         }

-        return jComboBoxCName;

+        return iComboBoxCName;

     }

 

     /**

@@ -288,11 +289,11 @@ public class PpisDlg extends IDialog implements ItemListener {
             Log.wrn("Init Ppi", "This module hasn't defined any package dependency, so there is no ppi can be added");

         }

 

-        Tools.generateComboBoxByVector(this.jComboBoxCName,

+        Tools.generateComboBoxByVector(this.iComboBoxCName,

                                        wt.getAllPpiDeclarationsFromPackages(wt.getPackageDependenciesOfModule(mid)));

 

         if (this.id != null) {

-            this.jComboBoxCName.setSelectedItem(id.getName());

+            this.iComboBoxCName.setSelectedItem(id.getName());

             this.jComboBoxPpiType.setSelectedItem(id.getType());

             this.jComboBoxUsage.setSelectedItem(id.getUsage());

             this.jTextAreaHelpText.setText(id.getHelp());

@@ -364,7 +365,7 @@ public class PpisDlg extends IDialog implements ItemListener {
             jContentPane.add(getJComboBoxPpiType(), null);

             jContentPane.add(jStarLabel2, null);

             jContentPane.add(jLabelC_Name, null);

-            jContentPane.add(getJComboBoxCName(), null);

+            jContentPane.add(getIComboBoxCName(), null);

             jContentPane.add(jStarLabel3, null);

             jContentPane.add(jLabelUsage, null);

             jContentPane.add(getJComboBoxUsage(), null);

@@ -427,13 +428,13 @@ public class PpisDlg extends IDialog implements ItemListener {
         //

         // Check Name

         //

-        if (this.jComboBoxCName.getSelectedItem() == null) {

+        if (this.iComboBoxCName.getSelectedItem() == null) {

             Log.wrn("Update Ppis", "Please select one Ppi/PpiNotify Name");

             return false;

         }

 

-        if (!isEmpty(this.jComboBoxCName.getSelectedItem().toString())) {

-            if (!DataValidation.isC_NameType(this.jComboBoxCName.getSelectedItem().toString())) {

+        if (!isEmpty(this.iComboBoxCName.getSelectedItem().toString())) {

+            if (!DataValidation.isC_NameType(this.iComboBoxCName.getSelectedItem().toString())) {

                 Log.wrn("Update Ppis", "Incorrect data type for Ppi/PpiNotify Name");

                 return false;

             }

@@ -453,7 +454,7 @@ public class PpisDlg extends IDialog implements ItemListener {
     }

 

     private PpisIdentification getCurrentPpis() {

-        String arg0 = this.jComboBoxCName.getSelectedItem().toString();

+        String arg0 = this.iComboBoxCName.getSelectedItem().toString();

         String arg1 = this.jComboBoxPpiType.getSelectedItem().toString();

         String arg2 = this.jComboBoxUsage.getSelectedItem().toString();

 

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/ProtocolsDlg.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/ProtocolsDlg.java
index 354f682661..aa7c453290 100644
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/ProtocolsDlg.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/ProtocolsDlg.java
@@ -34,6 +34,7 @@ import org.tianocore.frameworkwizard.common.EnumerationData;
 import org.tianocore.frameworkwizard.common.Log;

 import org.tianocore.frameworkwizard.common.Tools;

 import org.tianocore.frameworkwizard.common.ui.ArchCheckBox;

+import org.tianocore.frameworkwizard.common.ui.IComboBox;

 import org.tianocore.frameworkwizard.common.ui.IDialog;

 import org.tianocore.frameworkwizard.common.ui.IFrame;

 import org.tianocore.frameworkwizard.common.ui.StarLabel;

@@ -84,7 +85,7 @@ public class ProtocolsDlg extends IDialog implements ItemListener {
 

     private JComboBox jComboBoxProtocolType = null;

 

-    private JComboBox jComboBoxCName = null;

+    private IComboBox iComboBoxCName = null;

 

     private JLabel jLabelHelpText = null;

 

@@ -180,19 +181,19 @@ public class ProtocolsDlg extends IDialog implements ItemListener {
     }

 

     /**

-     * This method initializes jComboBoxCName

+     * This method initializes iComboBoxCName

      * 

      * @return javax.swing.JComboBox

      */

-    private JComboBox getJComboBoxCName() {

-        if (jComboBoxCName == null) {

-            jComboBoxCName = new JComboBox();

-            jComboBoxCName.setBounds(new java.awt.Rectangle(168, 37, 320, 20));

-            jComboBoxCName.setPreferredSize(new java.awt.Dimension(320, 20));

-            jComboBoxCName.setToolTipText("Select Guid C Name of the Protocol");

+    private IComboBox getIComboBoxCName() {

+        if (iComboBoxCName == null) {

+            iComboBoxCName = new IComboBox();

+            iComboBoxCName.setBounds(new java.awt.Rectangle(168, 37, 320, 20));

+            iComboBoxCName.setPreferredSize(new java.awt.Dimension(320, 20));

+            iComboBoxCName.setToolTipText("Select Guid C Name of the Protocol");

 

         }

-        return jComboBoxCName;

+        return iComboBoxCName;

     }

 

     /**

@@ -303,11 +304,11 @@ public class ProtocolsDlg extends IDialog implements ItemListener {
             Log.wrn("Init Protocol", "This module hasn't defined any package dependency, so there is no protocol can be added");

         }

 

-        Tools.generateComboBoxByVector(this.jComboBoxCName,

+        Tools.generateComboBoxByVector(this.iComboBoxCName,

                                        wt.getAllProtocolDeclarationsFromPackages(wt.getPackageDependenciesOfModule(mid)));

 

         if (this.id != null) {

-            this.jComboBoxCName.setSelectedItem(id.getName());

+            this.iComboBoxCName.setSelectedItem(id.getName());

             this.jComboBoxProtocolType.setSelectedItem(id.getType());

             this.jComboBoxUsage.setSelectedItem(id.getUsage());

             this.jTextAreaHelpText.setText(id.getHelp());

@@ -393,7 +394,7 @@ public class ProtocolsDlg extends IDialog implements ItemListener {
             jContentPane.add(getJComboBoxProtocolType(), null);

             jContentPane.add(jStarLabel2, null);

             jContentPane.add(jLabelC_Name, null);

-            jContentPane.add(getJComboBoxCName(), null);

+            jContentPane.add(getIComboBoxCName(), null);

             jContentPane.add(jStarLabel3, null);

             jContentPane.add(jLabelUsage, null);

             jContentPane.add(getJComboBoxProtocolUsage(), null);

@@ -456,13 +457,13 @@ public class ProtocolsDlg extends IDialog implements ItemListener {
         //

         // Check Name

         //

-        if (this.jComboBoxCName.getSelectedItem() == null) {

+        if (this.iComboBoxCName.getSelectedItem() == null) {

             Log.wrn("Update protocols", "Please select one Protocol/ProtocolNotify Name");

             return false;

         }

 

-        if (!isEmpty(this.jComboBoxCName.getSelectedItem().toString())) {

-            if (!DataValidation.isC_NameType(this.jComboBoxCName.getSelectedItem().toString())) {

+        if (!isEmpty(this.iComboBoxCName.getSelectedItem().toString())) {

+            if (!DataValidation.isC_NameType(this.iComboBoxCName.getSelectedItem().toString())) {

                 Log.wrn("Update Protocols", "Incorrect data type for Protocol/ProtocolNotify Name");

                 return false;

             }

@@ -482,7 +483,7 @@ public class ProtocolsDlg extends IDialog implements ItemListener {
     }

 

     private ProtocolsIdentification getCurrentProtocols() {

-        String arg0 = this.jComboBoxCName.getSelectedItem().toString();

+        String arg0 = this.iComboBoxCName.getSelectedItem().toString();

         String arg1 = this.jComboBoxProtocolType.getSelectedItem().toString();

         String arg2 = this.jComboBoxUsage.getSelectedItem().toString();

 

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/SourceFilesDlg.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/SourceFilesDlg.java
index d7df17eeb6..238c000cde 100644
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/SourceFilesDlg.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/SourceFilesDlg.java
@@ -304,30 +304,30 @@ public class SourceFilesDlg extends IDialog {
             this.jTextFieldFileName.setText(inSourceFilesIdentifications.getFilename());

             this.jTextFieldTagName.setText(inSourceFilesIdentifications.getTagName());

 

-            //

-            // Generate Tool Code selection list

-            //

-            Vector<String> v = ed.getVToolCode();

-            boolean isFind = false;

-            String strToolCode = inSourceFilesIdentifications.getToolCode();

-

-            //

-            // If the input value is not in the default list, add it to the list

-            //

-            if (strToolCode != null) {

-                for (int index = 0; index < v.size(); index++) {

-                    if (v.elementAt(index).equals(strToolCode)) {

-                        isFind = true;

-                        break;

-                    }

-                }

-                if (!isFind && !isEmpty(strToolCode)) {

-                    v.addElement(strToolCode);

-                }

-            }

-

-            Tools.generateComboBoxByVector(iComboBoxToolCode, v);

-            this.iComboBoxToolCode.setSelectedItem(strToolCode);

+//            //

+//            // Generate Tool Code selection list

+//            //

+//            Vector<String> v = ed.getVToolCode();

+//            boolean isFind = false;

+//            String strToolCode = inSourceFilesIdentifications.getToolCode();

+//

+//            //

+//            // If the input value is not in the default list, add it to the list

+//            //

+//            if (strToolCode != null) {

+//                for (int index = 0; index < v.size(); index++) {

+//                    if (v.elementAt(index).equals(strToolCode)) {

+//                        isFind = true;

+//                        break;

+//                    }

+//                }

+//                if (!isFind && !isEmpty(strToolCode)) {

+//                    v.addElement(strToolCode);

+//                }

+//            }

+

+            Tools.generateComboBoxByVector(iComboBoxToolCode, ed.getVToolCode());

+            this.iComboBoxToolCode.setSelectedItem(inSourceFilesIdentifications.getToolCode());

 

             this.jTextFieldToolChainFamily.setText(inSourceFilesIdentifications.getToolChainFamily());

             jTextFieldFeatureFlag.setText(inSourceFilesIdentifications.getFeatureFlag());

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/SystemTablesDlg.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/SystemTablesDlg.java
index 9b5cc6ed08..83d29cec2c 100644
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/SystemTablesDlg.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/SystemTablesDlg.java
@@ -32,6 +32,7 @@ import org.tianocore.frameworkwizard.common.EnumerationData;
 import org.tianocore.frameworkwizard.common.Log;

 import org.tianocore.frameworkwizard.common.Tools;

 import org.tianocore.frameworkwizard.common.ui.ArchCheckBox;

+import org.tianocore.frameworkwizard.common.ui.IComboBox;

 import org.tianocore.frameworkwizard.common.ui.IDialog;

 import org.tianocore.frameworkwizard.common.ui.IFrame;

 import org.tianocore.frameworkwizard.common.ui.StarLabel;

@@ -68,7 +69,7 @@ public class SystemTablesDlg extends IDialog {
 

     private StarLabel jStarLabel2 = null;

 

-    private JComboBox jComboBoxGuidC_Name = null;

+    private IComboBox iComboBoxGuidC_Name = null;

 

     private JLabel jLabelFeatureFlag = null;

 

@@ -100,19 +101,19 @@ public class SystemTablesDlg extends IDialog {
     private WorkspaceTools wt = new WorkspaceTools();

 

     /**

-     * This method initializes jComboBoxGuidC_Name

+     * This method initializes iComboBoxGuidC_Name

      * 

-     * @return javax.swing.JComboBox jComboBoxGuidC_Name

+     * @return javax.swing.JComboBox iComboBoxGuidC_Name

      * 

      */

-    private JComboBox getJComboBoxGuidC_Name() {

-        if (jComboBoxGuidC_Name == null) {

-            jComboBoxGuidC_Name = new JComboBox();

-            jComboBoxGuidC_Name.setBounds(new java.awt.Rectangle(168, 12, 320, 20));

-            jComboBoxGuidC_Name.setPreferredSize(new java.awt.Dimension(320, 20));

-            jComboBoxGuidC_Name.setToolTipText("Select the GUID C Name of the System Table");

+    private IComboBox getIComboBoxGuidC_Name() {

+        if (iComboBoxGuidC_Name == null) {

+            iComboBoxGuidC_Name = new IComboBox();

+            iComboBoxGuidC_Name.setBounds(new java.awt.Rectangle(168, 12, 320, 20));

+            iComboBoxGuidC_Name.setPreferredSize(new java.awt.Dimension(320, 20));

+            iComboBoxGuidC_Name.setToolTipText("Select the GUID C Name of the System Table");

         }

-        return jComboBoxGuidC_Name;

+        return iComboBoxGuidC_Name;

     }

 

     /**

@@ -276,12 +277,12 @@ public class SystemTablesDlg extends IDialog {
         // Init guids drop down list

         //

         Tools

-             .generateComboBoxByVector(jComboBoxGuidC_Name,

+             .generateComboBoxByVector(iComboBoxGuidC_Name,

                                        wt.getAllGuidDeclarationsFromPackages(vpid, EnumerationData.GUID_TYPE_EFI_SYSTEM_CONFIGURATION_TABLE));

 

 

         if (this.id != null) {

-            this.jComboBoxGuidC_Name.setSelectedItem(id.getName());

+            this.iComboBoxGuidC_Name.setSelectedItem(id.getName());

             this.jComboBoxUsage.setSelectedItem(id.getUsage());

             this.jTextAreaHelpText.setText(id.getHelp());

             this.jTextFieldFeatureFlag.setText(id.getFeatureFlag());

@@ -354,7 +355,7 @@ public class SystemTablesDlg extends IDialog {
             jContentPane.add(jLabelEntry, null);

             jContentPane.add(jLabelFeatureFlag, null);

             jContentPane.add(getJTextFieldFeatureFlag(), null);

-            jContentPane.add(getJComboBoxGuidC_Name(), null);

+            jContentPane.add(getIComboBoxGuidC_Name(), null);

             jContentPane.add(jLabelArch, null);

             jContentPane.add(jLabelUsage, null);

             jContentPane.add(getJComboBoxUsage(), null);

@@ -417,7 +418,7 @@ public class SystemTablesDlg extends IDialog {
         //

         // Check Name

         //

-        if (this.jComboBoxGuidC_Name.getSelectedItem() == null) {

+        if (this.iComboBoxGuidC_Name.getSelectedItem() == null) {

             Log.wrn("Update Guids", "Please select one System Table Name");

             return false;

         }

@@ -436,7 +437,7 @@ public class SystemTablesDlg extends IDialog {
     }

 

     private SystemTablesIdentification getCurrentSystemTables() {

-        String arg0 = this.jComboBoxGuidC_Name.getSelectedItem().toString();

+        String arg0 = this.iComboBoxGuidC_Name.getSelectedItem().toString();

         String arg1 = this.jComboBoxUsage.getSelectedItem().toString();

 

         String arg2 = this.jTextFieldFeatureFlag.getText();

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/VariablesDlg.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/VariablesDlg.java
index 65c8d61087..b906e9adff 100644
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/VariablesDlg.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/VariablesDlg.java
@@ -32,6 +32,7 @@ import org.tianocore.frameworkwizard.common.EnumerationData;
 import org.tianocore.frameworkwizard.common.Log;

 import org.tianocore.frameworkwizard.common.Tools;

 import org.tianocore.frameworkwizard.common.ui.ArchCheckBox;

+import org.tianocore.frameworkwizard.common.ui.IComboBox;

 import org.tianocore.frameworkwizard.common.ui.IDialog;

 import org.tianocore.frameworkwizard.common.ui.IFrame;

 import org.tianocore.frameworkwizard.common.ui.StarLabel;

@@ -76,7 +77,7 @@ public class VariablesDlg extends IDialog {
 

     private JLabel jLabelGuidCName = null;

 

-    private JComboBox jComboBoxGuidC_Name = null;

+    private IComboBox iComboBoxGuidC_Name = null;

 

     private JTextField jTextFieldFeatureFlag = null;

 

@@ -203,19 +204,19 @@ public class VariablesDlg extends IDialog {
     }

 

     /**

-     * This method initializes jComboBoxGuidC_Name

+     * This method initializes iComboBoxGuidC_Name

      * 

-     * @return javax.swing.JComboBox jComboBoxGuidC_Name

+     * @return javax.swing.JComboBox iComboBoxGuidC_Name

      * 

      */

-    private JComboBox getJComboBoxGuidC_Name() {

-        if (jComboBoxGuidC_Name == null) {

-            jComboBoxGuidC_Name = new JComboBox();

-            jComboBoxGuidC_Name.setBounds(new java.awt.Rectangle(168, 37, 320, 20));

-            jComboBoxGuidC_Name.setPreferredSize(new java.awt.Dimension(320, 20));

-            jComboBoxGuidC_Name.setToolTipText("Select the GUID C Name of the Variable.");

+    private IComboBox getIComboBoxGuidC_Name() {

+        if (iComboBoxGuidC_Name == null) {

+            iComboBoxGuidC_Name = new IComboBox();

+            iComboBoxGuidC_Name.setBounds(new java.awt.Rectangle(168, 37, 320, 20));

+            iComboBoxGuidC_Name.setPreferredSize(new java.awt.Dimension(320, 20));

+            iComboBoxGuidC_Name.setToolTipText("Select the GUID C Name of the Variable.");

         }

-        return jComboBoxGuidC_Name;

+        return iComboBoxGuidC_Name;

     }

 

     /**

@@ -296,12 +297,12 @@ public class VariablesDlg extends IDialog {
         // Init guids drop down list

         //

         Tools

-             .generateComboBoxByVector(jComboBoxGuidC_Name,

+             .generateComboBoxByVector(iComboBoxGuidC_Name,

                                        wt.getAllGuidDeclarationsFromPackages(vpid, EnumerationData.GUID_TYPE_EFI_VARIABLE));

 

         if (this.id != null) {

             this.jTextFieldVariableName.setText(id.getName());

-            this.jComboBoxGuidC_Name.setSelectedItem(id.getGuid());

+            this.iComboBoxGuidC_Name.setSelectedItem(id.getGuid());

             this.jComboBoxUsage.setSelectedItem(id.getUsage());

             this.jTextAreaHelpText.setText(id.getHelp());

             this.jTextFieldFeatureFlag.setText(id.getFeatureFlag());

@@ -386,7 +387,7 @@ public class VariablesDlg extends IDialog {
             jContentPane.add(getJTextFieldString(), null);

             jContentPane.add(jStarLabel2, null);

             jContentPane.add(jLabelGuidCName, null);

-            jContentPane.add(getJComboBoxGuidC_Name(), null);

+            jContentPane.add(getIComboBoxGuidC_Name(), null);

             jContentPane.add(jStarLabel3, null);

             jContentPane.add(jLabelUsage, null);

             jContentPane.add(getJComboBoxUsage(), null);

@@ -456,7 +457,7 @@ public class VariablesDlg extends IDialog {
         //

         // Check Guid Value

         //

-        if (this.jComboBoxGuidC_Name.getSelectedItem() == null) {

+        if (this.iComboBoxGuidC_Name.getSelectedItem() == null) {

             Log.wrn("Update Guids", "Please select one Varibale Guid value");

             return false;

         }

@@ -476,7 +477,7 @@ public class VariablesDlg extends IDialog {
 

     private VariablesIdentification getCurrentVariables() {

         String arg0 = this.jTextFieldVariableName.getText();

-        String arg1 = this.jComboBoxGuidC_Name.getSelectedItem().toString();

+        String arg1 = this.iComboBoxGuidC_Name.getSelectedItem().toString();

         String arg2 = this.jComboBoxUsage.getSelectedItem().toString();

 

         String arg3 = this.jTextFieldFeatureFlag.getText();