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

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2148 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/FrameworkWizardUI.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/FrameworkWizardUI.java
index 5001118ab080e7642c1d19618831b6dfc6e1ba5c..cc8a06534077793b6edaee4e49ef6993d2af4d0e 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/FrameworkWizardUI.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/FrameworkWizardUI.java
@@ -2831,67 +2831,67 @@ public class FrameworkWizardUI extends IFrame implements KeyListener, MouseListe
             getJDesktopPaneModule().add(frmMsaHeader, 1);\r
             break;\r
         case IDefaultMutableTreeNode.MSA_LIBRARYCLASSDEFINITIONS:\r
             getJDesktopPaneModule().add(frmMsaHeader, 1);\r
             break;\r
         case IDefaultMutableTreeNode.MSA_LIBRARYCLASSDEFINITIONS:\r

-            ModuleLibraryClassDefinitions frmMlcd = new ModuleLibraryClassDefinitions(msa);\r
+            ModuleLibraryClassDefinitions frmMlcd = new ModuleLibraryClassDefinitions(msa, this);\r

             getJDesktopPaneModule().add(frmMlcd, 1);\r
             break;\r
         case IDefaultMutableTreeNode.MSA_PACKAGEDEPENDENCIES:\r
             getJDesktopPaneModule().add(frmMlcd, 1);\r
             break;\r
         case IDefaultMutableTreeNode.MSA_PACKAGEDEPENDENCIES:\r

-            ModulePackageDependencies frmMpd = new ModulePackageDependencies(msa);\r
+            ModulePackageDependencies frmMpd = new ModulePackageDependencies(msa, this);\r

             getJDesktopPaneModule().add(frmMpd, 1);\r
             break;\r
         case IDefaultMutableTreeNode.MSA_SOURCEFILES:\r
             getJDesktopPaneModule().add(frmMpd, 1);\r
             break;\r
         case IDefaultMutableTreeNode.MSA_SOURCEFILES:\r

-            ModuleSourceFiles frmMsf = new ModuleSourceFiles(msa);\r
+            ModuleSourceFiles frmMsf = new ModuleSourceFiles(msa, this);\r

             getJDesktopPaneModule().add(frmMsf, 1);\r
             break;\r
         case IDefaultMutableTreeNode.MSA_PROTOCOLS:\r
             getJDesktopPaneModule().add(frmMsf, 1);\r
             break;\r
         case IDefaultMutableTreeNode.MSA_PROTOCOLS:\r

-            ModuleProtocols frmMp = new ModuleProtocols(msa);\r
+            ModuleProtocols frmMp = new ModuleProtocols(msa, this);\r

             getJDesktopPaneModule().add(frmMp, 1);\r
             break;\r
         case IDefaultMutableTreeNode.MSA_EVENTS:\r
             getJDesktopPaneModule().add(frmMp, 1);\r
             break;\r
         case IDefaultMutableTreeNode.MSA_EVENTS:\r

-            ModuleEvents frmMe = new ModuleEvents(msa);\r
+            ModuleEvents frmMe = new ModuleEvents(msa, this);\r

             getJDesktopPaneModule().add(frmMe, 1);\r
             break;\r
         case IDefaultMutableTreeNode.MSA_HOBS:\r
             getJDesktopPaneModule().add(frmMe, 1);\r
             break;\r
         case IDefaultMutableTreeNode.MSA_HOBS:\r

-            ModuleHobs frmMh = new ModuleHobs(msa);\r
+            ModuleHobs frmMh = new ModuleHobs(msa, this);\r

             getJDesktopPaneModule().add(frmMh, 1);\r
             break;\r
         case IDefaultMutableTreeNode.MSA_PPIS:\r
             getJDesktopPaneModule().add(frmMh, 1);\r
             break;\r
         case IDefaultMutableTreeNode.MSA_PPIS:\r

