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

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

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 68c368e29b16b57ad790742ae8d7a135741a42bd..c5a51fd3e6c35d91c2d7838c59c3a0f906acaa1d 100644 (file)
--- 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);\r
         this.getEditor().setItem("");\r
     }\r
+\r
+    /**\r
+     Set the input item as selected\r
+     \r
+     @param item the item which is needed to be set selected\r
+     \r
+     **/\r
+    public void setSelectedItem(Object item) {\r
+        boolean isFind = false;\r
+        //\r
+        // If the input value is not in the default list, add it to the list\r
+        //\r
+        if (item != null) {\r
+            for (int index = 0; index < this.getItemCount(); index++) {\r
+                if (this.getItemAt(index).equals(item)) {\r
+                    isFind = true;\r
+                    break;\r
+                }\r
+            }\r
+            //\r
+            // Add this item to IComboBox if not found\r
+            //\r
+            if (!isFind && !item.toString().equals("")) {\r
+                super.addItem(item);\r
+            }\r
+        }\r
+        \r
+        //\r
+        // Call super function to set the item selected.\r
+        //\r
+        super.setSelectedItem(item);\r
+    }\r
 }\r

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 521528aa0d0d0c7d7ecb05dd3e4a414ca7a0c505..552a77dd463232aaf81f1ed7fe3b3e147023ff0b 100644 (file)
--- 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;\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
@@ -62,7 +63,7 @@ public class EventsDlg 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
@@ -136,14 +137,14 @@ public class EventsDlg 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, 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
+    private IComboBox getIComboBoxGuidC_Name() {\r
+        if (iComboBoxGuidC_Name == null) {\r
+            iComboBoxGuidC_Name = new IComboBox();\r
+            iComboBoxGuidC_Name.setBounds(new java.awt.Rectangle(168, 37, 320, 20));\r
+            iComboBoxGuidC_Name.setPreferredSize(new java.awt.Dimension(320, 20));\r
+            iComboBoxGuidC_Name.setToolTipText("Select the GUID C Name of the Event");\r
         }\r
-        return jComboBoxGuidC_Name;\r
+        return iComboBoxGuidC_Name;\r
     }\r
 \r
     /**\r
@@ -327,11 +328,11 @@ public class EventsDlg 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_EFI_EVENT));\r
 \r
         if (this.id != null) {\r
-            this.jComboBoxGuidC_Name.setSelectedItem(id.getName());\r
+            this.iComboBoxGuidC_Name.setSelectedItem(id.getName());\r
             this.jComboBoxEventsType.setSelectedItem(id.getType());\r
             this.jComboBoxUsage.setSelectedItem(id.getUsage());\r
             this.jTextAreaHelpText.setText(id.getHelp());\r
@@ -363,7 +364,7 @@ public class EventsDlg 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
         }\r
     }\r
@@ -425,7 +426,7 @@ public class EventsDlg extends IDialog {
             jContentPane.add(getJComboBoxEventsType(), null);\r
             jContentPane.add(jStarLabel2, null);\r
             jContentPane.add(jLabelC_Name, null);\r
-            jContentPane.add(getJComboBoxGuidC_Name(), null);\r
+            jContentPane.add(getIComboBoxGuidC_Name(), null);\r
             jContentPane.add(jStarLabel3, null);\r
             jContentPane.add(jLabelGroup, null);\r
             jContentPane.add(getJComboBoxEventGroup(), null);\r
@@ -493,7 +494,7 @@ public class EventsDlg 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 Event Name");\r
             return false;\r
         }\r
@@ -501,13 +502,13 @@ public class EventsDlg extends IDialog {
         //\r
         // Check Name\r
         //\r
-        if (isEmpty(this.jComboBoxGuidC_Name.getSelectedItem().toString())) {\r
+        if (isEmpty(this.iComboBoxGuidC_Name.getSelectedItem().toString())) {\r
             Log.wrn("Update Events", "Event Name couldn't be empty");\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 Events", "Incorrect data type for Event Name");\r
                 return false;\r
             }\r
@@ -527,7 +528,7 @@ public class EventsDlg extends IDialog {
     }\r
 \r
     private EventsIdentification getCurrentEvents() {\r
-        String arg0 = this.jComboBoxGuidC_Name.getSelectedItem().toString();\r
+        String arg0 = this.iComboBoxGuidC_Name.getSelectedItem().toString();\r
         String arg1 = this.jComboBoxEventsType.getSelectedItem().toString();\r
         String arg2 = this.jComboBoxUsage.getSelectedItem().toString();\r
 \r

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 d3063beb1085a4becf1c96e364d54488e6e27296..cf22e2c10211cd83a11ec3d95661f30d741cd648 100644 (file)
--- 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;\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
@@ -58,7 +59,7 @@ public class GuidsDlg extends IDialog {
 \r
     private JLabel jLabelC_Name = null;\r
 \r
-    private JComboBox jComboBoxCName = null;\r
+    private IComboBox iComboBoxCName = null;\r
 \r
     private JLabel jLabelUsage = null;\r
 \r
@@ -103,14 +104,14 @@ public class GuidsDlg extends IDialog {
      * @return javax.swing.JTextField jTextFieldC_Name\r
      * \r
      */\r
