Mercurial > hg > icedtea7-forest-aarch64 > jdk
changeset 7695:7190843ddaf4 jdk7u60-b19
8036861: Application can't be loaded fine,the save dialog can't show up.
Reviewed-by: serb, azvegint
author | pchelko |
---|---|
date | Wed, 07 May 2014 16:23:04 +0100 |
parents | b622f43c4962 |
children | 8dc56d0f3e86 |
files | src/windows/classes/sun/awt/windows/WToolkit.java test/java/awt/Toolkit/ToolkitPropertyTest/NoAppContextTest.java |
diffstat | 2 files changed, 6 insertions(+), 210 deletions(-) [+] |
line wrap: on
line diff
--- a/src/windows/classes/sun/awt/windows/WToolkit.java Wed Apr 30 14:06:24 2014 -0700 +++ b/src/windows/classes/sun/awt/windows/WToolkit.java Wed May 07 16:23:04 2014 +0100 @@ -864,18 +864,12 @@ * Windows doesn't always send WM_SETTINGCHANGE when it should. */ private void windowsSettingChange() { - if (AppContext.getAppContext() == null) { - // No AppContext, so we can update properties on the current thread, - // DesktopPropertyChangeSupport will only post events. - updateProperties(); - } else { - EventQueue.invokeLater(new Runnable() { - @Override - public void run() { - updateProperties(); - } - }); - } + EventQueue.invokeLater(new Runnable() { + @Override + public void run() { + updateProperties(); + } + }); } private synchronized void updateProperties() {
--- a/test/java/awt/Toolkit/ToolkitPropertyTest/NoAppContextTest.java Wed Apr 30 14:06:24 2014 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,198 +0,0 @@ -/* - * Copyright (c) 2014, 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 8032960 - * @summary checks that desktop properties work if Toolkit thread has no AppContext - * @author Petr Pchelko - */ - -import sun.awt.OSInfo; -import sun.awt.SunToolkit; - -import javax.swing.*; -import java.awt.*; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicReference; - -public class NoAppContextTest { - - private static final ThreadGroup stubGroup = new ThreadGroup("stub"); - private static final ThreadGroup awtGroup = new ThreadGroup("AWT"); - private static final AtomicBoolean propertyChangeFired = new AtomicBoolean(false); - private static Frame frame; - - private static final Object LOCK = new Object(); - - public static void main(String[] args) throws Exception { - - if (OSInfo.getOSType() != OSInfo.OSType.WINDOWS) { - // The test is for Windows platform only - return; - } - - createStubContext(); - - Thread awtThread = new Thread(awtGroup, new Runnable() { - @Override - public void run() { - SunToolkit.createNewAppContext(); - SwingUtilities.invokeLater(new Runnable() { - @Override - public void run() { - synchronized (LOCK) { - frame = new Frame(); - frame.setBounds(100, 100, 100, 100); - frame.setVisible(true); - Toolkit.getDefaultToolkit().addPropertyChangeListener("win.propNames", new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent ev) { - propertyChangeFired.set(true); - } - }); - } - } - }); - } - }); - awtThread.start(); - awtThread.join(); - sync(); - - final GraphicsDevice device = GraphicsEnvironment.getLocalGraphicsEnvironment() - .getDefaultScreenDevice(); - - final AtomicReference<DisplayMode> originalRef = new AtomicReference<>(); - try { - final AtomicBoolean isSupported = new AtomicBoolean(true); - invokeInAWT(new Runnable() { - @Override - public void run() { - if (device.isFullScreenSupported()) { - device.setFullScreenWindow(frame); - } else { - isSupported.set(false); - } - } - }); - if (!isSupported.get()) { - return; - } - invokeInAWT(new Runnable() { - @Override - public void run() { - if (device.isDisplayChangeSupported()) { - DisplayMode original = device.getDisplayMode(); - originalRef.set(original); - try { - DisplayMode[] modes = device.getDisplayModes(); - for (DisplayMode mode : modes) { - if (!mode.equals(original)) { - device.setDisplayMode(mode); - break; - } - } - } finally { - device.setDisplayMode(original); - } - } else { - isSupported.set(false); - } - } - }); - if (!isSupported.get()) { - return; - } - } finally { - invokeInAWT(new Runnable() { - @Override - public void run() { - device.setDisplayMode(originalRef.get()); - frame.dispose(); - } - }); - } - - if (!propertyChangeFired.get()) { - throw new RuntimeException("Failed: PropertyChange did not fire"); - } - } - - private static void invokeInAWT(final Runnable r) throws InterruptedException { - Thread awtThread = new Thread(awtGroup, new Runnable() { - @Override - public void run() { - SwingUtilities.invokeLater(new Runnable() { - @Override - public void run() { - synchronized (LOCK) { - r.run(); - } - } - }); - } - }); - awtThread.start(); - awtThread.join(); - sync(); - } - - private static void createStubContext() throws InterruptedException { - Thread stub = new Thread(stubGroup, new Runnable() { - @Override - public void run() { - SunToolkit.createNewAppContext(); - } - }); - stub.start(); - stub.join(); - } - - /** - * Runs realSync on a thread with an AppContext and waits for it to finish - */ - private static void sync() throws InterruptedException { - final AtomicReference<InterruptedException> exc = new AtomicReference<>(null); - - Thread syncThread = new Thread(awtGroup, new Runnable() { - @Override - public void run() { - try { - ((SunToolkit) Toolkit.getDefaultToolkit()).realSync(); - Thread.sleep(2000); - } catch (InterruptedException e) { - exc.set(e); - } - } - }); - syncThread.start(); - syncThread.join(); - if (exc.get() != null) { - throw exc.get(); - } - } -} -