Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
15c77c94
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,发现更多精彩内容 >>
提交
15c77c94
编写于
1月 29, 2009
作者:
R
rupashka
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
6794836: BasicSliderUI throws NullPointerExc when JSlider maximum is Integer.MAX_VALUE
Reviewed-by: peterz
上级
ac0a3eec
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
112 addition
and
20 deletion
+112
-20
src/share/classes/javax/swing/plaf/basic/BasicSliderUI.java
src/share/classes/javax/swing/plaf/basic/BasicSliderUI.java
+32
-20
test/javax/swing/JSlider/6794836/bug6794836.java
test/javax/swing/JSlider/6794836/bug6794836.java
+80
-0
未找到文件。
src/share/classes/javax/swing/plaf/basic/BasicSliderUI.java
浏览文件 @
15c77c94
...
...
@@ -836,18 +836,24 @@ public class BasicSliderUI extends SliderUI{
*/
protected
Integer
getHighestValue
()
{
Dictionary
dictionary
=
slider
.
getLabelTable
();
if
(
dictionary
!=
null
)
{
Enumeration
keys
=
dictionary
.
keys
();
int
max
=
slider
.
getMinimum
()
-
1
;
while
(
keys
.
hasMoreElements
())
{
max
=
Math
.
max
(
max
,
((
Integer
)
keys
.
nextElement
()).
intValue
());
}
if
(
max
==
slider
.
getMinimum
()
-
1
)
{
return
null
;
if
(
dictionary
==
null
)
{
return
null
;
}
Enumeration
keys
=
dictionary
.
keys
();
Integer
max
=
null
;
while
(
keys
.
hasMoreElements
())
{
Integer
i
=
(
Integer
)
keys
.
nextElement
();
if
(
max
==
null
||
i
>
max
)
{
max
=
i
;
}
return
max
;
}
return
null
;
return
max
;
}
/**
...
...
@@ -859,18 +865,24 @@ public class BasicSliderUI extends SliderUI{
*/
protected
Integer
getLowestValue
()
{
Dictionary
dictionary
=
slider
.
getLabelTable
();
if
(
dictionary
!=
null
)
{
Enumeration
keys
=
dictionary
.
keys
();
int
min
=
slider
.
getMaximum
()
+
1
;
while
(
keys
.
hasMoreElements
())
{
min
=
Math
.
min
(
min
,
((
Integer
)
keys
.
nextElement
()).
intValue
());
}
if
(
min
==
slider
.
getMaximum
()
+
1
)
{
return
null
;
if
(
dictionary
==
null
)
{
return
null
;
}
Enumeration
keys
=
dictionary
.
keys
();
Integer
min
=
null
;
while
(
keys
.
hasMoreElements
())
{
Integer
i
=
(
Integer
)
keys
.
nextElement
();
if
(
min
==
null
||
i
<
min
)
{
min
=
i
;
}
return
min
;
}
return
null
;
return
min
;
}
...
...
test/javax/swing/JSlider/6794836/bug6794836.java
0 → 100644
浏览文件 @
15c77c94
/*
* Copyright 2009 Sun Microsystems, Inc. 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
/* @test
* @bug 6794836
* @summary BasicSliderUI throws NullPointerExc when JSlider maximum is Integer.MAX_VALUE
* @author Pavel Porvatov
* @run main bug6794836
*/
import
javax.swing.*
;
import
javax.swing.plaf.basic.BasicSliderUI
;
import
java.lang.reflect.Method
;
import
java.util.Hashtable
;
public
class
bug6794836
{
public
static
void
main
(
String
[]
args
)
throws
Exception
{
new
bug6794836
().
run
();
}
public
void
run
()
throws
Exception
{
JSlider
slider
=
new
JSlider
(
0
,
Integer
.
MAX_VALUE
);
slider
.
setPaintLabels
(
true
);
JLabel
minLabel
=
new
JLabel
(
"Min"
);
JLabel
maxLabel
=
new
JLabel
(
"Max"
);
Hashtable
<
Integer
,
JLabel
>
labelTable
=
new
Hashtable
<
Integer
,
JLabel
>();
labelTable
.
put
(
Integer
.
MIN_VALUE
,
minLabel
);
labelTable
.
put
(
Integer
.
MAX_VALUE
,
maxLabel
);
slider
.
setLabelTable
(
labelTable
);
BasicSliderUI
ui
=
(
BasicSliderUI
)
slider
.
getUI
();
if
(
invokeMethod
(
"getHighestValueLabel"
,
ui
)
!=
maxLabel
)
{
fail
(
"invalid getHighestValueLabel result"
);
}
if
(
invokeMethod
(
"getLowestValueLabel"
,
ui
)
!=
minLabel
)
{
fail
(
"invalid getLowestValueLabel result"
);
}
System
.
out
.
println
(
"The bug6794836 test passed"
);
}
private
static
Object
invokeMethod
(
String
name
,
BasicSliderUI
ui
)
throws
Exception
{
Method
method
=
BasicSliderUI
.
class
.
getDeclaredMethod
(
name
,
null
);
method
.
setAccessible
(
true
);
return
method
.
invoke
(
ui
,
null
);
}
private
static
void
fail
(
String
s
)
{
throw
new
RuntimeException
(
"Test failed: "
+
s
);
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录