Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
d49e3c5e
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,发现更多精彩内容 >>
提交
d49e3c5e
编写于
9月 11, 2014
作者:
A
asaha
浏览文件
操作
浏览文件
下载
差异文件
Merge
上级
68313d62
f5b0d056
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
75 addition
and
4 deletion
+75
-4
.hgtags
.hgtags
+4
-0
src/share/classes/com/sun/java/swing/plaf/motif/MotifScrollPaneUI.java
...sses/com/sun/java/swing/plaf/motif/MotifScrollPaneUI.java
+7
-3
src/solaris/classes/sun/awt/X11/XTextAreaPeer.java
src/solaris/classes/sun/awt/X11/XTextAreaPeer.java
+2
-1
test/javax/xml/bind/xjc/8029837/PreParseGrammarTest.java
test/javax/xml/bind/xjc/8029837/PreParseGrammarTest.java
+58
-0
test/javax/xml/bind/xjc/8029837/test.xsd
test/javax/xml/bind/xjc/8029837/test.xsd
+4
-0
未找到文件。
.hgtags
浏览文件 @
d49e3c5e
...
...
@@ -312,6 +312,7 @@ be30cb2a3088f2b7b334b499f7eddbd5312312a7 jdk8u20-b23
dfb9f24d56b51e5a2ca26e77fc69a2464d51a4d3 jdk8u20-b24
dfb9f24d56b51e5a2ca26e77fc69a2464d51a4d3 jdk8u20-b25
dd229c5f57bff4e75a70908294a13072b9a48385 jdk8u20-b26
684a13a7d2ccc91d2ad709ecad1fddbcc992ee5a jdk8u20-b31
abca9f6f1a10e9f91b2538bbe7870f54f550d986 jdk8u25-b00
7d0627679c9fdeaaaa9fe15c7cc11af0763621ec jdk8u25-b01
b0277ec994b751ebb761814675352506cd56bcd6 jdk8u25-b02
...
...
@@ -329,4 +330,7 @@ c3a855402b923d3ba819b05292a971953fc8ed0b jdk8u25-b13
2a6df63ca0f0f59bb730638b05c72d77a23f93c8 jdk8u25-b14
412d9ade90401d098f3662bd688ab393008423bd jdk8u25-b15
f07bc5dab84c67f5d1dccbab318ee1c5485c852d jdk8u25-b16
0000000000000000000000000000000000000000 jdk8u25-b16
0000000000000000000000000000000000000000 jdk8u25-b16
d067890f970f3a712f870f6311d20f3359b6eaf0 jdk8u25-b16
f935349e2c065487c745bc41f81ddc7869bd2d2d jdk8u31-b00
src/share/classes/com/sun/java/swing/plaf/motif/MotifScrollPaneUI.java
浏览文件 @
d49e3c5e
/*
* Copyright (c) 1997, 20
0
4, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 20
1
4, 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
...
...
@@ -56,19 +56,22 @@ public class MotifScrollPaneUI extends BasicScrollPaneUI
private
PropertyChangeListener
propertyChangeHandler
;
@Override
protected
void
installListeners
(
JScrollPane
scrollPane
)
{
super
.
installListeners
(
scrollPane
);
propertyChangeHandler
=
createPropertyChangeHandler
();
scrollPane
.
addPropertyChangeListener
(
propertyChangeHandler
);
}
protected
void
uninstallListeners
(
JScrollPane
scrollPane
)
{
@Override
protected
void
uninstallListeners
(
JComponent
scrollPane
)
{
super
.
uninstallListeners
(
scrollPane
);
scrollPane
.
removePropertyChangeListener
(
propertyChangeHandler
);
}
private
PropertyChangeListener
createPropertyChangeHandler
()
{
return
new
PropertyChangeListener
()
{
@Override
public
void
propertyChange
(
PropertyChangeEvent
e
)
{
String
propertyName
=
e
.
getPropertyName
();
...
...
@@ -92,6 +95,7 @@ public class MotifScrollPaneUI extends BasicScrollPaneUI
}};
}
@Override
protected
void
installDefaults
(
JScrollPane
scrollpane
)
{
super
.
installDefaults
(
scrollpane
);
...
...
@@ -115,7 +119,7 @@ public class MotifScrollPaneUI extends BasicScrollPaneUI
}
}
@Override
protected
void
uninstallDefaults
(
JScrollPane
c
)
{
super
.
uninstallDefaults
(
c
);
...
...
src/solaris/classes/sun/awt/X11/XTextAreaPeer.java
浏览文件 @
d49e3c5e
...
...
@@ -1024,7 +1024,8 @@ final class XTextAreaPeer extends XComponentPeer implements TextAreaPeer {
}
}
protected
void
uninstallListeners
(
JScrollPane
scrollPane
)
{
@Override
protected
void
uninstallListeners
(
JComponent
scrollPane
)
{
super
.
uninstallListeners
(
scrollPane
);
scrollPane
.
removePropertyChangeListener
(
propertyChangeHandler
);
}
...
...
test/javax/xml/bind/xjc/8029837/PreParseGrammarTest.java
0 → 100644
浏览文件 @
d49e3c5e
/*
* Copyright (c) 2014, 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 8029837
* @summary Test simulates the partial call to xjc ant task that fails with
* NullPointer exception
* @run main/othervm PreParseGrammarTest
*/
import
com.sun.org.apache.xerces.internal.parsers.XMLGrammarPreparser
;
import
com.sun.org.apache.xerces.internal.xni.XNIException
;
import
com.sun.org.apache.xerces.internal.xni.grammars.Grammar
;
import
com.sun.org.apache.xerces.internal.xni.grammars.XMLGrammarDescription
;
import
com.sun.org.apache.xerces.internal.xni.parser.XMLInputSource
;
import
java.io.BufferedInputStream
;
import
java.io.File
;
import
java.io.FileInputStream
;
import
java.io.FileNotFoundException
;
import
java.io.IOException
;
import
java.io.InputStream
;
public
class
PreParseGrammarTest
{
public
static
void
main
(
String
[]
args
)
throws
FileNotFoundException
,
XNIException
,
IOException
{
File
xsdf
=
new
File
(
System
.
getProperty
(
"test.src"
,
"."
)
+
"/test.xsd"
);
InputStream
is
=
new
BufferedInputStream
(
new
FileInputStream
(
xsdf
));
XMLInputSource
xis
=
new
XMLInputSource
(
null
,
null
,
null
,
is
,
null
);
XMLGrammarPreparser
gp
=
new
XMLGrammarPreparser
();
gp
.
registerPreparser
(
XMLGrammarDescription
.
XML_SCHEMA
,
null
);
//The NullPointerException is observed on next call during ant task
// execution
Grammar
res
=
gp
.
preparseGrammar
(
XMLGrammarDescription
.
XML_SCHEMA
,
xis
);
System
.
out
.
println
(
"Grammar preparsed successfully:"
+
res
);
return
;
}
}
test/javax/xml/bind/xjc/8029837/test.xsd
0 → 100644
浏览文件 @
d49e3c5e
<xsd:schema
xmlns:xsd=
"http://www.w3.org/2001/XMLSchema"
>
<xsd:element
name=
"root"
>
</xsd:element>
</xsd:schema>
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录