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

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdHeader.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdHeader.java
index 06a376bfc53dc9dd6cbcbf2a59ba3c4e0c3754e4..516b063d664f44e4ed47fb015d3018aae9f581ae 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdHeader.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdHeader.java
@@ -23,7 +23,6 @@ import java.awt.event.FocusEvent;
 import java.util.Vector;\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
@@ -100,7 +99,6 @@ public class FpdHeader extends IInternalFrame implements DocumentListener{
     ///\r
     private static final long serialVersionUID = -8152099582923006900L;\r
 \r
-    static JFrame frame;\r
     //\r
     //Define class members\r
     //\r
@@ -187,7 +185,7 @@ public class FpdHeader extends IInternalFrame implements DocumentListener{
             jTextFieldBaseName.addFocusListener(new FocusAdapter(){\r
                public void focusLost(FocusEvent e) {\r
                    if (!DataValidation.isUiNameType(jTextFieldBaseName.getText())) {\r
-                       JOptionPane.showMessageDialog(frame, "Package Name does not match the UiNameType datatype.");\r
+                       JOptionPane.showMessageDialog(FpdHeader.this, "Package Name does not match the UiNameType datatype.");\r
                        return;\r
                    }\r
                    if (jTextFieldBaseName.getText().equals(ffc.getFpdHdrPlatformName())) {\r
@@ -215,7 +213,7 @@ public class FpdHeader extends IInternalFrame implements DocumentListener{
             jTextFieldGuid.addFocusListener(new FocusAdapter(){\r
                 public void focusLost(FocusEvent e) {\r
                     if (!DataValidation.isGuid(jTextFieldGuid.getText())) {\r
-                        JOptionPane.showMessageDialog(frame, "Guid must be in registry (8-4-4-4-12) format.");\r
+                        JOptionPane.showMessageDialog(FpdHeader.this, "Guid must be in registry (8-4-4-4-12) format.");\r
                         return;\r
                     }\r
                     if (jTextFieldGuid.getText().equals(ffc.getFpdHdrGuidValue())) {\r
@@ -243,7 +241,7 @@ public class FpdHeader extends IInternalFrame implements DocumentListener{
             jTextFieldVersion.addFocusListener(new FocusAdapter(){\r
                 public void focusLost(FocusEvent e) {\r
                     if (!DataValidation.isVersion(jTextFieldVersion.getText())) {\r
-                        JOptionPane.showMessageDialog(frame, "Version does not match the Version datatype.");\r
+                        JOptionPane.showMessageDialog(FpdHeader.this, "Version does not match the Version datatype.");\r
                         return;\r
                     }\r
                     if (jTextFieldVersion.getText().equals(ffc.getFpdHdrVer())) {\r
@@ -287,7 +285,7 @@ public class FpdHeader extends IInternalFrame implements DocumentListener{
             jTextAreaLicense.addFocusListener(new FocusAdapter(){\r
                 public void focusLost(FocusEvent e) {\r
                     if (jTextAreaLicense.getText().length() == 0) {\r
-                        JOptionPane.showMessageDialog(frame, "License must be entered!");\r
+                        JOptionPane.showMessageDialog(FpdHeader.this, "License must be entered!");\r
                         return;\r
                     }\r
                     if (jTextAreaLicense.getText().equals(ffc.getFpdHdrLicense())) {\r
@@ -314,7 +312,7 @@ public class FpdHeader extends IInternalFrame implements DocumentListener{
             jTextAreaDescription.addFocusListener(new FocusAdapter(){\r
                 public void focusLost(FocusEvent e) {\r
                     if (jTextAreaDescription.getText().length() == 0) {\r
-                        JOptionPane.showMessageDialog(frame, "Description must be entered.");\r
+                        JOptionPane.showMessageDialog(FpdHeader.this, "Description must be entered.");\r
                         return;\r
                     }\r
                     if (jTextAreaDescription.getText().equals(ffc.getFpdHdrDescription())) {\r
@@ -432,7 +430,7 @@ public class FpdHeader extends IInternalFrame implements DocumentListener{
             jTextFieldAbstract.addFocusListener(new FocusAdapter(){\r
                 public void focusLost(FocusEvent e) {\r
                     if (!DataValidation.isAbstract(jTextFieldAbstract.getText())) {\r
-                        JOptionPane.showMessageDialog(frame, "Abstract must be entered.");\r
+                        JOptionPane.showMessageDialog(FpdHeader.this, "Abstract must be entered.");\r
                         return;\r
                     }\r
                     if (jTextFieldAbstract.getText().equals(ffc.getFpdHdrAbs())) {\r
@@ -470,7 +468,7 @@ public class FpdHeader 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(FpdHeader.this, "Copyright must be entered.");\r
                         return;\r
                     }\r
                     if (jCopyrightTextArea.getText().equals(ffc.getFpdHdrCopyright())) {\r