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

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdMsaFiles.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdMsaFiles.java
index 283c8972238c735903cf8502c34cb2e604f589bc..fb23e05659820c894cd79c569d99f0c85d637f41 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdMsaFiles.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdMsaFiles.java
@@ -54,7 +54,7 @@ public class SpdMsaFiles extends IInternalFrame implements TableModelListener{
      */\r
     private static final long serialVersionUID = 1L;\r
 \r
-    static JFrame frame;\r
+    private JFrame topFrame;\r
     \r
     private JScrollPane jScrollPane = null;  //  @jve:decl-index=0:visual-constraint="10,95"\r
 \r
@@ -229,21 +229,21 @@ public class SpdMsaFiles extends IInternalFrame implements TableModelListener{
     /**\r
       This is the default constructor\r
      **/\r
-    public SpdMsaFiles() {\r
+    public SpdMsaFiles(JFrame frame) {\r
         super();\r
         initialize();\r
         init();\r
-        \r
+        topFrame = frame;\r
     }\r
 \r
-    public SpdMsaFiles(PackageSurfaceAreaDocument.PackageSurfaceArea inPsa){\r
-        this();\r
+    public SpdMsaFiles(PackageSurfaceAreaDocument.PackageSurfaceArea inPsa, JFrame frame){\r
+        this(frame);\r
         sfc = new SpdFileContents(inPsa);\r
         init(sfc);\r
     }\r
     \r
-    public SpdMsaFiles(OpeningPackageType opt){\r
-        this(opt.getXmlSpd());\r
+    public SpdMsaFiles(OpeningPackageType opt, JFrame frame){\r
+        this(opt.getXmlSpd(), frame);\r
         docConsole = opt;\r
     }\r
     /**\r
@@ -269,7 +269,7 @@ public class SpdMsaFiles extends IInternalFrame implements TableModelListener{
     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
@@ -477,13 +477,13 @@ public class SpdMsaFiles extends IInternalFrame implements TableModelListener{
                     \r
                     chooser.setMultiSelectionEnabled(false);\r
                     chooser.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES);\r
-                    int retval = chooser.showOpenDialog(frame);\r
+                    int retval = chooser.showOpenDialog(SpdMsaFiles.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(SpdMsaFiles.this, "You can only select files in current package!");\r
                             return;\r
                         }\r
                         \r
@@ -512,9 +512,6 @@ public class SpdMsaFiles extends IInternalFrame implements TableModelListener{
         Tools.relocateComponentX(this.jButtonBrowse, this.getWidth(), this.getPreferredSize().width, 25);\r
     }\r
     \r
-    public static void main(String[] args){\r
-        new SpdMsaFiles().setVisible(true);\r
-    }\r
 }\r
 \r
 \r