Mercurial > hg > release > icedtea7-forest-2.6 > jdk
changeset 6318:af6be9d7aed7 jdk7u21-b05
Merge
author | coffeys |
---|---|
date | Tue, 05 Mar 2013 00:22:26 +0000 |
parents | 245c2dce7225 (current diff) 698d0997fef1 (diff) |
children | 17ac71e7b720 |
files | |
diffstat | 7 files changed, 119 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon Mar 04 12:29:30 2013 -0800 +++ b/.hgtags Tue Mar 05 00:22:26 2013 +0000 @@ -199,6 +199,7 @@ 0ae89e53f5300da1961984a7d81c220c7cf717d7 jdk7u6-b23 1c775da998735711853cfe1ae1d6baddc5f12a66 jdk7u6-b24 4bd0528374971157afd6372890f4250e1cf712d9 jdk7u6-b30 +8c2c5d63a17ee5aa85face026d6f60fb7d34aded jdk7u6-b31 78e01a6ca8d30e8fc4eb297d297a098edfb3fec6 jdk7u7-b10 9666d4e4bbf3f80614e246d5c15df86154544013 jdk7u7-b30 94154c14973aee7c5ff4846af7bcb71fe7a82fa5 jdk7u7-b11 @@ -212,6 +213,8 @@ 901c290c9c8b495a2696f10a87523363239d001b jdk7u9-b02 7302c386ca9c6cd20c27d0a2adb0b142f679d6b3 jdk7u9-b04 ffad06d7009576c3098705e05452ebc309a59e56 jdk7u9-b05 +3b1a395f1948c7063d342a0c3e26c8450c6e7acb jdk7u9-b31 +77f7e5f13763fed11afb6e12840d78bd55c2d979 jdk7u9-b32 c1efb11d7db509dafd7882811b2562ba593f6431 jdk7u10-b10 0243e41000c6f76654725cac31ffdc95633c63e7 jdk7u10-b11 c86a49dd4a0dca3a56f00429cfcffb2ad5f2a224 jdk7u10-b12 @@ -222,8 +225,11 @@ a1c5bac982a6d4aa58f551cb46cde53f526aca48 jdk7u10-b17 115d1e4365293846bbc911cf312886c471e37fbd jdk7u10-b18 84218dff5e4c7bc00fd9266769c0d12bdde866f5 jdk7u10-b30 +3515fd583ede49b125a0b5f72ac403b3984d199b jdk7u10-b31 ecc14534318c80dc7612c8b1d328a67849c5b07f jdk7u11-b20 d9969a953f693f5760b1d2759f11a2cb222e4f20 jdk7u11-b21 +c7282a85c6bcc717b7099a03db028ecb77b41098 jdk7u11-b32 +8fd5e105c6a288b01f8809a6c84a5a64a63f39be jdk7u11-b33 84da14fbd3ac12a3c6734fa4b6a366cfde1426af jdk7u11-b03 932ef74edbf984299a68c126c70bbe04ffbde9b5 jdk7u11-b04 fb35fb91f6478f8076993bcc4112746bcd9a2985 jdk7u11-b05 @@ -236,4 +242,12 @@ 8eb180a284b0911b2645d5cbdff5be499a75d6b2 jdk7u13-b20 835448d525a10bb826f4f7ebe272fc410bdb0f5d jdk7u15-b01 0443fe2d8023111b52f4c8db32e038f4a5a9f373 jdk7u15-b02 +70b0f967c0649c501fb14a27bb06daeccbff823a jdk7u15-b30 +9f20468265071696b4d2ece286bc228a4d5a302a jdk7u15-b31 +3ef25219292f57ea56ac0ef338ceadf5fd098bdf jdk7u15-b33 +87e45d30e24db726ea03b20d861f0a025e437641 jdk7u15-b03 +b5ae6fb92e71df1833221026efe50863593bf682 jdk7u17-b01 +b130c8cfecfc552614047b3244d5d94439827fcd jdk7u17-b02 +a474615061bf610105a426780a7ac4c95bd76456 jdk7u17-b30 +1ad6f413e250bd2671b4908e232bd0d244c917a7 jdk7u17-b31 8261e56b7f91c7553e8485b206bdc9030a3546e4 jdk7u21-b01
--- a/src/macosx/classes/sun/lwawt/LWToolkit.java Mon Mar 04 12:29:30 2013 -0800 +++ b/src/macosx/classes/sun/lwawt/LWToolkit.java Tue Mar 05 00:22:26 2013 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2013, 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 @@ -538,7 +538,7 @@ @Override public void ungrab(Window w) { if (w.getPeer() != null) { - ((LWWindowPeer)w.getPeer()).ungrab(); + ((LWWindowPeer)w.getPeer()).ungrab(false); } } }
--- a/src/macosx/classes/sun/lwawt/LWWindowPeer.java Mon Mar 04 12:29:30 2013 -0800 +++ b/src/macosx/classes/sun/lwawt/LWWindowPeer.java Tue Mar 05 00:22:26 2013 +0000 @@ -1268,13 +1268,19 @@ grabbingWindow = this; } - void ungrab() { + final void ungrab(boolean doPost) { if (isGrabbing()) { grabbingWindow = null; - postEvent(new UngrabEvent(getTarget())); + if (doPost) { + postEvent(new UngrabEvent(getTarget())); + } } } + void ungrab() { + ungrab(true); + } + private boolean isGrabbing() { return this == grabbingWindow; }
--- a/src/macosx/classes/sun/lwawt/macosx/CEmbeddedFrame.java Mon Mar 04 12:29:30 2013 -0800 +++ b/src/macosx/classes/sun/lwawt/macosx/CEmbeddedFrame.java Tue Mar 05 00:22:26 2013 +0000 @@ -119,7 +119,9 @@ public void handleWindowFocusEvent(boolean parentWindowActive) { this.parentWindowActive = parentWindowActive; - if (focused) { + // ignore focus "lost" native request as it may mistakenly + // deactivate active window (see 8001161) + if (focused && parentWindowActive) { responder.handleWindowFocusEvent(parentWindowActive); } }
--- a/src/windows/bin/cmdtoargs.c Mon Mar 04 12:29:30 2013 -0800 +++ b/src/windows/bin/cmdtoargs.c Tue Mar 05 00:22:26 2013 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2013, 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 @@ -104,6 +104,11 @@ case ' ': case '\t': + if (prev == '\\') { + for (i = 0 ; i < slashes; i++) { + *dest++ = prev; + } + } if (quotes % 2 == 1) { *dest++ = ch; } else { @@ -591,6 +596,12 @@ // v->disable(); vectors[i++] = v; + v= new Vector(argv[0], "a b\\\\ d"); + v->add("a", FALSE); + v->add("b\\\\", FALSE); + v->add("d", FALSE); + vectors[i++] = v; + dotest(vectors); printf("All tests pass [%d]\n", i); doexit(0);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/javax/swing/JComboBox/ShowPopupAfterHidePopupTest/ShowPopupAfterHidePopupTest.java Tue Mar 05 00:22:26 2013 +0000 @@ -0,0 +1,78 @@ +/* + * Copyright (c) 2013, 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 8006417 + @summary JComboBox.showPopup(), hidePopup() fails in JRE 1.7 on OS X + @author Anton Litvinov +*/ + +import java.awt.*; + +import javax.swing.*; +import javax.swing.plaf.metal.*; + +import sun.awt.SunToolkit; + +public class ShowPopupAfterHidePopupTest { + private static JFrame frame = null; + private static JComboBox comboBox = null; + private static boolean popupIsVisible = false; + + public static void main(String[] args) throws Exception { + UIManager.setLookAndFeel(new MetalLookAndFeel()); + SwingUtilities.invokeAndWait(new Runnable() { + @Override + public void run() { + frame = new JFrame("Popup Menu of JComboBox"); + comboBox = new JComboBox(new String[]{"Item1", "Item2", "Item3"}); + frame.getContentPane().add(comboBox); + frame.pack(); + frame.setVisible(true); + } + }); + final SunToolkit toolkit = (SunToolkit)Toolkit.getDefaultToolkit(); + toolkit.realSync(); + + SwingUtilities.invokeAndWait(new Runnable() { + @Override + public void run() { + comboBox.showPopup(); + comboBox.hidePopup(); + comboBox.showPopup(); + } + }); + toolkit.realSync(); + + SwingUtilities.invokeAndWait(new Runnable() { + @Override + public void run() { + popupIsVisible = comboBox.isPopupVisible(); + frame.dispose(); + } + }); + if (!popupIsVisible) { + throw new RuntimeException("Calling hidePopup() affected the next call to showPopup()."); + } + } +}
--- a/test/tools/launcher/Arrrghs.java Mon Mar 04 12:29:30 2013 -0800 +++ b/test/tools/launcher/Arrrghs.java Tue Mar 05 00:22:26 2013 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2013, 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 @@ -311,6 +311,7 @@ checkArgumentParsing("../../*", "../../*"); checkArgumentParsing("..\\..\\", "..\\..\\"); checkArgumentParsing("../../", "../../"); + checkArgumentParsing("a b\\ c", "a", "b\\", "c"); } private void initEmptyDir(File emptyDir) throws IOException {