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

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleBuildOptions.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleBuildOptions.java
index 076f820ae8e44b1f56d6b134b9990c23f0f7c1af..178ae39981e035ef1710cd6b7b70da851eae26f0 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleBuildOptions.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleBuildOptions.java
@@ -93,6 +93,8 @@ public class ModuleBuildOptions extends IInternalFrame {
     private IDefaultTableModel model = null;\r
 \r
     private int selectedRow = -1;\r
     private IDefaultTableModel model = null;\r
 \r
     private int selectedRow = -1;\r

+    \r
+    private IFrame parentFrame = null;\r

 \r
     /**\r
      This method initializes jButtonAdd \r
 \r
     /**\r
      This method initializes jButtonAdd \r


@@ -265,10 +267,11 @@ public class ModuleBuildOptions extends IInternalFrame {
      @param inBuildOptions The input BuildOptionsDocument.BuildOptions\r
      \r
      **/\r
      @param inBuildOptions The input BuildOptionsDocument.BuildOptions\r
      \r
      **/\r

-    public ModuleBuildOptions(OpeningModuleType inOmt) {\r
+    public ModuleBuildOptions(OpeningModuleType inOmt, IFrame iFrame) {\r

         super();\r
         this.omt = inOmt;\r
         this.msa = omt.getXmlMsa();\r
         super();\r
         this.omt = inOmt;\r
         this.msa = omt.getXmlMsa();\r

+        this.parentFrame = iFrame;\r

         init(msa.getModuleBuildOptions());\r
         this.setVisible(true);\r
     }\r
         init(msa.getModuleBuildOptions());\r
         this.setVisible(true);\r
     }\r


@@ -294,7 +297,7 @@ public class ModuleBuildOptions extends IInternalFrame {
     }\r
 \r
     private void showEdit(int index) {\r
     }\r
 \r
     private void showEdit(int index) {\r

-        BuildOptionsDlg dlg = new BuildOptionsDlg(vid.getBuildOptions(index), new IFrame(), omt.getId());\r
+        BuildOptionsDlg dlg = new BuildOptionsDlg(vid.getBuildOptions(index), this.parentFrame, omt.getId());\r

         int result = dlg.showDialog();\r
         if (result == DataType.RETURN_TYPE_OK) {\r
             if (index == -1) {\r
         int result = dlg.showDialog();\r
         if (result == DataType.RETURN_TYPE_OK) {\r
             if (index == -1) {\r