-            ModulePpis frmMpp = new ModulePpis(msa);\r
+            ModulePpis frmMpp = new ModulePpis(msa, this);\r

             getJDesktopPaneModule().add(frmMpp, 1);\r
             break;\r
         case IDefaultMutableTreeNode.MSA_VARIABLES:\r
             getJDesktopPaneModule().add(frmMpp, 1);\r
             break;\r
         case IDefaultMutableTreeNode.MSA_VARIABLES:\r

-            ModuleVariables frmMv = new ModuleVariables(msa);\r
+            ModuleVariables frmMv = new ModuleVariables(msa, this);\r

             getJDesktopPaneModule().add(frmMv, 1);\r
             break;\r
         case IDefaultMutableTreeNode.MSA_BOOTMODES:\r
             getJDesktopPaneModule().add(frmMv, 1);\r
             break;\r
         case IDefaultMutableTreeNode.MSA_BOOTMODES:\r

-            ModuleBootModes frmMbm = new ModuleBootModes(msa);\r
+            ModuleBootModes frmMbm = new ModuleBootModes(msa, this);\r

             getJDesktopPaneModule().add(frmMbm, 1);\r
             break;\r
         case IDefaultMutableTreeNode.MSA_SYSTEMTABLES:\r
             getJDesktopPaneModule().add(frmMbm, 1);\r
             break;\r
         case IDefaultMutableTreeNode.MSA_SYSTEMTABLES:\r

-            ModuleSystemTables frmMst = new ModuleSystemTables(msa);\r
+            ModuleSystemTables frmMst = new ModuleSystemTables(msa, this);\r

             getJDesktopPaneModule().add(frmMst, 1);\r
             break;\r
         case IDefaultMutableTreeNode.MSA_DATAHUBS:\r
             getJDesktopPaneModule().add(frmMst, 1);\r
             break;\r
         case IDefaultMutableTreeNode.MSA_DATAHUBS:\r

-            ModuleDataHubs frmMdh = new ModuleDataHubs(msa);\r
+            ModuleDataHubs frmMdh = new ModuleDataHubs(msa, this);\r

             getJDesktopPaneModule().add(frmMdh, 1);\r
             break;\r
         case IDefaultMutableTreeNode.MSA_HIIPACKAGES:\r
             getJDesktopPaneModule().add(frmMdh, 1);\r
             break;\r
         case IDefaultMutableTreeNode.MSA_HIIPACKAGES:\r

-            ModuleHiiPackages frmMf = new ModuleHiiPackages(msa);\r
+            ModuleHiiPackages frmMf = new ModuleHiiPackages(msa, this);\r

             getJDesktopPaneModule().add(frmMf, 1);\r
             break;\r
         case IDefaultMutableTreeNode.MSA_GUIDS:\r
             getJDesktopPaneModule().add(frmMf, 1);\r
             break;\r
         case IDefaultMutableTreeNode.MSA_GUIDS:\r

-            ModuleGuids frmGuid = new ModuleGuids(msa);\r
+            ModuleGuids frmGuid = new ModuleGuids(msa, this);\r

             getJDesktopPaneModule().add(frmGuid, 1);\r
             break;\r
         case IDefaultMutableTreeNode.MSA_EXTERNS:\r
             getJDesktopPaneModule().add(frmGuid, 1);\r
             break;\r
         case IDefaultMutableTreeNode.MSA_EXTERNS:\r

-            ModuleExterns frmMex = new ModuleExterns(msa);\r
+            ModuleExterns frmMex = new ModuleExterns(msa, this);\r

             getJDesktopPaneModule().add(frmMex, 1);\r
             break;\r
         case IDefaultMutableTreeNode.MSA_PCDS:\r
             getJDesktopPaneModule().add(frmMex, 1);\r
             break;\r
         case IDefaultMutableTreeNode.MSA_PCDS:\r

