Add no mouse support for table cell editors.

[mirror_edk2.git] / Tools / Source / FrameworkWizard / src / org / tianocore / frameworkwizard / packaging / ui / GenGuidDialog.java

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/GenGuidDialog.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/GenGuidDialog.java
index 9c0674ee0762b41c40fccc1c9eeca2ae7da2e052..4e65c3c81daa1e60cced3376901a56a1c120c526 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/GenGuidDialog.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/GenGuidDialog.java
@@ -20,6 +20,7 @@ import javax.swing.JPanel;
 import javax.swing.JDialog;\r
 import java.awt.GridLayout;\r
 \r
+import javax.swing.JComponent;\r
 import javax.swing.JFrame;\r
 import javax.swing.JOptionPane;\r
 import javax.swing.JTextField;\r
@@ -27,12 +28,14 @@ import javax.swing.JLabel;
 import javax.swing.JRadioButton;\r
 import javax.swing.ButtonGroup;\r
 import javax.swing.JButton;\r
+import javax.swing.KeyStroke;\r
 \r
 import org.tianocore.frameworkwizard.common.Tools;\r
 \r
 import java.awt.FlowLayout;\r
 import java.awt.event.ActionEvent;\r
 import java.awt.event.ActionListener;\r
+import java.awt.event.KeyEvent;\r
 import java.awt.event.WindowAdapter;\r
 import java.awt.event.WindowEvent;\r
 \r
@@ -62,6 +65,7 @@ public class GenGuidDialog extends JDialog implements ActionListener{
     private JButton jButtonCancel = null;\r
     private JButton jButtonNew = null;\r
     private JButton jButtonOk = null;\r
+    private ActionListener outerListener = null;\r
     \r
 //    private String guid = null;\r
 \r
@@ -121,7 +125,7 @@ public class GenGuidDialog extends JDialog implements ActionListener{
 //            else {\r
 //                JOptionPane.showMessageDialog(frame, "Incorrect GUID Value Format.");\r
 //            }\r
-            this.dispose();\r
+//            this.dispose();\r
         }\r
         \r
         if (arg0.getSource() == jButtonCancel){\r
@@ -227,6 +231,7 @@ public class GenGuidDialog extends JDialog implements ActionListener{
             jButtonCancel.setPreferredSize(new java.awt.Dimension(80,20));\r
             jButtonCancel.setText("Cancel");\r
             jButtonCancel.addActionListener(this);\r
+            jButtonCancel.registerKeyboardAction(this, KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0, false), JComponent.WHEN_FOCUSED);\r
         }\r
         return jButtonCancel;\r
     }\r
@@ -243,6 +248,7 @@ public class GenGuidDialog extends JDialog implements ActionListener{
             jButtonNew.setHorizontalTextPosition(javax.swing.SwingConstants.LEADING);\r
             jButtonNew.setText("New");\r
             jButtonNew.addActionListener(this);\r
+            jButtonNew.registerKeyboardAction(this, KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0, false), JComponent.WHEN_FOCUSED);\r
         }\r
         return jButtonNew;\r
     }\r
@@ -258,7 +264,9 @@ public class GenGuidDialog extends JDialog implements ActionListener{
             jButtonOk.setPreferredSize(new java.awt.Dimension(80,20));\r
             jButtonOk.setText("Ok");\r
             jButtonOk.setActionCommand("GenGuidValue");\r
-            jButtonOk.addActionListener(this);\r
+//            jButtonOk.addActionListener(this);\r
+            jButtonOk.registerKeyboardAction(outerListener, KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0, false), JComponent.WHEN_FOCUSED);\r
+            \r
         }\r
         return jButtonOk;\r
     }\r
@@ -289,6 +297,7 @@ public class GenGuidDialog extends JDialog implements ActionListener{
     \r
     public GenGuidDialog(ActionListener i){\r
         super();\r
+        outerListener = i;\r
         initialize();\r
         jButtonOk.addActionListener(i);\r
         this.addWindowListener(new WindowAdapter(){\r