Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell11
提交
8dfd1a23
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,发现更多精彩内容 >>
提交
8dfd1a23
编写于
10月 25, 2017
作者:
J
jjg
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8189843: Missing \"id\" attributes in table rows
Reviewed-by: bpatel, ksrini
上级
6eccc649
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
29 addition
and
9 deletion
+29
-9
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java
...c/internal/doclets/formats/html/AbstractMemberWriter.java
+6
-4
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/MemberSummaryWriter.java
...javadoc/internal/doclets/toolkit/MemberSummaryWriter.java
+4
-2
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/MemberSummaryBuilder.java
...ternal/doclets/toolkit/builders/MemberSummaryBuilder.java
+1
-1
test/langtools/jdk/javadoc/doclet/testProperty/TestProperty.java
...ngtools/jdk/javadoc/doclet/testProperty/TestProperty.java
+18
-2
未找到文件。
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java
浏览文件 @
8dfd1a23
...
...
@@ -36,7 +36,6 @@ import javax.lang.model.element.TypeParameterElement;
import
javax.lang.model.type.TypeMirror
;
import
com.sun.source.doctree.DocTree
;
import
jdk.javadoc.internal.doclets.formats.html.TableHeader
;
import
jdk.javadoc.internal.doclets.formats.html.markup.HtmlAttr
;
import
jdk.javadoc.internal.doclets.formats.html.markup.HtmlConstants
;
import
jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle
;
...
...
@@ -44,6 +43,7 @@ import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag;
import
jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree
;
import
jdk.javadoc.internal.doclets.formats.html.markup.StringContent
;
import
jdk.javadoc.internal.doclets.toolkit.Content
;
import
jdk.javadoc.internal.doclets.toolkit.MemberSummaryWriter
;
import
jdk.javadoc.internal.doclets.toolkit.Resources
;
import
jdk.javadoc.internal.doclets.toolkit.taglets.DeprecatedTaglet
;
import
jdk.javadoc.internal.doclets.toolkit.util.MethodTypes
;
...
...
@@ -65,7 +65,7 @@ import static javax.lang.model.element.Modifier.*;
* @author Jamie Ho (Re-write)
* @author Bhavesh Patel (Modified)
*/
public
abstract
class
AbstractMemberWriter
{
public
abstract
class
AbstractMemberWriter
implements
MemberSummaryWriter
{
protected
final
HtmlConfiguration
configuration
;
protected
final
Utils
utils
;
...
...
@@ -519,7 +519,8 @@ public abstract class AbstractMemberWriter {
* @param counter the counter for determining id and style for the table row
*/
public
void
addMemberSummary
(
TypeElement
tElement
,
Element
member
,
List
<?
extends
DocTree
>
firstSentenceTags
,
List
<
Content
>
tableContents
,
int
counter
)
{
List
<?
extends
DocTree
>
firstSentenceTags
,
List
<
Content
>
tableContents
,
int
counter
,
VisibleMemberMap
.
Kind
vmmKind
)
{
HtmlTree
tdSummaryType
=
new
HtmlTree
(
HtmlTag
.
TD
);
tdSummaryType
.
addStyle
(
HtmlStyle
.
colFirst
);
writer
.
addSummaryType
(
this
,
member
,
tdSummaryType
);
...
...
@@ -532,7 +533,8 @@ public abstract class AbstractMemberWriter {
tdDesc
.
addStyle
(
HtmlStyle
.
colLast
);
writer
.
addSummaryLinkComment
(
this
,
member
,
firstSentenceTags
,
tdDesc
);
tr
.
addContent
(
tdDesc
);
if
(
utils
.
isMethod
(
member
)
&&
!
utils
.
isAnnotationType
(
member
)
&&
!
utils
.
isProperty
(
name
(
member
)))
{
if
(
utils
.
isMethod
(
member
)
&&
!
utils
.
isAnnotationType
(
member
)
&&
vmmKind
!=
VisibleMemberMap
.
Kind
.
PROPERTIES
)
{
int
methodType
=
utils
.
isStatic
(
member
)
?
MethodTypes
.
STATIC
.
tableTabs
().
value
()
:
MethodTypes
.
INSTANCE
.
tableTabs
().
value
();
if
(
utils
.
isInterface
(
member
.
getEnclosingElement
()))
{
...
...
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/MemberSummaryWriter.java
浏览文件 @
8dfd1a23
/*
* Copyright (c) 2003, 201
6
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 201
7
, 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
...
...
@@ -32,6 +32,7 @@ import javax.lang.model.element.Element;
import
javax.lang.model.element.TypeElement
;
import
com.sun.source.doctree.DocTree
;
import
jdk.javadoc.internal.doclets.toolkit.util.VisibleMemberMap
;
/**
* The interface for writing member summary output.
...
...
@@ -77,7 +78,8 @@ public interface MemberSummaryWriter {
* @param counter the counter for determining id and style for the table row
*/
public
void
addMemberSummary
(
TypeElement
typeElement
,
Element
member
,
List
<?
extends
DocTree
>
firstSentenceTags
,
List
<
Content
>
tableContents
,
int
counter
);
List
<?
extends
DocTree
>
firstSentenceTags
,
List
<
Content
>
tableContents
,
int
counter
,
VisibleMemberMap
.
Kind
vmmKind
);
/**
* Get the inherited member summary header for the given class.
...
...
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/MemberSummaryBuilder.java
浏览文件 @
8dfd1a23
...
...
@@ -356,7 +356,7 @@ public abstract class MemberSummaryBuilder extends AbstractMemberBuilder {
}
}
writer
.
addMemberSummary
(
typeElement
,
member
,
firstSentenceTags
,
tableContents
,
counter
);
tableContents
,
counter
,
visibleMemberMap
.
kind
);
counter
++;
}
summaryTreeList
.
add
(
writer
.
getSummaryTableTree
(
typeElement
,
tableContents
));
...
...
test/langtools/jdk/javadoc/doclet/testProperty/TestProperty.java
浏览文件 @
8dfd1a23
...
...
@@ -23,7 +23,7 @@
/*
* @test
* @bug 8176231
* @bug 8176231
8189843
* @summary Test JavaFX property.
* @library ../lib/
* @modules jdk.javadoc/jdk.javadoc.internal.tool
...
...
@@ -71,7 +71,23 @@ public class TestProperty extends JavadocTester {
+
"<dd><a href=\"../pkg/MyClass.html#getBad--\"><code>getBad()</code></a>, \n"
+
"<a href=\"../pkg/MyClass.html#setBad-pkg.MyObj:A-\">"
+
"<code>setBad(MyObj[])</code></a></dd>\n"
+
"</dl>"
+
"</dl>"
,
// id should not be used in the property table
"<tr class=\"altColor\">\n"
+
"<td class=\"colFirst\"><code><a href=\"../pkg/ObjectProperty.html\" "
+
"title=\"class in pkg\">ObjectProperty</a><<a href=\"../pkg/MyObj.html\" "
+
"title=\"class in pkg\">MyObj</a>[]></code></td>\n"
+
"<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">"
+
"<a href=\"../pkg/MyClass.html#badProperty\">bad</a></span></code></th>"
,
// id should be used in the method table
"<tr id=\"i0\" class=\"altColor\">\n"
+
"<td class=\"colFirst\"><code><a href=\"../pkg/ObjectProperty.html\" "
+
"title=\"class in pkg\">ObjectProperty</a><<a href=\"../pkg/MyObj.html\" "
+
"title=\"class in pkg\">MyObj</a>[]></code></td>\n"
+
"<th class=\"colSecond\" scope=\"row\"><code><span class=\"memberNameLink\">"
+
"<a href=\"../pkg/MyClass.html#badProperty--\">badProperty</a></span>()</code></th>"
);
checkOutput
(
"pkg/MyClassT.html"
,
true
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录