Mercurial > hg > openjdk > jdk8 > jdk
changeset 8095:80a8c4ff3b51
8007156: [macosx] Wrong events in processKeyBinding of JTable Submit Date
Reviewed-by: leonidr
author | alexsch |
---|---|
date | Tue, 03 Sep 2013 17:27:20 +0400 |
parents | b5ed8686cc01 |
children | 2ad01ecbaf90 |
files | src/macosx/classes/sun/lwawt/LWComponentPeer.java src/macosx/classes/sun/lwawt/LWWindowPeer.java test/java/awt/event/KeyEvent/ExtendedKeyCode/ExtendedKeyCodeTest.java |
diffstat | 3 files changed, 89 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/macosx/classes/sun/lwawt/LWComponentPeer.java Tue Sep 03 11:00:06 2013 +0400 +++ b/src/macosx/classes/sun/lwawt/LWComponentPeer.java Tue Sep 03 17:27:20 2013 +0400 @@ -1254,6 +1254,8 @@ KeyEvent ke = (KeyEvent) e; delegateEvent = new KeyEvent(getDelegateFocusOwner(), ke.getID(), ke.getWhen(), ke.getModifiers(), ke.getKeyCode(), ke.getKeyChar(), ke.getKeyLocation()); + AWTAccessor.getKeyEventAccessor().setExtendedKeyCode((KeyEvent) delegateEvent, + ke.getExtendedKeyCode()); } else if (e instanceof FocusEvent) { FocusEvent fe = (FocusEvent) e; delegateEvent = new FocusEvent(getDelegateFocusOwner(), fe.getID(), fe.isTemporary());
--- a/src/macosx/classes/sun/lwawt/LWWindowPeer.java Tue Sep 03 11:00:06 2013 +0400 +++ b/src/macosx/classes/sun/lwawt/LWWindowPeer.java Tue Sep 03 17:27:20 2013 +0400 @@ -933,7 +933,12 @@ focusOwner = this.getTarget(); } } - postEvent(new KeyEvent(focusOwner, id, when, modifiers, keyCode, keyChar, keyLocation)); + + KeyEvent keyEvent = new KeyEvent(focusOwner, id, when, modifiers, + keyCode, keyChar, keyLocation); + AWTAccessor.getKeyEventAccessor().setExtendedKeyCode(keyEvent, + ExtendedKeyCodes.getExtendedKeyCodeForChar(keyChar)); + postEvent(keyEvent); } // ---- UTILITY METHODS ---- //
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/java/awt/event/KeyEvent/ExtendedKeyCode/ExtendedKeyCodeTest.java Tue Sep 03 17:27:20 2013 +0400 @@ -0,0 +1,81 @@ +/* + * Copyright (c) 2011, 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import java.awt.Frame; +import java.awt.Robot; +import java.awt.Toolkit; +import java.awt.event.KeyEvent; +import java.awt.event.KeyAdapter; +import sun.awt.ExtendedKeyCodes; +import sun.awt.SunToolkit; + +/* + * @test + * @bug 8007156 + * @summary Extended key code is not set for a key event + * @author Alexandr Scherbatiy + * @run main ExtendedKeyCodeTest + */ +public class ExtendedKeyCodeTest { + + private static volatile boolean setExtendedKeyCode = true; + private static volatile int eventsCount = 0; + + public static void main(String[] args) throws Exception { + SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit(); + Robot robot = new Robot(); + + Frame frame = new Frame(); + frame.setSize(300, 300); + + frame.addKeyListener(new KeyAdapter() { + + @Override + public void keyPressed(KeyEvent e) { + eventsCount++; + setExtendedKeyCode = setExtendedKeyCode && (e.getExtendedKeyCode() + == ExtendedKeyCodes.getExtendedKeyCodeForChar(e.getKeyChar())); + } + + @Override + public void keyReleased(KeyEvent e) { + eventsCount++; + setExtendedKeyCode = setExtendedKeyCode && (e.getExtendedKeyCode() + == ExtendedKeyCodes.getExtendedKeyCodeForChar(e.getKeyChar())); + } + }); + + frame.setVisible(true); + toolkit.realSync(); + + robot.keyPress(KeyEvent.VK_D); + robot.keyRelease(KeyEvent.VK_D); + toolkit.realSync(); + + frame.dispose(); + + if (eventsCount != 2 || !setExtendedKeyCode) { + throw new RuntimeException("Wrong extended key code"); + } + } +}