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

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

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