Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
db02d213
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看板
提交
db02d213
编写于
6月 04, 2014
作者:
A
alexsch
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8043705: Can't exit color chooser dialog when running as an applet
Reviewed-by: serb, pchelko
上级
ea3cbca9
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
121 addition
and
3 deletion
+121
-3
src/windows/classes/sun/awt/windows/WWindowPeer.java
src/windows/classes/sun/awt/windows/WWindowPeer.java
+3
-2
src/windows/native/sun/windows/awt_Dialog.cpp
src/windows/native/sun/windows/awt_Dialog.cpp
+2
-1
test/java/awt/Dialog/CloseDialog/CloseDialogTest.java
test/java/awt/Dialog/CloseDialog/CloseDialogTest.java
+116
-0
未找到文件。
src/windows/classes/sun/awt/windows/WWindowPeer.java
浏览文件 @
db02d213
...
@@ -450,8 +450,9 @@ public class WWindowPeer extends WPanelPeer implements WindowPeer,
...
@@ -450,8 +450,9 @@ public class WWindowPeer extends WPanelPeer implements WindowPeer,
* active window is always at the end.
* active window is always at the end.
*/
*/
@SuppressWarnings
(
"unchecked"
)
@SuppressWarnings
(
"unchecked"
)
public
static
long
[]
getActiveWindowHandles
()
{
public
static
long
[]
getActiveWindowHandles
(
Component
target
)
{
AppContext
appContext
=
AppContext
.
getAppContext
();
AppContext
appContext
=
SunToolkit
.
targetToAppContext
(
target
);
if
(
appContext
==
null
)
return
null
;
synchronized
(
appContext
)
{
synchronized
(
appContext
)
{
List
<
WWindowPeer
>
l
=
(
List
<
WWindowPeer
>)
appContext
.
get
(
ACTIVE_WINDOWS_KEY
);
List
<
WWindowPeer
>
l
=
(
List
<
WWindowPeer
>)
appContext
.
get
(
ACTIVE_WINDOWS_KEY
);
if
(
l
==
null
)
{
if
(
l
==
null
)
{
...
...
src/windows/native/sun/windows/awt_Dialog.cpp
浏览文件 @
db02d213
...
@@ -464,7 +464,8 @@ void AwtDialog::ModalActivateNextWindow(HWND dialogHWnd,
...
@@ -464,7 +464,8 @@ void AwtDialog::ModalActivateNextWindow(HWND dialogHWnd,
&
exc
,
&
exc
,
"sun/awt/windows/WWindowPeer"
,
"sun/awt/windows/WWindowPeer"
,
"getActiveWindowHandles"
,
"getActiveWindowHandles"
,
"()[J"
).
l
;
"(Ljava/awt/Component;)[J"
,
dialogTarget
).
l
;
if
(
exc
==
JNI_TRUE
)
{
if
(
exc
==
JNI_TRUE
)
{
throw
std
::
bad_alloc
();
throw
std
::
bad_alloc
();
}
}
...
...
test/java/awt/Dialog/CloseDialog/CloseDialogTest.java
0 → 100644
浏览文件 @
db02d213
/*
* 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.
*/
import
java.awt.Dialog
;
import
java.awt.Frame
;
import
java.io.*
;
import
javax.swing.*
;
import
sun.awt.SunToolkit
;
import
java.util.concurrent.atomic.AtomicReference
;
/**
* @test
* @bug 8043705
* @summary Can't exit color chooser dialog when running as an applet
* @run main CloseDialogTest
*/
public
class
CloseDialogTest
{
private
static
volatile
Frame
frame
;
private
static
volatile
Dialog
dialog
;
private
static
volatile
InputStream
testErrorStream
;
private
static
final
PrintStream
systemErrStream
=
System
.
err
;
private
static
final
AtomicReference
<
Exception
>
caughtException
=
new
AtomicReference
<>();
public
static
void
main
(
String
[]
args
)
throws
Exception
{
// redirect System err
PipedOutputStream
errorOutputStream
=
new
PipedOutputStream
();
testErrorStream
=
new
PipedInputStream
(
errorOutputStream
);
System
.
setErr
(
new
PrintStream
(
errorOutputStream
));
ThreadGroup
swingTG
=
new
ThreadGroup
(
getRootThreadGroup
(),
"SwingTG"
);
try
{
new
Thread
(
swingTG
,
()
->
{
SunToolkit
.
createNewAppContext
();
SwingUtilities
.
invokeLater
(()
->
{
frame
=
new
Frame
();
frame
.
setSize
(
300
,
300
);
frame
.
setVisible
(
true
);
dialog
=
new
Dialog
(
frame
);
dialog
.
setSize
(
200
,
200
);
dialog
.
setModal
(
true
);
dialog
.
setVisible
(
true
);
});
}).
start
();
Thread
.
sleep
(
400
);
Thread
disposeThread
=
new
Thread
(
swingTG
,
()
->
SwingUtilities
.
invokeLater
(()
->
{
try
{
while
(
dialog
==
null
||
!
dialog
.
isVisible
())
{
Thread
.
sleep
(
100
);
}
dialog
.
setVisible
(
false
);
dialog
.
dispose
();
frame
.
dispose
();
}
catch
(
Exception
e
)
{
caughtException
.
set
(
e
);
}
}));
disposeThread
.
start
();
disposeThread
.
join
();
Thread
.
sleep
(
500
);
// read System err
final
char
[]
buffer
=
new
char
[
2048
];
System
.
err
.
print
(
"END"
);
System
.
setErr
(
systemErrStream
);
try
(
Reader
in
=
new
InputStreamReader
(
testErrorStream
,
"UTF-8"
))
{
int
size
=
in
.
read
(
buffer
,
0
,
buffer
.
length
);
String
errorString
=
new
String
(
buffer
,
0
,
size
);
if
(!
errorString
.
startsWith
(
"END"
))
{
System
.
err
.
println
(
errorString
.
substring
(
0
,
errorString
.
length
()
-
4
));
throw
new
RuntimeException
(
"Error output is not empty!"
);
}
}
}
finally
{
if
(
caughtException
.
get
()
!=
null
)
{
throw
new
RuntimeException
(
"Failed. Caught exception!"
,
caughtException
.
get
());
}
}
}
private
static
ThreadGroup
getRootThreadGroup
()
{
ThreadGroup
threadGroup
=
Thread
.
currentThread
().
getThreadGroup
();
while
(
threadGroup
.
getParent
()
!=
null
)
{
threadGroup
=
threadGroup
.
getParent
();
}
return
threadGroup
;
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录