X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FSource%2FFrameworkWizard%2Fsrc%2Forg%2Ftianocore%2Fframeworkwizard%2Fpackaging%2Fui%2FGenGuidDialog.java;fp=Tools%2FSource%2FFrameworkWizard%2Fsrc%2Forg%2Ftianocore%2Fframeworkwizard%2Fpackaging%2Fui%2FGenGuidDialog.java;h=4e65c3c81daa1e60cced3376901a56a1c120c526;hp=9c0674ee0762b41c40fccc1c9eeca2ae7da2e052;hb=2a06ac5bc654ab86f0b94e30af23b0619a7e6fa4;hpb=2c71f6e5abba8841dce06d4686e6b4733c655285

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