-    private JComboBox getJComboBoxCName() {\r
-        if (jComboBoxCName == null) {\r
-            jComboBoxCName = new JComboBox();\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
+    private IComboBox getIComboBoxCName() {\r
+        if (iComboBoxCName == null) {\r
+            iComboBoxCName = new IComboBox();\r
+            iComboBoxCName.setBounds(new java.awt.Rectangle(168, 12, 320, 20));\r
+            iComboBoxCName.setPreferredSize(new java.awt.Dimension(320, 20));\r
+            iComboBoxCName.setToolTipText("Select the C Name of the GUID");\r
         }\r
-        return jComboBoxCName;\r
+        return iComboBoxCName;\r
     }\r
 \r
     /**\r
@@ -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");\r
         }\r
 \r
-        Tools.generateComboBoxByVector(this.jComboBoxCName,\r
+        Tools.generateComboBoxByVector(this.iComboBoxCName,\r
                                        wt.getAllGuidDeclarationsFromPackages(wt.getPackageDependenciesOfModule(mid),\r
                                                                              EnumerationData.GUID_TYPE_GUID));\r
+        \r
 \r
         if (this.id != null) {\r
-            this.jComboBoxCName.setSelectedItem(id.getName());\r
+            this.iComboBoxCName.setSelectedItem(id.getName());\r
             this.jComboBoxUsage.setSelectedItem(id.getUsage());\r
             this.jTextAreaHelpText.setText(id.getHelp());\r
             this.jTextFieldFeatureFlag.setText(id.getFeatureFlag());\r
@@ -354,7 +356,7 @@ public class GuidsDlg extends IDialog {
 \r
             jContentPane.add(jStarLabel1, null);\r
             jContentPane.add(jLabelC_Name, null);\r
-            jContentPane.add(getJComboBoxCName(), null);\r
+            jContentPane.add(getIComboBoxCName(), null);\r
             jContentPane.add(jStarLabel2, null);\r
             jContentPane.add(jLabelUsage, null);\r
             jContentPane.add(getJComboBoxUsage(), null);\r
@@ -416,13 +418,13 @@ public class GuidsDlg extends IDialog {
         //\r
         // Check Name\r
         //\r
-        if (this.jComboBoxCName.getSelectedItem() == null) {\r
+        if (this.iComboBoxCName.getSelectedItem() == null) {\r
             Log.wrn("Update Guids", "Please select one Guid Name");\r
             return false;\r
         }\r
 \r
-        if (!isEmpty(this.jComboBoxCName.getSelectedItem().toString())) {\r
-            if (!DataValidation.isC_NameType(this.jComboBoxCName.getSelectedItem().toString())) {\r
+        if (!isEmpty(this.iComboBoxCName.getSelectedItem().toString())) {\r
+            if (!DataValidation.isC_NameType(this.iComboBoxCName.getSelectedItem().toString())) {\r
                 Log.wrn("Update Guids", "Incorrect data type for Guid Name");\r
                 return false;\r
             }\r
@@ -442,7 +444,7 @@ public class GuidsDlg extends IDialog {
     }\r
 \r
     private GuidsIdentification getCurrentGuids() {\r
-        String arg0 = this.jComboBoxCName.getSelectedItem().toString();\r
+        String arg0 = this.iComboBoxCName.getSelectedItem().toString();\r
         String arg1 = this.jComboBoxUsage.getSelectedItem().toString();\r
 \r
         String arg2 = this.jTextFieldFeatureFlag.getText();\r

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

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 854c6514d5964e11928732376a46610890db5ba5..5c48303a26c079089596427645a4d0332bb00266 100644 (file)
--- 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;\r
 import org.tianocore.frameworkwizard.common.find.Find;\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
@@ -60,7 +61,7 @@ public class LibraryClassDefsDlg extends IDialog {
     //\r
     private JPanel jContentPane = null;\r
 \r
-    private JComboBox jComboBoxLibraryClassName = null;\r
+    private IComboBox iComboBoxLibraryClassName = null;\r
 \r
     private JLabel jLabelUsage = null;\r
 \r
@@ -121,14 +122,14 @@ public class LibraryClassDefsDlg extends IDialog {
      @return javax.swing.JComboBox jComboBoxSelect\r
      \r
      **/\r
-    private JComboBox getJComboBoxLibraryClassName() {\r
-        if (jComboBoxLibraryClassName == null) {\r
-            jComboBoxLibraryClassName = new JComboBox();\r
-            jComboBoxLibraryClassName.setBounds(new java.awt.Rectangle(168, 12, 320, 20));\r
-            jComboBoxLibraryClassName.setPreferredSize(new Dimension(320, 20));\r
-            jComboBoxLibraryClassName.setEnabled(true);\r
+    private IComboBox getIComboBoxLibraryClassName() {\r
+        if (iComboBoxLibraryClassName == null) {\r
+            iComboBoxLibraryClassName = new IComboBox();\r
+            iComboBoxLibraryClassName.setBounds(new java.awt.Rectangle(168, 12, 320, 20));\r
+            iComboBoxLibraryClassName.setPreferredSize(new Dimension(320, 20));\r
+            iComboBoxLibraryClassName.setEnabled(true);\r
         }\r
-        return jComboBoxLibraryClassName;\r
+        return iComboBoxLibraryClassName;\r
     }\r
 \r
     /**\r
@@ -349,13 +350,13 @@ public class LibraryClassDefsDlg extends IDialog {
 \r
         Tools\r
              .generateComboBoxByVector(\r
-                                       this.jComboBoxLibraryClassName,\r
+                                       this.iComboBoxLibraryClassName,\r
                                        wt\r
                                          .getAllLibraryClassDefinitionsFromPackages(wt\r
                                                                                       .getPackageDependenciesOfModule(mid)));\r
 \r
         if (lcid != null) {\r
-            this.jComboBoxLibraryClassName.setSelectedItem(lcid.getLibraryClassName());\r
+            this.iComboBoxLibraryClassName.setSelectedItem(lcid.getLibraryClassName());\r
             this.jComboBoxUsage.setSelectedItem(lcid.getUsage());\r
             this.jTextFieldRecommendedInstanceVersion.setText(lcid.getRecommendedInstanceVersion());\r
             this.jTextFieldRecommendedInstanceGuid.setText(lcid.getRecommendedInstanceGuid());\r
@@ -375,7 +376,7 @@ public class LibraryClassDefsDlg extends IDialog {
      **/\r
     public void setViewMode(boolean isView) {\r
         if (isView) {\r
-            this.jComboBoxLibraryClassName.setEnabled(!isView);\r
+            this.iComboBoxLibraryClassName.setEnabled(!isView);\r
             this.jComboBoxUsage.setEnabled(!isView);\r
         }\r
     }\r
@@ -422,7 +423,7 @@ public class LibraryClassDefsDlg extends IDialog {
             jContentPane.setLayout(null);\r
             jContentPane.setPreferredSize(new java.awt.Dimension(495, 255));\r
 \r
-            jContentPane.add(getJComboBoxLibraryClassName(), null);\r
+            jContentPane.add(getIComboBoxLibraryClassName(), null);\r
             jContentPane.add(jLabelUsage, null);\r
             jContentPane.add(getJComboBoxUsage(), null);\r
             jContentPane.add(jLabelLibraryClassName, null);\r
@@ -497,11 +498,11 @@ public class LibraryClassDefsDlg extends IDialog {
         //\r
         // Check LibraryClass\r
         //\r
-        if (this.jComboBoxLibraryClassName.getSelectedItem() == null) {\r
+        if (this.iComboBoxLibraryClassName.getSelectedItem() == null) {\r
             Log.wrn("Update Library Class Definitions", "Please select one Library Class");\r
             return false;\r
         }\r
-        if (!DataValidation.isLibraryClass(this.jComboBoxLibraryClassName.getSelectedItem().toString())) {\r
+        if (!DataValidation.isLibraryClass(this.iComboBoxLibraryClassName.getSelectedItem().toString())) {\r
             Log.wrn("Update Library Class Definitions", "Incorrect data type for Library Class");\r
             return false;\r
         }\r
@@ -548,7 +549,7 @@ public class LibraryClassDefsDlg extends IDialog {
             boolean isFind = false;\r
             for (int index = 0; index < v.size(); index++) {\r
                 LibraryClassIdentification lid = v.getLibraryClass(index);\r
-                if (lid.getLibraryClassName().equals(this.jComboBoxLibraryClassName.getSelectedItem().toString())) {\r
+                if (lid.getLibraryClassName().equals(this.iComboBoxLibraryClassName.getSelectedItem().toString())) {\r
                     if (lid.getUsage().equals(DataType.USAGE_TYPE_ALWAYS_PRODUCED)\r
                         || lid.getUsage().equals(DataType.USAGE_TYPE_SOMETIMES_PRODUCED)) {\r
                         isFind = true;\r
@@ -566,7 +567,7 @@ public class LibraryClassDefsDlg extends IDialog {
     }\r
 \r
     private LibraryClassIdentification getCurrentLibraryClass() {\r
-        String name = this.jComboBoxLibraryClassName.getSelectedItem().toString();\r
+        String name = this.iComboBoxLibraryClassName.getSelectedItem().toString();\r
         String usage = this.jComboBoxUsage.getSelectedItem().toString();\r
         String version = this.jTextFieldRecommendedInstanceVersion.getText();\r
         String guid = this.jTextFieldRecommendedInstanceGuid.getText();\r

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 2a24158ef53e74db4db2cde500739291fbc09384..c649d135088f29c453e0d4931673daa0a7a0d926 100644 (file)
--- 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;\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
@@ -61,7 +62,7 @@ public class PpisDlg extends IDialog implements ItemListener {
 \r
     private JLabel jLabelC_Name = null;\r
 \r
-    private JComboBox jComboBoxCName = null;\r
+    private IComboBox iComboBoxCName = null;\r
 \r
     private JTextField jTextFieldFeatureFlag = null;\r
 \r
@@ -129,14 +130,14 @@ public class PpisDlg extends IDialog implements ItemListener {
      * @return javax.swing.JTextField jTextFieldC_Name\r
      * \r
      */\r
-    private JComboBox getJComboBoxCName() {\r
-        if (jComboBoxCName == null) {\r
-            jComboBoxCName = new JComboBox();\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
+    private IComboBox getIComboBoxCName() {\r
+        if (iComboBoxCName == null) {\r
+            iComboBoxCName = new IComboBox();\r
+            iComboBoxCName.setBounds(new java.awt.Rectangle(168, 37, 320, 20));\r
+            iComboBoxCName.setPreferredSize(new java.awt.Dimension(320, 20));\r
+            iComboBoxCName.setToolTipText("Select Guid C Name of PPI");\r
         }\r
-        return jComboBoxCName;\r
+        return iComboBoxCName;\r
     }\r
 \r
     /**\r
@@ -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");\r
         }\r
 \r
-        Tools.generateComboBoxByVector(this.jComboBoxCName,\r
+        Tools.generateComboBoxByVector(this.iComboBoxCName,\r
                                        wt.getAllPpiDeclarationsFromPackages(wt.getPackageDependenciesOfModule(mid)));\r
 \r
         if (this.id != null) {\r
-            this.jComboBoxCName.setSelectedItem(id.getName());\r
+            this.iComboBoxCName.setSelectedItem(id.getName());\r
             this.jComboBoxPpiType.setSelectedItem(id.getType());\r
             this.jComboBoxUsage.setSelectedItem(id.getUsage());\r
             this.jTextAreaHelpText.setText(id.getHelp());\r
@@ -364,7 +365,7 @@ public class PpisDlg extends IDialog implements ItemListener {
             jContentPane.add(getJComboBoxPpiType(), null);\r
             jContentPane.add(jStarLabel2, null);\r
             jContentPane.add(jLabelC_Name, null);\r
-            jContentPane.add(getJComboBoxCName(), null);\r
+            jContentPane.add(getIComboBoxCName(), null);\r
             jContentPane.add(jStarLabel3, null);\r
             jContentPane.add(jLabelUsage, null);\r
             jContentPane.add(getJComboBoxUsage(), null);\r
@@ -427,13 +428,13 @@ public class PpisDlg extends IDialog implements ItemListener {
         //\r
         // Check Name\r
         //\r
-        if (this.jComboBoxCName.getSelectedItem() == null) {\r
+        if (this.iComboBoxCName.getSelectedItem() == null) {\r
             Log.wrn("Update Ppis", "Please select one Ppi/PpiNotify Name");\r
             return false;\r
         }\r
 \r
-        if (!isEmpty(this.jComboBoxCName.getSelectedItem().toString())) {\r
-            if (!DataValidation.isC_NameType(this.jComboBoxCName.getSelectedItem().toString())) {\r
+        if (!isEmpty(this.iComboBoxCName.getSelectedItem().toString())) {\r
+            if (!DataValidation.isC_NameType(this.iComboBoxCName.getSelectedItem().toString())) {\r
                 Log.wrn("Update Ppis", "Incorrect data type for Ppi/PpiNotify Name");\r
                 return false;\r
             }\r
@@ -453,7 +454,7 @@ public class PpisDlg extends IDialog implements ItemListener {
     }\r
 \r
     private PpisIdentification getCurrentPpis() {\r
-        String arg0 = this.jComboBoxCName.getSelectedItem().toString();\r
+        String arg0 = this.iComboBoxCName.getSelectedItem().toString();\r
         String arg1 = this.jComboBoxPpiType.getSelectedItem().toString();\r
         String arg2 = this.jComboBoxUsage.getSelectedItem().toString();\r
 \r

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 354f6826612ddfa10980ecbdfa97d64a0a006952..aa7c453290596adfb09901e2ced20136d5913af8 100644 (file)
--- 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;\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
@@ -84,7 +85,7 @@ public class ProtocolsDlg extends IDialog implements ItemListener {
 \r
     private JComboBox jComboBoxProtocolType = null;\r
 \r
-    private JComboBox jComboBoxCName = null;\r
+    private IComboBox iComboBoxCName = null;\r
 \r
     private JLabel jLabelHelpText = null;\r
 \r
@@ -180,19 +181,19 @@ public class ProtocolsDlg extends IDialog implements ItemListener {
     }\r
 \r
     /**\r
-     * This method initializes jComboBoxCName\r
+     * This method initializes iComboBoxCName\r
      * \r
      * @return javax.swing.JComboBox\r
      */\r
-    private JComboBox getJComboBoxCName() {\r
-        if (jComboBoxCName == null) {\r
-            jComboBoxCName = new JComboBox();\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
+    private IComboBox getIComboBoxCName() {\r
+        if (iComboBoxCName == null) {\r
+            iComboBoxCName = new IComboBox();\r
+            iComboBoxCName.setBounds(new java.awt.Rectangle(168, 37, 320, 20));\r
+            iComboBoxCName.setPreferredSize(new java.awt.Dimension(320, 20));\r
+            iComboBoxCName.setToolTipText("Select Guid C Name of the Protocol");\r
 \r
         }\r
-        return jComboBoxCName;\r
+        return iComboBoxCName;\r
     }\r
 \r
     /**\r
@@ -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");\r
         }\r
 \r
-        Tools.generateComboBoxByVector(this.jComboBoxCName,\r
+        Tools.generateComboBoxByVector(this.iComboBoxCName,\r
                                        wt.getAllProtocolDeclarationsFromPackages(wt.getPackageDependenciesOfModule(mid)));\r
 \r
         if (this.id != null) {\r
-            this.jComboBoxCName.setSelectedItem(id.getName());\r
+            this.iComboBoxCName.setSelectedItem(id.getName());\r
             this.jComboBoxProtocolType.setSelectedItem(id.getType());\r
             this.jComboBoxUsage.setSelectedItem(id.getUsage());\r
             this.jTextAreaHelpText.setText(id.getHelp());\r
@@ -393,7 +394,7 @@ public class ProtocolsDlg extends IDialog implements ItemListener {
             jContentPane.add(getJComboBoxProtocolType(), null);\r
             jContentPane.add(jStarLabel2, null);\r
             jContentPane.add(jLabelC_Name, null);\r
-            jContentPane.add(getJComboBoxCName(), null);\r
+            jContentPane.add(getIComboBoxCName(), null);\r
             jContentPane.add(jStarLabel3, null);\r
             jContentPane.add(jLabelUsage, null);\r
             jContentPane.add(getJComboBoxProtocolUsage(), null);\r
@@ -456,13 +457,13 @@ public class ProtocolsDlg extends IDialog implements ItemListener {
         //\r
         // Check Name\r
         //\r
-        if (this.jComboBoxCName.getSelectedItem() == null) {\r
+        if (this.iComboBoxCName.getSelectedItem() == null) {\r
             Log.wrn("Update protocols", "Please select one Protocol/ProtocolNotify Name");\r
             return false;\r
         }\r
 \r
-        if (!isEmpty(this.jComboBoxCName.getSelectedItem().toString())) {\r
-            if (!DataValidation.isC_NameType(this.jComboBoxCName.getSelectedItem().toString())) {\r
+        if (!isEmpty(this.iComboBoxCName.getSelectedItem().toString())) {\r
+            if (!DataValidation.isC_NameType(this.iComboBoxCName.getSelectedItem().toString())) {\r
                 Log.wrn("Update Protocols", "Incorrect data type for Protocol/ProtocolNotify Name");\r
                 return false;\r
             }\r
@@ -482,7 +483,7 @@ public class ProtocolsDlg extends IDialog implements ItemListener {
     }\r
 \r
     private ProtocolsIdentification getCurrentProtocols() {\r
-        String arg0 = this.jComboBoxCName.getSelectedItem().toString();\r
+        String arg0 = this.iComboBoxCName.getSelectedItem().toString();\r
         String arg1 = this.jComboBoxProtocolType.getSelectedItem().toString();\r
         String arg2 = this.jComboBoxUsage.getSelectedItem().toString();\r
 \r

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 d7df17eeb67f54e1abe2e4d02f0e24eeed2d20ae..238c000cde35b0aa09440543da1a0d9c966b0c9f 100644 (file)
--- 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());\r
             this.jTextFieldTagName.setText(inSourceFilesIdentifications.getTagName());\r
 \r
-            //\r
-            // Generate Tool Code selection list\r
-            //\r
-            Vector<String> v = ed.getVToolCode();\r
-            boolean isFind = false;\r
-            String strToolCode = inSourceFilesIdentifications.getToolCode();\r
-\r
-            //\r
-            // If the input value is not in the default list, add it to the list\r
-            //\r
-            if (strToolCode != null) {\r
-                for (int index = 0; index < v.size(); index++) {\r
-                    if (v.elementAt(index).equals(strToolCode)) {\r
-                        isFind = true;\r
-                        break;\r
-                    }\r
-                }\r
-                if (!isFind && !isEmpty(strToolCode)) {\r
-                    v.addElement(strToolCode);\r
-                }\r
-            }\r
-\r
-            Tools.generateComboBoxByVector(iComboBoxToolCode, v);\r
-            this.iComboBoxToolCode.setSelectedItem(strToolCode);\r
+//            //\r
+//            // Generate Tool Code selection list\r
+//            //\r
+//            Vector<String> v = ed.getVToolCode();\r
+//            boolean isFind = false;\r
+//            String strToolCode = inSourceFilesIdentifications.getToolCode();\r
+//\r
+//            //\r
+//            // If the input value is not in the default list, add it to the list\r
+//            //\r
+//            if (strToolCode != null) {\r
+//                for (int index = 0; index < v.size(); index++) {\r
+//                    if (v.elementAt(index).equals(strToolCode)) {\r
+//                        isFind = true;\r
+//                        break;\r
+//                    }\r
+//                }\r
+//                if (!isFind && !isEmpty(strToolCode)) {\r
+//                    v.addElement(strToolCode);\r
+//                }\r
+//            }\r
+\r
+            Tools.generateComboBoxByVector(iComboBoxToolCode, ed.getVToolCode());\r
+            this.iComboBoxToolCode.setSelectedItem(inSourceFilesIdentifications.getToolCode());\r
 \r
             this.jTextFieldToolChainFamily.setText(inSourceFilesIdentifications.getToolChainFamily());\r
             jTextFieldFeatureFlag.setText(inSourceFilesIdentifications.getFeatureFlag());\r

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 9b5cc6ed0859ca9845ed9df557ddaeef0df3cf6c..83d29cec2cfea0e2d5ee090f2a54e232f28b770a 100644 (file)
--- 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;\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
@@ -68,7 +69,7 @@ public class SystemTablesDlg extends IDialog {
 \r
     private StarLabel jStarLabel2 = null;\r
 \r
-    private JComboBox jComboBoxGuidC_Name = null;\r
+    private IComboBox iComboBoxGuidC_Name = null;\r
 \r
     private JLabel jLabelFeatureFlag = null;\r
 \r
@@ -100,19 +101,19 @@ public class SystemTablesDlg extends IDialog {
     private WorkspaceTools wt = new WorkspaceTools();\r
 \r
     /**\r
-     * This method initializes jComboBoxGuidC_Name\r
+     * This method initializes iComboBoxGuidC_Name\r
      * \r
-     * @return javax.swing.JComboBox jComboBoxGuidC_Name\r
+     * @return javax.swing.JComboBox iComboBoxGuidC_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 System Table");\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 System Table");\r
         }\r
-        return jComboBoxGuidC_Name;\r
+        return iComboBoxGuidC_Name;\r
     }\r
 \r
     /**\r
@@ -276,12 +277,12 @@ public class SystemTablesDlg 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_EFI_SYSTEM_CONFIGURATION_TABLE));\r
 \r
 \r
         if (this.id != null) {\r
-            this.jComboBoxGuidC_Name.setSelectedItem(id.getName());\r
+            this.iComboBoxGuidC_Name.setSelectedItem(id.getName());\r
             this.jComboBoxUsage.setSelectedItem(id.getUsage());\r
             this.jTextAreaHelpText.setText(id.getHelp());\r
             this.jTextFieldFeatureFlag.setText(id.getFeatureFlag());\r
@@ -354,7 +355,7 @@ public class SystemTablesDlg extends IDialog {
             jContentPane.add(jLabelEntry, null);\r
             jContentPane.add(jLabelFeatureFlag, null);\r
             jContentPane.add(getJTextFieldFeatureFlag(), null);\r
-            jContentPane.add(getJComboBoxGuidC_Name(), null);\r
+            jContentPane.add(getIComboBoxGuidC_Name(), null);\r
             jContentPane.add(jLabelArch, null);\r
             jContentPane.add(jLabelUsage, null);\r
             jContentPane.add(getJComboBoxUsage(), null);\r
@@ -417,7 +418,7 @@ public class SystemTablesDlg 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 System Table Name");\r
             return false;\r
         }\r
@@ -436,7 +437,7 @@ public class SystemTablesDlg extends IDialog {
     }\r
 \r
     private SystemTablesIdentification getCurrentSystemTables() {\r
-        String arg0 = this.jComboBoxGuidC_Name.getSelectedItem().toString();\r
+        String arg0 = this.iComboBoxGuidC_Name.getSelectedItem().toString();\r
         String arg1 = this.jComboBoxUsage.getSelectedItem().toString();\r
 \r
         String arg2 = this.jTextFieldFeatureFlag.getText();\r

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 65c8d610871db78c5f1d5add79d2c974f705ccff..b906e9adff87fbe739e7d05f4ac9e5bd624ed885 100644 (file)
--- 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;\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
@@ -76,7 +77,7 @@ public class VariablesDlg extends IDialog {
 \r
     private JLabel jLabelGuidCName = null;\r
 \r
-    private JComboBox jComboBoxGuidC_Name = null;\r
+    private IComboBox iComboBoxGuidC_Name = null;\r
 \r
     private JTextField jTextFieldFeatureFlag = null;\r
 \r
@@ -203,19 +204,19 @@ public class VariablesDlg extends IDialog {
     }\r
 \r
     /**\r
-     * This method initializes jComboBoxGuidC_Name\r
+     * This method initializes iComboBoxGuidC_Name\r
      * \r
-     * @return javax.swing.JComboBox jComboBoxGuidC_Name\r
+     * @return javax.swing.JComboBox iComboBoxGuidC_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, 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
+    private IComboBox getIComboBoxGuidC_Name() {\r
+        if (iComboBoxGuidC_Name == null) {\r
+            iComboBoxGuidC_Name = new IComboBox();\r
+            iComboBoxGuidC_Name.setBounds(new java.awt.Rectangle(168, 37, 320, 20));\r
+            iComboBoxGuidC_Name.setPreferredSize(new java.awt.Dimension(320, 20));\r
+            iComboBoxGuidC_Name.setToolTipText("Select the GUID C Name of the Variable.");\r
         }\r
-        return jComboBoxGuidC_Name;\r
+        return iComboBoxGuidC_Name;\r
     }\r
 \r
     /**\r
@@ -296,12 +297,12 @@ public class VariablesDlg 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_EFI_VARIABLE));\r
 \r
         if (this.id != null) {\r
             this.jTextFieldVariableName.setText(id.getName());\r
-            this.jComboBoxGuidC_Name.setSelectedItem(id.getGuid());\r
+            this.iComboBoxGuidC_Name.setSelectedItem(id.getGuid());\r
             this.jComboBoxUsage.setSelectedItem(id.getUsage());\r
             this.jTextAreaHelpText.setText(id.getHelp());\r
             this.jTextFieldFeatureFlag.setText(id.getFeatureFlag());\r
@@ -386,7 +387,7 @@ public class VariablesDlg extends IDialog {
             jContentPane.add(getJTextFieldString(), null);\r
             jContentPane.add(jStarLabel2, null);\r
             jContentPane.add(jLabelGuidCName, null);\r
-            jContentPane.add(getJComboBoxGuidC_Name(), null);\r
+            jContentPane.add(getIComboBoxGuidC_Name(), null);\r
             jContentPane.add(jStarLabel3, null);\r
             jContentPane.add(jLabelUsage, null);\r
             jContentPane.add(getJComboBoxUsage(), null);\r
@@ -456,7 +457,7 @@ public class VariablesDlg extends IDialog {
         //\r
         // Check Guid Value\r
         //\r
-        if (this.jComboBoxGuidC_Name.getSelectedItem() == null) {\r
+        if (this.iComboBoxGuidC_Name.getSelectedItem() == null) {\r
             Log.wrn("Update Guids", "Please select one Varibale Guid value");\r
             return false;\r
         }\r
@@ -476,7 +477,7 @@ public class VariablesDlg extends IDialog {
 \r
     private VariablesIdentification getCurrentVariables() {\r
         String arg0 = this.jTextFieldVariableName.getText();\r
-        String arg1 = this.jComboBoxGuidC_Name.getSelectedItem().toString();\r
+        String arg1 = this.iComboBoxGuidC_Name.getSelectedItem().toString();\r
         String arg2 = this.jComboBoxUsage.getSelectedItem().toString();\r
 \r
         String arg3 = this.jTextFieldFeatureFlag.getText();\r