Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
554790a7
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,发现更多精彩内容 >>
提交
554790a7
编写于
4月 12, 2011
作者:
D
denis
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
7030062: duplicate free
Reviewed-by: dcherepanov
上级
ee5f71da
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
35 addition
and
2 deletion
+35
-2
make/sun/jpeg/Makefile
make/sun/jpeg/Makefile
+1
-1
src/share/classes/java/awt/Toolkit.java
src/share/classes/java/awt/Toolkit.java
+33
-0
src/solaris/native/sun/awt/awt_mgrsel.c
src/solaris/native/sun/awt/awt_mgrsel.c
+1
-1
未找到文件。
make/sun/jpeg/Makefile
浏览文件 @
554790a7
...
...
@@ -74,7 +74,7 @@ ifeq ($(PLATFORM), linux)
# volatile to prevent the optimization. However, this approach does not
# work because we have to declare all variables as volatile in result.
OTHER_CFLAGS
+=
-Wno-clobbered
#
OTHER_CFLAGS += -Wno-clobbered
endif
include
$(BUILDDIR)/common/Mapfile-vers.gmk
...
...
src/share/classes/java/awt/Toolkit.java
浏览文件 @
554790a7
...
...
@@ -466,6 +466,10 @@ public abstract class Toolkit {
*/
protected
void
loadSystemColors
(
int
[]
systemColors
)
throws
HeadlessException
{
if
(
GraphicsEnvironment
.
isHeadless
()){
throw
new
HeadlessException
();
}
}
/**
...
...
@@ -500,6 +504,10 @@ public abstract class Toolkit {
*/
public
void
setDynamicLayout
(
boolean
dynamic
)
throws
HeadlessException
{
if
(
GraphicsEnvironment
.
isHeadless
()){
throw
new
HeadlessException
();
}
}
/**
...
...
@@ -523,6 +531,9 @@ public abstract class Toolkit {
*/
protected
boolean
isDynamicLayoutSet
()
throws
HeadlessException
{
if
(
GraphicsEnvironment
.
isHeadless
()){
throw
new
HeadlessException
();
}
if
(
this
!=
Toolkit
.
getDefaultToolkit
())
{
return
Toolkit
.
getDefaultToolkit
().
isDynamicLayoutSet
();
}
else
{
...
...
@@ -558,6 +569,9 @@ public abstract class Toolkit {
*/
public
boolean
isDynamicLayoutActive
()
throws
HeadlessException
{
if
(
GraphicsEnvironment
.
isHeadless
()){
throw
new
HeadlessException
();
}
if
(
this
!=
Toolkit
.
getDefaultToolkit
())
{
return
Toolkit
.
getDefaultToolkit
().
isDynamicLayoutActive
();
}
else
{
...
...
@@ -601,6 +615,9 @@ public abstract class Toolkit {
*/
public
Insets
getScreenInsets
(
GraphicsConfiguration
gc
)
throws
HeadlessException
{
if
(
GraphicsEnvironment
.
isHeadless
()){
throw
new
HeadlessException
();
}
if
(
this
!=
Toolkit
.
getDefaultToolkit
())
{
return
Toolkit
.
getDefaultToolkit
().
getScreenInsets
(
gc
);
}
else
{
...
...
@@ -1342,6 +1359,9 @@ public abstract class Toolkit {
* @since 1.4
*/
public
Clipboard
getSystemSelection
()
throws
HeadlessException
{
if
(
GraphicsEnvironment
.
isHeadless
()){
throw
new
HeadlessException
();
}
if
(
this
!=
Toolkit
.
getDefaultToolkit
())
{
return
Toolkit
.
getDefaultToolkit
().
getSystemSelection
();
}
else
{
...
...
@@ -1371,6 +1391,10 @@ public abstract class Toolkit {
* @since JDK1.1
*/
public
int
getMenuShortcutKeyMask
()
throws
HeadlessException
{
if
(
GraphicsEnvironment
.
isHeadless
()){
throw
new
HeadlessException
();
}
return
Event
.
CTRL_MASK
;
}
...
...
@@ -1499,6 +1523,9 @@ public abstract class Toolkit {
*/
public
Dimension
getBestCursorSize
(
int
preferredWidth
,
int
preferredHeight
)
throws
HeadlessException
{
if
(
GraphicsEnvironment
.
isHeadless
()){
throw
new
HeadlessException
();
}
// Override to implement custom cursor support.
if
(
this
!=
Toolkit
.
getDefaultToolkit
())
{
return
Toolkit
.
getDefaultToolkit
().
...
...
@@ -1526,6 +1553,9 @@ public abstract class Toolkit {
* @since 1.2
*/
public
int
getMaximumCursorColors
()
throws
HeadlessException
{
if
(
GraphicsEnvironment
.
isHeadless
()){
throw
new
HeadlessException
();
}
// Override to implement custom cursor support.
if
(
this
!=
Toolkit
.
getDefaultToolkit
())
{
return
Toolkit
.
getDefaultToolkit
().
getMaximumCursorColors
();
...
...
@@ -2572,6 +2602,9 @@ public abstract class Toolkit {
* @since 1.7
*/
public
boolean
areExtraMouseButtonsEnabled
()
throws
HeadlessException
{
if
(
GraphicsEnvironment
.
isHeadless
()){
throw
new
HeadlessException
();
}
return
Toolkit
.
getDefaultToolkit
().
areExtraMouseButtonsEnabled
();
}
}
src/solaris/native/sun/awt/awt_mgrsel.c
浏览文件 @
554790a7
...
...
@@ -136,7 +136,7 @@ awt_mgrsel_select(const char *selname, long extra_mask,
||
per_scr_owners
==
NULL
||
mgrsel
==
NULL
)
{
DTRACE_PRINTLN
(
"MG: select: unable to allocate memory"
);
if
(
namesbuf
!=
NULL
)
free
(
per_scr_atoms
);
if
(
namesbuf
!=
NULL
)
free
(
namesbuf
);
if
(
names
!=
NULL
)
free
(
names
);
if
(
per_scr_atoms
!=
NULL
)
free
(
per_scr_atoms
);
if
(
per_scr_owners
!=
NULL
)
free
(
per_scr_owners
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录