changeset 28986:79f293b29d6a

8068040: [macosx] Combo box consuming ENTER key Reviewed-by: serb, azvegint
author alexsch
date Fri, 16 Jan 2015 19:11:10 +0400
parents 33e7de0337d9
children a389d5a5bc45
files jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaComboBoxUI.java jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaKeyBindings.java
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaComboBoxUI.java	Fri Jan 16 13:53:44 2015 +0300
+++ b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaComboBoxUI.java	Fri Jan 16 19:11:10 2015 +0400
@@ -275,7 +275,7 @@
 
         actionMap.put("aquaSelectNext", highlightNextAction);
         actionMap.put("aquaSelectPrevious", highlightPreviousAction);
-        actionMap.put("aquaEnterPressed", triggerSelectionAction);
+        actionMap.put("enterPressed", triggerSelectionAction);
         actionMap.put("aquaSpacePressed", toggleSelectionAction);
 
         actionMap.put("aquaSelectHome", highlightFirstAction);
--- a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaKeyBindings.java	Fri Jan 16 13:53:44 2015 +0300
+++ b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaKeyBindings.java	Fri Jan 16 19:11:10 2015 +0400
@@ -214,7 +214,7 @@
             "PAGE_DOWN", "aquaSelectPageDown",
             "HOME", "aquaSelectHome",
             "END", "aquaSelectEnd",
-            "ENTER", "aquaEnterPressed",
+            "ENTER", "enterPressed",
             "UP", "aquaSelectPrevious",
             "KP_UP", "aquaSelectPrevious",
             "DOWN", "aquaSelectNext",