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

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdHeader.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdHeader.java
index 8ee2da170cc81007a286be2141b7bc7f79ff9c8e..a8def0a86bfbf6feed3b6819bfd31862a405242d 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdHeader.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdHeader.java
@@ -21,7 +21,6 @@ import java.awt.event.FocusAdapter;
 import java.awt.event.FocusEvent;\r
 \r
 import javax.swing.JButton;\r
-import javax.swing.JFrame;\r
 import javax.swing.JLabel;\r
 import javax.swing.JOptionPane;\r
 import javax.swing.JPanel;\r
@@ -102,7 +101,7 @@ public class SpdHeader extends IInternalFrame implements DocumentListener{
     //\r
     //Define class members\r
     //\r
-    static JFrame frame;\r
+    private IInternalFrame topFrame;\r
 \r
     private JPanel jContentPane = null;\r
 \r
@@ -191,7 +190,7 @@ public class SpdHeader extends IInternalFrame implements DocumentListener{
             jPackageNameTextField.addFocusListener(new FocusAdapter() {\r
                 public void focusLost(FocusEvent e) {\r
                     if (!DataValidation.isUiNameType(jPackageNameTextField.getText())) {\r
-                        JOptionPane.showMessageDialog(frame, "Package Name must start with a letter.");\r
+                        JOptionPane.showMessageDialog(topFrame, "Package Name must start with a letter.");\r
                         return;\r
                     }\r
                     if (jPackageNameTextField.getText().equals(sfc.getSpdHdrPkgName())) {\r
@@ -219,7 +218,7 @@ public class SpdHeader extends IInternalFrame implements DocumentListener{
             jGuidTextField.addFocusListener(new FocusAdapter() {\r
                 public void focusLost(FocusEvent e) {\r
                     if (!DataValidation.isGuid(jGuidTextField.getText())) {\r
-                        JOptionPane.showMessageDialog(frame, "Guid must be in registry (8-4-4-4-12) format.");\r
+                        JOptionPane.showMessageDialog(topFrame, "Guid must be in registry (8-4-4-4-12) format.");\r
                         return;\r
                     }\r
                     if (jGuidTextField.getText().equals(sfc.getSpdHdrGuidValue())) {\r
@@ -247,7 +246,7 @@ public class SpdHeader extends IInternalFrame implements DocumentListener{
             jVersionTextField.addFocusListener(new FocusAdapter() {\r
                 public void focusLost(FocusEvent e) {\r
                     if (!DataValidation.isVersion(jVersionTextField.getText())) {\r
-                        JOptionPane.showMessageDialog(frame, "Version must start with a number.");\r
+                        JOptionPane.showMessageDialog(topFrame, "Version must start with a number.");\r
                         return;\r
                     }\r
                     if (jVersionTextField.getText().equals(sfc.getSpdHdrVer())) {\r
@@ -290,7 +289,7 @@ public class SpdHeader extends IInternalFrame implements DocumentListener{
             jLicenseTextArea.addFocusListener(new FocusAdapter() {\r
                 public void focusLost(FocusEvent e) {\r
                     if (jLicenseTextArea.getText().length() == 0) {\r
-                        JOptionPane.showMessageDialog(frame, "License is a required field.");\r
+                        JOptionPane.showMessageDialog(topFrame, "License is a required field.");\r
                         return;\r
                     }\r
                     if (jLicenseTextArea.getText().equals(sfc.getSpdHdrLicense())) {\r
@@ -318,7 +317,7 @@ public class SpdHeader extends IInternalFrame implements DocumentListener{
                 public void focusLost(FocusEvent e) {\r
                     if (jDescriptionTextArea.getText().length() == 0) {\r
                         JOptionPane\r
-                                   .showMessageDialog(frame,\r
+                                   .showMessageDialog(topFrame,\r
                                                       "Description is a required field, and should reflect the contents of the package.");\r
                         return;\r
                     }\r
@@ -405,7 +404,7 @@ public class SpdHeader extends IInternalFrame implements DocumentListener{
             jAbstractTextField.addFocusListener(new FocusAdapter() {\r
                 public void focusLost(FocusEvent e) {\r
                     if (!DataValidation.isAbstract(jAbstractTextField.getText())) {\r
-                        JOptionPane.showMessageDialog(frame, "Abstract could NOT be empty.");\r
+                        JOptionPane.showMessageDialog(topFrame, "Abstract could NOT be empty.");\r
                         return;\r
                     }\r
                     if (jAbstractTextField.getText().equals(sfc.getSpdHdrAbs())) {\r
@@ -443,7 +442,7 @@ public class SpdHeader extends IInternalFrame implements DocumentListener{
             jCopyrightTextArea.addFocusListener(new FocusAdapter() {\r
                 public void focusLost(FocusEvent e) {\r
                     if (!DataValidation.isCopyright(jCopyrightTextArea.getText())) {\r
-                        JOptionPane.showMessageDialog(frame, "Copyright must be entered.");\r
+                        JOptionPane.showMessageDialog(topFrame, "Copyright must be entered.");\r
                         return;\r
                     }\r
                     if (jCopyrightTextArea.getText().equals(sfc.getSpdHdrCopyright())) {\r
@@ -560,6 +559,7 @@ public class SpdHeader extends IInternalFrame implements DocumentListener{
         this(opt.getXmlSpd());\r
         docConsole = opt;\r
         initFrame();\r
+        topFrame = this;\r
     }\r
 \r
     /**\r