stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Jesper Wilhelmsson 2020-12-21 09:09:05 +00:00
commit d234388042
76 changed files with 1559 additions and 541 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/hotspot/cpu/x86/gc/z/zBarrierSetAssembler_x86.cpp
View File

@ -374,7 +374,7 @@ OptoReg::Name ZBarrierSetAssembler::refine_register(const Node* node, OptoReg::N
}
// We use the vec_spill_helper from the x86.ad file to avoid reinventing this wheel
extern int vec_spill_helper(CodeBuffer *cbuf, bool do_size, bool is_load,
extern void vec_spill_helper(CodeBuffer *cbuf, bool is_load,
int stack_offset, int reg, uint ireg, outputStream* st);
#undef __
@ -435,13 +435,13 @@ private:
const OptoReg::Name opto_reg = OptoReg::as_OptoReg(reg_data._reg->as_VMReg());
const uint ideal_reg = xmm_ideal_reg_for_size(reg_data._size);
_spill_offset -= reg_data._size;
vec_spill_helper(__ code(), false /* do_size */, false /* is_load */, _spill_offset, opto_reg, ideal_reg, tty);
vec_spill_helper(__ code(), false /* is_load */, _spill_offset, opto_reg, ideal_reg, tty);
}
void xmm_register_restore(const XMMRegisterData& reg_data) {
const OptoReg::Name opto_reg = OptoReg::as_OptoReg(reg_data._reg->as_VMReg());
const uint ideal_reg = xmm_ideal_reg_for_size(reg_data._size);
vec_spill_helper(__ code(), false /* do_size */, true /* is_load */, _spill_offset, opto_reg, ideal_reg, tty);
vec_spill_helper(__ code(), true /* is_load */, _spill_offset, opto_reg, ideal_reg, tty);
_spill_offset += reg_data._size;
}

72
src/hotspot/cpu/x86/x86.ad
View File

