Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_langtools
提交
c40bedef
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看板
提交
c40bedef
编写于
10月 05, 2012
作者:
B
bpatel
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
7068595: html files in class-use dir do not get loaded correctly when Frames link is clicked
Reviewed-by: jjg
上级
10089735
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
17 addition
and
8 deletion
+17
-8
src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java
...es/com/sun/tools/doclets/formats/html/ClassUseWriter.java
+2
-5
test/com/sun/javadoc/testUseOption/TestUseOption.java
test/com/sun/javadoc/testUseOption/TestUseOption.java
+15
-3
未找到文件。
src/share/classes/com/sun/tools/doclets/formats/html/ClassUseWriter.java
浏览文件 @
c40bedef
/*
* Copyright (c) 1998, 201
1
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 201
2
, 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
...
...
@@ -195,10 +195,7 @@ public class ClassUseWriter extends SubWriterHolderWriter {
ClassUseWriter
clsgen
;
String
path
=
DirectoryManager
.
getDirectoryPath
(
classdoc
.
containingPackage
());
if
(
path
.
length
()
>
0
)
{
path
+=
File
.
separator
;
}
path
+=
"class-use"
;
path
+=
"class-use"
+
DirectoryManager
.
URL_FILE_SEPARATOR
;
String
filename
=
classdoc
.
name
()
+
".html"
;
String
pkgname
=
classdoc
.
containingPackage
().
name
();
pkgname
+=
(
pkgname
.
length
()
>
0
)?
".class-use"
:
"class-use"
;
...
...
test/com/sun/javadoc/testUseOption/TestUseOption.java
浏览文件 @
c40bedef
/*
* Copyright (c) 2002, 201
1
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2002, 201
2
, 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,7 +23,7 @@
/*
* @test
* @bug 4496290 4985072 7006178
* @bug 4496290 4985072 7006178
7068595
* @summary A simple test to determine if -use works.
* @author jamieh
* @library ../lib/
...
...
@@ -34,7 +34,7 @@
public
class
TestUseOption
extends
JavadocTester
{
private
static
final
String
BUG_ID
=
"4496290-4985072-7006178"
;
private
static
final
String
BUG_ID
=
"4496290-4985072-7006178
-7068595
"
;
//Input for string search tests.
private
static
final
String
[]
TEST2
=
{
...
...
@@ -64,6 +64,13 @@ public class TestUseOption extends JavadocTester {
}
};
private
static
final
String
[][]
TEST4
=
{
{
BUG_ID
+
"-4"
+
FS
+
"pkg2"
+
FS
+
"class-use"
+
FS
+
"C3.html"
,
"<a href="
+
"\"../../index.html?pkg2/class-use/C3.html\" target=\"_top\">"
+
"Frames</a></li>"
}
};
private
static
final
String
[]
ARGS
=
new
String
[]
{
"-d"
,
BUG_ID
,
"-sourcepath"
,
SRC_DIR
,
"-use"
,
"pkg1"
,
"pkg2"
};
...
...
@@ -76,6 +83,10 @@ public class TestUseOption extends JavadocTester {
"-d"
,
BUG_ID
+
"-3"
,
"-sourcepath"
,
SRC_DIR
,
"-use"
,
SRC_DIR
+
FS
+
"C.java"
,
SRC_DIR
+
FS
+
"UsedInC.java"
};
private
static
final
String
[]
ARGS4
=
new
String
[]
{
"-d"
,
BUG_ID
+
"-4"
,
"-sourcepath"
,
SRC_DIR
,
"-use"
,
"pkg1"
,
"pkg2"
};
/**
* The entry point of the test.
* @param args the array of command line arguments.
...
...
@@ -108,6 +119,7 @@ public class TestUseOption extends JavadocTester {
}
tester
.
printSummary
();
run
(
tester
,
ARGS3
,
TEST3
,
NO_TEST
);
run
(
tester
,
ARGS4
,
TEST4
,
NO_TEST
);
tester
.
printSummary
();
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录