Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
82df1abf
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,发现更多精彩内容 >>
提交
82df1abf
编写于
10月 08, 2013
作者:
M
malenkov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
7081584: Specification for Window.isAlwaysOnTopSupported needs to be clarified
Reviewed-by: art, serb
上级
4bab59d1
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
16 addition
and
46 deletion
+16
-46
src/macosx/classes/sun/lwawt/LWComponentPeer.java
src/macosx/classes/sun/lwawt/LWComponentPeer.java
+2
-7
src/macosx/classes/sun/lwawt/macosx/CFileDialog.java
src/macosx/classes/sun/lwawt/macosx/CFileDialog.java
+0
-5
src/share/classes/java/awt/Component.java
src/share/classes/java/awt/Component.java
+0
-4
src/share/classes/java/awt/Window.java
src/share/classes/java/awt/Window.java
+10
-6
src/share/classes/java/awt/peer/ComponentPeer.java
src/share/classes/java/awt/peer/ComponentPeer.java
+0
-9
src/share/classes/sun/awt/NullComponentPeer.java
src/share/classes/sun/awt/NullComponentPeer.java
+0
-4
src/solaris/classes/sun/awt/X11/XComponentPeer.java
src/solaris/classes/sun/awt/X11/XComponentPeer.java
+2
-6
src/windows/classes/sun/awt/windows/WComponentPeer.java
src/windows/classes/sun/awt/windows/WComponentPeer.java
+2
-5
未找到文件。
src/macosx/classes/sun/lwawt/LWComponentPeer.java
浏览文件 @
82df1abf
...
...
@@ -385,11 +385,6 @@ public abstract class LWComponentPeer<T extends Component, D extends JComponent>
// ---- PEER METHODS ---- //
@Override
public
Toolkit
getToolkit
()
{
return
LWToolkit
.
getLWToolkit
();
}
// Just a helper method
public
LWToolkit
getLWToolkit
()
{
return
LWToolkit
.
getLWToolkit
();
...
...
@@ -1010,13 +1005,13 @@ public abstract class LWComponentPeer<T extends Component, D extends JComponent>
@Override
public
boolean
prepareImage
(
Image
img
,
int
w
,
int
h
,
ImageObserver
o
)
{
// TODO: is it a right/complete implementation?
return
ge
tToolkit
().
prepareImage
(
img
,
w
,
h
,
o
);
return
Toolkit
.
getDefaul
tToolkit
().
prepareImage
(
img
,
w
,
h
,
o
);
}
@Override
public
int
checkImage
(
Image
img
,
int
w
,
int
h
,
ImageObserver
o
)
{
// TODO: is it a right/complete implementation?
return
ge
tToolkit
().
checkImage
(
img
,
w
,
h
,
o
);
return
Toolkit
.
getDefaul
tToolkit
().
checkImage
(
img
,
w
,
h
,
o
);
}
@Override
...
...
src/macosx/classes/sun/lwawt/macosx/CFileDialog.java
浏览文件 @
82df1abf
...
...
@@ -326,11 +326,6 @@ class CFileDialog implements FileDialogPeer {
return
getMinimumSize
();
}
@Override
public
Toolkit
getToolkit
()
{
return
Toolkit
.
getDefaultToolkit
();
}
@Override
public
void
handleEvent
(
AWTEvent
e
)
{
}
...
...
src/share/classes/java/awt/Component.java
浏览文件 @
82df1abf
...
...
@@ -1223,10 +1223,6 @@ public abstract class Component implements ImageObserver, MenuContainer,
* be called on the toolkit thread.
*/
final
Toolkit
getToolkitImpl
()
{
ComponentPeer
peer
=
this
.
peer
;
if
((
peer
!=
null
)
&&
!
(
peer
instanceof
LightweightPeer
)){
return
peer
.
getToolkit
();
}
Container
parent
=
this
.
parent
;
if
(
parent
!=
null
)
{
return
parent
.
getToolkitImpl
();
...
...
src/share/classes/java/awt/Window.java
浏览文件 @
82df1abf
...
...
@@ -2197,8 +2197,8 @@ public class Window extends Container implements Accessible {
* windows. To detect if always-on-top windows are supported by the
* current platform, use {@link Toolkit#isAlwaysOnTopSupported()} and
* {@link Window#isAlwaysOnTopSupported()}. If always-on-top mode
* isn't supported
by the toolkit or for this window, calling this
* method has no effect.
* isn't supported
for this window or this window's toolkit does not
*
support always-on-top windows, calling this
method has no effect.
* <p>
* If a SecurityManager is installed, the calling thread must be
* granted the AWTPermission "setWindowAlwaysOnTop" in
...
...
@@ -2211,11 +2211,13 @@ public class Window extends Container implements Accessible {
* windows
* @throws SecurityException if the calling thread does not have
* permission to set the value of always-on-top property
*
* @see #isAlwaysOnTop
* @see #toFront
* @see #toBack
* @see AWTPermission
* @see #isAlwaysOnTopSupported
* @see #getToolkit
* @see Toolkit#isAlwaysOnTopSupported
* @since 1.5
*/
...
...
@@ -2248,11 +2250,13 @@ public class Window extends Container implements Accessible {
* window. Some platforms may not support always-on-top windows, some
* may support only some kinds of top-level windows; for example,
* a platform may not support always-on-top modal dialogs.
* @return {@code true}, if the always-on-top mode is
* supported by the toolkit and for this window,
* {@code false}, if always-on-top mode is not supported
* for this window or toolkit doesn't support always-on-top windows.
*
* @return {@code true}, if the always-on-top mode is supported for
* this window and this window's toolkit supports always-on-top windows,
* {@code false} otherwise
*
* @see #setAlwaysOnTop(boolean)
* @see #getToolkit
* @see Toolkit#isAlwaysOnTopSupported
* @since 1.6
*/
...
...
src/share/classes/java/awt/peer/ComponentPeer.java
浏览文件 @
82df1abf
...
...
@@ -259,15 +259,6 @@ public interface ComponentPeer {
*/
ColorModel
getColorModel
();
/**
* Returns the toolkit that is responsible for the component.
*
* @return the toolkit that is responsible for the component
*
* @see Component#getToolkit()
*/
Toolkit
getToolkit
();
/**
* Returns a graphics object to paint on the component.
*
...
...
src/share/classes/sun/awt/NullComponentPeer.java
浏览文件 @
82df1abf
...
...
@@ -141,10 +141,6 @@ public class NullComponentPeer implements LightweightPeer,
return
new
Dimension
(
1
,
1
);
}
public
java
.
awt
.
Toolkit
getToolkit
()
{
return
null
;
}
public
ColorModel
getColorModel
()
{
return
null
;
}
...
...
src/solaris/classes/sun/awt/X11/XComponentPeer.java
浏览文件 @
82df1abf
...
...
@@ -607,10 +607,6 @@ public class XComponentPeer extends XWindow implements ComponentPeer, DropTarget
public
void
layout
()
{}
public
java
.
awt
.
Toolkit
getToolkit
()
{
return
Toolkit
.
getDefaultToolkit
();
}
void
updateMotifColors
(
Color
bg
)
{
int
red
=
bg
.
getRed
();
int
green
=
bg
.
getGreen
();
...
...
@@ -745,11 +741,11 @@ public class XComponentPeer extends XWindow implements ComponentPeer, DropTarget
}
public
boolean
prepareImage
(
Image
img
,
int
w
,
int
h
,
ImageObserver
o
)
{
return
ge
tToolkit
().
prepareImage
(
img
,
w
,
h
,
o
);
return
Toolkit
.
getDefaul
tToolkit
().
prepareImage
(
img
,
w
,
h
,
o
);
}
public
int
checkImage
(
Image
img
,
int
w
,
int
h
,
ImageObserver
o
)
{
return
ge
tToolkit
().
checkImage
(
img
,
w
,
h
,
o
);
return
Toolkit
.
getDefaul
tToolkit
().
checkImage
(
img
,
w
,
h
,
o
);
}
public
Dimension
preferredSize
()
{
...
...
src/windows/classes/sun/awt/windows/WComponentPeer.java
浏览文件 @
82df1abf
...
...
@@ -546,9 +546,6 @@ public abstract class WComponentPeer extends WObjectPeer
return
null
;
}
}
public
java
.
awt
.
Toolkit
getToolkit
()
{
return
Toolkit
.
getDefaultToolkit
();
}
// fallback default font object
final
static
Font
defaultFont
=
new
Font
(
Font
.
DIALOG
,
Font
.
PLAIN
,
12
);
...
...
@@ -739,11 +736,11 @@ public abstract class WComponentPeer extends WObjectPeer
}
public
boolean
prepareImage
(
Image
img
,
int
w
,
int
h
,
ImageObserver
o
)
{
return
ge
tToolkit
().
prepareImage
(
img
,
w
,
h
,
o
);
return
Toolkit
.
getDefaul
tToolkit
().
prepareImage
(
img
,
w
,
h
,
o
);
}
public
int
checkImage
(
Image
img
,
int
w
,
int
h
,
ImageObserver
o
)
{
return
ge
tToolkit
().
checkImage
(
img
,
w
,
h
,
o
);
return
Toolkit
.
getDefaul
tToolkit
().
checkImage
(
img
,
w
,
h
,
o
);
}
// Object overrides
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录