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

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