OpenJDK / jdk8u / jdk8u / jdk
changeset 10533:b1be6ed0ec4b
Merge
author | coffeys |
---|---|
date | Wed, 04 Mar 2015 12:22:34 +0000 |
parents | ed6bea8df5d4 00976f2e7ebf |
children | 569ad82d3904 |
files | |
diffstat | 3 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/macosx/classes/com/apple/laf/AquaComboBoxUI.java Thu Jan 29 20:45:30 2015 +0000 +++ b/src/macosx/classes/com/apple/laf/AquaComboBoxUI.java Wed Mar 04 12:22:34 2015 +0000 @@ -273,7 +273,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/src/macosx/classes/com/apple/laf/AquaKeyBindings.java Thu Jan 29 20:45:30 2015 +0000 +++ b/src/macosx/classes/com/apple/laf/AquaKeyBindings.java Wed Mar 04 12:22:34 2015 +0000 @@ -214,7 +214,7 @@ "PAGE_DOWN", "aquaSelectPageDown", "HOME", "aquaSelectHome", "END", "aquaSelectEnd", - "ENTER", "aquaEnterPressed", + "ENTER", "enterPressed", "UP", "aquaSelectPrevious", "KP_UP", "aquaSelectPrevious", "DOWN", "aquaSelectNext",
--- a/src/share/classes/sun/launcher/resources/launcher.properties Thu Jan 29 20:45:30 2015 +0000 +++ b/src/share/classes/sun/launcher/resources/launcher.properties Wed Mar 04 12:22:34 2015 +0000 @@ -47,9 +47,13 @@ \ enable verbose output\n\ \ -version print product version and exit\n\ \ -version:<value>\n\ +\ Warning: this feature is deprecated and will be removed\n\ +\ in a future release.\n\ \ require the specified version to run\n\ \ -showversion print product version and continue\n\ \ -jre-restrict-search | -no-jre-restrict-search\n\ +\ Warning: this feature is deprecated and will be removed\n\ +\ in a future release.\n\ \ include/exclude user private JREs in the version search\n\ \ -? -help print this help message\n\ \ -X print help on non-standard options\n\