--- old/src/java.desktop/macosx/classes/sun/lwawt/macosx/LWCToolkit.java 2017-11-22 07:25:58.000000000 -0800 +++ new/src/java.desktop/macosx/classes/sun/lwawt/macosx/LWCToolkit.java 2017-11-22 07:25:57.000000000 -0800 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -502,30 +502,18 @@ } } - /** - * Determines which modifier key is the appropriate accelerator - * key for menu shortcuts. - *

- * Menu shortcuts, which are embodied in the - * {@code MenuShortcut} class, are handled by the - * {@code MenuBar} class. - *

- * By default, this method returns {@code Event.CTRL_MASK}. - * Toolkit implementations should override this method if the - * Control key isn't the correct key for accelerators. - * @return the modifier mask on the {@code Event} class - * that is used for menu shortcuts on this toolkit. - * @see java.awt.MenuBar - * @see java.awt.MenuShortcut - * @since 1.1 - */ @Override - @SuppressWarnings("deprecation") + @Deprecated(since = "10") public int getMenuShortcutKeyMask() { return Event.META_MASK; } @Override + public int getMenuShortcutKeyMaskEx() { + return InputEvent.META_DOWN_MASK; + } + + @Override public Image getImage(final String filename) { final Image nsImage = checkForNSImage(filename); if (nsImage != null) {