Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
66cb4858
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,发现更多精彩内容 >>
提交
66cb4858
编写于
9月 14, 2010
作者:
M
malenkov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
6977726: JColorChooser.getPreviewPanel() returnes null starting from jdk7 b105.
Reviewed-by: alexp
上级
304962ab
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
57 addition
and
11 deletion
+57
-11
src/share/classes/javax/swing/JColorChooser.java
src/share/classes/javax/swing/JColorChooser.java
+1
-3
src/share/classes/javax/swing/plaf/basic/BasicColorChooserUI.java
...e/classes/javax/swing/plaf/basic/BasicColorChooserUI.java
+6
-8
test/javax/swing/JColorChooser/Test6977726.html
test/javax/swing/JColorChooser/Test6977726.html
+8
-0
test/javax/swing/JColorChooser/Test6977726.java
test/javax/swing/JColorChooser/Test6977726.java
+42
-0
未找到文件。
src/share/classes/javax/swing/JColorChooser.java
浏览文件 @
66cb4858
...
...
@@ -27,13 +27,11 @@ package javax.swing;
import
java.awt.*
;
import
java.awt.event.*
;
import
java.beans.*
;
import
java.io.*
;
import
java.util.*
;
import
javax.swing.colorchooser.*
;
import
javax.swing.plaf.ColorChooserUI
;
import
javax.swing.event.*
;
import
javax.accessibility.*
;
import
sun.swing.SwingUtilities2
;
...
...
@@ -95,7 +93,7 @@ public class JColorChooser extends JComponent implements Accessible {
private
ColorSelectionModel
selectionModel
;
private
JComponent
previewPanel
;
private
JComponent
previewPanel
=
ColorChooserComponentFactory
.
getPreviewPanel
()
;
private
AbstractColorChooserPanel
[]
chooserPanels
=
new
AbstractColorChooserPanel
[
0
];
...
...
src/share/classes/javax/swing/plaf/basic/BasicColorChooserUI.java
浏览文件 @
66cb4858
...
...
@@ -142,12 +142,9 @@ public class BasicColorChooserUI extends ColorChooserUI
if
(
previewPanel
==
null
)
{
previewPanel
=
ColorChooserComponentFactory
.
getPreviewPanel
();
}
else
{
Dimension
size
=
new
BorderLayout
().
minimumLayoutSize
(
previewPanel
);
if
((
size
.
width
==
0
)
&&
(
size
.
height
==
0
))
{
else
if
(
JPanel
.
class
.
equals
(
previewPanel
.
getClass
())
&&
(
0
==
previewPanel
.
getComponentCount
()))
{
previewPanel
=
null
;
}
}
this
.
previewPanel
=
previewPanel
;
if
(
previewPanel
!=
null
)
{
chooser
.
add
(
previewPanelHolder
,
BorderLayout
.
SOUTH
);
...
...
@@ -215,9 +212,10 @@ public class BasicColorChooserUI extends ColorChooserUI
}
private
void
selectionChanged
(
ColorSelectionModel
model
)
{
if
(
this
.
previewPanel
!=
null
)
{
this
.
previewPanel
.
setForeground
(
model
.
getSelectedColor
());
this
.
previewPanel
.
repaint
();
JComponent
previewPanel
=
this
.
chooser
.
getPreviewPanel
();
if
(
previewPanel
!=
null
)
{
previewPanel
.
setForeground
(
model
.
getSelectedColor
());
previewPanel
.
repaint
();
}
AbstractColorChooserPanel
[]
panels
=
this
.
chooser
.
getChooserPanels
();
if
(
panels
!=
null
)
{
...
...
test/javax/swing/JColorChooser/Test6977726.html
0 → 100644
浏览文件 @
66cb4858
<html>
<body>
If you don't see the preview panel, then test failed, otherwise it passed.
<applet
width=
"500"
height=
"400"
code=
"Test6977726.class"
>
</applet>
</body>
</html>
test/javax/swing/JColorChooser/Test6977726.java
0 → 100644
浏览文件 @
66cb4858
/*
* Copyright (c) 2010, 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 6977726
* @summary Checks if JColorChooser.setPreviewPanel removes the old one
* @author Sergey Malenkov
* @run applet/manual=yesno Test6977726.html
*/
import
javax.swing.JApplet
;
import
javax.swing.JColorChooser
;
import
javax.swing.JLabel
;
public
class
Test6977726
extends
JApplet
{
public
void
init
()
{
JColorChooser
chooser
=
new
JColorChooser
();
chooser
.
setPreviewPanel
(
new
JLabel
(
"Text Preview Panel"
));
getContentPane
().
add
(
chooser
);
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录