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

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdModuleSA.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdModuleSA.java
index fc715516eda5150cc26dd15a8315e32d5b8d810e..1eefec03b80a7f8739fe5bcb375eb4eebcf068e9 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdModuleSA.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdModuleSA.java
@@ -4,7 +4,6 @@ import java.awt.BorderLayout;
 import java.awt.Dimension;\r
 import java.awt.Toolkit;\r
 \r
-import javax.swing.JFrame;\r
 import javax.swing.JOptionPane;\r
 import javax.swing.JPanel;\r
 import javax.swing.JDialog;\r
@@ -24,6 +23,7 @@ import javax.swing.table.DefaultTableModel;
 import javax.swing.table.TableColumn;\r
 import javax.swing.table.TableModel;\r
 \r
+import org.tianocore.frameworkwizard.FrameworkWizardUI;\r
 import org.tianocore.frameworkwizard.common.DataValidation;\r
 import org.tianocore.frameworkwizard.common.GlobalData;\r
 import org.tianocore.frameworkwizard.common.IDefaultTableModel;\r
@@ -53,7 +53,6 @@ public class FpdModuleSA extends JDialog implements ActionListener {
      * \r
      */\r
     private static final long serialVersionUID = 1L;\r
-    static JFrame frame;\r
     private JPanel jContentPane = null;\r
     private JTabbedPane jTabbedPane = null;\r
     private JPanel jPanelPcd = null;\r
@@ -142,7 +141,7 @@ public class FpdModuleSA extends JDialog implements ActionListener {
      * This is the default constructor\r
      */\r
     public FpdModuleSA() {\r
-        super();\r
+        super(FrameworkWizardUI.getInstance());\r
         initialize();\r
     }\r
     public FpdModuleSA(FpdFileContents ffc) {\r
@@ -208,7 +207,7 @@ public class FpdModuleSA extends JDialog implements ActionListener {
         } catch (Exception e) {\r
             String exceptionMsg = e.getCause() + " " + e.getMessage();\r
             errorMsg.add(exceptionMsg);\r
-            JOptionPane.showMessageDialog(frame, exceptionMsg);\r
+            JOptionPane.showMessageDialog(FrameworkWizardUI.getInstance(), exceptionMsg);\r
         }\r
         //\r
         // display lib instances already selected for key\r
@@ -236,7 +235,7 @@ public class FpdModuleSA extends JDialog implements ActionListener {
                     } catch (Exception e) {\r
                         String exceptionMsg = e.getCause() + " " + e.getMessage();\r
                         if (!errorMsg.contains(exceptionMsg)) {\r
-                            JOptionPane.showMessageDialog(frame, e.getCause() + " " + e.getMessage());\r
+                            JOptionPane.showMessageDialog(FrameworkWizardUI.getInstance(), e.getCause() + " " + e.getMessage());\r
                         }\r
                     }\r
                     selectedInstancesTableModel.addRow(saa[i]);\r
@@ -249,7 +248,7 @@ public class FpdModuleSA extends JDialog implements ActionListener {
             for (int i = 0; i < errorMsg.size(); ++i) {\r
                 errors += " " + errorMsg.get(i) + "\n";\r
             }\r
-            JOptionPane.showMessageDialog(frame, errors);\r
+            JOptionPane.showMessageDialog(FrameworkWizardUI.getInstance(), errors);\r
         }\r
         showClassToResolved();\r
     }\r
@@ -767,7 +766,7 @@ public class FpdModuleSA extends JDialog implements ActionListener {
                                     jTextFieldMaxDatumSize.setText(ffc.setMaxSizeForPointer(model.getValueAt(selectedRow, 6)+"")+"");\r
                                 }\r
                                 catch(Exception except){\r
-                                    JOptionPane.showMessageDialog(frame, "Unacceptable PCD Value: " + except.getMessage());\r
+                                    JOptionPane.showMessageDialog(FpdModuleSA.this, "Unacceptable PCD Value: " + except.getMessage());\r
                                 }\r
                             }\r
                             else{\r
@@ -1198,7 +1197,7 @@ public class FpdModuleSA extends JDialog implements ActionListener {
                         addLibInstance (libMi);\r
                     }\r
                     catch (Exception exception) {\r
-                        JOptionPane.showMessageDialog(frame, "Adding Instance " + libMi.getName() + " : \n"+ exception.getMessage());\r
+                        JOptionPane.showMessageDialog(FpdModuleSA.this, "Adding Instance " + libMi.getName() + " : \n"+ exception.getMessage());\r
                         return;\r
                     }\r
                     docConsole.setSaved(false);\r
@@ -1212,7 +1211,7 @@ public class FpdModuleSA extends JDialog implements ActionListener {
                         resolveLibraryInstances(instanceValue, errorMsg);\r
                     }\r
                     catch (Exception exp) {\r
-                        JOptionPane.showMessageDialog(frame, exp.getMessage());\r
+                        JOptionPane.showMessageDialog(FpdModuleSA.this, exp.getMessage());\r
                     }\r
                     \r
                     if (errorMsg.size() > 0) {\r
@@ -1220,7 +1219,7 @@ public class FpdModuleSA extends JDialog implements ActionListener {
                         for (int i = 0; i < errorMsg.size(); ++i) {\r
                             errors += " " + errorMsg.get(i) + "\n";\r
                         }\r
-                        JOptionPane.showMessageDialog(frame, errors);\r
+                        JOptionPane.showMessageDialog(FpdModuleSA.this, errors);\r
                     }\r
                     showClassToResolved();\r
                 }\r
@@ -1414,7 +1413,7 @@ public class FpdModuleSA extends JDialog implements ActionListener {
                     }\r
                     if (newFileGuid.length() > 0) {\r
                         if (!DataValidation.isGuid(newFileGuid)) {\r
-                            JOptionPane.showMessageDialog(frame, "FFS File Guid is NOT GUID Type.");\r
+                            JOptionPane.showMessageDialog(FpdModuleSA.this, "FFS File Guid is NOT GUID Type.");\r
                             return;\r
                         }\r
                     }\r
@@ -1509,9 +1508,9 @@ public class FpdModuleSA extends JDialog implements ActionListener {
             vArch.add("EBC");\r
             vArch.add("ARM");\r
             vArch.add("PPC");\r
-            jTableModuleSaOptions.getColumnModel().getColumn(4).setCellEditor(new ListEditor(vArch));\r
+            jTableModuleSaOptions.getColumnModel().getColumn(4).setCellEditor(new ListEditor(vArch, FrameworkWizardUI.getInstance()));\r
             \r
-            jTableModuleSaOptions.getColumnModel().getColumn(5).setCellEditor(new LongTextEditor());\r
+            jTableModuleSaOptions.getColumnModel().getColumn(5).setCellEditor(new LongTextEditor(FrameworkWizardUI.getInstance()));\r
             \r
             jTableModuleSaOptions.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r
                        jTableModuleSaOptions.setAutoResizeMode(javax.swing.JTable.AUTO_RESIZE_OFF);\r
@@ -1761,7 +1760,7 @@ private void pcdNonDynamicToDynamic(String cName, String tsGuid) {
         ffc.addDynamicPcdBuildData(cName, model.getValueAt(jTablePcd.getSelectedRow(), 3), tsGuid, "DYNAMIC", model.getValueAt(jTablePcd.getSelectedRow(), 5)+"", jTextFieldPcdDefault.isVisible() ? jTextFieldPcdDefault.getText() : jComboBoxFeatureFlagValue.getSelectedItem()+"");\r
     }\r
     catch(Exception e){\r
-        JOptionPane.showMessageDialog(frame, "PCD value format: " + e.getMessage());\r
+        JOptionPane.showMessageDialog(FpdModuleSA.this, "PCD value format: " + e.getMessage());\r
     }\r
 }\r
 \r
@@ -1848,7 +1847,7 @@ private JButton getJButtonUpdatePcd() {
                         jTextFieldMaxDatumSize.setText(ffc.setMaxSizeForPointer(newValue)+"");\r
                     }\r
                     catch (Exception exp) {\r
-                        JOptionPane.showMessageDialog(frame, "PCD Value MalFormed: " + exp.getMessage());\r
+                        JOptionPane.showMessageDialog(FpdModuleSA.this, "PCD Value MalFormed: " + exp.getMessage());\r
                         return;\r
                     }\r
                 }\r
@@ -1859,12 +1858,12 @@ private JButton getJButtonUpdatePcd() {
                     try {\r
                         boolean changable = itemTypeCouldBeChanged (cName, tsGuid, newItemType, moduleInfo);\r
                         if (!changable) {\r
-                            JOptionPane.showMessageDialog(frame, "Can NOT Change Pcd Type in: " + moduleInfo.get(0).getName() + " contained in package " + moduleInfo.get(0).getPackageId().getName());\r
+                            JOptionPane.showMessageDialog(FpdModuleSA.this, "Can NOT Change Pcd Type in: " + moduleInfo.get(0).getName() + " contained in package " + moduleInfo.get(0).getPackageId().getName());\r
                             return;\r
                         }\r
                     }\r
                     catch (Exception exp) {\r
-                        JOptionPane.showMessageDialog(frame, "Can NOT Change Pcd Type in: " + moduleInfo.get(0).getName() + " contained in package " + moduleInfo.get(0).getPackageId().getName() + " " + exp.getMessage());\r
+                        JOptionPane.showMessageDialog(FpdModuleSA.this, "Can NOT Change Pcd Type in: " + moduleInfo.get(0).getName() + " contained in package " + moduleInfo.get(0).getPackageId().getName() + " " + exp.getMessage());\r
                         return;\r
                     }\r
                     \r