Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
cb3f7f8a
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,发现更多精彩内容 >>
提交
cb3f7f8a
编写于
2月 08, 2012
作者:
R
rupashka
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
7138665: JOptionPane.getValue() unexpected change between JRE 1.6 and JRE 1.7
Reviewed-by: alexp
上级
a34f6fb5
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
72 addition
and
3 deletion
+72
-3
src/share/classes/javax/swing/JOptionPane.java
src/share/classes/javax/swing/JOptionPane.java
+1
-3
src/share/classes/javax/swing/plaf/basic/BasicOptionPaneUI.java
...are/classes/javax/swing/plaf/basic/BasicOptionPaneUI.java
+1
-0
test/javax/swing/JOptionPane/7138665/bug7138665.java
test/javax/swing/JOptionPane/7138665/bug7138665.java
+70
-0
未找到文件。
src/share/classes/javax/swing/JOptionPane.java
浏览文件 @
cb3f7f8a
...
...
@@ -34,7 +34,6 @@ import java.awt.KeyboardFocusManager;
import
java.awt.Frame
;
import
java.awt.Point
;
import
java.awt.HeadlessException
;
import
java.awt.Toolkit
;
import
java.awt.Window
;
import
java.beans.PropertyChangeEvent
;
import
java.beans.PropertyChangeListener
;
...
...
@@ -994,8 +993,7 @@ public class JOptionPane extends JComponent implements Accessible
// if the user closed the window without selecting a button
// (newValue = null in that case). Otherwise, close the dialog.
if
(
dialog
.
isVisible
()
&&
event
.
getSource
()
==
JOptionPane
.
this
&&
(
event
.
getPropertyName
().
equals
(
VALUE_PROPERTY
)
||
event
.
getPropertyName
().
equals
(
INPUT_VALUE_PROPERTY
))
&&
(
event
.
getPropertyName
().
equals
(
VALUE_PROPERTY
))
&&
event
.
getNewValue
()
!=
null
&&
event
.
getNewValue
()
!=
JOptionPane
.
UNINITIALIZED_VALUE
)
{
dialog
.
setVisible
(
false
);
...
...
src/share/classes/javax/swing/plaf/basic/BasicOptionPaneUI.java
浏览文件 @
cb3f7f8a
...
...
@@ -1236,6 +1236,7 @@ public class BasicOptionPaneUI extends OptionPaneUI {
int
index
=
list
.
locationToIndex
(
e
.
getPoint
());
optionPane
.
setInputValue
(
list
.
getModel
().
getElementAt
(
index
));
optionPane
.
setValue
(
JOptionPane
.
OK_OPTION
);
}
}
...
...
test/javax/swing/JOptionPane/7138665/bug7138665.java
0 → 100644
浏览文件 @
cb3f7f8a
/*
* Copyright (c) 2012, 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 7138665
@summary JOptionPane.getValue() unexpected change between JRE 1.6 and JRE 1.7
@author Pavel Porvatov
*/
import
sun.awt.SunToolkit
;
import
javax.swing.*
;
import
java.awt.*
;
import
java.awt.event.KeyEvent
;
public
class
bug7138665
{
public
static
void
main
(
String
[]
args
)
throws
Exception
{
SwingUtilities
.
invokeLater
(
new
Runnable
()
{
@Override
public
void
run
()
{
JOptionPane
pane
=
new
JOptionPane
(
"Enter value"
,
JOptionPane
.
QUESTION_MESSAGE
,
JOptionPane
.
OK_CANCEL_OPTION
,
null
,
null
,
null
);
pane
.
setWantsInput
(
true
);
JDialog
dialog
=
pane
.
createDialog
(
null
,
"My Dialog"
);
dialog
.
setVisible
(
true
);
Object
result
=
pane
.
getValue
();
if
(
result
==
null
||
((
Integer
)
result
).
intValue
()
!=
JOptionPane
.
OK_OPTION
)
{
throw
new
RuntimeException
(
"Invalid result: "
+
result
);
}
System
.
out
.
println
(
"Test bug7138665 passed"
);
}
});
SunToolkit
toolkit
=
(
SunToolkit
)
Toolkit
.
getDefaultToolkit
();
toolkit
.
realSync
();
Robot
robot
=
new
Robot
();
robot
.
setAutoDelay
(
100
);
robot
.
keyPress
(
KeyEvent
.
VK_ENTER
);
robot
.
keyRelease
(
KeyEvent
.
VK_ENTER
);
toolkit
.
realSync
();
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录