1. Fix EDKT321 A module's all top level elements' arch should be in range of the...

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

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleEvents.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleEvents.java
index 676b7acc4eb71cd611d1bb0b30a1a4f706f38e18..7db1d9763bce7fe7515513e176a4121c64b7a97c 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleEvents.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleEvents.java
@@ -27,6 +27,7 @@ import javax.swing.JTable;
 import javax.swing.ListSelectionModel;\r
 import javax.swing.event.ListSelectionEvent;\r
 \r
+import org.tianocore.EventTypes;\r
 import org.tianocore.EventsDocument;\r
 import org.tianocore.ProtocolNotifyUsage;\r
 import org.tianocore.ProtocolUsage;\r
@@ -239,7 +240,8 @@ public class ModuleEvents extends IInternalFrame {
                         Vector<String> arg4 = Tools.convertListToVector(events.getCreateEvents().getEventTypesList()\r
                                                                               .get(index).getSupArchList());\r
                         String arg5 = events.getCreateEvents().getEventTypesList().get(index).getHelpText();\r
-                        id = new EventsIdentification(arg0, arg1, arg2, arg3, arg4, arg5);\r
+                        String arg6 = events.getCreateEvents().getEventTypesList().get(index).getEventType().toString();\r
+                        id = new EventsIdentification(arg0, arg1, arg2, arg3, arg4, arg5, arg6);\r
                         vid.addEvents(id);\r
                     }\r
                 }\r
@@ -258,7 +260,8 @@ public class ModuleEvents extends IInternalFrame {
                         Vector<String> arg4 = Tools.convertListToVector(events.getSignalEvents().getEventTypesList()\r
                                                                               .get(index).getSupArchList());\r
                         String arg5 = events.getSignalEvents().getEventTypesList().get(index).getHelpText();\r
-                        id = new EventsIdentification(arg0, arg1, arg2, arg3, arg4, arg5);\r
+                        String arg6 = events.getSignalEvents().getEventTypesList().get(index).getEventType().toString();\r
+                        id = new EventsIdentification(arg0, arg1, arg2, arg3, arg4, arg5, arg6);\r
                         vid.addEvents(id);\r
                     }\r
                 }\r
@@ -310,9 +313,9 @@ public class ModuleEvents extends IInternalFrame {
         }\r
         return jContentPane;\r
     }\r
-    \r
+\r
     private void showEdit(int index) {\r
-        EventsDlg dlg = new EventsDlg(vid.getEvents(index), new IFrame());\r
+        EventsDlg dlg = new EventsDlg(vid.getEvents(index), new IFrame(), omt.getId());\r
         int result = dlg.showDialog();\r
         if (result == DataType.RETURN_TYPE_OK) {\r
             if (index == -1) {\r
@@ -369,7 +372,7 @@ public class ModuleEvents extends IInternalFrame {
         }\r
         if (arg0.getSource() == jButtonUpdate) {\r
             if (this.selectedRow < 0) {\r
-                Log.err("Please select one record first.");\r
+                Log.wrn("Update Events", "Please select one record first.");\r
                 return;\r
             }\r
             showEdit(selectedRow);\r
@@ -422,6 +425,9 @@ public class ModuleEvents extends IInternalFrame {
                         if (!isEmpty(vid.getEvents(index).getHelp())) {\r
                             e.setHelpText(vid.getEvents(index).getHelp());\r
                         }\r
+                        if (!isEmpty(vid.getEvents(index).getGroup())) {\r
+                            e.setEventType(EventTypes.Enum.forString(vid.getEvents(index).getGroup()));\r
+                        }\r
                         ce.addNewEventTypes();\r
                         ce.setEventTypesArray(ce.getEventTypesList().size() - 1, e);\r
                     }\r
@@ -443,6 +449,9 @@ public class ModuleEvents extends IInternalFrame {
                         if (!isEmpty(vid.getEvents(index).getHelp())) {\r
                             e.setHelpText(vid.getEvents(index).getHelp());\r
                         }\r
+                        if (!isEmpty(vid.getEvents(index).getGroup())) {\r
+                            e.setEventType(EventTypes.Enum.forString(vid.getEvents(index).getGroup()));\r
+                        }\r
                         se.addNewEventTypes();\r
                         se.setEventTypesArray(ce.getEventTypesList().size() - 1, e);\r
                     }\r
@@ -459,7 +468,7 @@ public class ModuleEvents extends IInternalFrame {
             this.msa.setEvents(events);\r
             this.omt.setSaved(false);\r
         } catch (Exception e) {\r
-            e.printStackTrace();\r
+            Log.wrn("Update Events", e.getMessage());\r
             Log.err("Update Events", e.getMessage());\r
         }\r
     }\r
@@ -505,12 +514,16 @@ public class ModuleEvents extends IInternalFrame {
         int intPreferredWidth = this.getJContentPane().getPreferredSize().width;\r
         int intPreferredHeight = this.getJContentPane().getPreferredSize().height;\r
 \r
-        resizeComponent(this.jScrollPaneTable, intCurrentWidth, intCurrentHeight, intPreferredWidth, intPreferredHeight);\r
-        relocateComponent(this.jButtonAdd, intCurrentWidth, intCurrentHeight, intPreferredWidth, intPreferredHeight,\r
-                          DataType.SPACE_TO_RIGHT_FOR_ADD_BUTTON, DataType.SPACE_TO_BOTTOM_FOR_ADD_BUTTON);\r
-        relocateComponent(this.jButtonRemove, intCurrentWidth, intCurrentHeight, intPreferredWidth, intPreferredHeight,\r
-                          DataType.SPACE_TO_RIGHT_FOR_REMOVE_BUTTON, DataType.SPACE_TO_BOTTOM_FOR_REMOVE_BUTTON);\r
-        relocateComponent(this.jButtonUpdate, intCurrentWidth, intCurrentHeight, intPreferredWidth, intPreferredHeight,\r
-                          DataType.SPACE_TO_RIGHT_FOR_UPDATE_BUTTON, DataType.SPACE_TO_BOTTOM_FOR_UPDATE_BUTTON);\r
+        Tools.resizeComponent(this.jScrollPaneTable, intCurrentWidth, intCurrentHeight, intPreferredWidth,\r
+                              intPreferredHeight);\r
+        Tools.relocateComponent(this.jButtonAdd, intCurrentWidth, intCurrentHeight, intPreferredWidth,\r
+                                intPreferredHeight, DataType.SPACE_TO_RIGHT_FOR_ADD_BUTTON,\r
+                                DataType.SPACE_TO_BOTTOM_FOR_ADD_BUTTON);\r
+        Tools.relocateComponent(this.jButtonRemove, intCurrentWidth, intCurrentHeight, intPreferredWidth,\r
+                                intPreferredHeight, DataType.SPACE_TO_RIGHT_FOR_REMOVE_BUTTON,\r
+                                DataType.SPACE_TO_BOTTOM_FOR_REMOVE_BUTTON);\r
+        Tools.relocateComponent(this.jButtonUpdate, intCurrentWidth, intCurrentHeight, intPreferredWidth,\r
+                                intPreferredHeight, DataType.SPACE_TO_RIGHT_FOR_UPDATE_BUTTON,\r
+                                DataType.SPACE_TO_BOTTOM_FOR_UPDATE_BUTTON);\r
     }\r
 }\r