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 / VariablesDlg.java

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