-            ModulePCDs frmPcd = new ModulePCDs(msa);\r
+            ModulePCDs frmPcd = new ModulePCDs(msa, this);\r

             getJDesktopPaneModule().add(frmPcd, 1);\r
             break;\r
         case IDefaultMutableTreeNode.MSA_BUILDOPTIONS:\r
             getJDesktopPaneModule().add(frmPcd, 1);\r
             break;\r
         case IDefaultMutableTreeNode.MSA_BUILDOPTIONS:\r

-            ModuleBuildOptions frmMbo = new ModuleBuildOptions(msa);\r
+            ModuleBuildOptions frmMbo = new ModuleBuildOptions(msa, this);\r

             getJDesktopPaneModule().add(frmMbo, 1);\r
             break;\r
         }\r
             getJDesktopPaneModule().add(frmMbo, 1);\r
             break;\r
         }\r

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleBootModes.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleBootModes.java
index fbb8e46cecaee68804ed59c3714da4e56e0ac641..ce4fa37b392c10be024cacc01bc24314f4579454 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleBootModes.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleBootModes.java
@@ -75,6 +75,8 @@ public class ModuleBootModes extends IInternalFrame {
     private JScrollPane jScrollPaneTable = null;\r
 \r
     private JTable jTable = null;\r
     private JScrollPane jScrollPaneTable = null;\r
 \r
     private JTable jTable = null;\r

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

 \r
     //\r
     // Not used by UI\r
 \r
     //\r
     // Not used by UI\r


@@ -260,10 +262,11 @@ public class ModuleBootModes extends IInternalFrame {
      @param inBootModes The input BootModesDocument.BootModes\r
      \r
      **/\r
      @param inBootModes The input BootModesDocument.BootModes\r
      \r
      **/\r

-    public ModuleBootModes(OpeningModuleType inOmt) {\r
+    public ModuleBootModes(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.getBootModes());\r
         this.setVisible(true);\r
     }\r
         init(msa.getBootModes());\r
         this.setVisible(true);\r
     }\r


@@ -289,7 +292,7 @@ public class ModuleBootModes extends IInternalFrame {
     }\r
 \r
     private void showEdit(int index) {\r
     }\r
 \r
     private void showEdit(int index) {\r

-        BootModesDlg dlg = new BootModesDlg(vid.getBootModes(index), new IFrame(), omt.getId());\r
+        BootModesDlg dlg = new BootModesDlg(vid.getBootModes(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

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

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleDataHubs.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleDataHubs.java
index e0821e7435348a4f687a25f2ae96168582ff8dc5..642e21dbfd9a2f5837f9a421cf32253b169e35ec 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleDataHubs.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleDataHubs.java
@@ -91,6 +91,8 @@ public class ModuleDataHubs 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


@@ -257,10 +259,11 @@ public class ModuleDataHubs extends IInternalFrame {
      @param inDataHubs The input DataHubsDocument.DataHubs\r
      \r
      **/\r
      @param inDataHubs The input DataHubsDocument.DataHubs\r
      \r
      **/\r

-    public ModuleDataHubs(OpeningModuleType inOmt) {\r
+    public ModuleDataHubs(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.getDataHubs());\r
         this.setVisible(true);\r
     }\r
         init(msa.getDataHubs());\r
         this.setVisible(true);\r
     }\r


@@ -286,7 +289,7 @@ public class ModuleDataHubs extends IInternalFrame {
     }\r
 \r
     private void showEdit(int index) {\r
     }\r
 \r
     private void showEdit(int index) {\r

-        DataHubsDlg dlg = new DataHubsDlg(vid.getDataHubs(index), new IFrame(), omt.getId());\r
+        DataHubsDlg dlg = new DataHubsDlg(vid.getDataHubs(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

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 0fd3659e82389619ef33af5528116a27c809697a..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
     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


@@ -286,10 +288,11 @@ public class ModuleEvents extends IInternalFrame {
      @param inEvents The input EventsDocument.Events\r
      \r
      **/\r
      @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
         super();\r
         this.omt = inOmt;\r
         this.msa = omt.getXmlMsa();\r

+        this.parentFrame = iFrame;\r

         init(msa.getEvents());\r
         this.setVisible(true);\r
     }\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
     }\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
         int result = dlg.showDialog();\r
         if (result == DataType.RETURN_TYPE_OK) {\r
             if (index == -1) {\r

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleExterns.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleExterns.java
index a2a334aeb8e9ad675f321654ae4fd1858e62c4a6..8082632a2caa15076658e2ba384b01e6ce81abbc 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleExterns.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleExterns.java
@@ -91,6 +91,8 @@ public class ModuleExterns extends IInternalFrame implements ItemListener {
     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


@@ -315,10 +317,11 @@ public class ModuleExterns extends IInternalFrame implements ItemListener {
      @param inExterns The input data of ExternsDocument.Externs\r
      \r
      **/\r
      @param inExterns The input data of ExternsDocument.Externs\r
      \r
      **/\r

-    public ModuleExterns(OpeningModuleType inOmt) {\r
+    public ModuleExterns(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.getExterns());\r
         this.setVisible(true);\r
     }\r
         init(msa.getExterns());\r
         this.setVisible(true);\r
     }\r


@@ -344,7 +347,7 @@ public class ModuleExterns extends IInternalFrame implements ItemListener {
     }\r
 \r
     private void showEdit(int index) {\r
     }\r
 \r
     private void showEdit(int index) {\r

-        ExternsDlg dlg = new ExternsDlg(vid.getExterns(index), new IFrame(), omt.getId());\r
+        ExternsDlg dlg = new ExternsDlg(vid.getExterns(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

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleGuids.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleGuids.java
index 066de78d0db9e2a66b7bdabf02679ac27e076b12..4fa02d11227c29aca08f149b8217773f1cce800b 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleGuids.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleGuids.java
@@ -88,6 +88,8 @@ public class ModuleGuids 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


@@ -254,10 +256,11 @@ public class ModuleGuids extends IInternalFrame {
      @param inGuids The input data of GuidsDocument.Guids\r
      \r
      **/\r
      @param inGuids The input data of GuidsDocument.Guids\r
      \r
      **/\r

-    public ModuleGuids(OpeningModuleType inOmt) {\r
+    public ModuleGuids(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.getGuids());\r
         this.setVisible(true);\r
     }\r
         init(msa.getGuids());\r
         this.setVisible(true);\r
     }\r


@@ -283,7 +286,7 @@ public class ModuleGuids extends IInternalFrame {
     }\r
 \r
     private void showEdit(int index) {\r
     }\r
 \r
     private void showEdit(int index) {\r

-        GuidsDlg dlg = new GuidsDlg(vid.getGuids(index), new IFrame(), omt.getId());\r
+        GuidsDlg dlg = new GuidsDlg(vid.getGuids(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

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleHiiPackages.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleHiiPackages.java
index ed05598df962e2e34ed1fda0d09564e168a309f1..4761257a7b9a094f551f29b5690f2635cbc026ad 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleHiiPackages.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleHiiPackages.java
@@ -88,6 +88,8 @@ public class ModuleHiiPackages 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


@@ -257,10 +259,11 @@ public class ModuleHiiPackages extends IInternalFrame {
      @param inFormsets The input data of HiiPackagesDocument.HiiPackages\r
      \r
      **/\r
      @param inFormsets The input data of HiiPackagesDocument.HiiPackages\r
      \r
      **/\r

-    public ModuleHiiPackages(OpeningModuleType inOmt) {\r
+    public ModuleHiiPackages(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.getHiiPackages());\r
         this.setVisible(true);\r
     }\r
         init(msa.getHiiPackages());\r
         this.setVisible(true);\r
     }\r


@@ -286,7 +289,7 @@ public class ModuleHiiPackages extends IInternalFrame {
     }\r
 \r
     private void showEdit(int index) {\r
     }\r
 \r
     private void showEdit(int index) {\r

-        HiiPackagesDlg dlg = new HiiPackagesDlg(vid.getHiiPackages(index), new IFrame(), omt.getId());\r
+        HiiPackagesDlg dlg = new HiiPackagesDlg(vid.getHiiPackages(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

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleHobs.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleHobs.java
index 5a4dd2b7732300d7cc0b45fe93e90052db2517c0..e8125b6ebbdef8652b3e4a8701c50bcd2c91e728 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleHobs.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleHobs.java
@@ -90,6 +90,8 @@ public class ModuleHobs 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


@@ -259,10 +261,11 @@ public class ModuleHobs extends IInternalFrame {
      @param inHobs The input data of HobsDocument.Hobs\r
      \r
      **/\r
      @param inHobs The input data of HobsDocument.Hobs\r
      \r
      **/\r

-    public ModuleHobs(OpeningModuleType inOmt) {\r
+    public ModuleHobs(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.getHobs());\r
         this.setVisible(true);\r
     }\r
         init(msa.getHobs());\r
         this.setVisible(true);\r
     }\r


@@ -289,7 +292,7 @@ public class ModuleHobs extends IInternalFrame {
     }\r
 \r
     private void showEdit(int index) {\r
     }\r
 \r
     private void showEdit(int index) {\r

-        HobsDlg dlg = new HobsDlg(vid.getHobs(index), new IFrame(), omt.getId());\r
+        HobsDlg dlg = new HobsDlg(vid.getHobs(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

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleLibraryClassDefinitions.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleLibraryClassDefinitions.java
index 7d05abe5bac9f9c4c59cbed02b855310dd2c20bd..ce5d86f78ab2e72a663201a1b6e6557de56fd88f 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleLibraryClassDefinitions.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleLibraryClassDefinitions.java
@@ -86,6 +86,8 @@ public class ModuleLibraryClassDefinitions 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


@@ -209,10 +211,11 @@ public class ModuleLibraryClassDefinitions extends IInternalFrame {
      @param \r
      \r
      **/\r
      @param \r
      \r
      **/\r

-    public ModuleLibraryClassDefinitions(OpeningModuleType inOmt) {\r
+    public ModuleLibraryClassDefinitions(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.getLibraryClassDefinitions());\r
         this.setVisible(true);\r
     }\r
         init(msa.getLibraryClassDefinitions());\r
         this.setVisible(true);\r
     }\r


@@ -344,7 +347,7 @@ public class ModuleLibraryClassDefinitions extends IInternalFrame {
     }\r
 \r
     private void showEdit(int index) {\r
     }\r
 \r
     private void showEdit(int index) {\r

-        LibraryClassDefsDlg mcdd = new LibraryClassDefsDlg(vLibraryClass.getLibraryClass(index), new IFrame(), omt.getId());\r
+        LibraryClassDefsDlg mcdd = new LibraryClassDefsDlg(vLibraryClass.getLibraryClass(index), this.parentFrame, omt.getId());\r

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

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModulePCDs.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModulePCDs.java
index 9f119a71f44529c44796f979146b82c218962435..c6a5e8f49ac30c9ddff6fc8e450ab0aea6a5b06c 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModulePCDs.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModulePCDs.java
@@ -91,6 +91,8 @@ public class ModulePCDs 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


@@ -264,10 +266,11 @@ public class ModulePCDs extends IInternalFrame {
      @param inPcds The input data of PCDsDocument.PCDs\r
      \r
      **/\r
      @param inPcds The input data of PCDsDocument.PCDs\r
      \r
      **/\r

-    public ModulePCDs(OpeningModuleType inOmt) {\r
+    public ModulePCDs(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.getPcdCoded());\r
         this.setVisible(true);\r
     }\r
         init(msa.getPcdCoded());\r
         this.setVisible(true);\r
     }\r


@@ -293,7 +296,7 @@ public class ModulePCDs extends IInternalFrame {
     }\r
 \r
     private void showEdit(int index) {\r
     }\r
 \r
     private void showEdit(int index) {\r

-        PCDsDlg dlg = new PCDsDlg(vid.getPcdCoded(index), new IFrame(), omt.getId());\r
+        PCDsDlg dlg = new PCDsDlg(vid.getPcdCoded(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

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModulePackageDependencies.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModulePackageDependencies.java
index b82be702c1b37869196fec26c72a63714efea4ad..21e237eebe73ff291f7b8ce99ea8a523e7cda683 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModulePackageDependencies.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModulePackageDependencies.java
@@ -94,6 +94,8 @@ public class ModulePackageDependencies 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


@@ -217,10 +219,11 @@ public class ModulePackageDependencies extends IInternalFrame {
      @param \r
      \r
      **/\r
      @param \r
      \r
      **/\r

-    public ModulePackageDependencies(OpeningModuleType inOmt) {\r
+    public ModulePackageDependencies(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.getPackageDependencies());\r
         this.setVisible(true);\r
     }\r
         init(msa.getPackageDependencies());\r
         this.setVisible(true);\r
     }\r


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

-        PackageDepDlg pdd = new PackageDepDlg(vid.getPackageDependencies(index), new IFrame(), omt.getId());\r
+        PackageDepDlg pdd = new PackageDepDlg(vid.getPackageDependencies(index), this.parentFrame, omt.getId());\r

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

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModulePpis.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModulePpis.java
index ea4b125064d3354082e565e28a2f87529ee0b0c8..504f2912b4a5fc0aecb5db07aa5e4674cbfd6aa4 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModulePpis.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModulePpis.java
@@ -94,6 +94,8 @@ public class ModulePpis 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


@@ -279,10 +281,11 @@ public class ModulePpis extends IInternalFrame {
      @param inPpis The input data of PPIsDocument.PPIs\r
      \r
      **/\r
      @param inPpis The input data of PPIsDocument.PPIs\r
      \r
      **/\r

-    public ModulePpis(OpeningModuleType inOmt) {\r
+    public ModulePpis(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.getPPIs());\r
         this.setVisible(true);\r
     }\r
         init(msa.getPPIs());\r
         this.setVisible(true);\r
     }\r


@@ -308,7 +311,7 @@ public class ModulePpis extends IInternalFrame {
     }\r
 \r
     private void showEdit(int index) {\r
     }\r
 \r
     private void showEdit(int index) {\r

-        PpisDlg dlg = new PpisDlg(vid.getPpis(index), new IFrame(), omt.getId());\r
+        PpisDlg dlg = new PpisDlg(vid.getPpis(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

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleProtocols.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleProtocols.java
index a02ce38caa3f47f823ecb221152dca99a8e60b86..1d8c9336686215d8b0e182372ce978ed09f823f4 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleProtocols.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleProtocols.java
@@ -96,6 +96,8 @@ public class ModuleProtocols 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


@@ -280,10 +282,11 @@ public class ModuleProtocols extends IInternalFrame {
      @param inProtocol The input data of ProtocolsDocument.Protocols\r
      \r
      **/\r
      @param inProtocol The input data of ProtocolsDocument.Protocols\r
      \r
      **/\r

-    public ModuleProtocols(OpeningModuleType inOmt) {\r
+    public ModuleProtocols(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.getProtocols());\r
         this.setVisible(true);\r
     }\r
         init(msa.getProtocols());\r
         this.setVisible(true);\r
     }\r


@@ -309,7 +312,7 @@ public class ModuleProtocols extends IInternalFrame {
     }\r
 \r
     private void showEdit(int index) {\r
     }\r
 \r
     private void showEdit(int index) {\r

-        ProtocolsDlg dlg = new ProtocolsDlg(vid.getProtocols(index), new IFrame(), omt.getId());\r
+        ProtocolsDlg dlg = new ProtocolsDlg(vid.getProtocols(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

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleSourceFiles.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleSourceFiles.java
index 5a0747d9e624684ae61c7398511cb5160385d23d..770a0a0f3f93d7b2ace37fa0f794c5dbe63dc201 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleSourceFiles.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleSourceFiles.java
@@ -88,6 +88,8 @@ public class ModuleSourceFiles 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


@@ -213,10 +215,11 @@ public class ModuleSourceFiles extends IInternalFrame {
      @param \r
      \r
      **/\r
      @param \r
      \r
      **/\r

-    public ModuleSourceFiles(OpeningModuleType inOmt) {\r
+    public ModuleSourceFiles(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.getSourceFiles());\r
         this.setVisible(true);\r
     }\r
         init(msa.getSourceFiles());\r
         this.setVisible(true);\r
     }\r


@@ -348,7 +351,7 @@ public class ModuleSourceFiles extends IInternalFrame {
     }\r
 \r
     private void showEdit(int index) {\r
     }\r
 \r
     private void showEdit(int index) {\r

-        SourceFilesDlg sfd = new SourceFilesDlg(this.vSourceFiles.getSourceFiles(index), new IFrame(), omt.getId());\r
+        SourceFilesDlg sfd = new SourceFilesDlg(this.vSourceFiles.getSourceFiles(index), this.parentFrame, omt.getId());\r

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

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleSystemTables.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleSystemTables.java
index 46a336a07571d984a3ce195a9e2f4581be265e0c..29bed2b07cd07eb2eeb14598983680e96e163178 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleSystemTables.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleSystemTables.java
@@ -90,6 +90,8 @@ public class ModuleSystemTables 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


@@ -256,10 +258,11 @@ public class ModuleSystemTables extends IInternalFrame {
      @param inSystemTables The input data of SystemTablesDocument.SystemTables\r
      \r
      **/\r
      @param inSystemTables The input data of SystemTablesDocument.SystemTables\r
      \r
      **/\r

-    public ModuleSystemTables(OpeningModuleType inOmt) {\r
+    public ModuleSystemTables(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.getSystemTables());\r
         this.setVisible(true);\r
     }\r
         init(msa.getSystemTables());\r
         this.setVisible(true);\r
     }\r


@@ -286,7 +289,7 @@ public class ModuleSystemTables extends IInternalFrame {
     }\r
 \r
     private void showEdit(int index) {\r
     }\r
 \r
     private void showEdit(int index) {\r

-        SystemTablesDlg dlg = new SystemTablesDlg(vid.getSystemTables(index), new IFrame(), omt.getId());\r
+        SystemTablesDlg dlg = new SystemTablesDlg(vid.getSystemTables(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

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleVariables.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleVariables.java
index 7711c2f0fc78e6182233b3aa8c7062cffcf5a12c..7038ee9612829d10397bf5c1e511ea138de71f79 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleVariables.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleVariables.java
@@ -89,6 +89,8 @@ public class ModuleVariables 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


@@ -257,10 +259,11 @@ public class ModuleVariables extends IInternalFrame {
      @param inVariables The input data of VariablesDocument.Variables\r
      \r
      **/\r
      @param inVariables The input data of VariablesDocument.Variables\r
      \r
      **/\r

-    public ModuleVariables(OpeningModuleType inOmt) {\r
+    public ModuleVariables(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.getVariables());\r
         this.setVisible(true);\r
     }\r
         init(msa.getVariables());\r
         this.setVisible(true);\r
     }\r


@@ -286,7 +289,7 @@ public class ModuleVariables extends IInternalFrame {
     }\r
 \r
     private void showEdit(int index) {\r
     }\r
 \r
     private void showEdit(int index) {\r

-        VariablesDlg dlg = new VariablesDlg(vid.getVariables(index), new IFrame(), omt.getId());\r
+        VariablesDlg dlg = new VariablesDlg(vid.getVariables(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