Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
be69a164
D
dragonwell8_jdk
项目概览
openanolis
/
dragonwell8_jdk
通知
4
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dragonwell8_jdk
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
be69a164
编写于
5月 08, 2014
作者:
P
pchelko
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8036861: Application can't be loaded fine,the save dialog can't show up.
Reviewed-by: serb, azvegint
上级
df6a6845
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
1 addition
and
171 deletion
+1
-171
src/windows/classes/sun/awt/windows/WToolkit.java
src/windows/classes/sun/awt/windows/WToolkit.java
+1
-7
test/java/awt/Toolkit/ToolkitPropertyTest/NoAppContextTest.java
...ava/awt/Toolkit/ToolkitPropertyTest/NoAppContextTest.java
+0
-164
未找到文件。
src/windows/classes/sun/awt/windows/WToolkit.java
浏览文件 @
be69a164
...
@@ -867,13 +867,7 @@ public class WToolkit extends SunToolkit implements Runnable {
...
@@ -867,13 +867,7 @@ public class WToolkit extends SunToolkit implements Runnable {
* Windows doesn't always send WM_SETTINGCHANGE when it should.
* Windows doesn't always send WM_SETTINGCHANGE when it should.
*/
*/
private
void
windowsSettingChange
()
{
private
void
windowsSettingChange
()
{
if
(
AppContext
.
getAppContext
()
==
null
)
{
EventQueue
.
invokeLater
(
this
::
updateProperties
);
// No AppContext, so we can update properties on the current thread,
// DesktopPropertyChangeSupport will only post events.
updateProperties
();
}
else
{
EventQueue
.
invokeLater
(
this
::
updateProperties
);
}
}
}
private
synchronized
void
updateProperties
()
{
private
synchronized
void
updateProperties
()
{
...
...
test/java/awt/Toolkit/ToolkitPropertyTest/NoAppContextTest.java
已删除
100644 → 0
浏览文件 @
df6a6845
/*
* 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.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
,
()
->
{
SunToolkit
.
createNewAppContext
();
SwingUtilities
.
invokeLater
(()
->
{
synchronized
(
LOCK
)
{
frame
=
new
Frame
();
frame
.
setBounds
(
100
,
100
,
100
,
100
);
frame
.
setVisible
(
true
);
Toolkit
.
getDefaultToolkit
().
addPropertyChangeListener
(
"win.propNames"
,
ev
->
{
propertyChangeFired
.
set
(
true
);
});
}
});
});
awtThread
.
start
();
awtThread
.
join
();
sync
();
final
GraphicsDevice
device
=
GraphicsEnvironment
.
getLocalGraphicsEnvironment
()
.
getDefaultScreenDevice
();
AtomicReference
<
DisplayMode
>
originalRef
=
new
AtomicReference
<>();
try
{
AtomicBoolean
isSupported
=
new
AtomicBoolean
(
true
);
invokeInAWT
(()
->
{
if
(
device
.
isFullScreenSupported
())
{
device
.
setFullScreenWindow
(
frame
);
}
else
{
isSupported
.
set
(
false
);
}
});
if
(!
isSupported
.
get
())
{
return
;
}
invokeInAWT
(()
->
{
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
(()
->
{
device
.
setDisplayMode
(
originalRef
.
get
());
frame
.
dispose
();
});
}
if
(!
propertyChangeFired
.
get
())
{
throw
new
RuntimeException
(
"Failed: PropertyChange did not fire"
);
}
}
private
static
void
invokeInAWT
(
Runnable
r
)
throws
InterruptedException
{
Thread
awtThread
=
new
Thread
(
awtGroup
,
()
->
{
SwingUtilities
.
invokeLater
(()
->
{
synchronized
(
LOCK
)
{
r
.
run
();
}
});
});
awtThread
.
start
();
awtThread
.
join
();
sync
();
}
private
static
void
createStubContext
()
throws
InterruptedException
{
Thread
stub
=
new
Thread
(
stubGroup
,
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
,
()
->
{
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
();
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录