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 / platform / ui / FpdBuildOptions.java

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdBuildOptions.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdBuildOptions.java
index 0bdcfc8a9db1d26747dd270fe5751ffa204866be..feddaeeb71a32b8182bde18903317d7d107e8202 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdBuildOptions.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdBuildOptions.java
@@ -28,7 +28,6 @@ import java.awt.event.ComponentEvent;
 \r
 import javax.swing.DefaultCellEditor;\r
 import javax.swing.JFileChooser;\r
-import javax.swing.JFrame;\r
 import javax.swing.JOptionPane;\r
 import javax.swing.JTextField;\r
 import javax.swing.JButton;\r
@@ -48,6 +47,7 @@ import javax.swing.table.DefaultTableModel;
 import javax.swing.table.TableModel;\r
 \r
 import org.tianocore.PlatformSurfaceAreaDocument;\r
+import org.tianocore.frameworkwizard.FrameworkWizardUI;\r
 import org.tianocore.frameworkwizard.common.DataValidation;\r
 import org.tianocore.frameworkwizard.common.Tools;\r
 import org.tianocore.frameworkwizard.common.Identifications.OpeningPlatformType;\r
@@ -112,8 +112,6 @@ public class FpdBuildOptions extends IInternalFrame {
 \r
     private static final long serialVersionUID = 1L;\r
 \r
-    static JFrame frame;\r
-\r
     private JPanel jContentPane = null;\r
 \r
     //    private JPanel jPanelContentSouth = null;\r
@@ -1183,7 +1181,7 @@ public class FpdBuildOptions extends IInternalFrame {
                     String[] row = { "Compress" };\r
                     sectionsTableModel.addRow(row);\r
                     ffc.genBuildOptionsFfsSectionsSections(jTableFfs.getSelectedRow(), "");\r
-                    JOptionPane.showMessageDialog(frame, "Add Default Section Type EFI_SECTION_PE32 into the New Sections Entry.");\r
+                    JOptionPane.showMessageDialog(FpdBuildOptions.this, "Add Default Section Type EFI_SECTION_PE32 into the New Sections Entry.");\r
                     jTableFfsSections.changeSelection(sectionsTableModel.getRowCount()-1, 0, false, false);\r
                 }\r
             });\r
@@ -1830,9 +1828,9 @@ public class FpdBuildOptions extends IInternalFrame {
             vArch.add("EBC");\r
             vArch.add("ARM");\r
             vArch.add("PPC");\r
-            jTableOptions.getColumnModel().getColumn(2).setCellEditor(new ListEditor(vArch));\r
+            jTableOptions.getColumnModel().getColumn(2).setCellEditor(new ListEditor(vArch, FrameworkWizardUI.getInstance()));\r
             \r
-            jTableOptions.getColumnModel().getColumn(5).setCellEditor(new LongTextEditor());\r
+            jTableOptions.getColumnModel().getColumn(5).setCellEditor(new LongTextEditor(FrameworkWizardUI.getInstance()));\r
             \r
             jTableOptions.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r
                jTableOptions.setAutoResizeMode(javax.swing.JTable.AUTO_RESIZE_OFF);\r
@@ -1964,13 +1962,13 @@ public class FpdBuildOptions extends IInternalFrame {
 \r
                     chooser.setMultiSelectionEnabled(false);\r
                     chooser.setFileSelectionMode(JFileChooser.FILES_ONLY);\r
-                    int retval = chooser.showOpenDialog(frame);\r
+                    int retval = chooser.showOpenDialog(FpdBuildOptions.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(FpdBuildOptions.this, "You can only select files in current package!");\r
                             return;\r
                         }\r
                     } else {\r
@@ -2103,7 +2101,7 @@ public class FpdBuildOptions extends IInternalFrame {
                 public void actionPerformed(ActionEvent e) {\r
                     if (!DataValidation.isInt(jTextFieldAntTaskId.getText())\r
                         || jTextFieldAntTaskId.getText().length() != 8) {\r
-                        JOptionPane.showMessageDialog(frame, "ID must be an 8-digit integer.");\r
+                        JOptionPane.showMessageDialog(FpdBuildOptions.this, "ID must be an 8-digit integer.");\r
                         return;\r
                     }\r
                     Object[] o = { jTextFieldAntTaskId.getText(), null, null };\r