Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
650350b8
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,发现更多精彩内容 >>
提交
650350b8
编写于
2月 02, 2016
作者:
A
alitvinov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8139581: AWT components are not drawn after removal and addition to a container
Reviewed-by: ssadetsky, alexsch
上级
aeea9f85
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
187 addition
and
4 deletion
+187
-4
src/solaris/classes/sun/awt/X11/XBaseWindow.java
src/solaris/classes/sun/awt/X11/XBaseWindow.java
+0
-4
test/java/awt/Paint/ComponentIsNotDrawnAfterRemoveAddTest/ComponentIsNotDrawnAfterRemoveAddTest.java
...rRemoveAddTest/ComponentIsNotDrawnAfterRemoveAddTest.java
+187
-0
未找到文件。
src/solaris/classes/sun/awt/X11/XBaseWindow.java
浏览文件 @
650350b8
...
...
@@ -79,7 +79,6 @@ public class XBaseWindow {
static
enum
InitialiseState
{
INITIALISING
,
NOT_INITIALISED
,
INITIALISED
,
FAILED_INITIALISATION
};
...
...
@@ -122,7 +121,6 @@ public class XBaseWindow {
*/
void
instantPreInit
(
XCreateWindowParams
params
)
{
state_lock
=
new
StateLock
();
initialising
=
InitialiseState
.
NOT_INITIALISED
;
}
/**
...
...
@@ -131,7 +129,6 @@ public class XBaseWindow {
*/
void
preInit
(
XCreateWindowParams
params
)
{
state_lock
=
new
StateLock
();
initialising
=
InitialiseState
.
NOT_INITIALISED
;
embedded
=
Boolean
.
TRUE
.
equals
(
params
.
get
(
EMBEDDED
));
visible
=
Boolean
.
TRUE
.
equals
(
params
.
get
(
VISIBLE
));
...
...
@@ -223,7 +220,6 @@ public class XBaseWindow {
return
false
;
}
return
true
;
case
NOT_INITIALISED:
case
FAILED_INITIALISATION:
return
false
;
default
:
...
...
test/java/awt/Paint/ComponentIsNotDrawnAfterRemoveAddTest/ComponentIsNotDrawnAfterRemoveAddTest.java
0 → 100644
浏览文件 @
650350b8
/*
* Copyright (c) 2016, 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 8139581
@summary AWT components are not drawn after removal and addition to a container
@author Anton Litvinov
*/
import
java.awt.Button
;
import
java.awt.Color
;
import
java.awt.Canvas
;
import
java.awt.Frame
;
import
java.awt.Graphics
;
import
java.awt.Panel
;
import
java.util.ArrayList
;
public
class
ComponentIsNotDrawnAfterRemoveAddTest
{
private
final
Frame
frame
;
private
final
Panel
panel
;
private
final
ArrayList
<
Testable
>
compList
=
new
ArrayList
<
Testable
>();
public
ComponentIsNotDrawnAfterRemoveAddTest
()
{
frame
=
new
Frame
(
"ComponentIsNotDrawnAfterRemoveAddTest"
);
frame
.
setSize
(
500
,
500
);
frame
.
setLocation
(
200
,
200
);
frame
.
setLayout
(
null
);
frame
.
setBackground
(
Color
.
RED
);
panel
=
new
Panel
();
panel
.
setLayout
(
null
);
panel
.
setBounds
(
25
,
100
,
455
,
295
);
panel
.
setBackground
(
Color
.
GREEN
);
for
(
int
i
=
0
;
i
<
10
;
i
++)
{
TestCanvas
canv1
=
new
TestCanvas
();
canv1
.
setBounds
(
i
*
45
+
5
,
15
,
30
+
i
,
30
+
i
);
panel
.
add
(
canv1
);
compList
.
add
(
canv1
);
TestButton
btn1
=
new
TestButton
();
btn1
.
setBounds
(
i
*
45
+
5
,
60
,
30
+
i
,
30
+
i
);
panel
.
add
(
btn1
);
compList
.
add
(
btn1
);
TestCanvas
canv2
=
new
TestCanvas
();
canv2
.
setBounds
(
i
*
45
+
5
,
105
,
30
+
i
,
30
+
i
);
panel
.
add
(
canv2
);
compList
.
add
(
canv2
);
TestButton
btn2
=
new
TestButton
();
btn2
.
setBounds
(
i
*
45
+
5
,
150
,
30
+
i
,
30
+
i
);
panel
.
add
(
btn2
);
compList
.
add
(
btn2
);
TestCanvas
canv3
=
new
TestCanvas
();
canv3
.
setBounds
(
i
*
45
+
5
,
195
,
30
+
i
,
30
+
i
);
panel
.
add
(
canv3
);
compList
.
add
(
canv3
);
TestButton
btn3
=
new
TestButton
();
btn3
.
setBounds
(
i
*
45
+
5
,
240
,
30
+
i
,
30
+
i
);
panel
.
add
(
btn3
);
compList
.
add
(
btn3
);
}
frame
.
add
(
panel
);
frame
.
setVisible
(
true
);
}
private
void
runTest
()
{
try
{
doSleep
(
1500
);
checkTestableComponents
();
for
(
int
i
=
0
;
i
<
5
;
i
++)
{
System
.
err
.
println
(
String
.
format
(
"Test iteration #%d:"
,
i
));
frame
.
remove
(
panel
);
frame
.
invalidate
();
frame
.
validate
();
frame
.
add
(
panel
);
doSleep
(
1500
);
checkTestableComponents
();
}
}
finally
{
frame
.
dispose
();
}
}
private
void
doSleep
(
long
millis
)
{
try
{
Thread
.
sleep
(
millis
);
}
catch
(
InterruptedException
ie
)
{
ie
.
printStackTrace
();
}
}
private
void
checkTestableComponents
()
throws
RuntimeException
{
int
notDrawnCompsCount
=
0
;
for
(
Testable
comp
:
compList
)
{
if
(!
comp
.
wasPaintCalled
())
{
notDrawnCompsCount
++;
}
else
{
comp
.
resetPaintCalledFlag
();
}
}
if
(
notDrawnCompsCount
>
0
)
{
throw
new
RuntimeException
(
String
.
format
(
"'paint' method of %d components was not called."
,
notDrawnCompsCount
));
}
}
private
interface
Testable
{
boolean
wasPaintCalled
();
void
resetPaintCalledFlag
();
}
private
static
class
TestCanvas
extends
Canvas
implements
Testable
{
private
volatile
boolean
paintWasCalled
=
false
;
@Override
public
void
paint
(
Graphics
g
)
{
paintWasCalled
=
true
;
super
.
paint
(
g
);
g
.
setColor
(
Color
.
BLUE
);
g
.
fillRect
(
0
,
0
,
getWidth
(),
getHeight
());
}
@Override
public
boolean
wasPaintCalled
()
{
return
paintWasCalled
;
}
@Override
public
void
resetPaintCalledFlag
()
{
paintWasCalled
=
false
;
}
}
private
static
class
TestButton
extends
Button
implements
Testable
{
private
volatile
boolean
paintWasCalled
=
false
;
@Override
public
void
paint
(
Graphics
g
)
{
paintWasCalled
=
true
;
super
.
paint
(
g
);
g
.
setColor
(
Color
.
YELLOW
);
g
.
fillRect
(
0
,
0
,
15
,
15
);
}
@Override
public
boolean
wasPaintCalled
()
{
return
paintWasCalled
;
}
@Override
public
void
resetPaintCalledFlag
()
{
paintWasCalled
=
false
;
}
}
public
static
void
main
(
String
[]
args
)
{
new
ComponentIsNotDrawnAfterRemoveAddTest
().
runTest
();
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录