Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_langtools
提交
d08209f9
D
dragonwell8_langtools
项目概览
openanolis
/
dragonwell8_langtools
通知
0
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dragonwell8_langtools
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
d08209f9
编写于
2月 14, 2014
作者:
K
ksrini
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8029145: javadoc fails with java.lang.IllegalStateException: endPosTable already set
Reviewed-by: jjg
上级
16d08832
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
21 addition
and
12 deletion
+21
-12
src/share/classes/com/sun/tools/javadoc/JavadocTool.java
src/share/classes/com/sun/tools/javadoc/JavadocTool.java
+8
-4
test/tools/javadoc/parser/7091528/T7091528.java
test/tools/javadoc/parser/7091528/T7091528.java
+13
-8
未找到文件。
src/share/classes/com/sun/tools/javadoc/JavadocTool.java
浏览文件 @
d08209f9
/*
* Copyright (c) 2001, 201
3
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2001, 201
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
...
...
@@ -30,6 +30,7 @@ import java.io.IOException;
import
java.util.Collection
;
import
java.util.EnumSet
;
import
java.util.HashMap
;
import
java.util.HashSet
;
import
java.util.Map
;
import
java.util.Set
;
import
javax.tools.JavaFileManager.Location
;
...
...
@@ -238,10 +239,13 @@ public class JavadocTool extends com.sun.tools.javac.main.JavaCompiler {
files
=
lb
.
toList
();
}
Set
<
JavaFileObject
>
ufiles
=
new
HashSet
<>();
for
(
JavaFileObject
fo
:
files
)
{
// messager.notice("main.Loading_source_file", fn);
trees
.
append
(
parse
(
fo
));
hasFiles
=
true
;
if
(
ufiles
.
add
(
fo
))
{
// ignore duplicates
// messager.notice("main.Loading_source_file", fn);
trees
.
append
(
parse
(
fo
));
hasFiles
=
true
;
}
}
if
(!
hasFiles
)
{
...
...
test/tools/javadoc/parser/7091528/T7091528.java
浏览文件 @
d08209f9
/*
* Copyright (c) 2009, 201
1
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2009, 201
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
...
...
@@ -23,8 +23,8 @@
/**
* @test
* @bug 7091528
* @summary
javadoc attempts to parse .
class files
* @bug 7091528
8029145
* @summary
ensures javadoc parses unique source files and ignores all
class files
* @compile p/C1.java p/q/C2.java
* @run main T7091528
*/
...
...
@@ -37,17 +37,22 @@ public class T7091528 {
public
static
void
main
(
String
...
args
)
{
new
T7091528
().
run
();
}
void
run
()
{
File
testSrc
=
new
File
(
System
.
getProperty
(
"test.src"
));
File
testClasses
=
new
File
(
System
.
getProperty
(
"test.classes"
));
String
[]
args
=
{
"-d"
,
"."
,
// 7091528, tests if class files are being ignored
runTest
(
"-d"
,
"."
,
"-sourcepath"
,
testClasses
+
File
.
pathSeparator
+
testSrc
,
"-subpackages"
,
"p"
};
"p"
);
// 8029145, tests if unique source files are parsed
runTest
(
"-d"
,
"."
,
"-sourcepath"
,
testSrc
.
getAbsolutePath
(),
"-subpackages"
,
"p:p.q"
);
}
void
runTest
(
String
...
args
)
{
StringWriter
sw
=
new
StringWriter
();
PrintWriter
pw
=
new
PrintWriter
(
sw
);
String
doclet
=
com
.
sun
.
tools
.
doclets
.
standard
.
Standard
.
class
.
getName
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录