@ -2130,18 +2130,14 @@ static inline Assembler::ComparisonPredicateFP booltest_pred_to_comparison_pred_
}
// Helper methods for MachSpillCopyNode::implementation().
static int vec_mov_helper(CodeBuffer *cbuf, bool do_size, int src_lo, int dst_lo,
static void vec_mov_helper(CodeBuffer *cbuf, int src_lo, int dst_lo,
int src_hi, int dst_hi, uint ireg, outputStream* st) {
// In 64-bit VM size calculation is very complex. Emitting instructions
// into scratch buffer is used to get size in 64-bit VM.
LP64_ONLY( assert(!do_size, "this method calculates size only for 32-bit VM"); )
assert(ireg == Op_VecS || // 32bit vector
(src_lo & 1) == 0 && (src_lo + 1) == src_hi &&
(dst_lo & 1) == 0 && (dst_lo + 1) == dst_hi,
"no non-adjacent vector moves" );
if (cbuf) {
C2_MacroAssembler _masm(cbuf);
int offset = __ offset();
switch (ireg) {
case Op_VecS: // copy whole register
case Op_VecD:
@ -2173,14 +2169,8 @@ static int vec_mov_helper(CodeBuffer *cbuf, bool do_size, int src_lo, int dst_lo
default:
ShouldNotReachHere();
}
int size = __ offset() - offset;
#ifdef ASSERT
// VEX_2bytes prefix is used if UseAVX > 0, so it takes the same 2 bytes as SIMD prefix.
assert(!do_size || size == 4, "incorrect size calculattion");
#endif
return size;
#ifndef PRODUCT
} else if (!do_size) {
} else {
switch (ireg) {
case Op_VecS:
case Op_VecD:
@ -2196,18 +2186,12 @@ static int vec_mov_helper(CodeBuffer *cbuf, bool do_size, int src_lo, int dst_lo
}
#endif
}
// VEX_2bytes prefix is used if UseAVX > 0, and it takes the same 2 bytes as SIMD prefix.
return (UseAVX > 2) ? 6 : 4;
}
int vec_spill_helper(CodeBuffer *cbuf, bool do_size, bool is_load,
void vec_spill_helper(CodeBuffer *cbuf, bool is_load,
int stack_offset, int reg, uint ireg, outputStream* st) {
// In 64-bit VM size calculation is very complex. Emitting instructions
// into scratch buffer is used to get size in 64-bit VM.
LP64_ONLY( assert(!do_size, "this method calculates size only for 32-bit VM"); )
if (cbuf) {
C2_MacroAssembler _masm(cbuf);
int offset = __ offset();
if (is_load) {
switch (ireg) {
case Op_VecS:
@ -2285,15 +2269,8 @@ int vec_spill_helper(CodeBuffer *cbuf, bool do_size, bool is_load,
ShouldNotReachHere();
}
}
int size = __ offset() - offset;
#ifdef ASSERT
int offset_size = (stack_offset == 0) ? 0 : ((stack_offset < 0x80) ? 1 : (UseAVX > 2) ? 6 : 4);
// VEX_2bytes prefix is used if UseAVX > 0, so it takes the same 2 bytes as SIMD prefix.
assert(!do_size || size == (5+offset_size), "incorrect size calculattion");
#endif
return size;
#ifndef PRODUCT
} else if (!do_size) {
} else {
if (is_load) {
switch (ireg) {
case Op_VecS:
@ -2333,47 +2310,6 @@ int vec_spill_helper(CodeBuffer *cbuf, bool do_size, bool is_load,
}
#endif
}
bool is_single_byte = false;
int vec_len = 0;
if ((UseAVX > 2) && (stack_offset != 0)) {
int tuple_type = Assembler::EVEX_FVM;
int input_size = Assembler::EVEX_32bit;
switch (ireg) {
case Op_VecS:
tuple_type = Assembler::EVEX_T1S;
break;
case Op_VecD:
tuple_type = Assembler::EVEX_T1S;
input_size = Assembler::EVEX_64bit;
break;
case Op_VecX:
break;
case Op_VecY:
vec_len = 1;
break;
case Op_VecZ:
vec_len = 2;
break;
}
is_single_byte = Assembler::query_compressed_disp_byte(stack_offset, true, vec_len, tuple_type, input_size, 0);
}
int offset_size = 0;
int size = 5;
if (UseAVX > 2 ) {
if (VM_Version::supports_avx512novl() && (vec_len == 2)) {
offset_size = (stack_offset == 0) ? 0 : ((is_single_byte) ? 1 : 4);
size += 2; // Need an additional two bytes for EVEX encoding
} else if (VM_Version::supports_avx512novl() && (vec_len < 2)) {
offset_size = (stack_offset == 0) ? 0 : ((stack_offset <= 127) ? 1 : 4);
} else {
offset_size = (stack_offset == 0) ? 0 : ((is_single_byte) ? 1 : 4);
size += 2; // Need an additional two bytes for EVEX encodding
}
} else {
offset_size = (stack_offset == 0) ? 0 : ((stack_offset <= 127) ? 1 : 4);
}
// VEX_2bytes prefix is used if UseAVX > 0, so it takes the same 2 bytes as SIMD prefix.
return size+offset_size;
}
static inline jlong replicate8_imm(int con, int width) {

46
src/hotspot/cpu/x86/x86_32.ad
View File

@ -945,41 +945,16 @@ static int impl_fp_store_helper( CodeBuffer *cbuf, bool do_size, int src_lo, int
}
// Next two methods are shared by 32- and 64-bit VM. They are defined in x86.ad.
static int vec_mov_helper(CodeBuffer *cbuf, bool do_size, int src_lo, int dst_lo,
static void vec_mov_helper(CodeBuffer *cbuf, int src_lo, int dst_lo,
int src_hi, int dst_hi, uint ireg, outputStream* st);
static int vec_spill_helper(CodeBuffer *cbuf, bool do_size, bool is_load,
void vec_spill_helper(CodeBuffer *cbuf, bool is_load,
int stack_offset, int reg, uint ireg, outputStream* st);
static int vec_stack_to_stack_helper(CodeBuffer *cbuf, bool do_size, int src_offset,
static void vec_stack_to_stack_helper(CodeBuffer *cbuf, int src_offset,
int dst_offset, uint ireg, outputStream* st) {
int calc_size = 0;
int src_offset_size = (src_offset == 0) ? 0 : ((src_offset < 0x80) ? 1 : 4);
int dst_offset_size = (dst_offset == 0) ? 0 : ((dst_offset < 0x80) ? 1 : 4);
switch (ireg) {
case Op_VecS:
calc_size = 3+src_offset_size + 3+dst_offset_size;
break;
case Op_VecD: {
calc_size = 3+src_offset_size + 3+dst_offset_size;
int tmp_src_offset = src_offset + 4;
int tmp_dst_offset = dst_offset + 4;
src_offset_size = (tmp_src_offset == 0) ? 0 : ((tmp_src_offset < 0x80) ? 1 : 4);
dst_offset_size = (tmp_dst_offset == 0) ? 0 : ((tmp_dst_offset < 0x80) ? 1 : 4);
calc_size += 3+src_offset_size + 3+dst_offset_size;
break;
}
case Op_VecX:
case Op_VecY:
case Op_VecZ:
calc_size = 6 + 6 + 5+src_offset_size + 5+dst_offset_size;
break;
default:
ShouldNotReachHere();
}
if (cbuf) {
MacroAssembler _masm(cbuf);
int offset = __ offset();
switch (ireg) {
case Op_VecS:
__ pushl(Address(rsp, src_offset));
@ -1012,11 +987,8 @@ static int vec_stack_to_stack_helper(CodeBuffer *cbuf, bool do_size, int src_off
default:
ShouldNotReachHere();
}
int size = __ offset() - offset;
assert(size == calc_size, "incorrect size calculation");
return size;
#ifndef PRODUCT
} else if (!do_size) {
} else {
switch (ireg) {
case Op_VecS:
st->print("pushl [rsp + #%d]\t# 32-bit mem-mem spill\n\t"
@ -1056,7 +1028,6 @@ static int vec_stack_to_stack_helper(CodeBuffer *cbuf, bool do_size, int src_off
}
#endif
}
return calc_size;
}
uint MachSpillCopyNode::implementation( CodeBuffer *cbuf, PhaseRegAlloc *ra_, bool do_size, outputStream* st ) const {
@ -1088,18 +1059,19 @@ uint MachSpillCopyNode::implementation( CodeBuffer *cbuf, PhaseRegAlloc *ra_, bo
// mem -> mem
int src_offset = ra_->reg2offset(src_first);
int dst_offset = ra_->reg2offset(dst_first);
return vec_stack_to_stack_helper(cbuf, do_size, src_offset, dst_offset, ireg, st);
vec_stack_to_stack_helper(cbuf, src_offset, dst_offset, ireg, st);
} else if (src_first_rc == rc_xmm && dst_first_rc == rc_xmm ) {
return vec_mov_helper(cbuf, do_size, src_first, dst_first, src_second, dst_second, ireg, st);
vec_mov_helper(cbuf, src_first, dst_first, src_second, dst_second, ireg, st);
} else if (src_first_rc == rc_xmm && dst_first_rc == rc_stack ) {
int stack_offset = ra_->reg2offset(dst_first);
return vec_spill_helper(cbuf, do_size, false, stack_offset, src_first, ireg, st);
vec_spill_helper(cbuf, false, stack_offset, src_first, ireg, st);
} else if (src_first_rc == rc_stack && dst_first_rc == rc_xmm ) {
int stack_offset = ra_->reg2offset(src_first);
return vec_spill_helper(cbuf, do_size, true, stack_offset, dst_first, ireg, st);
vec_spill_helper(cbuf, true, stack_offset, dst_first, ireg, st);
} else {
ShouldNotReachHere();
}
return 0;
}
// --------------------------------------

10
src/hotspot/cpu/x86/x86_64.ad
View File

@ -1033,10 +1033,10 @@ static enum RC rc_class(OptoReg::Name reg)
}
// Next two methods are shared by 32- and 64-bit VM. They are defined in x86.ad.
static int vec_mov_helper(CodeBuffer *cbuf, bool do_size, int src_lo, int dst_lo,
static void vec_mov_helper(CodeBuffer *cbuf, int src_lo, int dst_lo,
int src_hi, int dst_hi, uint ireg, outputStream* st);
int vec_spill_helper(CodeBuffer *cbuf, bool do_size, bool is_load,
void vec_spill_helper(CodeBuffer *cbuf, bool is_load,
int stack_offset, int reg, uint ireg, outputStream* st);
static void vec_stack_to_stack_helper(CodeBuffer *cbuf, int src_offset,
@ -1151,13 +1151,13 @@ uint MachSpillCopyNode::implementation(CodeBuffer* cbuf,
int dst_offset = ra_->reg2offset(dst_first);
vec_stack_to_stack_helper(cbuf, src_offset, dst_offset, ireg, st);
} else if (src_first_rc == rc_float && dst_first_rc == rc_float ) {
vec_mov_helper(cbuf, false, src_first, dst_first, src_second, dst_second, ireg, st);
vec_mov_helper(cbuf, src_first, dst_first, src_second, dst_second, ireg, st);
} else if (src_first_rc == rc_float && dst_first_rc == rc_stack ) {
int stack_offset = ra_->reg2offset(dst_first);
vec_spill_helper(cbuf, false, false, stack_offset, src_first, ireg, st);
vec_spill_helper(cbuf, false, stack_offset, src_first, ireg, st);
} else if (src_first_rc == rc_stack && dst_first_rc == rc_float ) {
int stack_offset = ra_->reg2offset(src_first);
vec_spill_helper(cbuf, false, true, stack_offset, dst_first, ireg, st);
vec_spill_helper(cbuf, true, stack_offset, dst_first, ireg, st);
} else {
ShouldNotReachHere();
}

21
src/hotspot/os_cpu/aix_ppc/os_aix_ppc.cpp
View File

@ -65,16 +65,7 @@
# include <ucontext.h>
address os::current_stack_pointer() {
address csp;
#if !defined(USE_XLC_BUILTINS)
// inline assembly for `mr regno(csp), R1_SP':
__asm__ __volatile__ ("mr %0, 1":"=r"(csp):);
#else
csp = (address) __builtin_frame_address(0);
#endif
return csp;
return (address)__builtin_frame_address(0);
}
char* os::non_memory_address_word() {
@ -159,13 +150,9 @@ frame os::get_sender_for_C_frame(frame* fr) {
frame os::current_frame() {
intptr_t* csp = (intptr_t*) *((intptr_t*) os::current_stack_pointer());
// hack.
frame topframe(csp, (address)0x8);
// Return sender of sender of current topframe which hopefully
// both have pc != NULL.
frame tmp = os::get_sender_for_C_frame(&topframe);
return os::get_sender_for_C_frame(&tmp);
intptr_t* csp = *(intptr_t**) __builtin_frame_address(0);
frame topframe(csp, CAST_FROM_FN_PTR(address, os::current_frame));
return os::get_sender_for_C_frame(&topframe);
}
bool PosixSignals::pd_hotspot_signal_handler(int sig, siginfo_t* info,

17
src/hotspot/os_cpu/linux_ppc/os_linux_ppc.cpp
View File

@ -78,12 +78,7 @@
address os::current_stack_pointer() {
intptr_t* csp;
// inline assembly `mr regno(csp), R1_SP':
__asm__ __volatile__ ("mr %0, 1":"=r"(csp):);
return (address) csp;
return (address)__builtin_frame_address(0);
}
char* os::non_memory_address_word() {
@ -179,13 +174,9 @@ frame os::get_sender_for_C_frame(frame* fr) {
frame os::current_frame() {
intptr_t* csp = (intptr_t*) *((intptr_t*) os::current_stack_pointer());
// hack.
frame topframe(csp, (address)0x8);
// Return sender of sender of current topframe which hopefully
// both have pc != NULL.
frame tmp = os::get_sender_for_C_frame(&topframe);
return os::get_sender_for_C_frame(&tmp);
intptr_t* csp = *(intptr_t**) __builtin_frame_address(0);
frame topframe(csp, CAST_FROM_FN_PTR(address, os::current_frame));
return os::get_sender_for_C_frame(&topframe);
}
bool PosixSignals::pd_hotspot_signal_handler(int sig, siginfo_t* info,

9
src/hotspot/share/gc/g1/g1UncommitRegionTask.cpp
View File

@ -59,9 +59,9 @@ void G1UncommitRegionTask::enqueue() {
G1UncommitRegionTask* uncommit_task = instance();
if (!uncommit_task->is_active()) {
// Change state to active and schedule with no delay.
// Change state to active and schedule using UncommitInitialDelayMs.
uncommit_task->set_active(true);
G1CollectedHeap::heap()->service_thread()->schedule_task(uncommit_task, 0);
G1CollectedHeap::heap()->service_thread()->schedule_task(uncommit_task, UncommitInitialDelayMs);
}
}
@ -124,9 +124,8 @@ void G1UncommitRegionTask::execute() {
// Reschedule if there are more regions to uncommit, otherwise
// change state to inactive.
if (g1h->has_uncommittable_regions()) {
// No delay, reason to reschedule rather then to loop is to allow
// other tasks to run without waiting for a full uncommit cycle.
schedule(0);
// Delay to avoid starving application.
schedule(UncommitTaskDelayMs);
} else {
// Nothing more to do, change state and report a summary.
set_active(false);

8
src/hotspot/share/gc/g1/g1UncommitRegionTask.hpp
View File

@ -30,10 +30,14 @@
#include "utilities/ticks.hpp"
class G1UncommitRegionTask : public G1ServiceTask {
// Each execution of the uncommit task is limited to uncommit at most 256M.
// Each execution of the uncommit task is limited to uncommit at most 128M.
// This limit is small enough to ensure that the duration of each invocation
// is short, while still making reasonable progress.
static const uint UncommitSizeLimit = 256 * M;
static const uint UncommitSizeLimit = 128 * M;
// Initial delay in milliseconds after GC before the regions are uncommitted.
static const uint UncommitInitialDelayMs = 100;
// The delay between two uncommit task executions.
static const uint UncommitTaskDelayMs = 10;
static G1UncommitRegionTask* _instance;
static void initialize();

2
src/hotspot/share/utilities/nativeCallStack.cpp
View File

@ -36,7 +36,7 @@ NativeCallStack::NativeCallStack(int toSkip, bool fillStack) :
// to call os::get_native_stack. A tail call is used if _NMT_NOINLINE_ is not defined
// (which means this is not a slowdebug build), and we are on 64-bit (except Windows).
// This is not necessarily a rule, but what has been obvserved to date.
#if (defined(_NMT_NOINLINE_) || defined(_WINDOWS) || !defined(_LP64))
#if (defined(_NMT_NOINLINE_) || defined(_WINDOWS) || !defined(_LP64) || defined(PPC64))
// Not a tail call.
toSkip++;
#if (defined(_NMT_NOINLINE_) && defined(BSD) && defined(_LP64))

4
src/java.base/share/classes/java/lang/reflect/AnnotatedParameterizedType.java
View File

@ -38,6 +38,10 @@ public interface AnnotatedParameterizedType extends AnnotatedType {
/**
* Returns the potentially annotated actual type arguments of this parameterized type.
*
* <p>Note that in some cases, the returned array can be empty. This can occur
* if this annotated type represents a non-parameterized type nested within
* a parameterized type.
*
* @return the potentially annotated actual type arguments of this parameterized type
* @see ParameterizedType#getActualTypeArguments()
*/

2
src/java.base/share/classes/java/lang/reflect/Constructor.java
View File

@ -662,7 +662,7 @@ public final class Constructor<T> extends Executable {
getConstantPool(thisDeclClass),
this,
thisDeclClass,
resolveToOwnerType(enclosingClass),
parameterize(enclosingClass),
TypeAnnotation.TypeAnnotationTarget.METHOD_RECEIVER);
}
}

41
src/java.base/share/classes/java/lang/reflect/Executable.java
View File

@ -699,10 +699,29 @@ public abstract class Executable extends AccessibleObject
getConstantPool(getDeclaringClass()),
this,
getDeclaringClass(),
resolveToOwnerType(getDeclaringClass()),
parameterize(getDeclaringClass()),
TypeAnnotation.TypeAnnotationTarget.METHOD_RECEIVER);
}
Type parameterize(Class<?> c) {
Class<?> ownerClass = c.getDeclaringClass();
TypeVariable<?>[] typeVars = c.getTypeParameters();
if (ownerClass == null) { // base case
if (typeVars.length == 0)
return c;
else
return ParameterizedTypeImpl.make(c, typeVars, null);
}
// Resolve owner
Type ownerType = parameterize(ownerClass);
if (ownerType instanceof Class<?> && typeVars.length == 0) // We have yet to encounter type parameters
return c;
else
return ParameterizedTypeImpl.make(c, typeVars, ownerType);
}
/**
* Returns an array of {@code AnnotatedType} objects that represent the use
* of types to specify formal parameter types of the method/constructor
@ -753,24 +772,4 @@ public abstract class Executable extends AccessibleObject
getGenericExceptionTypes(),
TypeAnnotation.TypeAnnotationTarget.THROWS);
}
static Type resolveToOwnerType(Class<?> c) {
TypeVariable<?>[] v = c.getTypeParameters();
Type o = resolveOwner(c);
Type t;
if (o != null || v.length > 0) {
t = ParameterizedTypeImpl.make(c, v, o);
} else {
t = c;
}
return t;
}
private static Type resolveOwner(Class<?> t) {
if (Modifier.isStatic(t.getModifiers()) || !(t.isLocalClass() || t.isMemberClass() || t.isAnonymousClass())) {
return null;
}
Class<?> d = t.getDeclaringClass();
return ParameterizedTypeImpl.make(d, d.getTypeParameters(), resolveOwner(d));
}
}

78
src/java.base/share/classes/java/util/regex/Pattern.java
View File

@ -2063,7 +2063,7 @@ loop: for(int x=0, offset=0; x<nCodePoints; x++, offset+=len) {
Node prev = null;
Node firstTail = null;
Branch branch = null;
BranchConn branchConn = null;
Node branchConn = null;
for (;;) {
Node node = sequence(end);
@ -2211,24 +2211,7 @@ loop: for(int x=0, offset=0; x<nCodePoints; x++, offset+=len) {
break;
}
if (node instanceof LineEnding) {
LineEnding le = (LineEnding)node;
node = closureOfLineEnding(le);
if (node != le) {
// LineEnding was replaced with an anonymous group
if (head == null)
head = node;
else
tail.next = node;
// Double return: Tail was returned in root
tail = root;
continue;
}
} else {
node = closure(node);
}
node = closure(node);
/* save the top dot-greedy nodes (.*, .+) as well
if (node instanceof GreedyCharProperty &&
((GreedyCharProperty)node).cp instanceof Dot) {
@ -3096,31 +3079,18 @@ loop: for(int x=0, offset=0; x<nCodePoints; x++, offset+=len) {
if (saveTCNCount < topClosureNodes.size())
topClosureNodes.subList(saveTCNCount, topClosureNodes.size()).clear();
return groupWithClosure(node, head, tail, capturingGroup);
}
/**
* Transforms a Group with quantifiers into some special constructs
* (such as Branch or Loop/GroupCurly), if necessary.
*
* This method is applied either to actual groups or to the Unicode
* linebreak (aka \\R) represented as an anonymous group.
*/
private Node groupWithClosure(Node node, Node head, Node tail,
boolean capturingGroup)
{
if (node instanceof Ques) {
Ques ques = (Ques) node;
if (ques.type == Qtype.POSSESSIVE) {
root = node;
return node;
}
BranchConn branchConn = new BranchConn();
tail = tail.next = branchConn;
tail.next = new BranchConn();
tail = tail.next;
if (ques.type == Qtype.GREEDY) {
head = new Branch(head, null, branchConn);
head = new Branch(head, null, tail);
} else { // Reluctant quantifier
head = new Branch(null, head, branchConn);
head = new Branch(null, head, tail);
}
root = tail;
return head;
@ -3297,31 +3267,6 @@ loop: for(int x=0, offset=0; x<nCodePoints; x++, offset+=len) {
return new Curly(prev, cmin, MAX_REPS, qtype);
}
/**
* Processing repetition of a Unicode linebreak \\R.
*/
private Node closureOfLineEnding(LineEnding le) {
int ch = peek();
if (ch != '?' && ch != '*' && ch != '+' && ch != '{') {
return le;
}
// Replace the LineEnding with an anonymous group
// (?:\\u000D\\u000A|[\\u000A\\u000B\\u000C\\u000D\\u0085\\u2028\\u2029])
Node grHead = createGroup(true);
Node grTail = root;
BranchConn branchConn = new BranchConn();
branchConn.next = grTail;
Node slice = new Slice(new int[] {0x0D, 0x0A});
slice.next = branchConn;
Node chClass = newCharProperty(x -> x == 0x0A || x == 0x0B ||
x == 0x0C || x == 0x0D || x == 0x85 || x == 0x2028 ||
x == 0x2029);
chClass.next = branchConn;
grHead.next = new Branch(slice, chClass, branchConn);
return groupWithClosure(closure(grHead), grHead, grTail, false);
}
/**
* Processes repetition. If the next character peeked is a quantifier
* then new nodes must be appended to handle the repetition.
@ -4777,8 +4722,8 @@ loop: for(int x=0, offset=0; x<nCodePoints; x++, offset+=len) {
static final class Branch extends Node {
Node[] atoms = new Node[2];
int size = 2;
BranchConn conn;
Branch(Node first, Node second, BranchConn branchConn) {
Node conn;
Branch(Node first, Node second, Node branchConn) {
conn = branchConn;
atoms[0] = first;
atoms[1] = second;
@ -4786,10 +4731,9 @@ loop: for(int x=0, offset=0; x<nCodePoints; x++, offset+=len) {
void add(Node node) {
if (size >= atoms.length) {
int len = ArraysSupport.newLength(size,
1, /* minimum growth */
size /* preferred growth */);
atoms = Arrays.copyOf(atoms, len);
Node[] tmp = new Node[atoms.length*2];
System.arraycopy(atoms, 0, tmp, 0, atoms.length);
atoms = tmp;
}
atoms[size++] = node;
}

24
src/java.desktop/share/classes/javax/swing/JPasswordField.java
View File

@ -280,6 +280,30 @@ public class JPasswordField extends JTextField {
return super.getText(offs, len);
}
@Override
@BeanProperty(bound = false, description = "the text of this component")
public void setText(String t) {
// overwrite the old data first
Document doc = getDocument();
int nleft = doc.getLength();
Segment text = new Segment();
// we would like to get direct data array access, not a copy of it
text.setPartialReturn(true);
int offs = 0;
try {
while (nleft > 0) {
doc.getText(offs, nleft, text);
Arrays.fill(text.array, text.offset,
text.count + text.offset, '\u0000');
nleft -= text.count;
offs += text.count;
}
} catch (BadLocationException ignored) {
// we tried
}
super.setText(t);
}
/**
* Returns the text contained in this <code>TextComponent</code>.
* If the underlying document is <code>null</code>, will give a

11
src/java.desktop/share/classes/javax/swing/text/GapContent.java
View File

@ -24,6 +24,7 @@
*/
package javax.swing.text;
import java.util.Arrays;
import java.util.Vector;
import java.io.IOException;
import java.io.ObjectInputStream;
@ -103,6 +104,12 @@ public class GapContent extends GapVector implements AbstractDocument.Content, S
return carray.length;
}
@Override
void resize(int nsize) {
char[] carray = (char[]) getArray();
super.resize(nsize);
Arrays.fill(carray, '\u0000');
}
// --- AbstractDocument.Content methods -------------------------
/**
@ -195,10 +202,12 @@ public class GapContent extends GapVector implements AbstractDocument.Content, S
if ((where + len) <= g0) {
// below gap
chars.array = array;
chars.copy = false;
chars.offset = where;
} else if (where >= g0) {
// above gap
chars.array = array;
chars.copy = false;
chars.offset = g1 + where - g0;
} else {
// spans the gap
@ -206,12 +215,14 @@ public class GapContent extends GapVector implements AbstractDocument.Content, S
if (chars.isPartialReturn()) {
// partial return allowed, return amount before the gap
chars.array = array;
chars.copy = false;
chars.offset = where;
chars.count = before;
return;
}
// partial return not allowed, must copy
chars.array = new char[len];
chars.copy = true;
chars.offset = 0;
System.arraycopy(array, where, chars.array, 0, before);
System.arraycopy(array, g1, chars.array, before, len - before);

7
src/java.desktop/share/classes/javax/swing/text/Segment.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2020, 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
@ -61,6 +61,11 @@ public class Segment implements Cloneable, CharacterIterator, CharSequence {
*/
public int count;
/**
* Whether the array is a copy of data or not.
*/
boolean copy;
private boolean partialReturn;
/**

5
src/java.desktop/share/classes/javax/swing/text/SegmentCache.java
View File

@ -25,6 +25,7 @@
package javax.swing.text;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
/**
@ -110,7 +111,11 @@ class SegmentCache {
public void releaseSegment(Segment segment) {
if (segment instanceof CachedSegment) {
synchronized(this) {
if (segment.copy) {
Arrays.fill(segment.array, '\u0000');
}
segment.array = null;
segment.copy = false;
segment.count = 0;
segments.add(segment);
}

14
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AbstractMemberWriter.java
View File

@ -27,13 +27,9 @@ package jdk.javadoc.internal.doclets.formats.html;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import java.util.TreeSet;
import java.util.stream.Collectors;
import javax.lang.model.element.Element;
import javax.lang.model.element.ExecutableElement;
import javax.lang.model.element.Modifier;
import javax.lang.model.element.TypeElement;
import javax.lang.model.element.TypeParameterElement;
import javax.lang.model.type.TypeMirror;
@ -46,7 +42,6 @@ import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
import jdk.javadoc.internal.doclets.formats.html.markup.TagName;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
import jdk.javadoc.internal.doclets.formats.html.markup.Links;
import jdk.javadoc.internal.doclets.formats.html.markup.StringContent;
import jdk.javadoc.internal.doclets.formats.html.markup.Table;
import jdk.javadoc.internal.doclets.formats.html.markup.TableHeader;
import jdk.javadoc.internal.doclets.toolkit.Content;
@ -54,15 +49,8 @@ import jdk.javadoc.internal.doclets.toolkit.MemberSummaryWriter;
import jdk.javadoc.internal.doclets.toolkit.MemberWriter;
import jdk.javadoc.internal.doclets.toolkit.Resources;
import jdk.javadoc.internal.doclets.toolkit.taglets.DeprecatedTaglet;
import jdk.javadoc.internal.doclets.toolkit.util.DocletConstants;
import jdk.javadoc.internal.doclets.toolkit.util.Utils;
import static javax.lang.model.element.Modifier.ABSTRACT;
import static javax.lang.model.element.Modifier.NATIVE;
import static javax.lang.model.element.Modifier.PUBLIC;
import static javax.lang.model.element.Modifier.STRICTFP;
import static javax.lang.model.element.Modifier.SYNCHRONIZED;
/**
* The base class for member writers.
*
@ -89,7 +77,7 @@ public abstract class AbstractMemberWriter implements MemberSummaryWriter, Membe
this.writer = writer;
this.typeElement = typeElement;
this.utils = configuration.utils;
this.contents = configuration.contents;
this.contents = configuration.getContents();
this.resources = configuration.docResources;
this.links = writer.links;
}

12
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AllClassesIndexWriter.java
View File

@ -116,12 +116,12 @@ public class AllClassesIndexWriter extends HtmlDocletWriter {
.setColumnStyles(HtmlStyle.colFirst, HtmlStyle.colLast)
.setId("all-classes-table")
.setDefaultTab(resources.getText("doclet.All_Classes"))
.addTab(resources.interfaceSummary, utils::isInterface)
.addTab(resources.classSummary, e -> utils.isOrdinaryClass((TypeElement)e))
.addTab(resources.enumSummary, utils::isEnum)
.addTab(resources.exceptionSummary, e -> utils.isException((TypeElement)e))
.addTab(resources.errorSummary, e -> utils.isError((TypeElement)e))
.addTab(resources.annotationTypeSummary, utils::isAnnotationType);
.addTab(contents.interfaceSummary, utils::isInterface)
.addTab(contents.classSummary, e -> utils.isOrdinaryClass((TypeElement)e))
.addTab(contents.enumSummary, utils::isEnum)
.addTab(contents.exceptionSummary, e -> utils.isException((TypeElement)e))
.addTab(contents.errorSummary, e -> utils.isError((TypeElement)e))
.addTab(contents.annotationTypeSummary, utils::isAnnotationType);
for (Character unicode : indexBuilder.getFirstCharacters()) {
for (IndexItem indexItem : indexBuilder.getItems(unicode)) {
TypeElement typeElement = (TypeElement) indexItem.getElement();

2
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AllPackagesIndexWriter.java
View File

@ -96,7 +96,7 @@ public class AllPackagesIndexWriter extends HtmlDocletWriter {
*/
protected void addPackages(Content content) {
Table table = new Table(HtmlStyle.summaryTable)
.setCaption(new StringContent(resources.packageSummary))
.setCaption(new StringContent(contents.packageSummary))
.setHeader(new TableHeader(contents.packageLabel, contents.descriptionLabel))
.setColumnStyles(HtmlStyle.colFirst, HtmlStyle.colLast);
for (PackageElement pkg : configuration.packages) {

5
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeOptionalMemberWriterImpl.java
View File

@ -66,8 +66,9 @@ public class AnnotationTypeOptionalMemberWriterImpl extends
@Override
public Content getMemberSummaryHeader(TypeElement typeElement,
Content memberSummaryTree) {
memberSummaryTree.add(
MarkerComments.START_OF_ANNOTATION_TYPE_OPTIONAL_MEMBER_SUMMARY);
memberSummaryTree.add(selectComment(
MarkerComments.START_OF_ANNOTATION_TYPE_OPTIONAL_MEMBER_SUMMARY,
MarkerComments.START_OF_ANNOTATION_INTERFACE_OPTIONAL_MEMBER_SUMMARY));
Content memberTree = new ContentBuilder();
writer.addSummaryHeader(this, memberTree);
return memberTree;

17
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/AnnotationTypeRequiredMemberWriterImpl.java
View File

@ -25,11 +25,13 @@
package jdk.javadoc.internal.doclets.formats.html;
import javax.lang.model.SourceVersion;
import javax.lang.model.element.Element;
import javax.lang.model.element.ExecutableElement;
import javax.lang.model.element.TypeElement;
import javax.lang.model.type.TypeMirror;
import jdk.javadoc.internal.doclets.formats.html.markup.Comment;
import jdk.javadoc.internal.doclets.formats.html.markup.ContentBuilder;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle;
import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree;
@ -66,8 +68,9 @@ public class AnnotationTypeRequiredMemberWriterImpl extends AbstractMemberWriter
@Override
public Content getMemberSummaryHeader(TypeElement typeElement,
Content memberSummaryTree) {
memberSummaryTree.add(
MarkerComments.START_OF_ANNOTATION_TYPE_REQUIRED_MEMBER_SUMMARY);
memberSummaryTree.add(selectComment(
MarkerComments.START_OF_ANNOTATION_TYPE_REQUIRED_MEMBER_SUMMARY,
MarkerComments.START_OF_ANNOTATION_INTERFACE_REQUIRED_MEMBER_SUMMARY));
Content memberTree = new ContentBuilder();
writer.addSummaryHeader(this, memberTree);
return memberTree;
@ -86,7 +89,9 @@ public class AnnotationTypeRequiredMemberWriterImpl extends AbstractMemberWriter
@Override
public void addAnnotationDetailsMarker(Content memberDetails) {
memberDetails.add(MarkerComments.START_OF_ANNOTATION_TYPE_DETAILS);
memberDetails.add(selectComment(
MarkerComments.START_OF_ANNOTATION_TYPE_DETAILS,
MarkerComments.START_OF_ANNOTATION_INTERFACE_DETAILS));
}
@Override
@ -201,6 +206,12 @@ public class AnnotationTypeRequiredMemberWriterImpl extends AbstractMemberWriter
return writer.getDocLink(LinkInfoImpl.Kind.MEMBER, member, name);
}
protected Comment selectComment(Comment c1, Comment c2) {
HtmlConfiguration configuration = writer.configuration;
SourceVersion sv = configuration.docEnv.getSourceVersion();
return sv.compareTo(SourceVersion.RELEASE_16) < 0 ? c1 : c2;
}
private TypeMirror getType(Element member) {
return utils.isExecutableElement(member)
? utils.getReturnType(typeElement, (ExecutableElement) member)

10
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ClassUseWriter.java
View File

@ -412,9 +412,13 @@ public class ClassUseWriter extends SubWriterHolderWriter {
* @return a content tree representing the class use header
*/
protected HtmlTree getClassUseHeader() {
String cltype = resources.getText(utils.isInterface(typeElement)
? "doclet.Interface"
: "doclet.Class");
String cltype = resources.getText(switch (typeElement.getKind()) {
case ANNOTATION_TYPE -> "doclet.AnnotationType";
case INTERFACE -> "doclet.Interface";
case RECORD -> "doclet.RecordClass";
case ENUM -> "doclet.Enum";
default -> "doclet.Class";
});
String clname = utils.getFullyQualifiedName(typeElement);
String title = resources.getText("doclet.Window_ClassUse_Header",
cltype, clname);

20
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Contents.java
View File

@ -177,6 +177,15 @@ public class Contents {
private final EnumMap<VisibleMemberTable.Kind, Content> navLinkLabels;
public final String annotationTypeSummary;
public final String classSummary;
public final String enumSummary;
public final String errorSummary;
public final String exceptionSummary;
public final String interfaceSummary;
public final String packageSummary;
public final String recordSummary;
private final Resources resources;
/**
@ -289,7 +298,7 @@ public class Contents {
propertyLabel = getContent("doclet.Property");
propertyDetailsLabel = getContent("doclet.Property_Detail");
propertySummaryLabel = getContent("doclet.Property_Summary");
record = getContent("doclet.Record");
record = getContent("doclet.RecordClass");
recordComponents = getContent("doclet.RecordComponents");
referencedIn = getContent("doclet.ReferencedIn");
returns = getContent("doclet.Returns");
@ -315,6 +324,15 @@ public class Contents {
navLinkLabels.put(VisibleMemberTable.Kind.FIELDS, getContent("doclet.navField"));
navLinkLabels.put(VisibleMemberTable.Kind.CONSTRUCTORS, getContent("doclet.navConstructor"));
navLinkLabels.put(VisibleMemberTable.Kind.METHODS, getContent("doclet.navMethod"));
this.annotationTypeSummary = resources.getText("doclet.Annotation_Types_Summary");
this.classSummary = resources.getText("doclet.Class_Summary");
this.enumSummary = resources.getText("doclet.Enum_Summary");
this.errorSummary = resources.getText("doclet.Error_Summary");
this.exceptionSummary = resources.getText("doclet.Exception_Summary");
this.interfaceSummary = resources.getText("doclet.Interface_Summary");
this.packageSummary = resources.getText("doclet.Package_Summary");
this.recordSummary = resources.getText("doclet.Record_Class_Summary");
}
/**

17
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DeprecatedListWriter.java
View File

@ -78,13 +78,13 @@ public class DeprecatedListWriter extends SubWriterHolderWriter {
case CLASS:
return "class";
case ENUM:
return "enum";
return "enum.class";
case EXCEPTION:
return "exception";
case ERROR:
return "error";
case ANNOTATION_TYPE:
return "annotation.type";
return "annotation.interface";
case FIELD:
return "field";
case METHOD:
@ -94,7 +94,7 @@ public class DeprecatedListWriter extends SubWriterHolderWriter {
case ENUM_CONSTANT:
return "enum.constant";
case ANNOTATION_TYPE_MEMBER:
return "annotation.type.member";
return "annotation.interface.member";
case RECORD_CLASS:
return "record.class";
default:
@ -197,7 +197,7 @@ public class DeprecatedListWriter extends SubWriterHolderWriter {
case ANNOTATION_TYPE:
return "doclet.AnnotationType";
case RECORD_CLASS:
return "doclet.Record";
return "doclet.RecordClass";
case FIELD:
return "doclet.Field";
case METHOD:
@ -287,17 +287,13 @@ public class DeprecatedListWriter extends SubWriterHolderWriter {
throws DocFileIOException {
HtmlTree body = getHeader();
bodyContents.addMainContent(getContentsList(deprAPI));
String memberTableSummary;
Content content = new ContentBuilder();
for (DeprElementKind kind : DeprElementKind.values()) {
if (deprAPI.hasDocumentation(kind)) {
memberTableSummary = resources.getText("doclet.Member_Table_Summary",
resources.getText(getHeadingKey(kind)),
resources.getText(getSummaryKey(kind)));
TableHeader memberTableHeader = new TableHeader(
contents.getContent(getHeaderKey(kind)), contents.descriptionLabel);
addDeprecatedAPI(deprAPI.getSet(kind), getAnchorName(kind),
getHeadingKey(kind), memberTableSummary, memberTableHeader, content);
getHeadingKey(kind), memberTableHeader, content);
}
}
bodyContents.addMainContent(content);
@ -368,12 +364,11 @@ public class DeprecatedListWriter extends SubWriterHolderWriter {
* @param deprList list of deprecated API elements
* @param id the id attribute of the table
* @param headingKey the caption for the deprecated table
* @param tableSummary the summary for the deprecated table
* @param tableHeader table headers for the deprecated table
* @param contentTree the content tree to which the deprecated table will be added
*/
protected void addDeprecatedAPI(SortedSet<Element> deprList, String id, String headingKey,
String tableSummary, TableHeader tableHeader, Content contentTree) {
TableHeader tableHeader, Content contentTree) {
if (deprList.size() > 0) {
Content caption = contents.getContent(headingKey);
Table table = new Table(HtmlStyle.summaryTable)

12
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlConfiguration.java
View File

@ -32,7 +32,9 @@ import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.function.Function;
import java.util.stream.Collectors;
import javax.lang.model.element.Element;
import javax.lang.model.element.PackageElement;
@ -118,7 +120,7 @@ public class HtmlConfiguration extends BaseConfiguration {
*/
protected DeprecatedAPIListBuilder deprecatedAPIListBuilder;
public final Contents contents;
private Contents contents;
protected final Messages messages;
@ -181,7 +183,6 @@ public class HtmlConfiguration extends BaseConfiguration {
}
messages = new Messages(this, msgResources);
contents = new Contents(this);
options = new HtmlOptions(this);
Runtime.Version v;
@ -195,6 +196,11 @@ public class HtmlConfiguration extends BaseConfiguration {
conditionalPages = EnumSet.noneOf(ConditionalPage.class);
}
protected void initConfiguration(DocletEnvironment docEnv,
Function<String, String> resourceKeyMapper) {
super.initConfiguration(docEnv, resourceKeyMapper);
contents = new Contents(this);
}
private final Runtime.Version docletVersion;
public final Date startTime = new Date();
@ -215,7 +221,7 @@ public class HtmlConfiguration extends BaseConfiguration {
* @return a utility object providing commonly used fragments of content
*/
public Contents getContents() {
return contents;
return Objects.requireNonNull(contents);
}
@Override

49
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDoclet.java
View File

@ -26,12 +26,15 @@
package jdk.javadoc.internal.doclets.formats.html;
import java.util.*;
import java.util.function.Function;
import javax.lang.model.SourceVersion;
import javax.lang.model.element.ModuleElement;
import javax.lang.model.element.PackageElement;
import javax.lang.model.element.TypeElement;
import jdk.javadoc.doclet.Doclet;
import jdk.javadoc.doclet.DocletEnvironment;
import jdk.javadoc.doclet.Reporter;
import jdk.javadoc.internal.doclets.toolkit.AbstractDoclet;
import jdk.javadoc.internal.doclets.toolkit.DocletException;
@ -115,6 +118,52 @@ public class HtmlDoclet extends AbstractDoclet {
return configuration;
}
@Override
protected Function<String, String> getResourceKeyMapper(DocletEnvironment docEnv) {
SourceVersion sv = docEnv.getSourceVersion();
Map<String, String> map = new HashMap<>();
String[][] pairs = {
// in standard.properties
{ "doclet.Enum_Hierarchy", "doclet.Enum_Class_Hierarchy" },
{ "doclet.Annotation_Type_Hierarchy", "doclet.Annotation_Interface_Hierarchy" },
{ "doclet.Href_Enum_Title", "doclet.Href_Enum_Class_Title" },
{ "doclet.Annotation_Types", "doclet.Annotation_Interfaces" },
{ "doclet.Annotation_Type_Members", "doclet.Annotation_Interface_Members" },
{ "doclet.annotation_types", "doclet.annotation_interfaces" },
{ "doclet.annotation_type_members", "doclet.annotation_interface_members" },
{ "doclet.help.enum.intro", "doclet.help.enum.class.intro" },
{ "doclet.help.annotation_type.intro", "doclet.help.annotation_interface.intro" },
{ "doclet.help.annotation_type.declaration", "doclet.help.annotation_interface.declaration" },
{ "doclet.help.annotation_type.description", "doclet.help.annotation_interface.description" },
// in doclets.properties
{ "doclet.Annotation_Types_Summary", "doclet.Annotation_Interfaces_Summary" },
{ "doclet.Enum_Summary", "doclet.Enum_Class_Summary" },
{ "doclet.Enums", "doclet.EnumClasses" },
{ "doclet.AnnotationType", "doclet.AnnotationInterface" },
{ "doclet.AnnotationTypes", "doclet.AnnotationInterfaces" },
{ "doclet.annotationtype", "doclet.annotationinterface" },
{ "doclet.annotationtypes", "doclet.annotationinterfaces" },
{ "doclet.Enum", "doclet.EnumClass" },
{ "doclet.enum", "doclet.enumclass" },
{ "doclet.enums", "doclet.enumclasses" },
{ "doclet.Annotation_Type_Member", "doclet.Annotation_Interface_Member" },
{ "doclet.enum_values_doc.fullbody", "doclet.enum_class_values_doc.fullbody" },
{ "doclet.enum_values_doc.return", "doclet.enum_class_values_doc.return" },
{ "doclet.enum_valueof_doc.fullbody", "doclet.enum_class_valueof_doc.fullbody" },
{ "doclet.enum_valueof_doc.throws_ila", "doclet.enum_class_valueof_doc.throws_ila" },
{ "doclet.search.types", "doclet.search.classes_and_interfaces"}
};
for (String[] pair : pairs) {
if (sv.compareTo(SourceVersion.RELEASE_16) >= 0) {
map.put(pair[0], pair[1]);
} else {
map.put(pair[1], pair[0]);
}
}
return (k) -> map.getOrDefault(k, k);
}
@Override // defined by AbstractDoclet
public void generateClassFiles(ClassTree classTree) throws DocletException {

2
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java
View File

@ -216,7 +216,7 @@ public class HtmlDocletWriter {
public HtmlDocletWriter(HtmlConfiguration configuration, DocPath path) {
this.configuration = configuration;
this.options = configuration.getOptions();
this.contents = configuration.contents;
this.contents = configuration.getContents();
this.messages = configuration.messages;
this.resources = configuration.docResources;
this.links = new Links(path, configuration.utils);

18
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/MarkerComments.java
View File

@ -97,12 +97,24 @@ public class MarkerComments {
public static final Comment START_OF_ANNOTATION_TYPE_OPTIONAL_MEMBER_SUMMARY =
new Comment("=========== ANNOTATION TYPE OPTIONAL MEMBER SUMMARY ===========");
/**
* Marker to identify start of annotation interface optional member summary.
*/
public static final Comment START_OF_ANNOTATION_INTERFACE_OPTIONAL_MEMBER_SUMMARY =
new Comment("=========== ANNOTATION INTERFACE OPTIONAL MEMBER SUMMARY ===========");
/**
* Marker to identify start of annotation type required member summary.
*/
public static final Comment START_OF_ANNOTATION_TYPE_REQUIRED_MEMBER_SUMMARY =
new Comment("=========== ANNOTATION TYPE REQUIRED MEMBER SUMMARY ===========");
/**
* Marker to identify start of annotation interface required member summary.
*/
public static final Comment START_OF_ANNOTATION_INTERFACE_REQUIRED_MEMBER_SUMMARY =
new Comment("=========== ANNOTATION INTERFACE REQUIRED MEMBER SUMMARY ===========");
/**
* Marker to identify start of constructor summary.
*/
@ -140,10 +152,10 @@ public class MarkerComments {
new Comment("============ ANNOTATION TYPE MEMBER DETAIL ===========");
/**
* Marker to identify start of annotation type field details.
* Marker to identify start of annotation interface details.
*/
public static final Comment START_OF_ANNOTATION_TYPE_FIELD_DETAILS =
new Comment("============ ANNOTATION TYPE FIELD DETAIL ===========");
public static final Comment START_OF_ANNOTATION_INTERFACE_DETAILS =
new Comment("============ ANNOTATION INTERFACE MEMBER DETAIL ===========");
/**
* Marker to identify start of method details.

6
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriterImpl.java
View File

@ -481,9 +481,6 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW
addSummaryHeader(MarkerComments.START_OF_MODULES_SUMMARY, contents.navModules, section);
if (display(requires)) {
String text = resources.getText("doclet.Requires_Summary");
String tableSummary = resources.getText("doclet.Member_Table_Summary",
text,
resources.getText("doclet.modules"));
Content caption = new StringContent(text);
Table table = getTable3(caption, requiresTableHeader);
addModulesList(requires, table);
@ -492,9 +489,6 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW
// Display indirect modules table in both "api" and "all" mode.
if (display(indirectModules)) {
String amrText = resources.getText("doclet.Indirect_Requires_Summary");
String amrTableSummary = resources.getText("doclet.Member_Table_Summary",
amrText,
resources.getText("doclet.modules"));
Content amrCaption = new StringContent(amrText);
Table amrTable = getTable3(amrCaption, requiresTableHeader);
addModulesList(indirectModules, amrTable);

2
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/Navigation.java
View File

@ -116,7 +116,7 @@ public class Navigation {
this.configuration = configuration;
this.options = configuration.getOptions();
this.element = element;
this.contents = configuration.contents;
this.contents = configuration.getContents();
this.documentedPage = page;
this.path = path;
this.pathToRoot = path.parent().invert();

6
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageUseWriter.java
View File

@ -61,7 +61,6 @@ public class PackageUseWriter extends SubWriterHolderWriter {
final PackageElement packageElement;
final SortedMap<String, Set<TypeElement>> usingPackageToUsedClasses = new TreeMap<>();
final String packageUseTableSummary;
/**
* Constructor.
@ -96,9 +95,6 @@ public class PackageUseWriter extends SubWriterHolderWriter {
}
}
}
packageUseTableSummary = resources.getText("doclet.Use_Table_Summary",
resources.getText("doclet.packages"));
}
/**
@ -193,8 +189,6 @@ public class PackageUseWriter extends SubWriterHolderWriter {
PackageElement usingPackage = utils.elementUtils.getPackageElement(packageName);
HtmlTree section = HtmlTree.SECTION(HtmlStyle.detail)
.setId(getPackageAnchorName(usingPackage));
String tableSummary = resources.getText("doclet.Use_Table_Summary",
resources.getText("doclet.classes"));
Content caption = contents.getContent(
"doclet.ClassUse_Classes.in.0.used.by.1",
getPackageLink(packageElement, utils.getPackageName(packageElement)),

14
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/PackageWriterImpl.java
View File

@ -164,43 +164,43 @@ public class PackageWriterImpl extends HtmlDocletWriter
@Override
public void addInterfaceSummary(SortedSet<TypeElement> interfaces, Content summaryContentTree) {
TableHeader tableHeader= new TableHeader(contents.interfaceLabel, contents.descriptionLabel);
addClassesSummary(interfaces, resources.interfaceSummary, tableHeader, summaryContentTree);
addClassesSummary(interfaces, contents.interfaceSummary, tableHeader, summaryContentTree);
}
@Override
public void addClassSummary(SortedSet<TypeElement> classes, Content summaryContentTree) {
TableHeader tableHeader= new TableHeader(contents.classLabel, contents.descriptionLabel);
addClassesSummary(classes, resources.classSummary, tableHeader, summaryContentTree);
addClassesSummary(classes, contents.classSummary, tableHeader, summaryContentTree);
}
@Override
public void addEnumSummary(SortedSet<TypeElement> enums, Content summaryContentTree) {
TableHeader tableHeader= new TableHeader(contents.enum_, contents.descriptionLabel);
addClassesSummary(enums, resources.enumSummary, tableHeader, summaryContentTree);
addClassesSummary(enums, contents.enumSummary, tableHeader, summaryContentTree);
}
@Override
public void addRecordSummary(SortedSet<TypeElement> records, Content summaryContentTree) {
TableHeader tableHeader= new TableHeader(contents.record, contents.descriptionLabel);
addClassesSummary(records, resources.recordSummary, tableHeader, summaryContentTree);
addClassesSummary(records, contents.recordSummary, tableHeader, summaryContentTree);
}
@Override
public void addExceptionSummary(SortedSet<TypeElement> exceptions, Content summaryContentTree) {
TableHeader tableHeader= new TableHeader(contents.exception, contents.descriptionLabel);
addClassesSummary(exceptions, resources.exceptionSummary, tableHeader, summaryContentTree);
addClassesSummary(exceptions, contents.exceptionSummary, tableHeader, summaryContentTree);
}
@Override
public void addErrorSummary(SortedSet<TypeElement> errors, Content summaryContentTree) {
TableHeader tableHeader= new TableHeader(contents.error, contents.descriptionLabel);
addClassesSummary(errors, resources.errorSummary, tableHeader, summaryContentTree);
addClassesSummary(errors, contents.errorSummary, tableHeader, summaryContentTree);
}
@Override
public void addAnnotationTypeSummary(SortedSet<TypeElement> annoTypes, Content summaryContentTree) {
TableHeader tableHeader= new TableHeader(contents.annotationType, contents.descriptionLabel);
addClassesSummary(annoTypes, resources.annotationTypeSummary, tableHeader, summaryContentTree);
addClassesSummary(annoTypes, contents.annotationTypeSummary, tableHeader, summaryContentTree);
}
public void addClassesSummary(SortedSet<TypeElement> classes, String label,

6
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/SectionName.java
View File

@ -35,9 +35,9 @@ package jdk.javadoc.internal.doclets.formats.html;
*/
public enum SectionName {
ANNOTATION_TYPE_ELEMENT_DETAIL("annotation.type.element.detail"),
ANNOTATION_TYPE_OPTIONAL_ELEMENT_SUMMARY("annotation.type.optional.element.summary"),
ANNOTATION_TYPE_REQUIRED_ELEMENT_SUMMARY("annotation.type.required.element.summary"),
ANNOTATION_TYPE_ELEMENT_DETAIL("annotation.interface.element.detail"),
ANNOTATION_TYPE_OPTIONAL_ELEMENT_SUMMARY("annotation.interface.optional.element.summary"),
ANNOTATION_TYPE_REQUIRED_ELEMENT_SUMMARY("annotation.interface.required.element.summary"),
CONSTRUCTOR_DETAIL("constructor.detail"),
CONSTRUCTOR_SUMMARY("constructor.summary"),
ENUM_CONSTANT_DETAIL("enum.constant.detail"),

15
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard.properties
View File

@ -39,11 +39,14 @@ doclet.Class_Hierarchy=Class Hierarchy
doclet.Window_Class_Hierarchy=Class Hierarchy
doclet.Interface_Hierarchy=Interface Hierarchy
doclet.Enum_Hierarchy=Enum Hierarchy
doclet.Enum_Class_Hierarchy=Enum Class Hierarchy
doclet.Annotation_Type_Hierarchy=Annotation Type Hierarchy
doclet.Annotation_Interface_Hierarchy=Annotation Interface Hierarchy
doclet.Href_Class_Title=class in {0}
doclet.Href_Interface_Title=interface in {0}
doclet.Href_Annotation_Title=annotation in {0}
doclet.Href_Enum_Title=enum in {0}
doclet.Href_Enum_Class_Title=enum class in {0}
doclet.Href_Type_Param_Title=type parameter in {0}
doclet.Href_Class_Or_Interface_Title=class or interface in {0}
doclet.Summary=Summary:
@ -95,10 +98,14 @@ doclet.tag.invalid_usage=invalid usage of tag {0}
doclet.Deprecated_API=Deprecated API
doclet.For_Removal=For Removal
doclet.Annotation_Types=Annotation Types
doclet.Annotation_Interfaces=Annotation Interfaces
doclet.Annotation_Type_Members=Annotation Type Elements
doclet.Annotation_Interface_Members=Annotation Interface Elements
doclet.for_removal=for removal
doclet.annotation_types=annotation types
doclet.annotation_interfaces=annotation interfaces
doclet.annotation_type_members=annotation type elements
doclet.annotation_interface_members=annotation interface elements
doclet.record_classes=record classes
doclet.Generated_Docs_Untitled=Generated Documentation (Untitled)
doclet.Other_Packages=Other Packages
@ -212,16 +219,24 @@ doclet.help.footnote=\
This help file applies to API documentation generated by the standard doclet.
doclet.help.enum.intro=\
Each enum has its own separate page with the following sections:
doclet.help.enum.class.intro=\
Each enum class has its own separate page with the following sections:
doclet.help.enum.declaration=\
Enum Declaration
doclet.help.enum.definition=\
Enum Description
doclet.help.annotation_type.intro=\
Each annotation type has its own separate page with the following sections:
doclet.help.annotation_interface.intro=\
Each annotation interface has its own separate page with the following sections:
doclet.help.annotation_type.declaration=\
Annotation Type Declaration
doclet.help.annotation_interface.declaration=\
Annotation Interface Declaration
doclet.help.annotation_type.description=\
Annotation Type Description
doclet.help.annotation_interface.description=\
Annotation Interface Description
doclet.help.search.head=Search
# Introduction to Javadoc search features, followed by a list of examples
doclet.help.search.intro=You can search for definitions of modules, packages, types, fields, methods, \

8
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/AbstractDoclet.java
View File

@ -25,8 +25,10 @@
package jdk.javadoc.internal.doclets.toolkit;
import java.util.Map;
import java.util.SortedSet;
import java.util.TreeSet;
import java.util.function.Function;
import javax.lang.model.SourceVersion;
import javax.lang.model.element.PackageElement;
@ -99,7 +101,7 @@ public abstract class AbstractDoclet implements Doclet {
@Override
public boolean run(DocletEnvironment docEnv) {
configuration = getConfiguration();
configuration.initConfiguration(docEnv);
configuration.initConfiguration(docEnv, getResourceKeyMapper(docEnv));
utils = configuration.utils;
messages = configuration.getMessages();
BaseOptions options = configuration.getOptions();
@ -149,6 +151,10 @@ public abstract class AbstractDoclet implements Doclet {
return false;
}
protected Function<String, String> getResourceKeyMapper(DocletEnvironment docEnv) {
return null;
}
private void reportInternalError(Throwable t) {
if (getClass().equals(StandardDoclet.class) || getClass().equals(HtmlDoclet.class)) {
System.err.println(configuration.getDocResources().getText("doclet.internal.report.bug"));

6
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/BaseConfiguration.java
View File

@ -41,6 +41,7 @@ import java.util.SortedMap;
import java.util.SortedSet;
import java.util.TreeMap;
import java.util.TreeSet;
import java.util.function.Function;
import javax.lang.model.SourceVersion;
import javax.lang.model.element.Element;
@ -237,7 +238,8 @@ public abstract class BaseConfiguration {
private boolean initialized = false;
protected void initConfiguration(DocletEnvironment docEnv) {
protected void initConfiguration(DocletEnvironment docEnv,
Function<String, String> resourceKeyMapper) {
if (initialized) {
throw new IllegalStateException("configuration previously initialized");
}
@ -251,6 +253,8 @@ public abstract class BaseConfiguration {
options.setJavaFX(isJavaFXMode());
}
getDocResources().setKeyMapper(resourceKeyMapper);
// Once docEnv and Utils have been initialized, others should be safe.
metakeywords = new MetaKeywords(this);
cmtUtils = new CommentUtils(this);

41
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/Resources.java
View File

@ -29,6 +29,7 @@ import java.text.MessageFormat;
import java.util.Locale;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
import java.util.function.Function;
/**
* Access to the localizable resources used by a doclet.
@ -39,17 +40,10 @@ import java.util.ResourceBundle;
* HTML doclet.
*/
public class Resources {
public final String annotationTypeSummary;
public final String classSummary;
public final String enumSummary;
public final String errorSummary;
public final String exceptionSummary;
public final String interfaceSummary;
public final String packageSummary;
public final String recordSummary;
protected ResourceBundle commonBundle;
protected ResourceBundle docletBundle;
protected final ResourceBundle commonBundle;
protected final ResourceBundle docletBundle;
protected Function<String, String> mapper;
/**
* Creates a {@code Resources} object to provide access the resource
@ -65,20 +59,17 @@ public class Resources {
public Resources(Locale locale, String commonBundleName, String docletBundleName) {
this.commonBundle = ResourceBundle.getBundle(commonBundleName, locale);
this.docletBundle = ResourceBundle.getBundle(docletBundleName, locale);
}
this.annotationTypeSummary = getText("doclet.Annotation_Types_Summary");
this.classSummary = getText("doclet.Class_Summary");
this.enumSummary = getText("doclet.Enum_Summary");
this.errorSummary = getText("doclet.Error_Summary");
this.exceptionSummary = getText("doclet.Exception_Summary");
this.interfaceSummary = getText("doclet.Interface_Summary");
this.packageSummary = getText("doclet.Package_Summary");
this.recordSummary = getText("doclet.Record_Summary");
public void setKeyMapper(Function<String, String> mapper) {
this.mapper = mapper;
}
/**
* Returns the string for the given key from one of the doclet's
* resource bundles.
* resource bundles. If the current {@code mapper} is not {@code null},
* it will be applied to the {@code key} before looking up the resulting
* key in the resource bundle(s).
*
* The more specific bundle is checked first;
* if it is not there, the common bundle is then checked.
@ -89,13 +80,17 @@ public class Resources {
* bundle.
*/
public String getText(String key) throws MissingResourceException {
if (docletBundle.containsKey(key))
return docletBundle.getString(key);
String mKey = mapper == null ? key : mapper.apply(key);
return commonBundle.getString(key);
if (docletBundle.containsKey(mKey))
return docletBundle.getString(mKey);
return commonBundle.getString(mKey);
}
/**
* Returns the string for the given key from one of the doclet's
* Returns the string for the given key (after applying the current
* {@code mapper} if it is not {@code null}) from one of the doclet's
* resource bundles, substituting additional arguments into
* into the resulting string with {@link MessageFormat#format}.
*

9
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/WorkArounds.java
View File

@ -25,13 +25,10 @@
package jdk.javadoc.internal.doclets.toolkit;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;
@ -48,14 +45,10 @@ import javax.lang.model.util.Types;
import javax.tools.FileObject;
import javax.tools.JavaFileManager.Location;
import com.sun.source.tree.CompilationUnitTree;
import com.sun.source.util.JavacTask;
import com.sun.source.util.TreePath;
import com.sun.tools.javac.api.BasicJavacTask;
import com.sun.tools.javac.code.Attribute;
import com.sun.tools.javac.code.Flags;
import com.sun.tools.javac.code.Scope;
import com.sun.tools.javac.code.Source.Feature;
import com.sun.tools.javac.code.Symbol;
import com.sun.tools.javac.code.Symbol.ClassSymbol;
import com.sun.tools.javac.code.Symbol.MethodSymbol;
@ -66,11 +59,9 @@ import com.sun.tools.javac.code.TypeTag;
import com.sun.tools.javac.comp.AttrContext;
import com.sun.tools.javac.comp.Env;
import com.sun.tools.javac.model.JavacElements;
import com.sun.tools.javac.model.JavacTypes;
import com.sun.tools.javac.util.Names;
import jdk.javadoc.internal.doclets.toolkit.util.Utils;
import jdk.javadoc.internal.doclint.DocLint;
import jdk.javadoc.internal.tool.ToolEnvironment;
import jdk.javadoc.internal.tool.DocEnvImpl;

2
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/builders/ClassBuilder.java
View File

@ -128,7 +128,7 @@ public class ClassBuilder extends AbstractBuilder {
key = "doclet.Enum";
break;
case RECORD:
key = "doclet.Record";
key = "doclet.RecordClass";
break;
case ANNOTATION_TYPE:
key = "doclet.AnnotationType";

42
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/doclets.properties
View File

@ -127,7 +127,9 @@ doclet.Uses_Summary=Uses
doclet.Provides_Summary=Provides
doclet.Interface_Summary=Interface Summary
doclet.Annotation_Types_Summary=Annotation Types Summary
doclet.Annotation_Interfaces_Summary=Annotation Interfaces Summary
doclet.Enum_Summary=Enum Summary
doclet.Enum_Class_Summary=Enum Class Summary
doclet.Exception_Summary=Exception Summary
doclet.Error_Summary=Error Summary
doclet.Class_Summary=Class Summary
@ -139,11 +141,13 @@ doclet.Property_Summary=Property Summary
doclet.Enum_Constant_Summary=Enum Constant Summary
doclet.Constructor_Summary=Constructor Summary
doclet.Method_Summary=Method Summary
doclet.Record_Summary=Record Summary
doclet.Record_Class_Summary=Record Class Summary
doclet.Interfaces=Interfaces
doclet.Enums=Enums
doclet.EnumClasses=Enum Classes
doclet.RecordClasses=Record Classes
doclet.AnnotationTypes=Annotation Types
doclet.AnnotationInterfaces=Annotation Interfaces
doclet.Exceptions=Exceptions
doclet.Errors=Errors
doclet.Classes=Classes
@ -155,17 +159,23 @@ doclet.All_Implemented_Interfaces=All Implemented Interfaces:
doclet.Interface=Interface
doclet.Class=Class
doclet.AnnotationType=Annotation Type
doclet.AnnotationInterface=Annotation Interface
doclet.annotationtype=annotation type
doclet.annotationinterface=annotation interface
doclet.annotationtypes=annotation types
doclet.annotationinterfaces=annotation interfaces
doclet.Enum=Enum
doclet.EnumClass=Enum Class
doclet.enum=enum
doclet.enumclass=enum class
doclet.enums=enums
doclet.enumclasses=enum classes
doclet.interface=interface
doclet.interfaces=interfaces
doclet.class=class
doclet.classes=classes
doclet.Record=Record
doclet.record=record
doclet.RecordClass=Record Class
doclet.recordclass=record class
doclet.Error=Error
doclet.error=error
doclet.errors=errors
@ -206,8 +216,6 @@ doclet.value_tag_invalid_constant=@value tag (which references {0}) can only be
doclet.value_tag_invalid_use=@value tag cannot be used here.
doclet.dest_dir_create=Creating destination directory: "{0}"
doclet.in={0} in {1}
doclet.Use_Table_Summary=Use table, listing {0}, and an explanation
doclet.Member_Table_Summary={0} table, listing {1}, and an explanation
doclet.fields=fields
doclet.Fields=Fields
doclet.Properties=Properties
@ -239,6 +247,7 @@ doclet.Method=Method
doclet.Annotation_Type_Optional_Member=Optional Element
doclet.Annotation_Type_Required_Member=Required Element
doclet.Annotation_Type_Member=Annotation Type Element
doclet.Annotation_Interface_Member=Annotation Interface Element
doclet.Enum_Constant=Enum Constant
doclet.Description=Description
doclet.ConstantField=Constant Field
@ -253,15 +262,25 @@ doclet.urlRedirected=URL {0} was redirected to {1} -- Update the command-line op
doclet.enum_values_doc.fullbody=\
Returns an array containing the constants of this enum type, in\n\
the order they are declared.
doclet.enum_class_values_doc.fullbody=\
Returns an array containing the constants of this enum class, in\n\
the order they are declared.
doclet.enum_values_doc.return=\
an array containing the constants of this enum type, in the order they are declared
doclet.enum_class_values_doc.return=\
an array containing the constants of this enum class, in the order they are declared
doclet.enum_valueof_doc.fullbody=\
Returns the enum constant of this type with the specified name.\n\
The string must match <i>exactly</i> an identifier used to declare an\n\
enum constant in this type. (Extraneous whitespace characters are \n\
not permitted.)
doclet.enum_class_valueof_doc.fullbody=\
Returns the enum constant of this class with the specified name.\n\
The string must match <i>exactly</i> an identifier used to declare an\n\
enum constant in this class. (Extraneous whitespace characters are \n\
not permitted.)
doclet.enum_valueof_doc.param_name=\
the name of the enum constant to be returned.
@ -271,6 +290,8 @@ doclet.enum_valueof_doc.return=\
doclet.enum_valueof_doc.throws_ila=\
if this enum type has no constant with the specified name
doclet.enum_class_valueof_doc.throws_ila=\
if this enum class has no constant with the specified name
doclet.enum_valueof_doc.throws_npe=\
if the argument is null
@ -278,7 +299,7 @@ doclet.enum_valueof_doc.throws_npe=\
#Documentation for records
doclet.record_constructor_doc.fullbody=\
Creates an instance of a {0} record.
Creates an instance of a {0} record class.
doclet.record_constructor_doc.param_name=\
the value for the {0} record component
@ -294,10 +315,10 @@ doclet.record_equals_doc.fullbody.tail.both=\
primitive components are compared with '=='.
doclet.record_equals_doc.fullbody.tail.primitive=\
All components in this record are compared with '=='.
All components in this record class are compared with '=='.
doclet.record_equals_doc.fullbody.tail.reference=\
All components in this record are compared with \
All components in this record class are compared with \
{@link java.util.Objects#equals(Object,Object) Objects::equals(Object,Object)}.
doclet.record_equals_doc.param_name=\
@ -314,8 +335,8 @@ doclet.record_hashCode_doc.return=\
a hash code value for this object
doclet.record_toString_doc.fullbody=\
Returns a string representation of this record. \
The representation contains the name of the type, followed by \
Returns a string representation of this record class. \
The representation contains the name of the class, followed by \
the name and value of each of the record components.
doclet.record_toString_doc.return=\
@ -338,6 +359,7 @@ doclet.search.no_results=No results found
doclet.search.loading=Loading search index...
doclet.search.modules=Modules
doclet.search.packages=Packages
doclet.search.classes_and_interfaces=Classes and Interfaces
doclet.search.types=Types
doclet.search.members=Members
doclet.search.search_tags=Search Tags

2
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java
View File

@ -1362,7 +1362,7 @@ public class Utils {
case INTERFACE ->
"doclet.Interface";
case RECORD ->
"doclet.Record";
"doclet.RecordClass";
case CLASS ->
isException(te) ? "doclet.Exception"
: isError(te) ? "doclet.Error"

104
src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/VisibleMemberTable.java
View File

@ -25,20 +25,28 @@
package jdk.javadoc.internal.doclets.toolkit.util;
import javax.lang.model.element.AnnotationMirror;
import javax.lang.model.element.Element;
import javax.lang.model.element.ExecutableElement;
import javax.lang.model.element.Modifier;
import javax.lang.model.element.TypeElement;
import javax.lang.model.element.VariableElement;
import javax.lang.model.type.ArrayType;
import javax.lang.model.type.DeclaredType;
import javax.lang.model.type.ExecutableType;
import javax.lang.model.type.TypeKind;
import javax.lang.model.type.TypeMirror;
import javax.lang.model.type.WildcardType;
import javax.lang.model.util.Elements;
import javax.lang.model.util.SimpleElementVisitor14;
import javax.lang.model.util.SimpleTypeVisitor14;
import java.lang.ref.SoftReference;
import java.util.ArrayList;
import java.util.Collections;
import java.util.EnumMap;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
@ -582,14 +590,10 @@ public class VisibleMemberTable {
return false;
}
TypeMirror inheritedMethodReturn = inheritedMethod.getReturnType();
TypeMirror lMethodReturn = lMethod.getReturnType();
boolean covariantReturn =
lMethodReturn.getKind() == TypeKind.DECLARED
&& inheritedMethodReturn.getKind() == TypeKind.DECLARED
&& !utils.typeUtils.isSameType(lMethodReturn, inheritedMethodReturn)
&& utils.typeUtils.isSubtype(lMethodReturn, inheritedMethodReturn);
boolean simpleOverride = covariantReturn ? false : utils.isSimpleOverride(lMethod);
// Even with --override-methods=summary we want to include details of
// overriding method if something noteworthy has been added or changed.
boolean simpleOverride = utils.isSimpleOverride(lMethod)
&& !overridingSignatureChanged(lMethod, inheritedMethod);
overriddenMethodTable.computeIfAbsent(lMethod,
l -> new OverridingMethodInfo(inheritedMethod, simpleOverride));
return simpleOverride;
@ -598,6 +602,90 @@ public class VisibleMemberTable {
return true;
}
// Check whether the signature of an overriding method has any changes worth
// being documented compared to the overridden method.
private boolean overridingSignatureChanged(ExecutableElement method, ExecutableElement overriddenMethod) {
// Covariant return type
TypeMirror overriddenMethodReturn = overriddenMethod.getReturnType();
TypeMirror methodReturn = method.getReturnType();
if (methodReturn.getKind() == TypeKind.DECLARED
&& overriddenMethodReturn.getKind() == TypeKind.DECLARED
&& !utils.typeUtils.isSameType(methodReturn, overriddenMethodReturn)
&& utils.typeUtils.isSubtype(methodReturn, overriddenMethodReturn)) {
return true;
}
// Modifiers changed from protected to public, non-final to final, or change in abstractness
Set<Modifier> modifiers = method.getModifiers();
Set<Modifier> overriddenModifiers = overriddenMethod.getModifiers();
if ((modifiers.contains(Modifier.PUBLIC) && overriddenModifiers.contains(Modifier.PROTECTED))
|| modifiers.contains(Modifier.FINAL)
|| modifiers.contains(Modifier.ABSTRACT) != overriddenModifiers.contains(Modifier.ABSTRACT)) {
return true;
}
// Change in thrown types
if (!method.getThrownTypes().equals(overriddenMethod.getThrownTypes())) {
return true;
}
// Documented annotations added anywhere in the method signature
return !getDocumentedAnnotations(method).equals(getDocumentedAnnotations(overriddenMethod));
}
private Set<AnnotationMirror> getDocumentedAnnotations(ExecutableElement element) {
Set<AnnotationMirror> annotations = new HashSet<>();
addDocumentedAnnotations(annotations, element.getAnnotationMirrors());
new SimpleTypeVisitor14<Void, Void>() {
@Override
protected Void defaultAction(TypeMirror e, Void v) {
addDocumentedAnnotations(annotations, e.getAnnotationMirrors());
return null;
}
@Override
public Void visitArray(ArrayType t, Void unused) {
if (t.getComponentType() != null) {
visit(t.getComponentType());
}
return super.visitArray(t, unused);
}
@Override
public Void visitDeclared(DeclaredType t, Void unused) {
t.getTypeArguments().forEach(this::visit);
return super.visitDeclared(t, unused);
}
@Override
public Void visitWildcard(WildcardType t, Void unused) {
if (t.getExtendsBound() != null) {
visit(t.getExtendsBound());
}
if (t.getSuperBound() != null) {
visit(t.getSuperBound());
}
return super.visitWildcard(t, unused);
}
@Override
public Void visitExecutable(ExecutableType t, Void unused) {
t.getParameterTypes().forEach(this::visit);
t.getTypeVariables().forEach(this::visit);
visit(t.getReturnType());
return super.visitExecutable(t, unused);
}
}.visit(element.asType());
return annotations;
}
private void addDocumentedAnnotations(Set<AnnotationMirror> annotations, List<? extends AnnotationMirror> annotationMirrors) {
annotationMirrors.forEach(annotation -> {
if (utils.isDocumentedAnnotation((TypeElement) annotation.getAnnotationType().asElement())) {
annotations.add(annotation);
}
});
}
/*
* This class encapsulates the details of local members, orderedMembers
* contains the members in the declaration order, additionally a

16
test/hotspot/jtreg/compiler/codegen/TestCharVect2.java
View File

@ -26,18 +26,10 @@
* @bug 8001183
* @summary incorrect results of char vectors right shift operation
*
* @run main/othervm/timeout=400 -Xbatch -Xmx128m compiler.codegen.TestCharVect2
*/
/**
* @test
* @bug 8001183
* @summary incorrect results of char vectors right shift operation
* @requires vm.compiler2.enabled | vm.graal.enabled
*
* @run main/othervm/timeout=400 -Xbatch -Xmx128m -XX:MaxVectorSize=8 compiler.codegen.TestCharVect2
* @run main/othervm/timeout=400 -Xbatch -Xmx128m -XX:MaxVectorSize=16 compiler.codegen.TestCharVect2
* @run main/othervm/timeout=400 -Xbatch -Xmx128m -XX:MaxVectorSize=32 compiler.codegen.TestCharVect2
* @run main/othervm -Xbatch -XX:CompileCommand=exclude,*::test() -Xmx128m compiler.codegen.TestCharVect2
* @run main/othervm -Xbatch -XX:CompileCommand=exclude,*::test() -Xmx128m -XX:MaxVectorSize=8 compiler.codegen.TestCharVect2
* @run main/othervm -Xbatch -XX:CompileCommand=exclude,*::test() -Xmx128m -XX:MaxVectorSize=16 compiler.codegen.TestCharVect2
* @run main/othervm -Xbatch -XX:CompileCommand=exclude,*::test() -Xmx128m -XX:MaxVectorSize=32 compiler.codegen.TestCharVect2
*/
package compiler.codegen;

1
test/jdk/java/lang/ClassLoader/nativeLibrary/NativeLibraryTest.java
View File

@ -60,6 +60,7 @@ public class NativeLibraryTest {
setup();
for (int count=1; count <= 5; count++) {
System.out.println("count: " + count);
// create a class loader and load a native library
runTest();
// Unload the class loader and native library, and give the Cleaner

92
test/jdk/java/lang/annotation/typeAnnotations/GetAnnotatedReceiverType.java
View File

@ -23,12 +23,10 @@
/*
* @test
* @bug 8024915 8044629
* @bug 8024915 8044629 8256693
*/
import java.lang.reflect.AnnotatedType;
import java.lang.reflect.Executable;
import java.util.Arrays;
import java.lang.reflect.*;
public class GetAnnotatedReceiverType {
public void method() {}
@ -62,9 +60,15 @@ public class GetAnnotatedReceiverType {
public class Inner2 {
public Inner2() { }
public void innerMethod2(GetAnnotatedReceiverType.Inner2 this) {}
public class Inner3 {
public Inner3() { }
public void innerMethod3(GetAnnotatedReceiverType.Inner2.Inner3 this) {}
public class Inner7<T> {
public void innerMethod7(GetAnnotatedReceiverType.Inner2.Inner3.Inner7<T> this) {}
}
public Class<?> getLocalClass () {
class InnerLocal { public InnerLocal() {} }
@ -86,8 +90,23 @@ public class GetAnnotatedReceiverType {
}
}
public class Inner4<T> {
public Inner4(GetAnnotatedReceiverType GetAnnotatedReceiverType.this) {}
public void innerMethod4(GetAnnotatedReceiverType.Inner4<T> this) {}
public class Inner5 {
public Inner5(GetAnnotatedReceiverType.Inner4<T> GetAnnotatedReceiverType.Inner4.this) {}
public void innerMethod5(GetAnnotatedReceiverType.Inner4<T>.Inner5 this) {}
public class Inner6 {
public Inner6(GetAnnotatedReceiverType.Inner4<T>.Inner5 GetAnnotatedReceiverType.Inner4.Inner5.this) {}
}
}
}
private static int failures = 0;
private static int tests = 0;
private static final int EXPECTED_TEST_CASES = 25;
public static void main(String[] args) throws NoSuchMethodException {
checkEmptyAT(GetAnnotatedReceiverType.class.getMethod("method"),
@ -132,9 +151,35 @@ public class GetAnnotatedReceiverType {
checkNull(instance3.getAnonymousClass().getDeclaredConstructors()[0],
"getAnnotatedReceiverType() on a constructor for an anonymous class should return null");
Inner4<?> instance4 = outer.new Inner4<String>();
Inner4<?>.Inner5 instance5 = instance4.new Inner5();
Inner4<?>.Inner5.Inner6 instance6 = instance5.new Inner6();
checkAnnotatedReceiverType(instance4.getClass().getConstructors()[0], false,
"The type of .getAnnotatedReceiverType().getType() for this constructor should be");
checkAnnotatedReceiverType(instance5.getClass().getConstructors()[0], true,
"The type of .getAnnotatedReceiverType().getType() for this constructor should be");
checkAnnotatedReceiverType(instance6.getClass().getConstructors()[0], true,
"The type of .getAnnotatedReceiverType().getType() for this constructor should be");
checkAnnotatedReceiverType(outer.getClass().getMethod("method0"), false,
"The type of .getAnnotatedReceiverType().getType() for this method should be");
checkAnnotatedReceiverType(instance4.getClass().getMethod("innerMethod4"), true,
"The type of .getAnnotatedReceiverType().getType() for this method should be");
checkAnnotatedReceiverType(instance5.getClass().getMethod("innerMethod5"), true,
"The type of .getAnnotatedReceiverType().getType() for this method should be");
checkAnnotatedReceiverType(instance2.getClass().getMethod("innerMethod2"), false,
"The type of .getAnnotatedReceiverType().getType() for this method should be");
checkAnnotatedReceiverType(instance3.getClass().getMethod("innerMethod3"), false,
"The type of .getAnnotatedReceiverType().getType() for this method should be");
Inner2.Inner3.Inner7<?> instance7 = instance3.new Inner7<String>();
checkAnnotatedReceiverType(instance7.getClass().getMethod("innerMethod7"), true,
"The type of .getAnnotatedReceiverType().getType() for this method should be");
recursiveCheckAnnotatedOwnerTypes(instance7.getClass().getMethod("innerMethod7").getAnnotatedReceiverType());
if (failures != 0)
throw new RuntimeException("Test failed, see log for details");
else if (tests != 15)
else if (tests != EXPECTED_TEST_CASES)
throw new RuntimeException("Not all cases ran, failing");
}
@ -155,4 +200,41 @@ public class GetAnnotatedReceiverType {
}
tests++;
}
private static void checkAnnotatedReceiverType(Executable e, boolean shouldBeParameterized, String msg) {
Type t = e.getAnnotatedReceiverType().getType();
if (shouldBeParameterized != (t instanceof ParameterizedType)) {
failures++;
System.err.println(e + ", " + msg + " " + (shouldBeParameterized ? "ParameterizedType" : "Class") + ", found: " + t.getClass().getSimpleName());
}
// Test we can get the potentially empty annotated actual type arguments array
if (shouldBeParameterized) {
try {
ParameterizedType t1 = (ParameterizedType)t;
AnnotatedParameterizedType at1 = (AnnotatedParameterizedType)e.getAnnotatedReceiverType();
if (t1.getActualTypeArguments().length != at1.getAnnotatedActualTypeArguments().length) {
System.err.println(t1 + "'s actual type arguments can't match " + at1);
failures++;
}
} catch (ClassCastException cce) {
System.err.println("Couldn't get potentially empty actual type arguments: " + cce.getMessage());
failures++;
}
}
tests++;
}
private static void recursiveCheckAnnotatedOwnerTypes(AnnotatedType t) {
AnnotatedType check = t.getAnnotatedOwnerType();
do {
if (!(check.getType() instanceof Class<?>)) {
failures++;
System.err.println("Expecting only instances of Class returned for .getType() found " + check.getType().getClass().getSimpleName());
}
check = check.getAnnotatedOwnerType();
} while (check != null);
tests++;
}
}

28
test/jdk/java/util/regex/RegExTest.java
View File

@ -36,7 +36,7 @@
* 8151481 4867170 7080302 6728861 6995635 6736245 4916384 6328855 6192895
* 6345469 6988218 6693451 7006761 8140212 8143282 8158482 8176029 8184706
* 8194667 8197462 8184692 8221431 8224789 8228352 8230829 8236034 8235812
* 8216332 8214245 8237599 8241055 8247546
* 8216332 8214245 8237599 8241055 8247546 8258259
*
* @library /test/lib
* @library /lib/testlibrary/java/lang
@ -5063,7 +5063,15 @@ public class RegExTest {
report("surrogatePairWithCanonEq");
}
// This test is for 8235812
private static String s2x(String s) {
StringBuilder sb = new StringBuilder();
for (char ch : s.toCharArray()) {
sb.append(String.format("\\u%04x", (int)ch));
}
return sb.toString();
}
// This test is for 8235812, with cases excluded by 8258259
private static void lineBreakWithQuantifier() {
// key: pattern
// value: lengths of input that must match the pattern
@ -5073,12 +5081,12 @@ public class RegExTest {
Map.entry("\\R+", List.of(1, 2, 3)),
Map.entry("\\R{0}", List.of(0)),
Map.entry("\\R{1}", List.of(1)),
Map.entry("\\R{2}", List.of(2)),
Map.entry("\\R{3}", List.of(3)),
// Map.entry("\\R{2}", List.of(2)), // 8258259
// Map.entry("\\R{3}", List.of(3)), // 8258259
Map.entry("\\R{0,}", List.of(0, 1, 2, 3)),
Map.entry("\\R{1,}", List.of(1, 2, 3)),
Map.entry("\\R{2,}", List.of(2, 3)),
Map.entry("\\R{3,}", List.of(3)),
// Map.entry("\\R{2,}", List.of(2, 3)), // 8258259
// Map.entry("\\R{3,}", List.of(3)), // 8258259
Map.entry("\\R{0,0}", List.of(0)),
Map.entry("\\R{0,1}", List.of(0, 1)),
Map.entry("\\R{0,2}", List.of(0, 1, 2)),
@ -5086,9 +5094,9 @@ public class RegExTest {
Map.entry("\\R{1,1}", List.of(1)),
Map.entry("\\R{1,2}", List.of(1, 2)),
Map.entry("\\R{1,3}", List.of(1, 2, 3)),
Map.entry("\\R{2,2}", List.of(2)),
Map.entry("\\R{2,3}", List.of(2, 3)),
Map.entry("\\R{3,3}", List.of(3)),
// Map.entry("\\R{2,2}", List.of(2)), // 8258259
// Map.entry("\\R{2,3}", List.of(2, 3)), // 8258259
// Map.entry("\\R{3,3}", List.of(3)), // 8258259
Map.entry("\\R", List.of(1)),
Map.entry("\\R\\R", List.of(2)),
Map.entry("\\R\\R\\R", List.of(3))
@ -5131,7 +5139,7 @@ public class RegExTest {
if (!m.reset(in).matches()) {
failCount++;
System.err.println("Expected to match '" +
in + "' =~ /" + p + "/");
s2x(in) + "' =~ /" + p + "/");
}
}
}

129
test/jdk/javax/swing/JPasswordField/CheckCommonUseCases.java Normal file
View File

@ -0,0 +1,129 @@
/*
* Copyright (c) 2020, 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.
*/
import java.awt.EventQueue;
import java.util.Arrays;
import java.util.concurrent.atomic.AtomicInteger;
import javax.swing.JPasswordField;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
/**
* @test
* @bug 8258373
*/
public final class CheckCommonUseCases {
public static void main(String[] args) throws Exception {
EventQueue.invokeAndWait(() -> {
JPasswordField pf = new JPasswordField();
// check that pf work if the new text is longer/shorter than the old
checkDifferentTextLength(pf);
// count the listeners called by the setText();
countListeners(pf);
});
}
private static void countListeners(JPasswordField pf) {
AtomicInteger insert = new AtomicInteger();
AtomicInteger update = new AtomicInteger();
AtomicInteger remove = new AtomicInteger();
pf.getDocument().addDocumentListener(new DocumentListener() {
@Override
public void insertUpdate(DocumentEvent e) {
insert.incrementAndGet();
System.err.println("e = " + e);
}
@Override
public void removeUpdate(DocumentEvent e) {
remove.incrementAndGet();
System.err.println("e = " + e);
}
@Override
public void changedUpdate(DocumentEvent e) {
update.incrementAndGet();
System.err.println("e = " + e);
}
});
// set the new text
pf.setText("aaa");
if (remove.get() != 0 || update.get() != 0 || insert.get() > 1) {
System.err.println("remove = " + remove);
System.err.println("update = " + update);
System.err.println("insert = " + insert);
throw new RuntimeException("Unexpected number of listeners");
}
insert.set(0);
update.set(0);
remove.set(0);
// replace the old text
pf.setText("bbb");
if (remove.get() > 1 || update.get() > 1 || insert.get() > 1) {
System.err.println("remove = " + remove);
System.err.println("update = " + update);
System.err.println("insert = " + insert);
throw new RuntimeException("Unexpected number of listeners");
}
insert.set(0);
update.set(0);
remove.set(0);
// remove the text
pf.setText("");
if (remove.get() > 1 || update.get() > 0 || insert.get() > 0) {
System.err.println("remove = " + remove);
System.err.println("update = " + update);
System.err.println("insert = " + insert);
throw new RuntimeException("Unexpected number of listeners");
}
}
private static void checkDifferentTextLength(JPasswordField pf) {
// forward
for (int i = 0 ; i < 100; ++i){
String expected = ("" + i).repeat(i);
pf.setText(expected);
String actual = Arrays.toString(pf.getPassword());
if (actual.equals(expected)){
System.err.println("Expected: " + expected);
System.err.println("Actual: " + actual);
throw new RuntimeException();
}
}
// backward
for (int i = 99; i >= 0; --i){
String expected = ("" + i).repeat(i);
pf.setText(expected);
String actual = Arrays.toString(pf.getPassword());
if (actual.equals(expected)){
System.err.println("Expected: " + expected);
System.err.println("Actual: " + actual);
throw new RuntimeException();
}
}
}
}

157
test/jdk/javax/swing/JPasswordField/CleanInternalStorageOnSetText.java Normal file
View File

@ -0,0 +1,157 @@
/*
* Copyright (c) 2020, 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.
*/
import java.awt.EventQueue;
import java.util.ArrayList;
import java.util.Arrays;
import javax.swing.JPasswordField;
import javax.swing.text.BadLocationException;
import javax.swing.text.Document;
import javax.swing.text.GapContent;
import javax.swing.text.PlainDocument;
import javax.swing.text.Segment;
import javax.swing.text.StringContent;
import javax.swing.text.html.HTMLDocument;
import javax.swing.text.html.StyleSheet;
/**
* @test
* @bug 8258373
* @summary The JPasswordField#setText() should reset the old internal storage
*/
public final class CleanInternalStorageOnSetText {
public static void main(String[] args) throws Exception {
EventQueue.invokeAndWait(() -> {
// default case
testStorage(false, new JPasswordField());
testStorage(true, new JPasswordField());
// custom Plain String document
Document document = new PlainDocument(new StringContent());
testStorage(false, new JPasswordField(document, "", 10));
document = new PlainDocument(new StringContent());
testStorage(true, new JPasswordField(document, "", 10));
// custom Plain GAP document
document = new PlainDocument(new GapContent());
testStorage(false, new JPasswordField(document, "", 10));
document = new PlainDocument(new GapContent());
testStorage(true, new JPasswordField(document, "", 10));
// custom HTMLDocument String document
document = new HTMLDocument(new StringContent(), new StyleSheet());
testStorage(false, new JPasswordField(document, "", 10));
document = new HTMLDocument(new StringContent(), new StyleSheet());
testStorage(true, new JPasswordField(document, "", 10));
// custom HTMLDocument GAP document
document = new HTMLDocument(new GapContent(), new StyleSheet());
testStorage(false, new JPasswordField(document, "", 10));
document = new HTMLDocument(new GapContent(), new StyleSheet());
testStorage(true, new JPasswordField(document, "", 10));
});
}
private static void testStorage(boolean makeGap, JPasswordField pf) {
test(pf, "123", makeGap);
test(pf, "1234567", makeGap);
test(pf, "1234567890", makeGap);
test(pf, "1".repeat(100), makeGap);
test(pf, "1234567890", makeGap);
test(pf, "1234567", makeGap);
test(pf, "123", makeGap);
test(pf, "", makeGap);
}
private static void test(JPasswordField pf, String text, boolean makeGap) {
pf.setText(text);
if (makeGap && text.length() > 3) {
try {
pf.getDocument().remove(1, 2);
} catch (BadLocationException e) {
throw new RuntimeException(e);
}
}
// if no gaps we can check whole array
char[] internalArray = getInternalArray(pf);
ArrayList<Segment> segments = new ArrayList<>();
if (makeGap) {
// if gaps exists we can check only part of the array
Document doc = pf.getDocument();
int nleft = doc.getLength();
Segment sgm = new Segment();
sgm.setPartialReturn(true);
int offs = 0;
try {
while (nleft > 0) {
doc.getText(offs, nleft, sgm);
segments.add(sgm);
nleft -= sgm.count;
offs += sgm.count;
}
} catch (BadLocationException e) {
throw new RuntimeException(e);
}
}
System.err.println("Before = " + Arrays.toString(internalArray));
pf.setText("");
System.err.println("After = " + Arrays.toString(internalArray));
if (!makeGap) {
for (char c : internalArray) {
if (c != '\u0000' && c != '\n') {
throw new RuntimeException(Arrays.toString(internalArray));
}
}
} else {
for (Segment sgm : segments) {
for (int i = sgm.offset; i < sgm.count + sgm.offset; i++) {
char c = sgm.array[i];
if (c != '\u0000' && c != '\n') {
throw new RuntimeException(Arrays.toString(sgm.array));
}
}
}
}
}
/**
* This method returns the reference to the internal data stored by the
* document inside JPasswordField.
*/
private static char[] getInternalArray(JPasswordField pf) {
Document doc = pf.getDocument();
int nleft = doc.getLength();
Segment text = new Segment();
int offs = 0;
text.setPartialReturn(true);
try {
doc.getText(offs, nleft, text);
} catch (BadLocationException e) {
throw new RuntimeException(e);
}
return text.array;
}
}

61
test/jdk/javax/swing/JPasswordField/TextBeanProperty.java Normal file
View File

@ -0,0 +1,61 @@
/*
* Copyright (c) 2020, 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.
*/
import java.beans.BeanInfo;
import java.beans.Introspector;
import java.beans.PropertyDescriptor;
import javax.swing.JPasswordField;
import javax.swing.JTextArea;
import javax.swing.JTextField;
import javax.swing.text.JTextComponent;
/**
* @test
* @bug 8258373
* @summary The "text" property should not be "bound"
*/
public final class TextBeanProperty {
public static void main(String[] args) throws Exception {
test(JTextComponent.class);
test(JTextField.class);
test(JTextArea.class);
test(JPasswordField.class);
}
private static void test(Class<?> beanClass) throws Exception {
BeanInfo info = Introspector.getBeanInfo(beanClass);
PropertyDescriptor[] pd = info.getPropertyDescriptors();
int i;
for (i = 0; i < pd.length; i++) {
if (pd[i].getName().equals("text")) {
break;
}
}
if (pd[i].isBound()) {
System.err.println("Property: " + pd[i]);
throw new RuntimeException("text property is flagged as bound");
}
}
}

2
test/langtools/jdk/javadoc/doclet/testAnnotationOptional/TestAnnotationOptional.java
View File

@ -50,6 +50,6 @@ public class TestAnnotationOptional extends JavadocTester {
checkOutput("pkg/AnnotationOptional.html", true,
"""
<section class="details" id="annotation.type.element.detail">""");
<section class="details" id="annotation.interface.element.detail">""");
}
}

4
test/langtools/jdk/javadoc/doclet/testAnnotationTypes/TestAnnotationTypes.java
View File

@ -79,11 +79,11 @@ public class TestAnnotationTypes extends JavadocTester {
<li>Field&nbsp;|&nbsp;</li>""");
checkOutput("pkg/AnnotationType.html", true,
"<!-- ============ ANNOTATION TYPE MEMBER DETAIL =========== -->",
"<!-- ============ ANNOTATION INTERFACE MEMBER DETAIL =========== -->",
"<ul class=\"member-list\">",
"<li>",
"""
<section class="details" id="annotation.type.element.detail">""",
<section class="details" id="annotation.interface.element.detail">""",
"<h2>Element Details</h2>",
"<!-- -->",
"</a>",

6
test/langtools/jdk/javadoc/doclet/testClassTree/TestClassTree.java
View File

@ -57,21 +57,21 @@ public class TestClassTree extends JavadocTester {
<li class="circle">pkg.<a href="ParentClass.html" title="class in pkg"><span cla\
ss="type-name-link">ParentClass</span></a>""",
"""
<h2 title="Annotation Type Hierarchy">Annotation Type Hierarchy</h2>
<h2 title="Annotation Interface Hierarchy">Annotation Interface Hierarchy</h2>
<ul>
<li class="circle">pkg.<a href="AnnotationType.html" title="annotation in pkg"><\
span class="type-name-link">AnnotationType</span></a> (implements java.lang.anno\
tation.Annotation)</li>
</ul>""",
"""
<h2 title="Enum Hierarchy">Enum Hierarchy</h2>
<h2 title="Enum Class Hierarchy">Enum Class Hierarchy</h2>
<ul>
<li class="circle">java.lang.Object
<ul>
<li class="circle">java.lang.Enum&lt;E&gt; (implements java.lang.Comparable&lt;T\
&gt;, java.lang.constant.Constable, java.io.Serializable)
<ul>
<li class="circle">pkg.<a href="Coin.html" title="enum in pkg"><span class="type-name-link">Coin</span></a></li>
<li class="circle">pkg.<a href="Coin.html" title="enum class in pkg"><span class="type-name-link">Coin</span></a></li>
</ul>
</li>
</ul>

18
test/langtools/jdk/javadoc/doclet/testDeprecatedDocs/TestDeprecatedDocs.java
View File

@ -216,7 +216,7 @@ public class TestDeprecatedDocs extends JavadocTester {
<div class="type-signature"><span class="annotations">@Deprecated(forRemoval=true)
</span><span class="modifiers">public enum </span><span class="element-name type-name-label">TestEnum</span>
<span class="extends-implements">extends java.lang.Enum&lt;<a href="TestEnum.htm\
l" title="enum in pkg">TestEnum</a>&gt;</span></div>
l" title="enum class in pkg">TestEnum</a>&gt;</span></div>
<div class="deprecation-block"><span class="deprecated-label">Deprecated, for re\
moval: This API element is subject to removal in a future version.</span>
<div class="deprecation-comment">enum_test1 passes.</div>
@ -224,7 +224,7 @@ public class TestDeprecatedDocs extends JavadocTester {
"""
<div class="member-signature"><span class="annotations">@Deprecated(forRemoval=true)
</span><span class="modifiers">public static final</span>&nbsp;<span class="retu\
rn-type"><a href="TestEnum.html" title="enum in pkg">TestEnum</a></span>&nbsp;<s\
rn-type"><a href="TestEnum.html" title="enum class in pkg">TestEnum</a></span>&nbsp;<s\
pan class="element-name">FOR_REMOVAL</span></div>
<div class="deprecation-block"><span class="deprecated-label">Deprecated, for re\
moval: This API element is subject to removal in a future version.</span>
@ -269,15 +269,15 @@ public class TestDeprecatedDocs extends JavadocTester {
<ul>
<li><a href="#forRemoval">For Removal</a></li>
<li><a href="#class">Classes</a></li>
<li><a href="#enum">Enums</a></li>
<li><a href="#enum.class">Enum Classes</a></li>
<li><a href="#exception">Exceptions</a></li>
<li><a href="#error">Errors</a></li>
<li><a href="#annotation.type">Annotation Types</a></li>
<li><a href="#annotation.interface">Annotation Interfaces</a></li>
<li><a href="#field">Fields</a></li>
<li><a href="#method">Methods</a></li>
<li><a href="#constructor">Constructors</a></li>
<li><a href="#enum.constant">Enum Constants</a></li>
<li><a href="#annotation.type.member">Annotation Type Elements</a></li>
<li><a href="#annotation.interface.member">Annotation Interface Elements</a></li>
</ul>""",
"""
<div id="forRemoval">
@ -286,12 +286,12 @@ public class TestDeprecatedDocs extends JavadocTester {
<div class="table-header col-first">Element</div>
<div class="table-header col-last">Description</div>""",
"""
<div id="enum">
<div class="caption"><span>Enums</span></div>
<div id="enum.class">
<div class="caption"><span>Enum Classes</span></div>
<div class="summary-table two-column-summary">
<div class="table-header col-first">Enum</div>
<div class="table-header col-first">Enum Class</div>
<div class="table-header col-last">Description</div>
<div class="col-deprecated-item-name even-row-color"><a href="pkg/TestEnum.html" title="enum in pkg">pkg.TestEnum</a></div>
<div class="col-deprecated-item-name even-row-color"><a href="pkg/TestEnum.html" title="enum class in pkg">pkg.TestEnum</a></div>
<div class="col-last even-row-color">
<div class="deprecation-comment">enum_test1 passes.</div>
</div>""",

2
test/langtools/jdk/javadoc/doclet/testHelpFile/TestHelpFile.java
View File

@ -63,7 +63,7 @@ public class TestHelpFile extends JavadocTester {
<ul class="help-section-list">
<li>Interfaces</li>
<li>Classes</li>
<li>Enums</li>""",
<li>Enum Classes</li>""",
"""
</section>
<section class="help-section">

2
test/langtools/jdk/javadoc/doclet/testHtmlDefinitionListTag/TestHtmlDefinitionListTag.java
View File

@ -353,7 +353,7 @@ public class TestHtmlDefinitionListTag extends JavadocTester {
"""
<div class="member-signature"><span class="modifiers">public static final</span>\
&nbsp;<span class="return-type"><a href="C1.ModalExclusionType.html" title="enum\
in pkg1">C1.ModalExclusionType</a></span>&nbsp;<span class="element-name">APPLICATION_E\
class in pkg1">C1.ModalExclusionType</a></span>&nbsp;<span class="element-name">APPLICATION_E\
XCLUDE</span></div>
</section>
</li>""");

18
test/langtools/jdk/javadoc/doclet/testHtmlTableTags/TestHtmlTableTags.java
View File

@ -191,10 +191,10 @@ public class TestHtmlTableTags extends JavadocTester {
checkOutput("pkg2/package-summary.html", true,
"""
<div class="type-summary">
<table summary="Enum Summary table, listing enums, and an explanation">""",
<table summary="Enum Class Summary table, listing enums, and an explanation">""",
"""
<div class="type-summary">
<table summary="Annotation Types Summary table, listing annotation types, and an explanation">""");
<table summary="Annotation Interfaces Summary table, listing annotation types, and an explanation">""");
// Class documentation
checkOutput("pkg1/C1.html", true,
@ -309,8 +309,8 @@ public class TestHtmlTableTags extends JavadocTester {
"<div class=\"caption\"><span>Interface Summary</span></div>");
checkOutput("pkg2/package-summary.html", true,
"<div class=\"caption\"><span>Enum Summary</span></div>",
"<div class=\"caption\"><span>Annotation Types Summary</span></div>");
"<div class=\"caption\"><span>Enum Class Summary</span></div>",
"<div class=\"caption\"><span>Annotation Interfaces Summary</span></div>");
// Class documentation
checkOutput("pkg1/C1.html", true,
@ -373,7 +373,7 @@ public class TestHtmlTableTags extends JavadocTester {
checkOutput("pkg2/class-use/C2.ModalExclusionType.html", true,
"""
<div class="caption"><span>Methods in <a href="../package-summary.html">pkg2</a> that return\
<a href="../C2.ModalExclusionType.html" title="enum in pkg2">C2.ModalExclusionT\
<a href="../C2.ModalExclusionType.html" title="enum class in pkg2">C2.ModalExclusionT\
ype</a></span></div>""");
// Package use documentation
@ -421,10 +421,10 @@ public class TestHtmlTableTags extends JavadocTester {
checkOutput("pkg2/package-summary.html", true,
"""
<div class="table-header col-first">Enum</div>
<div class="table-header col-first">Enum Class</div>
<div class="table-header col-last">Description</div>""",
"""
<div class="table-header col-first">Annotation Type</div>
<div class="table-header col-first">Annotation Interface</div>
<div class="table-header col-last">Description</div>""");
// Class documentation
@ -558,7 +558,7 @@ public class TestHtmlTableTags extends JavadocTester {
checkOutput("pkg2/package-summary.html", true,
"""
<div class="col-first even-row-color"><a href="C2.ModalExclusionType.html" title="enum in pkg2">C2.ModalExclusionType</a></div>
<div class="col-first even-row-color"><a href="C2.ModalExclusionType.html" title="enum class in pkg2">C2.ModalExclusionType</a></div>
<div class="col-last even-row-color">
<div class="block">A sample enum.</div>
</div>""",
@ -715,7 +715,7 @@ public class TestHtmlTableTags extends JavadocTester {
checkOutput("pkg2/package-summary.html", true,
"""
<div class="col-first even-row-color"><a href="C2.ModalExclusionType.html" title="enum in pkg2">C2.ModalExclusionType</a></div>
<div class="col-first even-row-color"><a href="C2.ModalExclusionType.html" title="enum class in pkg2">C2.ModalExclusionType</a></div>
<div class="col-last even-row-color"></div>""",
"""
<div class="col-first even-row-color"><a href="C3.html" title="annotation in pkg2">C3</a></div>

18
test/langtools/jdk/javadoc/doclet/testHtmlVersion/TestHtmlVersion.java
View File

@ -144,10 +144,10 @@ public class TestHtmlVersion extends JavadocTester {
<h2 title="Interface Hierarchy">Interface Hierarchy</h2>""",
"""
<section class="hierarchy">
<h2 title="Annotation Type Hierarchy">Annotation Type Hierarchy</h2>""",
<h2 title="Annotation Interface Hierarchy">Annotation Interface Hierarchy</h2>""",
"""
<section class="hierarchy">
<h2 title="Enum Hierarchy">Enum Hierarchy</h2>""",
<h2 title="Enum Class Hierarchy">Enum Class Hierarchy</h2>""",
"""
<footer role="contentinfo">""",
"""
@ -272,11 +272,11 @@ public class TestHtmlVersion extends JavadocTester {
""",
"""
<section class="hierarchy">
<h2 title="Annotation Type Hierarchy">Annotation Type Hierarchy</h2>
<h2 title="Annotation Interface Hierarchy">Annotation Interface Hierarchy</h2>
""",
"""
<section class="hierarchy">
<h2 title="Enum Hierarchy">Enum Hierarchy</h2>
<h2 title="Enum Class Hierarchy">Enum Class Hierarchy</h2>
""",
"""
<footer role="contentinfo">""",
@ -534,19 +534,19 @@ public class TestHtmlVersion extends JavadocTester {
<!-- ======== START OF CLASS DATA ======== -->
<div class="header">""",
"""
<section class="member-summary" id="annotation.type.required.element.summary">
<section class="member-summary" id="annotation.interface.required.element.summary">
<h2>Required Element Summary</h2>
<div class="caption"><span>Required Elements</span></div>
<div class="summary-table three-column-summary">""",
"""
<section class="member-summary" id="annotation.type.optional.element.summary">
<section class="member-summary" id="annotation.interface.optional.element.summary">
<h2>Optional Element Summary</h2>
<div class="caption"><span>Optional Elements</span></div>
<div class="summary-table three-column-summary">""",
"""
<section class="details" id="annotation.type.element.detail">
<section class="details" id="annotation.interface.element.detail">
<ul class="details-list">
<!-- ============ ANNOTATION TYPE MEMBER DETAIL =========== -->
<!-- ============ ANNOTATION INTERFACE MEMBER DETAIL =========== -->
<li>
<section class="member-details">
<h2>Element Details</h2>
@ -759,7 +759,7 @@ public class TestHtmlVersion extends JavadocTester {
<h2 title="Interface Hierarchy">Interface Hierarchy</h2>""",
"""
</ul>
<h2 title="Enum Hierarchy">Enum Hierarchy</h2>""");
<h2 title="Enum Class Hierarchy">Enum Class Hierarchy</h2>""");
// Negated test for index-all page
checkOutput("index-all.html", false,

8
test/langtools/jdk/javadoc/doclet/testIndex/TestIndex.java
View File

@ -60,11 +60,11 @@ public class TestIndex extends JavadocTester {
>""",
"""
<a href="pkg/AnnotationType.html" title="annotation in pkg"><span class="type-na\
me-link">AnnotationType</span></a> - Annotation Type in <a href="pkg/package-sum\
me-link">AnnotationType</span></a> - Annotation Interface in <a href="pkg/package-sum\
mary.html">pkg</a>""",
"""
<a href="pkg/Coin.html" title="enum in pkg"><span class="type-name-link">Coin</s\
pan></a> - Enum in <a href="pkg/package-summary.html">pkg</a>""",
<a href="pkg/Coin.html" title="enum class in pkg"><span class="type-name-link">Coin</s\
pan></a> - Enum Class in <a href="pkg/package-summary.html">pkg</a>""",
"""
Class in <a href="package-summary.html">&lt;Unnamed&gt;</a>""",
"""
@ -77,6 +77,6 @@ public class TestIndex extends JavadocTester {
<dd>&nbsp;</dd>
</dl>""",
"""
<dt><span class="search-tag-link"><a href="pkg/Coin.html#Enum">Enum</a></span> - Search tag in enum pkg.Coin</dt>""");
<dt><span class="search-tag-link"><a href="pkg/Coin.html#Enum">Enum</a></span> - Search tag in enum class pkg.Coin</dt>""");
}
}

6
test/langtools/jdk/javadoc/doclet/testLists/TestLists.java
View File

@ -171,7 +171,7 @@ public class TestLists extends JavadocTester {
checkOutput("p/A.html", true,
"""
<ul class="details-list">
<!-- ============ ANNOTATION TYPE MEMBER DETAIL =========== -->
<!-- ============ ANNOTATION INTERFACE MEMBER DETAIL =========== -->
<li>
<section class="member-details">
<h2>Element Details</h2>
@ -240,9 +240,9 @@ public class TestLists extends JavadocTester {
"""
<section class="summary">
<ul class="summary-list">
<!-- =========== ANNOTATION TYPE REQUIRED MEMBER SUMMARY =========== -->
<!-- =========== ANNOTATION INTERFACE REQUIRED MEMBER SUMMARY =========== -->
<li>
<section class="member-summary" id="annotation.type.required.element.summary">
<section class="member-summary" id="annotation.interface.required.element.summary">
<h2>Required Element Summary</h2>
<div class="caption"><span>Required Elements</span></div>
<div class="summary-table three-column-summary">""");

2
test/langtools/jdk/javadoc/doclet/testModules/TestModules.java
View File

@ -1383,7 +1383,7 @@ public class TestModules extends JavadocTester {
<button id="all-classes-table-tab6" role="tab" aria-selected="false" aria-contro\
ls="all-classes-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" oncli\
ck="show('all-classes-table', 'all-classes-table-tab6', 2)" class="table-tab">An\
notation Types Summary</button>\
notation Interfaces Summary</button>\
</div>
""",
"""

16
test/langtools/jdk/javadoc/doclet/testNewLanguageFeatures/TestNewLanguageFeatures.java
View File

@ -65,31 +65,31 @@ public class TestNewLanguageFeatures extends JavadocTester {
void checkEnums() {
checkOutput("pkg/Coin.html", true,
// Make sure enum header is correct.
"Enum Coin</h1>",
"Enum Class Coin</h1>",
// Make sure enum signature is correct.
"""
<div class="type-signature"><span class="modifiers">public enum </span><span clas\
s="element-name type-name-label">Coin</span>
<span class="extends-implements">extends java.lang.Enum&lt;<a href="Coin.html" ti\
tle="enum in pkg">Coin</a>&gt;</span></div>""",
tle="enum class in pkg">Coin</a>&gt;</span></div>""",
// Check for enum constant section
"<div class=\"caption\"><span>Enum Constants</span></div>",
// Detail for enum constant
"""
<span class="member-name-link"><a href="#Dime">Dime</a></span>""",
// Automatically insert documentation for values() and valueOf().
"Returns an array containing the constants of this enum type,",
"Returns the enum constant of this type with the specified name",
"Returns an array containing the constants of this enum class,",
"Returns the enum constant of this class with the specified name",
"Overloaded valueOf() method has correct documentation.",
"Overloaded values method has correct documentation.",
"""
<div class="member-signature"><span class="modifiers">public static</span>&nbsp;\
<span class="return-type"><a href="Coin.html" title="enum in pkg">Coin</a></span\
<span class="return-type"><a href="Coin.html" title="enum class in pkg">Coin</a></span\
>&nbsp;<span class="element-name">valueOf</span>&#8203;<span class="parameters">(java.la\
ng.String&nbsp;name)</span></div>
<div class="block">Returns the enum constant of this type with the specified name.
<div class="block">Returns the enum constant of this class with the specified name.
The string must match <i>exactly</i> an identifier used to declare an
enum constant in this type. (Extraneous whitespace characters are\s
enum constant in this class. (Extraneous whitespace characters are\s
not permitted.)</div>
<dl class="notes">
<dt>Parameters:</dt>
@ -97,7 +97,7 @@ public class TestNewLanguageFeatures extends JavadocTester {
<dt>Returns:</dt>
<dd>the enum constant with the specified name</dd>
<dt>Throws:</dt>
<dd><code>java.lang.IllegalArgumentException</code> - if this enum type has no constant with the specified name</dd>
<dd><code>java.lang.IllegalArgumentException</code> - if this enum class has no constant with the specified name</dd>
<dd><code>java.lang.NullPointerException</code> - if the argument is null</dd>""");
// NO constructor section

4
test/langtools/jdk/javadoc/doclet/testOptions/TestOptions.java
View File

@ -262,12 +262,12 @@ public class TestOptions extends JavadocTester {
checkOutput("linksource/SomeEnum.html", true,
"""
<div class="member-signature"><span class="modifiers">public static final</span>\
&nbsp;<span class="return-type"><a href="SomeEnum.html" title="enum in linksourc\
&nbsp;<span class="return-type"><a href="SomeEnum.html" title="enum class in linksourc\
e">SomeEnum</a></span>&nbsp;<span class="element-name"><a href="../src-html/linksource/S\
omeEnum.html#line.29">VALUE1</a></span></div>""",
"""
<div class="member-signature"><span class="modifiers">public static final</span>\
&nbsp;<span class="return-type"><a href="SomeEnum.html" title="enum in linksourc\
&nbsp;<span class="return-type"><a href="SomeEnum.html" title="enum class in linksourc\
e">SomeEnum</a></span>&nbsp;<span class="element-name"><a href="../src-html/linksource/S\
omeEnum.html#line.30">VALUE2</a></span></div>""");

80
test/langtools/jdk/javadoc/doclet/testOrdering/TestOrdering.java
View File

@ -249,9 +249,9 @@ public class TestOrdering extends JavadocTester {
String expectedEnumOrdering[] = {
"""
Add.add.html" title="enum in REPLACE_ME\"""",
Add.add.html" title="enum class in REPLACE_ME\"""",
"""
Add.ADD.html" title="enum in REPLACE_ME\""""
Add.ADD.html" title="enum class in REPLACE_ME\""""
};
String expectedFieldOrdering[] = {
@ -397,78 +397,78 @@ public class TestOrdering extends JavadocTester {
checkOrder("index-all.html", composeTestVectors());
checkOrder("add0/add/package-tree.html",
"""
<a href="Add.add.html" title="enum in add0.add">""",
<a href="Add.add.html" title="enum class in add0.add">""",
"""
<a href="Add.ADD.html" title="enum in add0.add">""");
<a href="Add.ADD.html" title="enum class in add0.add">""");
checkOrder("overview-tree.html",
"""
<a href="Add.add.html" title="enum in &lt;Unnamed&gt;">""",
<a href="Add.add.html" title="enum class in &lt;Unnamed&gt;">""",
"""
<a href="add0/Add.add.html" title="enum in add0">""",
<a href="add0/Add.add.html" title="enum class in add0">""",
"""
<a href="add0/add/Add.add.html" title="enum in add0.add">""",
<a href="add0/add/Add.add.html" title="enum class in add0.add">""",
"""
<a href="add0/add/add/Add.add.html" title="enum in add0.add.add">""",
<a href="add0/add/add/Add.add.html" title="enum class in add0.add.add">""",
"""
<a href="add0/add/add/add/Add.add.html" title="enum in add0.add.add.add">""",
<a href="add0/add/add/add/Add.add.html" title="enum class in add0.add.add.add">""",
"""
<a href="add1/Add.add.html" title="enum in add1">""",
<a href="add1/Add.add.html" title="enum class in add1">""",
"""
<a href="add1/add/Add.add.html" title="enum in add1.add">""",
<a href="add1/add/Add.add.html" title="enum class in add1.add">""",
"""
<a href="add1/add/add/Add.add.html" title="enum in add1.add.add">""",
<a href="add1/add/add/Add.add.html" title="enum class in add1.add.add">""",
"""
<a href="add1/add/add/add/Add.add.html" title="enum in add1.add.add.add">""",
<a href="add1/add/add/add/Add.add.html" title="enum class in add1.add.add.add">""",
"""
<a href="add2/Add.add.html" title="enum in add2">""",
<a href="add2/Add.add.html" title="enum class in add2">""",
"""
<a href="add2/add/Add.add.html" title="enum in add2.add">""",
<a href="add2/add/Add.add.html" title="enum class in add2.add">""",
"""
<a href="add2/add/add/Add.add.html" title="enum in add2.add.add">""",
<a href="add2/add/add/Add.add.html" title="enum class in add2.add.add">""",
"""
<a href="add2/add/add/add/Add.add.html" title="enum in add2.add.add.add">""",
<a href="add2/add/add/add/Add.add.html" title="enum class in add2.add.add.add">""",
"""
<a href="add3/Add.add.html" title="enum in add3">""",
<a href="add3/Add.add.html" title="enum class in add3">""",
"""
<a href="add3/add/Add.add.html" title="enum in add3.add">""",
<a href="add3/add/Add.add.html" title="enum class in add3.add">""",
"""
<a href="add3/add/add/Add.add.html" title="enum in add3.add.add">""",
<a href="add3/add/add/Add.add.html" title="enum class in add3.add.add">""",
"""
<a href="add3/add/add/add/Add.add.html" title="enum in add3.add.add.add">""",
<a href="add3/add/add/add/Add.add.html" title="enum class in add3.add.add.add">""",
"""
<a href="Add.ADD.html" title="enum in &lt;Unnamed&gt;">""",
<a href="Add.ADD.html" title="enum class in &lt;Unnamed&gt;">""",
"""
<a href="add0/Add.ADD.html" title="enum in add0">""",
<a href="add0/Add.ADD.html" title="enum class in add0">""",
"""
<a href="add0/add/Add.ADD.html" title="enum in add0.add">""",
<a href="add0/add/Add.ADD.html" title="enum class in add0.add">""",
"""
<a href="add0/add/add/Add.ADD.html" title="enum in add0.add.add">""",
<a href="add0/add/add/Add.ADD.html" title="enum class in add0.add.add">""",
"""
<a href="add0/add/add/add/Add.ADD.html" title="enum in add0.add.add.add">""",
<a href="add0/add/add/add/Add.ADD.html" title="enum class in add0.add.add.add">""",
"""
<a href="add1/Add.ADD.html" title="enum in add1">""",
<a href="add1/Add.ADD.html" title="enum class in add1">""",
"""
<a href="add1/add/Add.ADD.html" title="enum in add1.add">""",
<a href="add1/add/Add.ADD.html" title="enum class in add1.add">""",
"""
<a href="add1/add/add/Add.ADD.html" title="enum in add1.add.add">""",
<a href="add1/add/add/Add.ADD.html" title="enum class in add1.add.add">""",
"""
<a href="add1/add/add/add/Add.ADD.html" title="enum in add1.add.add.add">""",
<a href="add1/add/add/add/Add.ADD.html" title="enum class in add1.add.add.add">""",
"""
<a href="add2/Add.ADD.html" title="enum in add2">""",
<a href="add2/Add.ADD.html" title="enum class in add2">""",
"""
<a href="add2/add/Add.ADD.html" title="enum in add2.add">""",
<a href="add2/add/Add.ADD.html" title="enum class in add2.add">""",
"""
<a href="add2/add/add/Add.ADD.html" title="enum in add2.add.add">""",
<a href="add2/add/add/Add.ADD.html" title="enum class in add2.add.add">""",
"""
<a href="add2/add/add/add/Add.ADD.html" title="enum in add2.add.add.add">""",
<a href="add2/add/add/add/Add.ADD.html" title="enum class in add2.add.add.add">""",
"""
<a href="add3/Add.ADD.html" title="enum in add3">""",
<a href="add3/Add.ADD.html" title="enum class in add3">""",
"""
<a href="add3/add/Add.ADD.html" title="enum in add3.add">""",
<a href="add3/add/Add.ADD.html" title="enum class in add3.add">""",
"""
<a href="add3/add/add/Add.ADD.html" title="enum in add3.add.add">""",
<a href="add3/add/add/Add.ADD.html" title="enum class in add3.add.add">""",
"""
<a href="add3/add/add/add/Add.ADD.html" title="enum in add3.add.add.add">""");
<a href="add3/add/add/add/Add.ADD.html" title="enum class in add3.add.add.add">""");
}
void emitFile(String pkgname, String clsname, ListOrder order) throws IOException {
@ -558,9 +558,9 @@ public class TestOrdering extends JavadocTester {
checkOrder("index-all.html",
"something</a> - package something</dt>",
"something</span></a> - Class in",
"something</span></a> - Enum in",
"something</span></a> - Enum Class in",
"something</span></a> - Interface in",
"something</span></a> - Annotation Type in",
"something</span></a> - Annotation Interface in",
"something</a></span> - Variable in class",
"something()</a></span> - Constructor",
"""

223
test/langtools/jdk/javadoc/doclet/testOverriddenMethods/TestOverrideMethods.java
View File

@ -23,7 +23,7 @@
/*
* @test
* @bug 8157000 8192850 8182765
* @bug 8157000 8192850 8182765 8223607
* @summary test the behavior of --override-methods option
* @library ../../lib
* @modules jdk.javadoc/jdk.javadoc.internal.tool
@ -304,14 +304,14 @@ public class TestOverrideMethods extends JavadocTester {
<a href="pkg5/Classes.C.html#m7()">m7()</a>""",
"""
<a href="pkg5/Classes.GP.html#m7()">m7()</a>""",
"Returns the enum constant of this type with the specified name.",
"Returns the enum constant of this class with the specified name.",
"""
Returns an array containing the constants of this enum type, in
Returns an array containing the constants of this enum class, in
the order they are declared."""
);
// Check methods with covariant return types
// Only m2 should be shown in summary; m1 and m3 should listed as declared in Base
// Check methods with covariant return types, changes in modifiers or thrown exceptions.
// Only those should be shown in summary; m1, m3, m9 should listed as declared in Base
checkOutput("pkg6/Sub.html", true,
"""
<div class="summary-table three-column-summary" aria-labelledby="method-summary-table-tab0">
@ -326,13 +326,224 @@ public class TestOverrideMethods extends JavadocTester {
<div class="col-last even-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table">
<div class="block">This is Base::m2.</div>
</div>
<div class="col-first odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code>void</code></div>
<div class="col-second odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code><span class="member-name-link"><a href="#m4()">m4</a></span>()</code></div>
<div class="col-last odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table">
<div class="block">This is Base::m4.</div>
</div>
<div class="col-first even-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code>java.lang.Object</code></div>
<div class="col-second even-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code><span class="member-name-link"><a href="#m5()">m5</a></span>()</code></div>
<div class="col-last even-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table">
<div class="block">This is Base::m5.</div>
</div>
<div class="col-first odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code>java.lang.Object</code></div>
<div class="col-second odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code><span class="member-name-link"><a href="#m6()">m6</a></span>()</code></div>
<div class="col-last odd-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table">
<div class="block">This is Base::m6.</div>
</div>
<div class="col-first even-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code>java.lang.Object</code></div>
<div class="col-second even-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table"><code><span class="member-name-link"><a href="#m7()">m7</a></span>()</code></div>
<div class="col-last even-row-color method-summary-table-tab2 method-summary-table-tab4 method-summary-table">
<div class="block">This is Base::m7.</div>
</div>
<div class="col-first odd-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code>abstract java.lang.Object</code></div>
<div class="col-second odd-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3"><code><span class="member-name-link"><a href="#m8()">m8</a></span>()</code></div>
<div class="col-last odd-row-color method-summary-table-tab2 method-summary-table method-summary-table-tab3">
<div class="block">This is Base::m8.</div>
</div>
""",
"""
<div class="inherited-list">
<h3 id="methods.inherited.from.class.pkg6.Base">Methods declared in class&nbsp;p\
kg6.<a href="Base.html" title="class in pkg6">Base</a></h3>
<code><a href="Base.html#m1()">m1</a>, <a href="Base.html#m3()">m3</a></code></div>
<code><a href="Base.html#m1()">m1</a>, <a href="Base.html#m3()">m3</a>, <a href="Base.html#m9()">m9</a></code></div>
""");
}
@Test
public void testSummaryAnnotations() {
javadoc("-d", "out-summary-annotations",
"-sourcepath", testSrc,
"--no-platform-links",
"-javafx",
"--disable-javafx-strict-checks",
"--override-methods=summary",
"-private",
"pkg7");
checkExit(Exit.OK);
checkOutput("pkg7/AnnotatedSub1.html", true,
"""
<div class="inherited-list">
<h3 id="methods.inherited.from.class.pkg7.AnnotatedBase">Methods declared in int\
erface&nbsp;pkg7.<a href="AnnotatedBase.html" title="interface in pkg7">Annotate\
dBase</a></h3>
<code><a href="AnnotatedBase.html#m1(java.lang.Class,int%5B%5D)">m1</a></code></div>""");
checkOutput("pkg7/AnnotatedSub2.html", true,
"""
<div class="member-signature"><span class="annotations"><a href="A.html" title="\
annotation in pkg7">@A</a>
</span><span class="return-type"><a href="A.html" title="annotation in pkg7">@A<\
/a> java.lang.Iterable&lt;java.lang.String&gt;</span>&nbsp;<span class="element-\
name">m1</span>&#8203;<span class="parameters">(java.lang.Class&lt;? extends jav\
a.lang.CharSequence&gt;&nbsp;p1,
int[]&nbsp;p2)</span></div>
<div class="block"><span class="descfrm-type-label">Description copied from inte\
rface:&nbsp;<code><a href="AnnotatedBase.html#m1(java.lang.Class,int%5B%5D)">Ann\
otatedBase</a></code></span></div>
<div class="block">This is AnnotatedBase::m1.</div>
<dl class="notes">
<dt>Specified by:</dt>
<dd><code><a href="AnnotatedBase.html#m1(java.lang.Class,int%5B%5D)">m1</a></cod\
e>&nbsp;in interface&nbsp;<code><a href="AnnotatedBase.html" title="interface in\
pkg7">AnnotatedBase</a></code></dd>
<dt>Parameters:</dt>
<dd><code>p1</code> - first parameter</dd>
<dd><code>p2</code> - second parameter</dd>
<dt>Returns:</dt>
<dd>something</dd>
</dl>""");
checkOutput("pkg7/AnnotatedSub3.html", true,
"""
<div class="member-signature"><span class="annotations"><a href="A.html" title="\
annotation in pkg7">@A</a>
</span><span class="return-type"><a href="A.html" title="annotation in pkg7">@A<\
/a> java.lang.Iterable&lt;java.lang.String&gt;</span>&nbsp;<span class="element-\
name">m1</span>&#8203;<span class="parameters">(java.lang.Class&lt;? extends jav\
a.lang.CharSequence&gt;&nbsp;p1,
int[]&nbsp;p2)</span></div>
<div class="block"><span class="descfrm-type-label">Description copied from inte\
rface:&nbsp;<code><a href="AnnotatedBase.html#m1(java.lang.Class,int%5B%5D)">Ann\
otatedBase</a></code></span></div>
<div class="block">This is AnnotatedBase::m1.</div>
<dl class="notes">
<dt>Specified by:</dt>
<dd><code><a href="AnnotatedBase.html#m1(java.lang.Class,int%5B%5D)">m1</a></cod\
e>&nbsp;in interface&nbsp;<code><a href="AnnotatedBase.html" title="interface in\
pkg7">AnnotatedBase</a></code></dd>
<dt>Parameters:</dt>
<dd><code>p1</code> - first parameter</dd>
<dd><code>p2</code> - second parameter</dd>
<dt>Returns:</dt>
<dd>something</dd>
</dl>""");
checkOutput("pkg7/AnnotatedSub4.html", true,
"""
<div class="member-signature"><span class="return-type">java.lang.Iterable&lt;<a\
href="A.html" title="annotation in pkg7">@A</a> java.lang.String&gt;</span>&nbs\
p;<span class="element-name">m1</span>&#8203;<span class="parameters">(java.lang\
.Class&lt;? extends java.lang.CharSequence&gt;&nbsp;p1,
int[]&nbsp;p2)</span></div>
<div class="block"><span class="descfrm-type-label">Description copied from inte\
rface:&nbsp;<code><a href="AnnotatedBase.html#m1(java.lang.Class,int%5B%5D)">Ann\
otatedBase</a></code></span></div>
<div class="block">This is AnnotatedBase::m1.</div>
<dl class="notes">
<dt>Specified by:</dt>
<dd><code><a href="AnnotatedBase.html#m1(java.lang.Class,int%5B%5D)">m1</a></cod\
e>&nbsp;in interface&nbsp;<code><a href="AnnotatedBase.html" title="interface in\
pkg7">AnnotatedBase</a></code></dd>
<dt>Parameters:</dt>
<dd><code>p1</code> - first parameter</dd>
<dd><code>p2</code> - second parameter</dd>
<dt>Returns:</dt>
<dd>something</dd>
</dl>""");
checkOutput("pkg7/AnnotatedSub5.html", true,
"""
<div class="member-signature"><span class="return-type">java.lang.Iterable&lt;ja\
va.lang.String&gt;</span>&nbsp;<span class="element-name">m1</span>&#8203;<span \
class="parameters">(<a href="A.html" title="annotation in pkg7">@A</a>
<a href="A.html" title="annotation in pkg7">@A</a> java.lang.Class&lt;? extends\
java.lang.CharSequence&gt;&nbsp;p1,
int[]&nbsp;p2)</span></div>
<div class="block"><span class="descfrm-type-label">Description copied from inte\
rface:&nbsp;<code><a href="AnnotatedBase.html#m1(java.lang.Class,int%5B%5D)">Ann\
otatedBase</a></code></span></div>
<div class="block">This is AnnotatedBase::m1.</div>
<dl class="notes">
<dt>Specified by:</dt>
<dd><code><a href="AnnotatedBase.html#m1(java.lang.Class,int%5B%5D)">m1</a></cod\
e>&nbsp;in interface&nbsp;<code><a href="AnnotatedBase.html" title="interface in\
pkg7">AnnotatedBase</a></code></dd>
<dt>Parameters:</dt>
<dd><code>p1</code> - first parameter</dd>
<dd><code>p2</code> - second parameter</dd>
<dt>Returns:</dt>
<dd>something</dd>
</dl>""");
checkOutput("pkg7/AnnotatedSub6.html", true,
"""
<div class="member-signature"><span class="return-type">java.lang.Iterable&lt;ja\
va.lang.String&gt;</span>&nbsp;<span class="element-name">m1</span>&#8203;<span \
class="parameters">(java.lang.Class&lt;<a href="A.html" title="annotation in pkg\
7">@A</a> ? extends java.lang.CharSequence&gt;&nbsp;p1,
int[]&nbsp;p2)</span></div>
<div class="block"><span class="descfrm-type-label">Description copied from inte\
rface:&nbsp;<code><a href="AnnotatedBase.html#m1(java.lang.Class,int%5B%5D)">Ann\
otatedBase</a></code></span></div>
<div class="block">This is AnnotatedBase::m1.</div>
<dl class="notes">
<dt>Specified by:</dt>
<dd><code><a href="AnnotatedBase.html#m1(java.lang.Class,int%5B%5D)">m1</a></cod\
e>&nbsp;in interface&nbsp;<code><a href="AnnotatedBase.html" title="interface in\
pkg7">AnnotatedBase</a></code></dd>
<dt>Parameters:</dt>
<dd><code>p1</code> - first parameter</dd>
<dd><code>p2</code> - second parameter</dd>
<dt>Returns:</dt>
<dd>something</dd>
</dl>""");
checkOutput("pkg7/AnnotatedSub7.html", true,
"""
<div class="member-signature"><span class="return-type">java.lang.Iterable&lt;ja\
va.lang.String&gt;</span>&nbsp;<span class="element-name">m1</span>&#8203;<span \
class="parameters">(java.lang.Class&lt;? extends <a href="A.html" title="annotat\
ion in pkg7">@A</a> java.lang.CharSequence&gt;&nbsp;p1,
int[]&nbsp;p2)</span></div>
<div class="block"><span class="descfrm-type-label">Description copied from inte\
rface:&nbsp;<code><a href="AnnotatedBase.html#m1(java.lang.Class,int%5B%5D)">Ann\
otatedBase</a></code></span></div>
<div class="block">This is AnnotatedBase::m1.</div>
<dl class="notes">
<dt>Specified by:</dt>
<dd><code><a href="AnnotatedBase.html#m1(java.lang.Class,int%5B%5D)">m1</a></cod\
e>&nbsp;in interface&nbsp;<code><a href="AnnotatedBase.html" title="interface in\
pkg7">AnnotatedBase</a></code></dd>
<dt>Parameters:</dt>
<dd><code>p1</code> - first parameter</dd>
<dd><code>p2</code> - second parameter</dd>
<dt>Returns:</dt>
<dd>something</dd>
</dl>""");
checkOutput("pkg7/AnnotatedSub8.html", true,
"""
<div class="member-signature"><span class="return-type">java.lang.Iterable&lt;ja\
va.lang.String&gt;</span>&nbsp;<span class="element-name">m1</span>&#8203;<span \
class="parameters">(java.lang.Class&lt;? extends java.lang.CharSequence&gt;&nbsp;p1,
int <a href="A.html" title="annotation in pkg7">@A</a> []&nbsp;p2)</span></div>
<div class="block"><span class="descfrm-type-label">Description copied from inte\
rface:&nbsp;<code><a href="AnnotatedBase.html#m1(java.lang.Class,int%5B%5D)">Ann\
otatedBase</a></code></span></div>
<div class="block">This is AnnotatedBase::m1.</div>
<dl class="notes">
<dt>Specified by:</dt>
<dd><code><a href="AnnotatedBase.html#m1(java.lang.Class,int%5B%5D)">m1</a></cod\
e>&nbsp;in interface&nbsp;<code><a href="AnnotatedBase.html" title="interface in\
pkg7">AnnotatedBase</a></code></dd>
<dt>Parameters:</dt>
<dd><code>p1</code> - first parameter</dd>
<dd><code>p2</code> - second parameter</dd>
<dt>Returns:</dt>
<dd>something</dd>
</dl>""");
}
}

42
test/langtools/jdk/javadoc/doclet/testOverriddenMethods/pkg6/Base.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2019, 2020, 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,21 +23,55 @@
package pkg6;
import java.io.IOException;
public class Base<T> {
/**
* This is Base::m1.
* @return something
* */
*/
public Object m1() { }
/**
* This is Base::m2.
* @return something
* */
*/
public Object m2() { }
/**
* This is Base::m3.
* @return something
* */
*/
public T m3() { }
/**
* This is Base::m4.
*/
protected void m4() { }
/**
* This is Base::m5.
* @throws IOException an error
*/
public Object m5() throws IOException { }
/**
* This is Base::m6.
*/
public Object m6() { }
/**
* This is Base::m7.
*/
public abstract Object m7();
/**
* This is Base::m8.
*/
public Object m8() { }
/**
* This is Base::m9.
*/
public abstract Object m9();
}

20
test/langtools/jdk/javadoc/doclet/testOverriddenMethods/pkg6/Sub.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2019, 2020, 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
@ -33,5 +33,23 @@ public class Sub<T> extends Base<T> {
// not a covariant override
@Override
public T m3() { }
// change visibility to public
@Override
public void m4() { }
// drop checked exception
@Override
public Object m5() { }
// add final modifier
@Override
public final Object m6() { }
// implement abstract method
@Override
public Object m7() { }
// override concrete method as abstract
@Override
public abstract Object m8();
// override abstract method unchanged
@Override
public abstract Object m9();
}

87
test/langtools/jdk/javadoc/doclet/testOverriddenMethods/pkg7/Annotated.java Normal file
View File

@ -0,0 +1,87 @@
/*
* Copyright (c) 2020, 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 pkg7;
import java.lang.annotation.Documented;
import java.lang.annotation.Target;
import java.lang.annotation.ElementType;
// Adding documented annotations anywhere in the signature of an overriding
// method should cause it to be included in the details section even with
// --override-methods=summary option.
interface AnnotatedBase {
/**
* This is AnnotatedBase::m1.
* @param p1 first parameter
* @param p2 second parameter
* @return something
*/
public Iterable<String> m1(Class<? extends CharSequence> p1, int[] p2);
}
interface AnnotatedSub1 extends AnnotatedBase {
@Override
public Iterable<String> m1(Class<? extends CharSequence> p1, int[] p2);
}
interface AnnotatedSub2 extends AnnotatedBase {
@Override
@A
public Iterable<String> m1(Class<? extends CharSequence> p1, int[] p2);
}
interface AnnotatedSub3 extends AnnotatedBase {
@Override
public @A Iterable<String> m1(Class<? extends CharSequence> p1, int[] p2);
}
interface AnnotatedSub4 extends AnnotatedBase {
@Override
public Iterable<@A String> m1(Class<? extends CharSequence> p1, int[] p2);
}
interface AnnotatedSub5 extends AnnotatedBase {
@Override
public Iterable<String> m1(@A Class<? extends CharSequence> p1, int[] p2);
}
interface AnnotatedSub6 extends AnnotatedBase {
@Override
public Iterable<String> m1(Class<@A ? extends CharSequence> p1, int[] p2);
}
interface AnnotatedSub7 extends AnnotatedBase {
@Override
public Iterable<String> m1(Class<? extends @A CharSequence> p1, int[] p2);
}
interface AnnotatedSub8 extends AnnotatedBase {
@Override
public Iterable<String> m1(Class<? extends CharSequence> p1, int @A [] p2);
}
@Target({ElementType.METHOD, ElementType.PARAMETER, ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
@Documented
@interface A {}

2
test/langtools/jdk/javadoc/doclet/testRecordLinks/TestRecordLinks.java
View File

@ -87,7 +87,7 @@ public class TestRecordLinks extends JavadocTester {
checkOutput("example/JavadocTest.Bar.html", true,
"""
<h1 title="Record JavadocTest.Bar" class="title">Record JavadocTest.Bar</h1>
<h1 title="Record Class JavadocTest.Bar" class="title">Record Class JavadocTest.Bar</h1>
""",
"""
<div class="block"><a href="#bar()"><code>bar()</code></a>

36
test/langtools/jdk/javadoc/doclet/testRecordTypes/TestRecordTypes.java
View File

@ -73,7 +73,7 @@ public class TestRecordTypes extends JavadocTester {
checkOutput("R.html", true,
"""
<h1 title="Record R" class="title">Record R</h1>""",
<h1 title="Record Class R" class="title">Record Class R</h1>""",
"""
<span class="modifiers">public record </span><span class="element-name type-name-label">R</span>""",
"""
@ -94,7 +94,7 @@ public class TestRecordTypes extends JavadocTester {
checkOutput("p/R.html", true,
"""
<h1 title="Record R" class="title">Record R</h1>""",
<h1 title="Record Class R" class="title">Record Class R</h1>""",
"""
<span class="modifiers">public record </span><span class="element-name type-name-label">R</span>""",
"""
@ -115,7 +115,7 @@ public class TestRecordTypes extends JavadocTester {
checkOutput("p/R.html", true,
"""
<h1 title="Record R" class="title">Record R</h1>""",
<h1 title="Record Class R" class="title">Record Class R</h1>""",
"""
<span class="modifiers">public record </span><span class="element-name type-name-label">R</span>""",
"""
@ -140,7 +140,7 @@ public class TestRecordTypes extends JavadocTester {
checkOutput("p/R.html", true,
"""
<h1 title="Record R" class="title">Record R</h1>""",
<h1 title="Record Class R" class="title">Record Class R</h1>""",
"""
<span class="modifiers">public record </span><span class="element-name type-name-label">R</span>""",
"""
@ -171,7 +171,7 @@ public class TestRecordTypes extends JavadocTester {
checkOutput("p/R.html", true,
"""
<h1 title="Record R" class="title">Record R&lt;T&gt;</h1>""",
<h1 title="Record Class R" class="title">Record Class R&lt;T&gt;</h1>""",
"""
<span class="modifiers">public record </span><span class="element-name type-name-label">R&lt;T&gt;</span>""",
"""
@ -208,7 +208,7 @@ public class TestRecordTypes extends JavadocTester {
"""
<section class="constructor-summary" id="constructor.summary">""",
"<a href=\"#%3Cinit%3E(int)\">R</a>",
"Creates an instance of a <code>R</code> record.",
"Creates an instance of a <code>R</code> record class.",
"""
<section class="method-summary" id="method.summary">""",
"""
@ -223,12 +223,12 @@ public class TestRecordTypes extends JavadocTester {
Returns the value of the <a href="#param-r1"><code>r1</code></a> record component.""",
"""
<a href="#toString()">toString</a>""",
"Returns a string representation of this record.",
"Returns a string representation of this record class.",
"Method Details",
"""
<span class="element-name">toString</span>""",
"Returns a string representation of this record. The representation "
+ "contains the name of the type, followed by the name and value of "
"Returns a string representation of this record class. The representation "
+ "contains the name of the class, followed by the name and value of "
+ "each of the record components.",
"""
<span class="element-name">hashCode</span>""",
@ -239,7 +239,7 @@ public class TestRecordTypes extends JavadocTester {
"""
Indicates whether some other object is "equal to" this one. The objects are equa\
l if the other object is of the same class and if all the record components are \
equal. All components in this record are compared with '=='.""",
equal. All components in this record class are compared with '=='.""",
"""
<span class="element-name">r1</span>""",
"""
@ -271,7 +271,7 @@ public class TestRecordTypes extends JavadocTester {
"""
<section class="constructor-summary" id="constructor.summary">""",
"<a href=\"#%3Cinit%3E(int)\">R</a>",
"Creates an instance of a <code>R</code> record.",
"Creates an instance of a <code>R</code> record class.",
"""
<section class="method-summary" id="method.summary">""",
"""
@ -286,12 +286,12 @@ public class TestRecordTypes extends JavadocTester {
Returns the value of the <a href="#param-r1"><code>r1</code></a> record component.""",
"""
<a href="#toString()">toString</a>""",
"Returns a string representation of this record.",
"Returns a string representation of this record class.",
"Method Details",
"""
<span class="element-name">toString</span>""",
"Returns a string representation of this record. The representation "
+ "contains the name of the type, followed by the name and value of "
"Returns a string representation of this record class. The representation "
+ "contains the name of the class, followed by the name and value of "
+ "each of the record components.",
"""
<span class="element-name">hashCode</span>""",
@ -302,7 +302,7 @@ public class TestRecordTypes extends JavadocTester {
"""
Indicates whether some other object is "equal to" this one. The objects are equa\
l if the other object is of the same class and if all the record components are \
equal. All components in this record are compared with '=='.""",
equal. All components in this record class are compared with '=='.""",
"""
<span class="element-name">r1</span>""",
"""
@ -313,13 +313,13 @@ public class TestRecordTypes extends JavadocTester {
@Test
public void testGeneratedEqualsPrimitive(Path base) throws IOException {
testGeneratedEquals(base, "int a, int b",
"All components in this record are compared with '=='.");
"All components in this record class are compared with '=='.");
}
@Test
public void testGeneratedEqualsReference(Path base) throws IOException {
testGeneratedEquals(base, "Object a, Object b",
"All components in this record are compared with <code>Objects::equals(Object,Object)</code>");
"All components in this record class are compared with <code>Objects::equals(Object,Object)</code>");
}
@Test
@ -522,7 +522,7 @@ public class TestRecordTypes extends JavadocTester {
<div id="record.class">
<div class="caption"><span>Record Classes</span></div>
<div class="summary-table two-column-summary">
<div class="table-header col-first">Record</div>
<div class="table-header col-first">Record Class</div>
<div class="table-header col-last">Description</div>
<div class="col-deprecated-item-name even-row-color"><a href="p/R.html" title="class in p">p.R</a></div>
<div class="col-last even-row-color">

24
test/langtools/jdk/javadoc/doclet/testSearch/TestSearch.java
View File

@ -452,7 +452,7 @@ public class TestSearch extends JavadocTester {
"""
<dt><span class="search-tag-link"><a href="pkg2/TestAnnotationType.html#searchph\
rasewithdescdeprecated">search phrase with desc deprecated</a></span> - Search t\
ag in annotation type pkg2.TestAnnotationType</dt>""",
ag in annotation interface pkg2.TestAnnotationType</dt>""",
"""
<dt><span class="search-tag-link"><a href="pkg2/TestClass.html#SearchTagDeprecat\
edClass">SearchTagDeprecatedClass</a></span> - Search tag in class pkg2.TestClas\
@ -487,14 +487,14 @@ public class TestSearch extends JavadocTester {
/a></span> - Search tag in pkg.AnotherClass.CONSTANT1</dt>""",
"""
<dt><span class="member-name-link"><a href="pkg2/TestEnum.html#ONE">ONE</a></spa\
n> - Enum constant in enum pkg2.<a href="pkg2/TestEnum.html" title="enum in pkg2">TestEnum</a></dt>""",
n> - Enum constant in enum class pkg2.<a href="pkg2/TestEnum.html" title="enum class in pkg2">TestEnum</a></dt>""",
"""
<dt><span class="member-name-link"><a href="pkg2/TestEnum.html#THREE">THREE</a><\
/span> - Enum constant in enum pkg2.<a href="pkg2/TestEnum.html" title="enum in pkg2">TestEnum</a></dt\
/span> - Enum constant in enum class pkg2.<a href="pkg2/TestEnum.html" title="enum class in pkg2">TestEnum</a></dt\
>""",
"""
<dt><span class="member-name-link"><a href="pkg2/TestEnum.html#TWO">TWO</a></spa\
n> - Enum constant in enum pkg2.<a href="pkg2/TestEnum.html" title="enum in pkg2">TestEnum</a></dt>""");
n> - Enum constant in enum class pkg2.<a href="pkg2/TestEnum.html" title="enum class in pkg2">TestEnum</a></dt>""");
checkOutput("index-all.html", true,
"""
<div class="deprecation-comment">class_test1 passes. Search tag <span id="Search\
@ -518,7 +518,7 @@ public class TestSearch extends JavadocTester {
"""
<dt><span class="search-tag-link"><a href="../pkg2/TestAnnotationType.html#searc\
hphrasewithdescdeprecated">search phrase with desc deprecated</a></span> - Searc\
h tag in annotation type pkg2.TestAnnotationType</dt>""",
h tag in annotation interface pkg2.TestAnnotationType</dt>""",
"""
<dt><span class="search-tag-link"><a href="../pkg2/TestClass.html#SearchTagDepre\
catedClass">SearchTagDeprecatedClass</a></span> - Search tag in class pkg2.TestC\
@ -575,16 +575,16 @@ public class TestSearch extends JavadocTester {
checkOutput("index-files/index-9.html", true,
"""
<dt><span class="member-name-link"><a href="../pkg2/TestEnum.html#ONE">ONE</a></\
span> - Enum constant in enum pkg2.<a href="../pkg2/TestEnum.html" title="enum in pkg2">TestEnum</a></\
span> - Enum constant in enum class pkg2.<a href="../pkg2/TestEnum.html" title="enum class in pkg2">TestEnum</a></\
dt>""");
checkOutput("index-files/index-14.html", true,
"""
<dt><span class="member-name-link"><a href="../pkg2/TestEnum.html#THREE">THREE</\
a></span> - Enum constant in enum pkg2.<a href="../pkg2/TestEnum.html" title="enum in pkg2">TestEnum</\
a></span> - Enum constant in enum class pkg2.<a href="../pkg2/TestEnum.html" title="enum class in pkg2">TestEnum</\
a></dt>""",
"""
<dt><span class="member-name-link"><a href="../pkg2/TestEnum.html#TWO">TWO</a></\
span> - Enum constant in enum pkg2.<a href="../pkg2/TestEnum.html" title="enum in pkg2">TestEnum</a></\
span> - Enum constant in enum class pkg2.<a href="../pkg2/TestEnum.html" title="enum class in pkg2">TestEnum</a></\
dt>""");
}
@ -611,7 +611,7 @@ public class TestSearch extends JavadocTester {
"""
<dt><span class="search-tag-link"><a href="pkg2/TestAnnotationType.html#searchph\
rasewithdescdeprecated">search phrase with desc deprecated</a></span> - Search t\
ag in annotation type pkg2.TestAnnotationType</dt>""",
ag in annotation interface pkg2.TestAnnotationType</dt>""",
"""
<dt><span class="search-tag-link"><a href="pkg2/TestClass.html#SearchTagDeprecat\
edClass">SearchTagDeprecatedClass</a></span> - Search tag in class pkg2.TestClas\
@ -655,7 +655,7 @@ public class TestSearch extends JavadocTester {
"""
<dt><span class="search-tag-link"><a href="pkg2/TestAnnotationType.html#searchph\
rasewithdescdeprecated">search phrase with desc deprecated</a></span> - Search t\
ag in annotation type pkg2.TestAnnotationType</dt>""",
ag in annotation interface pkg2.TestAnnotationType</dt>""",
"""
<dt><span class="search-tag-link"><a href="pkg2/TestClass.html#SearchTagDeprecat\
edClass">SearchTagDeprecatedClass</a></span> - Search tag in class pkg2.TestClas\
@ -833,7 +833,7 @@ public class TestSearch extends JavadocTester {
<button id="all-classes-table-tab3" role="tab" aria-selected="false" aria-contro\
ls="all-classes-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" oncli\
ck="show('all-classes-table', 'all-classes-table-tab3', 2)" class="table-tab">En\
um Summary</button>\
um Class Summary</button>\
<button id="all-classes-table-tab4" role="tab" aria-selected="false" aria-contro\
ls="all-classes-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" oncli\
ck="show('all-classes-table', 'all-classes-table-tab4', 2)" class="table-tab">Ex\
@ -845,7 +845,7 @@ public class TestSearch extends JavadocTester {
<button id="all-classes-table-tab6" role="tab" aria-selected="false" aria-contro\
ls="all-classes-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" oncli\
ck="show('all-classes-table', 'all-classes-table-tab6', 2)" class="table-tab">An\
notation Types Summary</button>\
notation Interfaces Summary</button>\
</div>
<div id="all-classes-table.tabpanel" role="tabpanel">
<div class="summary-table two-column-summary" aria-labelledby="all-classes-table-tab0">

12
test/langtools/jdk/javadoc/doclet/testSystemPropertyTaglet/TestSystemPropertyTaglet.java
View File

@ -63,7 +63,7 @@ public class TestSystemPropertyTaglet extends JavadocTester {
checkOrder("mymodule/mypackage/MyAnnotation.html",
"""
<h1 title="Annotation Type MyAnnotation" class="title">Annotation Type MyAnnotation</h1>""",
<h1 title="Annotation Interface MyAnnotation" class="title">Annotation Interface MyAnnotation</h1>""",
"""
(annotation) the <code><span id="test.property" class="search-tag-result">test.property</span></code> system property.""",
"<h2>Element Details</h2>",
@ -99,7 +99,7 @@ public class TestSystemPropertyTaglet extends JavadocTester {
checkOrder("mymodule/mypackage/MyEnum.html",
"""
<h1 title="Enum MyEnum" class="title">Enum MyEnum</h1>""",
<h1 title="Enum Class MyEnum" class="title">Enum Class MyEnum</h1>""",
"""
(enum) the <code><span id="test.property" class="search-tag-result">test.property</span></code> system property.""",
"<h2>Enum Constant Details</h2>",
@ -166,7 +166,7 @@ public class TestSystemPropertyTaglet extends JavadocTester {
<h2 class="title" id="I:T">T</h2>""",
"""
<dt><span class="search-tag-link"><a href="mymodule/mypackage/MyAnnotation.html#\
test.property">test.property</a></span> - Search tag in annotation type mypackag\
test.property">test.property</a></span> - Search tag in annotation interface mypackag\
e.MyAnnotation</dt>
<dd>System Property</dd>""",
"""
@ -175,7 +175,7 @@ public class TestSystemPropertyTaglet extends JavadocTester {
<dd>System Property</dd>""",
"""
<dt><span class="search-tag-link"><a href="mymodule/mypackage/MyEnum.html#test.p\
roperty">test.property</a></span> - Search tag in enum mypackage.MyEnum</dt>
roperty">test.property</a></span> - Search tag in enum class mypackage.MyEnum</dt>
<dd>System Property</dd>""",
"""
<dt><span class="search-tag-link"><a href="mymodule/mypackage/MyError.html#test.\
@ -267,13 +267,13 @@ public class TestSystemPropertyTaglet extends JavadocTester {
checkOutput("tag-search-index.js", true,
"""
{"l":"test.property","h":"annotation type mypackage.MyAnnotation","d":"System Pr\
{"l":"test.property","h":"annotation interface mypackage.MyAnnotation","d":"System Pr\
operty","u":"mymodule/mypackage/MyAnnotation.html#test.property"}""",
"""
{"l":"test.property","h":"class mypackage.MyClass","d":"System Property","u":"my\
module/mypackage/MyClass.html#test.property"}""",
"""
{"l":"test.property","h":"enum mypackage.MyEnum","d":"System Property","u":"mymo\
{"l":"test.property","h":"enum class mypackage.MyEnum","d":"System Property","u":"mymo\
dule/mypackage/MyEnum.html#test.property"}""",
"""
{"l":"test.property","h":"error mypackage.MyError","d":"System Property","u":"my\

157
test/langtools/jdk/javadoc/doclet/testTerminology/TestTerminology.java Normal file
View File

@ -0,0 +1,157 @@
/*
* Copyright (c) 2020, 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 8258002
* @summary Update "type" terminology in generated docs
* @library /tools/lib ../../lib
* @modules jdk.javadoc/jdk.javadoc.internal.tool
* @build toolbox.ToolBox javadoc.tester.*
* @run main TestTerminology
*/
import java.io.IOException;
import java.nio.file.Path;
import javax.lang.model.SourceVersion;
import javadoc.tester.JavadocTester;
import toolbox.ToolBox;
public class TestTerminology extends JavadocTester {
public static void main(String... args) throws Exception {
TestTerminology tester = new TestTerminology();
tester.runTests(m -> new Object[]{Path.of(m.getName())});
}
private final ToolBox tb = new ToolBox();
@Test
public void testAnnotationInterface(Path base) throws IOException {
Path src = base.resolve("src");
tb.writeJavaFiles(src,
"""
package p; /** Comment. */ public @interface A {
int m();
}
"""
);
testAnnotationInterface(base, src, SourceVersion.RELEASE_15);
testAnnotationInterface(base, src, SourceVersion.latest());
}
void testAnnotationInterface(Path base, Path src, SourceVersion sv) {
String v = asOption(sv);
javadoc("-d", base.resolve("out" + v).toString(),
"--source-path", src.toString(),
"--source", v,
"-use",
"p");
checkExit(Exit.OK);
checkOutput("p/A.html", sv.compareTo(SourceVersion.RELEASE_16) < 0,
"""
<h1 title="Annotation Type A" class="title">Annotation Type A</h1>"""
);
checkOutput("p/A.html", sv.compareTo(SourceVersion.RELEASE_16) >= 0,
"""
<h1 title="Annotation Interface A" class="title">Annotation Interface A</h1>"""
);
checkOutput("p/class-use/A.html", sv.compareTo(SourceVersion.RELEASE_16) < 0,
"""
<h1 title="Uses of Annotation Type p.A" class="title">Uses of Annotation Type<br>p.A</h1>"""
);
checkOutput("p/class-use/A.html", sv.compareTo(SourceVersion.RELEASE_16) >= 0,
"""
<h1 title="Uses of Annotation Interface p.A" class="title">Uses of Annotation Interface<br>p.A</h1>"""
);
}
@Test
public void testEnumClass(Path base) throws IOException {
Path src = base.resolve("src");
tb.writeJavaFiles(src,
"""
package p; /** Comment. */ public enum E { }
"""
);
testEnumClass(base, src, SourceVersion.RELEASE_15);
testEnumClass(base, src, SourceVersion.latest());
}
void testEnumClass(Path base, Path src, SourceVersion sv) {
String v = asOption(sv);
javadoc("-d", base.resolve("out" + v).toString(),
"--source-path", src.toString(),
"--source", v,
"p");
checkExit(Exit.OK);
checkOutput("p/E.html", sv.compareTo(SourceVersion.RELEASE_16) < 0,
"""
<h1 title="Enum E" class="title">Enum E</h1>"""
);
checkOutput("p/E.html", sv.compareTo(SourceVersion.RELEASE_16) >= 0,
"""
<h1 title="Enum Class E" class="title">Enum Class E</h1>"""
);
}
@Test
public void testSearch(Path base) throws IOException {
Path src = base.resolve("src");
tb.writeJavaFiles(src,
"""
package p; /** Comment. */ public class C { }
"""
);
testSearch(base, src, SourceVersion.RELEASE_15);
testSearch(base, src, SourceVersion.latest());
}
public void testSearch(Path base, Path src, SourceVersion sv) {
String v = asOption(sv);
javadoc("-d", base.resolve("out" + v).toString(),
"--source-path", src.toString(),
"--source", v,
"p");
checkExit(Exit.OK);
checkOutput("search.js", sv.compareTo(SourceVersion.RELEASE_16) < 0,
"""
var catTypes = "Types";""" //
);
checkOutput("search.js", sv.compareTo(SourceVersion.RELEASE_16) >= 0,
"""
var catTypes = "Classes and Interfaces";"""
);
}
private String asOption(SourceVersion sv) {
return sv.name().replace("RELEASE_", "");
}
}

5
test/langtools/jdk/javadoc/doclet/testVisibleMembers/TestVisibleMembers.java
View File

@ -309,7 +309,7 @@ public class TestVisibleMembers extends JavadocTester {
checkOrder("p/C.html",
"METHOD DETAIL",
"public", "void", "method", "See Also:", "sub()", "I.sub1()",
"public", "void", "method", "See Also:", "sub()", "sub1()",
"public", "void", "m", "Method in C. See", "I.length()"
);
@ -325,9 +325,8 @@ public class TestVisibleMembers extends JavadocTester {
"METHOD DETAIL",
"Method sub in p.IImpl",
"Specified by:", "I.html",
"Specified by:", "II.html",
"END OF CLASS DATA");
checkUnique("p/IImpl.html", "Specified by:");
}
// see j.u.Spliterator

2
test/langtools/jdk/javadoc/tool/CheckResourceKeys.java
View File

@ -216,7 +216,7 @@ public class CheckResourceKeys {
// special handling for code strings synthesized in
// jdk.javadoc.internal.doclets.toolkit.util.Utils.getTypeName
String[] extras = {
"AnnotationType", "Class", "Enum", "Error", "Exception", "Interface", "Record"
"AnnotationType", "Class", "Enum", "EnumClass", "Error", "Exception", "Interface", "RecordClass"
};
for (String s: extras) {
if (results.contains("doclet." + s))

16
test/lib/jdk/test/lib/util/ForceGC.java
View File

@ -34,15 +34,18 @@ import java.util.function.BooleanSupplier;
public class ForceGC {
private final CountDownLatch cleanerInvoked = new CountDownLatch(1);
private final Cleaner cleaner = Cleaner.create();
private Object o;
public ForceGC() {
cleaner.register(new Object(), () -> cleanerInvoked.countDown());
this.o = new Object();
cleaner.register(o, () -> cleanerInvoked.countDown());
}
private void doit() {
private void doit(int iter) {
try {
for (int i = 0; i < 10; i++) {
System.gc();
System.out.println("gc " + i);
System.out.println("doit() iter: " + iter + ", gc " + i);
if (cleanerInvoked.await(1L, TimeUnit.SECONDS)) {
return;
}
@ -62,9 +65,14 @@ public class ForceGC {
* @throws InterruptedException if the current thread is interrupted while waiting
*/
public boolean await(BooleanSupplier s) {
o = null; // Keep reference to Object until now, to ensure the Cleaner
// doesn't count down the latch before await() is called.
for (int i = 0; i < 10; i++) {
if (s.getAsBoolean()) return true;
doit();
doit(i);
try { Thread.sleep(1000); } catch (InterruptedException e) {
throw new AssertionError("unexpected interrupted sleep", e);
}
}
return false;
}