Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell11
提交
6eccc649
D
dragonwell11
项目概览
openanolis
/
dragonwell11
通知
7
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dragonwell11
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
6eccc649
编写于
10月 25, 2017
作者:
J
jjg
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8189841: Error in alternate row coloring in package-summary files
Reviewed-by: bpatel, ksrini
上级
8dd1882f
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
337 addition
and
1 deletion
+337
-1
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriterImpl.java
...adoc/internal/doclets/formats/html/PackageWriterImpl.java
+1
-1
test/langtools/jdk/javadoc/doclet/testGroupName/TestGroupName.java
...tools/jdk/javadoc/doclet/testGroupName/TestGroupName.java
+110
-0
test/langtools/jdk/javadoc/doclet/testPackageSummary/TestPackageSummary.java
...javadoc/doclet/testPackageSummary/TestPackageSummary.java
+75
-0
test/langtools/jdk/javadoc/doclet/testPackageSummary/pkg/C0.java
...ngtools/jdk/javadoc/doclet/testPackageSummary/pkg/C0.java
+29
-0
test/langtools/jdk/javadoc/doclet/testPackageSummary/pkg/C1.java
...ngtools/jdk/javadoc/doclet/testPackageSummary/pkg/C1.java
+29
-0
test/langtools/jdk/javadoc/doclet/testPackageSummary/pkg/C2.java
...ngtools/jdk/javadoc/doclet/testPackageSummary/pkg/C2.java
+30
-0
test/langtools/jdk/javadoc/doclet/testPackageSummary/pkg/C3.java
...ngtools/jdk/javadoc/doclet/testPackageSummary/pkg/C3.java
+31
-0
test/langtools/jdk/javadoc/doclet/testPackageSummary/pkg/C4.java
...ngtools/jdk/javadoc/doclet/testPackageSummary/pkg/C4.java
+32
-0
未找到文件。
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriterImpl.java
浏览文件 @
6eccc649
...
@@ -292,11 +292,11 @@ public class PackageWriterImpl extends HtmlDocletWriter
...
@@ -292,11 +292,11 @@ public class PackageWriterImpl extends HtmlDocletWriter
Content
tbody
=
new
HtmlTree
(
HtmlTag
.
TBODY
);
Content
tbody
=
new
HtmlTree
(
HtmlTag
.
TBODY
);
boolean
altColor
=
false
;
boolean
altColor
=
false
;
for
(
TypeElement
klass
:
classes
)
{
for
(
TypeElement
klass
:
classes
)
{
altColor
=
!
altColor
;
if
(!
utils
.
isCoreClass
(
klass
)
||
if
(!
utils
.
isCoreClass
(
klass
)
||
!
configuration
.
isGeneratedDoc
(
klass
))
{
!
configuration
.
isGeneratedDoc
(
klass
))
{
continue
;
continue
;
}
}
altColor
=
!
altColor
;
Content
classContent
=
getLink
(
new
LinkInfoImpl
(
Content
classContent
=
getLink
(
new
LinkInfoImpl
(
configuration
,
LinkInfoImpl
.
Kind
.
PACKAGE
,
klass
));
configuration
,
LinkInfoImpl
.
Kind
.
PACKAGE
,
klass
));
Content
thClass
=
HtmlTree
.
TH_ROW_SCOPE
(
HtmlStyle
.
colFirst
,
classContent
);
Content
thClass
=
HtmlTree
.
TH_ROW_SCOPE
(
HtmlStyle
.
colFirst
,
classContent
);
...
...
test/langtools/jdk/javadoc/doclet/testGroupName/TestGroupName.java
0 → 100644
浏览文件 @
6eccc649
/*
* Copyright (c) 2017, 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 8190003
* @summary Special characters in group names should be escaped
* @library /tools/lib ../lib
* @modules jdk.javadoc/jdk.javadoc.internal.tool
* @build toolbox.ToolBox JavadocTester
* @run main TestGroupName
*/
import
java.io.IOException
;
import
java.nio.file.Path
;
import
java.nio.file.Paths
;
import
toolbox.*
;
public
class
TestGroupName
extends
JavadocTester
{
public
final
ToolBox
tb
;
public
static
void
main
(
String
...
args
)
throws
Exception
{
TestGroupName
tester
=
new
TestGroupName
();
tester
.
runTests
(
m
->
new
Object
[]
{
Paths
.
get
(
m
.
getName
())
});
}
public
TestGroupName
()
{
tb
=
new
ToolBox
();
}
@Test
public
void
testPackageGroups
(
Path
base
)
throws
IOException
{
Path
src
=
base
.
resolve
(
"src"
);
tb
.
writeJavaFiles
(
src
,
"package p1; public class C1 { }"
,
"package p2; public class C2 { }"
,
"package p3; public class C3 { }"
);
javadoc
(
"-d"
,
base
.
resolve
(
"out"
).
toString
(),
"-sourcepath"
,
src
.
toString
(),
"-group"
,
"abc < & > def"
,
"p1"
,
"p1"
,
"p2"
,
"p3"
);
checkExit
(
Exit
.
OK
);
checkOutput
(
"overview-summary.html"
,
true
,
"summary=\"abc < & > def table"
,
"<span>abc < & > def</span>"
);
checkOutput
(
"overview-summary.html"
,
false
,
"abc < & > def"
);
The
name
should
be
wrapped
in
a
StringContent
node
instead
.
}
@Test
public
void
testModuleGroups
(
Path
base
)
throws
IOException
{
Path
src
=
base
.
resolve
(
"src"
);
tb
.
writeJavaFiles
(
src
.
resolve
(
"ma"
),
"module ma { exports pa1; }"
,
"package pa1; public class CA1 { }"
,
"package pa2; public class CA2 { }"
,
"package pa3; public class CA3 { }"
);
tb
.
writeJavaFiles
(
src
.
resolve
(
"mb"
),
"module mb { exports pb1; }"
,
"package pb1; public class CB1 { }"
,
"package pb2; public class CB2 { }"
,
"package pb3; public class CB3 { }"
);
tb
.
writeJavaFiles
(
src
.
resolve
(
"mc"
),
"module mc { exports pc1; }"
,
"package pc1; public class CC1 { }"
,
"package pc2; public class CC2 { }"
,
"package pc3; public class CC3 { }"
);
javadoc
(
"-d"
,
base
.
resolve
(
"out"
).
toString
(),
"--module-source-path"
,
src
.
toString
(),
"-group"
,
"abc < & > def"
,
"ma"
,
"--module"
,
"ma,mb,mc"
);
checkExit
(
Exit
.
OK
);
checkOutput
(
"overview-summary.html"
,
true
,
"summary=\"abc < & > def table"
,
"<span>abc < & > def</span>"
);
checkOutput
(
"overview-summary.html"
,
false
,
"abc < & > def"
);
}
}
test/langtools/jdk/javadoc/doclet/testPackageSummary/TestPackageSummary.java
0 → 100644
浏览文件 @
6eccc649
/*
* Copyright (c) 2017, 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 8189841
* @summary Error in alternate row coloring in package-summary files
* @library ../lib/
* @modules jdk.javadoc/jdk.javadoc.internal.tool
* @build JavadocTester TestPackageSummary
* @run main TestPackageSummary
*/
public
class
TestPackageSummary
extends
JavadocTester
{
public
static
void
main
(
String
...
args
)
throws
Exception
{
TestPackageSummary
tester
=
new
TestPackageSummary
();
tester
.
runTests
();
}
@Test
void
testStripes
()
{
javadoc
(
"-d"
,
"out"
,
"-sourcepath"
,
testSrc
,
"pkg"
);
checkExit
(
Exit
.
OK
);
checkOutput
(
"pkg/package-summary.html"
,
true
,
"<tbody>\n"
+
"<tr class=\"altColor\">\n"
+
"<th class=\"colFirst\" scope=\"row\"><a href=\"../pkg/C0.html\" title=\"class in pkg\">C0</a></th>\n"
+
"<td class=\"colLast\"> </td>\n"
+
"</tr>\n"
+
"<tr class=\"rowColor\">\n"
+
"<th class=\"colFirst\" scope=\"row\"><a href=\"../pkg/C1.html\" title=\"class in pkg\">C1</a></th>\n"
+
"<td class=\"colLast\"> </td>\n"
+
"</tr>\n"
+
"<tr class=\"altColor\">\n"
+
"<th class=\"colFirst\" scope=\"row\"><a href=\"../pkg/C2.html\" title=\"class in pkg\">C2</a></th>\n"
+
"<td class=\"colLast\"> </td>\n"
+
"</tr>\n"
+
"<tr class=\"rowColor\">\n"
+
"<th class=\"colFirst\" scope=\"row\"><a href=\"../pkg/C3.html\" title=\"class in pkg\">C3</a></th>\n"
+
"<td class=\"colLast\"> </td>\n"
+
"</tr>\n"
+
"<tr class=\"altColor\">\n"
+
"<th class=\"colFirst\" scope=\"row\"><a href=\"../pkg/C4.html\" title=\"class in pkg\">C4</a></th>\n"
+
"<td class=\"colLast\"> </td>\n"
+
"</tr>\n"
+
"</tbody>\n"
);
}
}
test/langtools/jdk/javadoc/doclet/testPackageSummary/pkg/C0.java
0 → 100644
浏览文件 @
6eccc649
/*
* Copyright (c) 2017, 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.
*/
package
pkg
;
public
class
C0
{
// no inner classes
}
test/langtools/jdk/javadoc/doclet/testPackageSummary/pkg/C1.java
0 → 100644
浏览文件 @
6eccc649
/*
* Copyright (c) 2017, 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.
*/
package
pkg
;
public
class
C1
{
public
class
Inner1
{
}
}
test/langtools/jdk/javadoc/doclet/testPackageSummary/pkg/C2.java
0 → 100644
浏览文件 @
6eccc649
/*
* Copyright (c) 2017, 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.
*/
package
pkg
;
public
class
C2
{
public
class
Inner1
{
}
public
class
Inner2
{
}
}
test/langtools/jdk/javadoc/doclet/testPackageSummary/pkg/C3.java
0 → 100644
浏览文件 @
6eccc649
/*
* Copyright (c) 2017, 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.
*/
package
pkg
;
public
class
C3
{
public
class
Inner1
{
}
public
class
Inner2
{
}
public
class
Inner3
{
}
}
test/langtools/jdk/javadoc/doclet/testPackageSummary/pkg/C4.java
0 → 100644
浏览文件 @
6eccc649
/*
* Copyright (c) 2017, 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.
*/
package
pkg
;
public
class
C4
{
public
class
Inner1
{
}
public
class
Inner2
{
}
public
class
Inner3
{
}
public
class
Inner4
{
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录