Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
64e73098
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,发现更多精彩内容 >>
提交
64e73098
编写于
9月 01, 2009
作者:
A
alexp
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
6875153: JLayer.isOptimizedDrawingEnabled() throws NPE for null glass pane set
Reviewed-by: rupashka
上级
11fe97e5
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
70 addition
and
5 deletion
+70
-5
src/share/classes/javax/swing/JLayer.java
src/share/classes/javax/swing/JLayer.java
+11
-5
src/share/classes/javax/swing/plaf/LayerUI.java
src/share/classes/javax/swing/plaf/LayerUI.java
+12
-0
test/javax/swing/JLayer/6875153/bug6875153.java
test/javax/swing/JLayer/6875153/bug6875153.java
+47
-0
未找到文件。
src/share/classes/javax/swing/JLayer.java
浏览文件 @
64e73098
...
...
@@ -178,7 +178,7 @@ public final class JLayer<V extends Component>
* @return the {@code JLayer}'s view component
* or {@code null} if none exists
*
* @see #setView(
V
)
* @see #setView(
Component
)
*/
public
V
getView
()
{
return
view
;
...
...
@@ -279,7 +279,7 @@ public final class JLayer<V extends Component>
* @throws UnsupportedOperationException this method is not supported
*
* @see #setView(Component)
* @see #setGlassPane(
Component
)
* @see #setGlassPane(
JPanel
)
*/
protected
void
addImpl
(
Component
comp
,
Object
constraints
,
int
index
)
{
throw
new
UnsupportedOperationException
(
...
...
@@ -339,7 +339,7 @@ public final class JLayer<V extends Component>
* @return false if {@code JLayer}'s {@code glassPane} is visible
*/
public
boolean
isOptimizedDrawingEnabled
()
{
return
!
glassPane
.
isVisible
();
return
glassPane
==
null
||
!
glassPane
.
isVisible
();
}
/**
...
...
@@ -560,14 +560,20 @@ public final class JLayer<V extends Component>
}
}
/**
* {@inheritDoc}
*/
public
void
addNotify
()
{
eventController
.
updateAWTEventListener
(
0
,
eventMask
);
super
.
addNotify
();
eventController
.
updateAWTEventListener
(
0
,
eventMask
);
}
/**
* {@inheritDoc}
*/
public
void
removeNotify
()
{
eventController
.
updateAWTEventListener
(
eventMask
,
0
);
super
.
removeNotify
();
eventController
.
updateAWTEventListener
(
eventMask
,
0
);
}
/**
...
...
src/share/classes/javax/swing/plaf/LayerUI.java
浏览文件 @
64e73098
...
...
@@ -222,6 +222,7 @@ public class LayerUI<V extends Component>
* Returns an array of all the listeners which have been associated
* with the named property.
*
* @param propertyName The name of the property being listened to
* @return all of the {@code PropertyChangeListener}s associated with
* the named property; if no such listeners have been added or
* if {@code propertyName} is {@code null}, an empty
...
...
@@ -262,6 +263,7 @@ public class LayerUI<V extends Component>
/**
* Returns the preferred size of the viewport for a view component.
*
* @param l the {@code JLayer} component where this UI delegate is being installed
* @return the preferred size of the viewport for a view component
* @see Scrollable#getPreferredScrollableViewportSize()
*/
...
...
@@ -277,6 +279,10 @@ public class LayerUI<V extends Component>
* that display logical rows or columns in order to completely expose
* one block of rows or columns, depending on the value of orientation.
*
* @param l the {@code JLayer} component where this UI delegate is being installed
* @param visibleRect The view area visible within the viewport
* @param orientation Either SwingConstants.VERTICAL or SwingConstants.HORIZONTAL.
* @param direction Less than zero to scroll up/left, greater than zero for down/right.
* @return the "block" increment for scrolling in the specified direction
* @see Scrollable#getScrollableBlockIncrement(Rectangle, int, int)
*/
...
...
@@ -296,6 +302,7 @@ public class LayerUI<V extends Component>
* determine the height of the layer, unless the preferred height
* of the layer is smaller than the height of the viewport.
*
* @param l the {@code JLayer} component where this UI delegate is being installed
* @return whether the layer should track the height of the viewport
* @see Scrollable#getScrollableTracksViewportHeight()
*/
...
...
@@ -311,6 +318,7 @@ public class LayerUI<V extends Component>
* determine the width of the layer, unless the preferred width
* of the layer is smaller than the width of the viewport.
*
* @param l the {@code JLayer} component where this UI delegate is being installed
* @return whether the layer should track the width of the viewport
* @see Scrollable
* @see LayerUI#getScrollableTracksViewportWidth(JLayer)
...
...
@@ -332,6 +340,10 @@ public class LayerUI<V extends Component>
* Scrolling containers, like JScrollPane, will use this method
* each time the user requests a unit scroll.
*
* @param l the {@code JLayer} component where this UI delegate is being installed
* @param visibleRect The view area visible within the viewport
* @param orientation Either SwingConstants.VERTICAL or SwingConstants.HORIZONTAL.
* @param direction Less than zero to scroll up/left, greater than zero for down/right.
* @return The "unit" increment for scrolling in the specified direction.
* This value should always be positive.
* @see Scrollable#getScrollableUnitIncrement(Rectangle, int, int)
...
...
test/javax/swing/JLayer/6875153/bug6875153.java
0 → 100644
浏览文件 @
64e73098
/*
* Copyright 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 6875153
* @summary JLayer.isOptimizedDrawingEnabled() throws NPE for null glass pane set
* @author Alexander Potochkin
*/
import
javax.swing.*
;
public
class
bug6875153
{
private
static
void
createGui
()
{
JLayer
layer
=
new
JLayer
();
layer
.
setGlassPane
(
null
);
layer
.
isOptimizedDrawingEnabled
();
}
public
static
void
main
(
String
[]
args
)
throws
Exception
{
SwingUtilities
.
invokeAndWait
(
new
Runnable
()
{
public
void
run
()
{
bug6875153
.
createGui
();
}
});
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录