Make opening dialogs re-gain focus when user switch back to main UI from other window...

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

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPackageHeaders.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPackageHeaders.java
index 5691e77654cea62bfbfa8fc674eec486ea49eee0..1c1d13a24532b1861ba8929636753777550587ce 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPackageHeaders.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPackageHeaders.java
@@ -57,7 +57,7 @@ public class SpdPackageHeaders extends IInternalFrame implements TableModelListe
      */\r
     private static final long serialVersionUID = 1L;\r
 \r
-    static JFrame frame;\r
+    private JFrame topFrame;\r
     \r
     private SpdFileContents sfc = null;\r
     \r
@@ -213,21 +213,21 @@ public class SpdPackageHeaders extends IInternalFrame implements TableModelListe
     /**\r
       This is the default constructor\r
      **/\r
-    public SpdPackageHeaders() {\r
+    public SpdPackageHeaders(JFrame frame) {\r
         super();\r
         initialize();\r
         init();\r
-        \r
+        topFrame = frame;\r
     }\r
 \r
-    public SpdPackageHeaders(PackageSurfaceAreaDocument.PackageSurfaceArea inPsa){\r
-        this();\r
+    public SpdPackageHeaders(PackageSurfaceAreaDocument.PackageSurfaceArea inPsa, JFrame frame){\r
+        this(frame);\r
         sfc = new SpdFileContents(inPsa);\r
         init(sfc);\r
     }\r
     \r
-    public SpdPackageHeaders(OpeningPackageType opt) {\r
-        this(opt.getXmlSpd());\r
+    public SpdPackageHeaders(OpeningPackageType opt, JFrame frame) {\r
+        this(opt.getXmlSpd(), frame);\r
         docConsole = opt;\r
     }\r
     /**\r
@@ -253,7 +253,7 @@ public class SpdPackageHeaders extends IInternalFrame implements TableModelListe
     private void init(SpdFileContents sfc){\r
 \r
         if (sfc.getSpdPkgDefsRdOnly().equals("true")) {\r
-            JOptionPane.showMessageDialog(frame, "This is a read-only package. You will not be able to edit contents in table.");\r
+            JOptionPane.showMessageDialog(topFrame, "This is a read-only package. You will not be able to edit contents in table.");\r
         }\r
         initFrame();\r
         \r
@@ -445,13 +445,13 @@ public class SpdPackageHeaders extends IInternalFrame implements TableModelListe
                     \r
                     chooser.setMultiSelectionEnabled(false);\r
                     chooser.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES);\r
-                    int retval = chooser.showOpenDialog(frame);\r
+                    int retval = chooser.showOpenDialog(SpdPackageHeaders.this);\r
                     if (retval == JFileChooser.APPROVE_OPTION) {\r
 \r
                         theFile = chooser.getSelectedFile();\r
                         String file = theFile.getPath();\r
                         if (!file.startsWith(dirPrefix)) {\r
-                            JOptionPane.showMessageDialog(frame, "You can only select files in current package!");\r
+                            JOptionPane.showMessageDialog(SpdPackageHeaders.this, "You can only select files in current package!");\r
                             return;\r
                         }\r
                         \r
@@ -573,10 +573,7 @@ public class SpdPackageHeaders extends IInternalFrame implements TableModelListe
         Tools.resizeComponentWidth(this.jScrollPanePkgHdr, this.getWidth(), intPreferredWidth);\r
         Tools.relocateComponentX(this.jButtonBrowse, this.getWidth(), this.getPreferredSize().width, 30);\r
     }\r
-    \r
-    public static void main(String[] args){\r
-        new SpdPackageHeaders().setVisible(true);\r
-    }\r
+\r
 }\r
 \r
 \r