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

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