Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
d577340f
D
dragonwell8_jdk
项目概览
openanolis
/
dragonwell8_jdk
通知
3
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看板
体验新版 GitCode,发现更多精彩内容 >>
提交
d577340f
编写于
7月 01, 2014
作者:
D
dmarkov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8048506: [macosx] javax.swing.PopupFactory issue with null owner
Reviewed-by: pchelko, alexsch
上级
c5425c3c
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
67 addition
and
1 deletion
+67
-1
src/share/classes/javax/swing/PopupFactory.java
src/share/classes/javax/swing/PopupFactory.java
+2
-1
test/javax/swing/PopupFactory/8048506/bug8048506.java
test/javax/swing/PopupFactory/8048506/bug8048506.java
+65
-0
未找到文件。
src/share/classes/javax/swing/PopupFactory.java
浏览文件 @
d577340f
...
@@ -232,7 +232,8 @@ public class PopupFactory {
...
@@ -232,7 +232,8 @@ public class PopupFactory {
case
HEAVY_WEIGHT_POPUP:
case
HEAVY_WEIGHT_POPUP:
Popup
popup
=
getHeavyWeightPopup
(
owner
,
contents
,
ownerX
,
ownerY
);
Popup
popup
=
getHeavyWeightPopup
(
owner
,
contents
,
ownerX
,
ownerY
);
if
((
AccessController
.
doPrivileged
(
OSInfo
.
getOSTypeAction
())
==
if
((
AccessController
.
doPrivileged
(
OSInfo
.
getOSTypeAction
())
==
OSInfo
.
OSType
.
MACOSX
)
&&
(
EmbeddedFrame
.
getAppletIfAncestorOf
(
owner
)
!=
null
))
{
OSInfo
.
OSType
.
MACOSX
)
&&
(
owner
!=
null
)
&&
(
EmbeddedFrame
.
getAppletIfAncestorOf
(
owner
)
!=
null
))
{
((
HeavyWeightPopup
)
popup
).
setCacheEnabled
(
false
);
((
HeavyWeightPopup
)
popup
).
setCacheEnabled
(
false
);
}
}
return
popup
;
return
popup
;
...
...
test/javax/swing/PopupFactory/8048506/bug8048506.java
0 → 100644
浏览文件 @
d577340f
/*
* 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 8048506
* @summary Tests that popup with null-owner does not throw NPE
* @author Dmitry Markov
*/
import
javax.swing.*
;
import
javax.swing.plaf.metal.MetalLookAndFeel
;
public
class
bug8048506
{
public
static
void
main
(
String
[]
args
)
throws
Exception
{
UIManager
.
setLookAndFeel
(
new
MetalLookAndFeel
());
SwingUtilities
.
invokeAndWait
(
new
Runnable
()
{
@Override
public
void
run
()
{
createAndShowGUI
();
}
});
System
.
out
.
println
(
"The test passed"
);
}
private
static
void
createAndShowGUI
()
{
JFrame
frame
=
new
JFrame
(
"bug8048506"
);
frame
.
setSize
(
400
,
400
);
frame
.
setDefaultCloseOperation
(
JFrame
.
EXIT_ON_CLOSE
);
frame
.
setVisible
(
true
);
PopupFactory
factory
=
PopupFactory
.
getSharedInstance
();
// Create and show popup with owner
Popup
popup1
=
factory
.
getPopup
(
frame
,
new
JLabel
(
"Popup with owner"
),
100
,
100
);
popup1
.
show
();
//Create and show popup without owner
Popup
popup2
=
factory
.
getPopup
(
null
,
new
JLabel
(
"Popup without owner"
),
200
,
200
);
popup2
.
show
();
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录