Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
cc2c9677
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,发现更多精彩内容 >>
提交
cc2c9677
编写于
6月 15, 2016
作者:
A
asaha
浏览文件
操作
浏览文件
下载
差异文件
Merge
上级
5b856e6d
4300ebdd
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
163 addition
and
4 deletion
+163
-4
.hgtags
.hgtags
+2
-0
src/share/classes/javax/swing/JEditorPane.java
src/share/classes/javax/swing/JEditorPane.java
+5
-4
test/javax/swing/JEditorPane/6882559/bug6882559.java
test/javax/swing/JEditorPane/6882559/bug6882559.java
+41
-0
test/javax/swing/JEditorPane/8158734/bug8158734.java
test/javax/swing/JEditorPane/8158734/bug8158734.java
+115
-0
未找到文件。
.hgtags
浏览文件 @
cc2c9677
...
...
@@ -589,6 +589,8 @@ ea965fea71f612d65013192aa637d88e05915b10 jdk8u92-b00
cc8d0d6c6f9543120836e70e0aa3fa9c9b6fe0f3 jdk8u92-b13
4f06a20cdc59ce9742e6538ff4b9040baba0778a jdk8u92-b14
5875e297cfcf18304b4b062dc44fa9be312ad6e8 jdk8u92-b31
ed69541ce48b38bf0830c762f353e4379ce43630 jdk8u92-b32
739b1dc838cdf73c7e16bacb5ce4d1c4534c7d76 jdk8u92-b33
f6cc9dbb5db5883385c91bb71ca02081220aaf3d jdk8u81-b00
00f8f39308687cde45f23282871c46cc6c2f10b3 jdk8u101-b01
6042757c329b1b96fa6bc931e09306794f5c50c0 jdk8u101-b02
...
...
src/share/classes/javax/swing/JEditorPane.java
浏览文件 @
cc2c9677
...
...
@@ -24,15 +24,12 @@
*/
package
javax.swing
;
import
sun.swing.SwingUtilities2
;
import
java.awt.*
;
import
java.awt.event.*
;
import
java.lang.reflect.*
;
import
java.net.*
;
import
java.util.*
;
import
java.io.*
;
import
java.util.*
;
import
javax.swing.plaf.*
;
import
javax.swing.text.*
;
...
...
@@ -1244,7 +1241,11 @@ public class JEditorPane extends JTextComponent {
*/
public
static
void
registerEditorKitForContentType
(
String
type
,
String
classname
,
ClassLoader
loader
)
{
getKitTypeRegistry
().
put
(
type
,
classname
);
getKitLoaderRegistry
().
put
(
type
,
loader
);
if
(
loader
!=
null
)
{
getKitLoaderRegistry
().
put
(
type
,
loader
);
}
else
{
getKitLoaderRegistry
().
remove
(
type
);
}
getKitRegisty
().
remove
(
type
);
}
...
...
test/javax/swing/JEditorPane/6882559/bug6882559.java
0 → 100644
浏览文件 @
cc2c9677
/*
* 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 6882559
@summary new JEditorPane("text/plain","") fails for null context class loader
@author Mikhail Cherkasov
@run main bug6882559
*/
import
javax.swing.*
;
public
class
bug6882559
{
public
static
void
main
(
String
[]
args
)
throws
Exception
{
SwingUtilities
.
invokeAndWait
(()
->
{
Thread
.
currentThread
().
setContextClassLoader
(
null
);
new
javax
.
swing
.
JEditorPane
(
"text/plain"
,
""
);
});
}
}
test/javax/swing/JEditorPane/8158734/bug8158734.java
0 → 100644
浏览文件 @
cc2c9677
/*
* 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 8158734
@summary JEditorPane.createEditorKitForContentType throws NPE after 6882559
@author Mikhail Cherkasov
@run main bug8158734
*/
import
javax.swing.*
;
import
javax.swing.text.*
;
import
java.io.*
;
import
java.lang.reflect.InvocationTargetException
;
public
class
bug8158734
{
public
static
final
String
TYPE
=
"test/test"
;
public
static
final
String
TYPE_2
=
"test2/test2"
;
static
boolean
myClassloaderWasUsed
=
false
;
static
class
MyEditorKit
extends
EditorKit
{
@Override
public
String
getContentType
()
{
return
null
;
}
@Override
public
ViewFactory
getViewFactory
()
{
return
null
;
}
@Override
public
Action
[]
getActions
()
{
return
new
Action
[
0
];
}
@Override
public
Caret
createCaret
()
{
return
null
;
}
@Override
public
Document
createDefaultDocument
()
{
return
null
;
}
@Override
public
void
read
(
InputStream
in
,
Document
doc
,
int
pos
)
throws
IOException
,
BadLocationException
{
}
@Override
public
void
write
(
OutputStream
out
,
Document
doc
,
int
pos
,
int
len
)
throws
IOException
,
BadLocationException
{
}
@Override
public
void
read
(
Reader
in
,
Document
doc
,
int
pos
)
throws
IOException
,
BadLocationException
{
}
@Override
public
void
write
(
Writer
out
,
Document
doc
,
int
pos
,
int
len
)
throws
IOException
,
BadLocationException
{
}
}
static
class
MyClassloader
extends
ClassLoader
{
@Override
public
Class
<?>
loadClass
(
String
name
)
throws
ClassNotFoundException
{
myClassloaderWasUsed
=
true
;
return
super
.
loadClass
(
name
);
}
}
public
static
void
main
(
String
[]
args
)
throws
InvocationTargetException
,
InterruptedException
{
SwingUtilities
.
invokeAndWait
(
new
Runnable
()
{
@Override
public
void
run
()
{
JEditorPane
c
=
new
JEditorPane
();
c
.
setContentType
(
TYPE
);
final
MyClassloader
loader
=
new
MyClassloader
();
JEditorPane
.
registerEditorKitForContentType
(
TYPE_2
,
MyEditorKit
.
class
.
getName
(),
loader
);
JEditorPane
.
registerEditorKitForContentType
(
TYPE_2
,
MyEditorKit
.
class
.
getName
(),
null
);
JEditorPane
.
createEditorKitForContentType
(
TYPE_2
);
if
(
myClassloaderWasUsed
)
{
throw
new
RuntimeException
(
"Class loader has not been removed for '"
+
TYPE_2
+
"' type"
);
}
}
});
}
}
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录