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

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdGuidDecls.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdGuidDecls.java
index c0c4b2698c3536d8a55652c2097e9002f85a4c5b..8f39783a8f5de4b230ac033dbbabb2c874031063 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdGuidDecls.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdGuidDecls.java
@@ -19,6 +19,7 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ComponentEvent;\r
 import java.util.Vector;\r
 \r
+import javax.swing.JFrame;\r
 import javax.swing.JOptionPane;\r
 import javax.swing.JPanel;\r
 import javax.swing.JTable;\r
@@ -26,7 +27,6 @@ import javax.swing.JTextField;
 import javax.swing.JLabel;\r
 import javax.swing.JScrollPane;\r
 import javax.swing.JButton;\r
-import javax.swing.JFrame;\r
 import javax.swing.ListSelectionModel;\r
 import javax.swing.event.InternalFrameAdapter;\r
 import javax.swing.event.InternalFrameEvent;\r
@@ -58,8 +58,8 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{
      * \r
      */\r
     private static final long serialVersionUID = 1L;\r
-\r
-    static JFrame frame;\r
+    \r
+    private JFrame topFrame = null;\r
     \r
     private SpdFileContents sfc = null;\r
     \r
@@ -219,8 +219,8 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{
            column = jTable.getColumnModel().getColumn(6);\r
            column.setMinWidth(this.guidTypeMinWidth);\r
            \r
-           jTable.getColumnModel().getColumn(2).setCellEditor(new GuidEditor());\r
-           jTable.getColumnModel().getColumn(3).setCellEditor(new LongTextEditor());\r
+           jTable.getColumnModel().getColumn(2).setCellEditor(new GuidEditor(topFrame));\r
+           jTable.getColumnModel().getColumn(3).setCellEditor(new LongTextEditor(topFrame));\r
 \r
            Vector<String> vArch = new Vector<String>();\r
            vArch.add("IA32");\r
@@ -229,7 +229,7 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{
            vArch.add("EBC");\r
            vArch.add("ARM");\r
            vArch.add("PPC");\r
-           jTable.getColumnModel().getColumn(4).setCellEditor(new ListEditor(vArch));\r
+           jTable.getColumnModel().getColumn(4).setCellEditor(new ListEditor(vArch, topFrame));\r
            \r
            Vector<String> vModule = new Vector<String>();\r
            vModule.add("BASE");\r
@@ -244,7 +244,7 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{
            vModule.add("UEFI_DRIVER");\r
            vModule.add("UEFI_APPLICATION");\r
            vModule.add("USER_DEFINED");\r
-           jTable.getColumnModel().getColumn(5).setCellEditor(new ListEditor(vModule));\r
+           jTable.getColumnModel().getColumn(5).setCellEditor(new ListEditor(vModule, topFrame));\r
            \r
            Vector<String> vGuid = new Vector<String>();\r
            vGuid.add("DATA_HUB_RECORD");\r
@@ -255,7 +255,7 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{
            vGuid.add("HII_PACKAGE_LIST");\r
            vGuid.add("HOB");\r
            vGuid.add("TOKEN_SPACE_GUID");\r
-           ListEditor le = new ListEditor(vGuid);\r
+           ListEditor le = new ListEditor(vGuid, topFrame);\r
            le.setCanNotBeEmpty(true);\r
            jTable.getColumnModel().getColumn(6).setCellEditor(le);\r
            \r
@@ -416,24 +416,25 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{
     /**\r
       This is the default constructor\r
      **/\r
-    public SpdGuidDecls() {\r
+    public SpdGuidDecls(JFrame frame) {\r
         super();\r
+        topFrame = frame;\r
         initialize();\r
         init();\r
         \r
     }\r
 \r
-    public SpdGuidDecls(PackageSurfaceAreaDocument.PackageSurfaceArea inPsa){\r
-        this();\r
+    public SpdGuidDecls(PackageSurfaceAreaDocument.PackageSurfaceArea inPsa, JFrame frame){\r
+        this(frame);\r
         sfc = new SpdFileContents(inPsa);\r
         init(sfc);\r
     }\r
     \r
-    public SpdGuidDecls(OpeningPackageType opt) {\r
-        this(opt.getXmlSpd());\r
+    public SpdGuidDecls(OpeningPackageType opt, JFrame frame) {\r
+        this(opt.getXmlSpd(), frame);\r
         docConsole = opt;\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(this, "This is a read-only package. You will not be able to edit contents in table.");\r
         }\r
         initFrame();\r
     }\r
@@ -896,10 +897,6 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{
         return iCheckBoxListMod;\r
     }\r
 \r
-    public static void main(String[] args){\r
-        new SpdGuidDecls().setVisible(true);\r
-    }\r
-\r
     protected DefaultTableModel getModel() {\r
         return model;\r
     }\r