Mercurial > hg > openjdk > jdk8u > jdk
changeset 10917:ea547c5a1217 jdk8u45-b32
Merge
author | asaha |
---|---|
date | Mon, 13 Apr 2015 19:21:09 -0700 |
parents | 7087623dfa70 (current diff) c7fbbf6133c3 (diff) |
children | 4a2ba0cecaf1 |
files | .hgtags |
diffstat | 6 files changed, 221 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Fri Apr 10 07:27:56 2015 -0700 +++ b/.hgtags Mon Apr 13 19:21:09 2015 -0700 @@ -353,9 +353,11 @@ a21dd7999d1e4ba612c951c2c78504d23eb7243a jdk8u31-b11 6a12f34816d2ee12368274fc21225384a8893426 jdk8u31-b12 1fbdd5d80d0671decd8acb5adb64866f609e986f jdk8u31-b13 -ced84cf3eebc69f7e04b0098d85dcb3a6b872586 jdk8u31-b31 +a1c3099e1b90230435e890ca56adc8a5aa5149ff jdk8u31-b33 367c7f061c5831ee54cd197f727e06109a67875b jdk8u31-b14 287e3219f3f531b2f20b50b180802a563a782b26 jdk8u31-b15 +ced84cf3eebc69f7e04b0098d85dcb3a6b872586 jdk8u31-b31 +46338075c4262057099e57638e0758817052da0d jdk8u31-b32 e6ed015afbbf3459ba3297e270b4f3170e989c80 jdk8u40-b00 6e223d48080ef40f4ec11ecbcd19b4a20813b9eb jdk8u40-b01 4797cd0713b44b009525f1276d571ade7e24f3f5 jdk8u40-b02
--- a/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java Fri Apr 10 07:27:56 2015 -0700 +++ b/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java Mon Apr 13 19:21:09 2015 -0700 @@ -488,6 +488,9 @@ } else { deliverZoom(true); + // We need an up to date size of the peer, so we flush the native events + // to be sure that there are no setBounds requests in the queue. + LWCToolkit.flushNativeSelectors(); this.normalBounds = peer.getBounds(); GraphicsConfiguration config = getPeer().getGraphicsConfiguration();
--- a/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java Fri Apr 10 07:27:56 2015 -0700 +++ b/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java Mon Apr 13 19:21:09 2015 -0700 @@ -833,7 +833,7 @@ /** * Just spin a single empty block synchronously. */ - private static native void flushNativeSelectors(); + static native void flushNativeSelectors(); @Override public Clipboard createPlatformClipboard() {
--- a/src/macosx/native/sun/awt/AWTView.m Fri Apr 10 07:27:56 2015 -0700 +++ b/src/macosx/native/sun/awt/AWTView.m Mon Apr 13 19:21:09 2015 -0700 @@ -889,9 +889,9 @@ // text, or 'text in progress'. We also need to send the event if we get an insert text out of the blue! // (i.e., when the user uses the Character palette or Inkwell), or when the string to insert is a complex // Unicode value. - NSUInteger utf8Length = [aString lengthOfBytesUsingEncoding:NSUTF8StringEncoding]; + NSUInteger utf16Length = [aString lengthOfBytesUsingEncoding:NSUTF16StringEncoding]; - if ([self hasMarkedText] || !fProcessingKeystroke || (utf8Length > 1)) { + if ([self hasMarkedText] || !fProcessingKeystroke || (utf16Length > 2)) { JNIEnv *env = [ThreadUtilities getJNIEnv]; static JNF_MEMBER_CACHE(jm_selectPreviousGlyph, jc_CInputMethod, "selectPreviousGlyph", "()V");
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/java/awt/Frame/MaximizedNormalBoundsUndecoratedTest/MaximizedNormalBoundsUndecoratedTest.java Mon Apr 13 19:21:09 2015 -0700 @@ -0,0 +1,76 @@ +/* + * Copyright (c) 2007, 2015, 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.Toolkit; +import java.awt.Dimension; +/* + * @test + * @bug 8066436 + * @summary Set the size of frame. Set extendedState Frame.MAXIMIZED_BOTH and Frame.NORMAL + * sequentially for undecorated Frame and . + * Check if resulted size is equal to original frame size. + * @run main MaximizedNormalBoundsUndecoratedTest + */ + + +public class MaximizedNormalBoundsUndecoratedTest { + private Frame frame; + public static void main(String args[]) { + if (!Toolkit.getDefaultToolkit().isFrameStateSupported(Frame.MAXIMIZED_BOTH) + && !Toolkit.getDefaultToolkit().isFrameStateSupported(Frame.NORMAL)) { + return; + } + MaximizedNormalBoundsUndecoratedTest test = new MaximizedNormalBoundsUndecoratedTest(); + boolean doPass = true; + if( !test.doTest() ) { + System.out.println("Maximizing frame not saving correct normal bounds"); + doPass = false; + } + + if(!doPass) { + throw new RuntimeException("Maximizing frame not saving correct normal bounds"); + } + } + + boolean doTest() { + Dimension beforeMaximizeCalled = new Dimension(300,300); + + frame = new Frame("Test Frame"); + frame.setUndecorated(true); + frame.setFocusable(true); + frame.setSize(beforeMaximizeCalled); + frame.setVisible(true); + frame.setExtendedState(Frame.MAXIMIZED_BOTH); + frame.setExtendedState(Frame.NORMAL); + + Dimension afterMaximizedCalled= frame.getBounds().getSize(); + + frame.dispose(); + + if (beforeMaximizeCalled.equals(afterMaximizedCalled)) { + return true; + } + return false; + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/java/awt/event/KeyEvent/AltCharAcceleratorTest/AltCharAcceleratorTest.java Mon Apr 13 19:21:09 2015 -0700 @@ -0,0 +1,136 @@ +/* + * Copyright (c) 2015, 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. + */ + +/* +@test +@bug 8068283 +@summary Checks that <Alt>+Char accelerators work when pressed in a text component +@author Anton Nashatyrev +@run main AltCharAcceleratorTest +*/ + +import sun.awt.SunToolkit; + +import javax.swing.*; +import java.awt.*; +import java.awt.event.*; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; + +public class AltCharAcceleratorTest { + + boolean action1 = false; + boolean action2 = false; + + CountDownLatch focusLatch = new CountDownLatch(1); + CountDownLatch actionLatch = new CountDownLatch(2); + + public AltCharAcceleratorTest() throws Exception { + SwingUtilities.invokeAndWait(new Runnable() { + @Override + public void run() { + JFrame f = new JFrame("frame"); + final JTextField t = new JTextField(); + JMenuBar mb = new JMenuBar(); + JMenu m1 = new JMenu("File"); + JMenuItem i1 = new JMenuItem("Save"); + JMenuItem i2 = new JMenuItem("Load"); + + i1.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_T, KeyEvent.ALT_MASK)); + i2.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_F, KeyEvent.ALT_MASK)); + + i1.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + System.out.println("Action1!"); + action1 = true; + actionLatch.countDown(); + } + }); + + i2.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + System.out.println("Action2!"); + action2 = true; + actionLatch.countDown(); + } + }); + + t.addFocusListener(new FocusAdapter() { + @Override + public void focusGained(FocusEvent e) { + System.out.println("Focused!"); + focusLatch.countDown(); + } + }); + + t.setColumns(10); + t.requestFocusInWindow(); + + f.setJMenuBar(mb); + mb.add(m1); + m1.add(i1); + m1.add(i2); + + f.setLayout(new FlowLayout()); + f.add(t); + f.setSize(200, 200); + + f.setVisible(true); + } + }); + } + + void test() throws Exception { + ((SunToolkit) Toolkit.getDefaultToolkit()).realSync(); + + focusLatch.await(5, TimeUnit.SECONDS); + + Robot robot = new Robot(); + robot.setAutoDelay(100); + + robot.keyPress(KeyEvent.VK_ALT); + robot.keyPress(KeyEvent.VK_T); + robot.keyRelease(KeyEvent.VK_T); + robot.keyRelease(KeyEvent.VK_ALT); + + robot.keyPress(KeyEvent.VK_ALT); + robot.keyPress(KeyEvent.VK_F); + robot.keyRelease(KeyEvent.VK_F); + robot.keyRelease(KeyEvent.VK_ALT); + + actionLatch.await(5, TimeUnit.SECONDS); + + if (!action1 || !action2) { + throw new RuntimeException("Actions not performed"); + } + + System.out.println("Passed."); + } + + public static void main(String[] args) throws Exception { + AltCharAcceleratorTest t = new AltCharAcceleratorTest(); + t.test(); + } +} \ No newline at end of file