Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
0055b34a
D
dragonwell8_jdk
项目概览
openanolis
/
dragonwell8_jdk
通知
4
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看板
提交
0055b34a
编写于
7月 09, 2009
作者:
D
dcherepanov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
6855323: Robot(GraphicsDevice) constructor initializes LEGAL_BUTTON_MASK variable improperly
Reviewed-by: art
上级
4673efe8
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
94 addition
and
18 deletion
+94
-18
src/share/classes/java/awt/Robot.java
src/share/classes/java/awt/Robot.java
+23
-18
test/java/awt/Robot/CtorTest/CtorTest.java
test/java/awt/Robot/CtorTest/CtorTest.java
+71
-0
未找到文件。
src/share/classes/java/awt/Robot.java
浏览文件 @
0055b34a
...
...
@@ -70,7 +70,7 @@ public class Robot {
private
RobotPeer
peer
;
private
boolean
isAutoWaitForIdle
=
false
;
private
int
autoDelay
=
0
;
private
static
int
LEGAL_BUTTON_MASK
;
private
static
int
LEGAL_BUTTON_MASK
=
0
;
// location of robot's GC, used in mouseMove(), getPixelColor() and captureScreenImage()
private
Point
gdLoc
;
...
...
@@ -95,23 +95,6 @@ public class Robot {
}
init
(
GraphicsEnvironment
.
getLocalGraphicsEnvironment
()
.
getDefaultScreenDevice
());
int
tmpMask
=
0
;
if
(
Toolkit
.
getDefaultToolkit
().
areExtraMouseButtonsEnabled
()){
if
(
Toolkit
.
getDefaultToolkit
()
instanceof
SunToolkit
)
{
final
int
buttonsNumber
=
((
SunToolkit
)(
Toolkit
.
getDefaultToolkit
())).
getNumberOfButtons
();
for
(
int
i
=
0
;
i
<
buttonsNumber
;
i
++){
tmpMask
|=
InputEvent
.
getMaskForButton
(
i
+
1
);
}
}
}
tmpMask
|=
InputEvent
.
BUTTON1_MASK
|
InputEvent
.
BUTTON2_MASK
|
InputEvent
.
BUTTON3_MASK
|
InputEvent
.
BUTTON1_DOWN_MASK
|
InputEvent
.
BUTTON2_DOWN_MASK
|
InputEvent
.
BUTTON3_DOWN_MASK
;
LEGAL_BUTTON_MASK
=
tmpMask
;
}
/**
...
...
@@ -156,6 +139,28 @@ public class Robot {
disposer
=
new
RobotDisposer
(
peer
);
sun
.
java2d
.
Disposer
.
addRecord
(
anchor
,
disposer
);
}
initLegalButtonMask
();
}
private
static
synchronized
void
initLegalButtonMask
()
{
if
(
LEGAL_BUTTON_MASK
!=
0
)
return
;
int
tmpMask
=
0
;
if
(
Toolkit
.
getDefaultToolkit
().
areExtraMouseButtonsEnabled
()){
if
(
Toolkit
.
getDefaultToolkit
()
instanceof
SunToolkit
)
{
final
int
buttonsNumber
=
((
SunToolkit
)(
Toolkit
.
getDefaultToolkit
())).
getNumberOfButtons
();
for
(
int
i
=
0
;
i
<
buttonsNumber
;
i
++){
tmpMask
|=
InputEvent
.
getMaskForButton
(
i
+
1
);
}
}
}
tmpMask
|=
InputEvent
.
BUTTON1_MASK
|
InputEvent
.
BUTTON2_MASK
|
InputEvent
.
BUTTON3_MASK
|
InputEvent
.
BUTTON1_DOWN_MASK
|
InputEvent
.
BUTTON2_DOWN_MASK
|
InputEvent
.
BUTTON3_DOWN_MASK
;
LEGAL_BUTTON_MASK
=
tmpMask
;
}
/* determine if the security policy allows Robot's to be created */
...
...
test/java/awt/Robot/CtorTest/CtorTest.java
0 → 100644
浏览文件 @
0055b34a
/*
* Copyright (c) 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 6855323
@summary Robot(GraphicsDevice) constructor initializes LEGAL_BUTTON_MASK variable improperly
@author Dmitry Cherepanov area=awt.robot
@run main CtorTest
*/
/**
* CtorRobot.java
*
* summary: creates Robot using one parameter constructor
*/
import
java.awt.*
;
import
java.awt.event.*
;
import
sun.awt.SunToolkit
;
public
class
CtorTest
{
public
static
void
main
(
String
[]
s
)
throws
Exception
{
// one parameter constructor
GraphicsDevice
graphicsDevice
=
GraphicsEnvironment
.
getLocalGraphicsEnvironment
().
getDefaultScreenDevice
();
Robot
robot
=
new
Robot
(
graphicsDevice
);
clickOnFrame
(
robot
);
}
// generate mouse events
private
static
void
clickOnFrame
(
Robot
robot
)
{
Frame
frame
=
new
Frame
();
frame
.
setBounds
(
100
,
100
,
100
,
100
);
frame
.
setVisible
(
true
);
((
SunToolkit
)
Toolkit
.
getDefaultToolkit
()).
realSync
();
// click in the middle of the frame
robot
.
mouseMove
(
150
,
150
);
robot
.
delay
(
50
);
robot
.
mousePress
(
InputEvent
.
BUTTON1_MASK
);
robot
.
delay
(
50
);
robot
.
mouseRelease
(
InputEvent
.
BUTTON1_MASK
);
((
SunToolkit
)
Toolkit
.
getDefaultToolkit
()).
realSync
();
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录