1. Fix EDKT336: Back to focused dialog window when shift to wizard

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

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleEvents.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleEvents.java
index 7db1d9763bce7fe7515513e176a4121c64b7a97c..dd6bbde19021caaf7c892b8304a9ac168aa316e1 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleEvents.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleEvents.java
@@ -96,6 +96,8 @@ public class ModuleEvents extends IInternalFrame {
     private IDefaultTableModel model = null;\r
 \r
     private int selectedRow = -1;\r
+    \r
+    private IFrame parentFrame = null;\r
 \r
     /**\r
      This method initializes jButtonAdd \r
@@ -106,10 +108,10 @@ public class ModuleEvents extends IInternalFrame {
     private JButton getJButtonAdd() {\r
         if (jButtonAdd == null) {\r
             jButtonAdd = new JButton();\r
-            jButtonAdd.setBounds(new java.awt.Rectangle(230, 220, 80, 20));\r
+            jButtonAdd.setBounds(new java.awt.Rectangle(230, 220, 90, 20));\r
             jButtonAdd.setText("Add");\r
             jButtonAdd.addActionListener(this);\r
-            jButtonAdd.setPreferredSize(new java.awt.Dimension(80, 20));\r
+            jButtonAdd.setPreferredSize(new java.awt.Dimension(90, 20));\r
         }\r
         return jButtonAdd;\r
     }\r
@@ -123,10 +125,10 @@ public class ModuleEvents extends IInternalFrame {
     private JButton getJButtonRemove() {\r
         if (jButtonRemove == null) {\r
             jButtonRemove = new JButton();\r
-            jButtonRemove.setBounds(new java.awt.Rectangle(400, 220, 80, 20));\r
+            jButtonRemove.setBounds(new java.awt.Rectangle(400, 220, 90, 20));\r
             jButtonRemove.setText("Remove");\r
             jButtonRemove.addActionListener(this);\r
-            jButtonRemove.setPreferredSize(new java.awt.Dimension(80, 20));\r
+            jButtonRemove.setPreferredSize(new java.awt.Dimension(90, 20));\r
         }\r
         return jButtonRemove;\r
     }\r
@@ -140,8 +142,8 @@ public class ModuleEvents extends IInternalFrame {
     private JButton getJButtonUpdate() {\r
         if (jButtonUpdate == null) {\r
             jButtonUpdate = new JButton();\r
-            jButtonUpdate.setBounds(new java.awt.Rectangle(315, 220, 80, 20));\r
-            jButtonUpdate.setPreferredSize(new java.awt.Dimension(80, 20));\r
+            jButtonUpdate.setBounds(new java.awt.Rectangle(315, 220, 90, 20));\r
+            jButtonUpdate.setPreferredSize(new java.awt.Dimension(90, 20));\r
             jButtonUpdate.setText("Edit");\r
             jButtonUpdate.addActionListener(this);\r
         }\r
@@ -286,10 +288,11 @@ public class ModuleEvents extends IInternalFrame {
      @param inEvents The input EventsDocument.Events\r
      \r
      **/\r
-    public ModuleEvents(OpeningModuleType inOmt) {\r
+    public ModuleEvents(OpeningModuleType inOmt, IFrame iFrame) {\r
         super();\r
         this.omt = inOmt;\r
         this.msa = omt.getXmlMsa();\r
+        this.parentFrame = iFrame;\r
         init(msa.getEvents());\r
         this.setVisible(true);\r
     }\r
@@ -315,7 +318,7 @@ public class ModuleEvents extends IInternalFrame {
     }\r
 \r
     private void showEdit(int index) {\r
-        EventsDlg dlg = new EventsDlg(vid.getEvents(index), new IFrame(), omt.getId());\r
+        EventsDlg dlg = new EventsDlg(vid.getEvents(index), this.parentFrame, omt.getId());\r
         int result = dlg.showDialog();\r
         if (result == DataType.RETURN_TYPE_OK) {\r
             if (index == -1) {\r