Merge
diff --git a/.hgtags-top-repo b/.hgtags-top-repo
index e7cd2f8..4a5b789 100644
--- a/.hgtags-top-repo
+++ b/.hgtags-top-repo
@@ -319,3 +319,4 @@
57f3134853ecdd4a3ee2d4d26f22ba981d653d79 jdk9-b74
8fd6eeb878606e39c908f12535f34ebbfd225a4a jdk9-b75
d82072b699b880a1f647a5e2d7c0f86cec958941 jdk9-b76
+7972dc8f2a47f0c4cd8f02fa5662af41f028aa14 jdk9-b77
diff --git a/corba/.hgtags b/corba/.hgtags
index 5f49560..3f3d3c4 100644
--- a/corba/.hgtags
+++ b/corba/.hgtags
@@ -319,3 +319,4 @@
622fe934e351e89107edf3c667d6b57f543f58f1 jdk9-b74
960b56805abd8460598897481820bd6a75f979e7 jdk9-b75
d8126bc88fa5cd1ae4e44d86a4b1280ca1c9e2aa jdk9-b76
+8bb2441c0fec8b28f7bf11a0ca3ec1642e7ef457 jdk9-b77
diff --git a/hotspot/.hgtags b/hotspot/.hgtags
index ec379ef..9662d2a 100644
--- a/hotspot/.hgtags
+++ b/hotspot/.hgtags
@@ -479,3 +479,4 @@
fff6b54e9770ac4c12c2fb4cab5aa7672affa4bd jdk9-b74
2f354281e9915275693c4e519a959b8a6f22d3a3 jdk9-b75
0bc8d1656d6f2b1fdfe803c1305a108bb9939f35 jdk9-b76
+e66c3813789debfc06f206afde1bf7a84cb08451 jdk9-b77
diff --git a/hotspot/src/cpu/aarch64/vm/aarch64.ad b/hotspot/src/cpu/aarch64/vm/aarch64.ad
index bef849a..37d1b09 100644
--- a/hotspot/src/cpu/aarch64/vm/aarch64.ad
+++ b/hotspot/src/cpu/aarch64/vm/aarch64.ad
@@ -2389,9 +2389,11 @@
// Note that the code buffer's insts_mark is always relative to insts.
// That's why we must use the macroassembler to generate a handler.
MacroAssembler _masm(&cbuf);
- address base =
- __ start_a_stub(size_exception_handler());
- if (base == NULL) return 0; // CodeBuffer::expand failed
+ address base = __ start_a_stub(size_exception_handler());
+ if (base == NULL) {
+ ciEnv::current()->record_failure("CodeCache is full");
+ return 0; // CodeBuffer::expand failed
+ }
int offset = __ offset();
__ far_jump(RuntimeAddress(OptoRuntime::exception_blob()->entry_point()));
assert(__ offset() - offset <= (int) size_exception_handler(), "overflow");
@@ -2405,9 +2407,11 @@
// Note that the code buffer's insts_mark is always relative to insts.
// That's why we must use the macroassembler to generate a handler.
MacroAssembler _masm(&cbuf);
- address base =
- __ start_a_stub(size_deopt_handler());
- if (base == NULL) return 0; // CodeBuffer::expand failed
+ address base = __ start_a_stub(size_deopt_handler());
+ if (base == NULL) {
+ ciEnv::current()->record_failure("CodeCache is full");
+ return 0; // CodeBuffer::expand failed
+ }
int offset = __ offset();
__ adr(lr, __ pc());
@@ -3657,24 +3661,37 @@
MacroAssembler _masm(&cbuf);
address addr = (address)$meth$$method;
+ address call;
if (!_method) {
// A call to a runtime wrapper, e.g. new, new_typeArray_Java, uncommon_trap.
- __ trampoline_call(Address(addr, relocInfo::runtime_call_type), &cbuf);
+ call = __ trampoline_call(Address(addr, relocInfo::runtime_call_type), &cbuf);
} else if (_optimized_virtual) {
- __ trampoline_call(Address(addr, relocInfo::opt_virtual_call_type), &cbuf);
+ call = __ trampoline_call(Address(addr, relocInfo::opt_virtual_call_type), &cbuf);
} else {
- __ trampoline_call(Address(addr, relocInfo::static_call_type), &cbuf);
+ call = __ trampoline_call(Address(addr, relocInfo::static_call_type), &cbuf);
+ }
+ if (call == NULL) {
+ ciEnv::current()->record_failure("CodeCache is full");
+ return;
}
if (_method) {
// Emit stub for static call
- CompiledStaticCall::emit_to_interp_stub(cbuf);
+ address stub = CompiledStaticCall::emit_to_interp_stub(cbuf);
+ if (stub == NULL) {
+ ciEnv::current()->record_failure("CodeCache is full");
+ return;
+ }
}
%}
enc_class aarch64_enc_java_dynamic_call(method meth) %{
MacroAssembler _masm(&cbuf);
- __ ic_call((address)$meth$$method);
+ address call = __ ic_call((address)$meth$$method);
+ if (call == NULL) {
+ ciEnv::current()->record_failure("CodeCache is full");
+ return;
+ }
%}
enc_class aarch64_enc_call_epilog() %{
@@ -3695,7 +3712,11 @@
address entry = (address)$meth$$method;
CodeBlob *cb = CodeCache::find_blob(entry);
if (cb) {
- __ trampoline_call(Address(entry, relocInfo::runtime_call_type));
+ address call = __ trampoline_call(Address(entry, relocInfo::runtime_call_type));
+ if (call == NULL) {
+ ciEnv::current()->record_failure("CodeCache is full");
+ return;
+ }
} else {
int gpcnt;
int fpcnt;
diff --git a/hotspot/src/cpu/aarch64/vm/c1_CodeStubs_aarch64.cpp b/hotspot/src/cpu/aarch64/vm/c1_CodeStubs_aarch64.cpp
index 5cb78d2..bdfc017 100644
--- a/hotspot/src/cpu/aarch64/vm/c1_CodeStubs_aarch64.cpp
+++ b/hotspot/src/cpu/aarch64/vm/c1_CodeStubs_aarch64.cpp
@@ -327,9 +327,16 @@
ce->align_call(lir_static_call);
ce->emit_static_call_stub();
+ if (ce->compilation()->bailed_out()) {
+ return; // CodeCache is full
+ }
Address resolve(SharedRuntime::get_resolve_static_call_stub(),
relocInfo::static_call_type);
- __ trampoline_call(resolve);
+ address call = __ trampoline_call(resolve);
+ if (call == NULL) {
+ ce->bailout("trampoline stub overflow");
+ return;
+ }
ce->add_call_info_here(info());
#ifndef PRODUCT
diff --git a/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp b/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp
index 353486c..907370d 100644
--- a/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp
+++ b/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp
@@ -1996,13 +1996,21 @@
void LIR_Assembler::call(LIR_OpJavaCall* op, relocInfo::relocType rtype) {
- __ trampoline_call(Address(op->addr(), rtype));
+ address call = __ trampoline_call(Address(op->addr(), rtype));
+ if (call == NULL) {
+ bailout("trampoline stub overflow");
+ return;
+ }
add_call_info(code_offset(), op->info());
}
void LIR_Assembler::ic_call(LIR_OpJavaCall* op) {
- __ ic_call(op->addr());
+ address call = __ ic_call(op->addr());
+ if (call == NULL) {
+ bailout("trampoline stub overflow");
+ return;
+ }
add_call_info(code_offset(), op->info());
}
diff --git a/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.hpp b/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.hpp
index d6d3238..6d7e27e 100644
--- a/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.hpp
+++ b/hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.hpp
@@ -26,6 +26,9 @@
#ifndef CPU_X86_VM_C1_LIRASSEMBLER_X86_HPP
#define CPU_X86_VM_C1_LIRASSEMBLER_X86_HPP
+// ArrayCopyStub needs access to bailout
+friend class ArrayCopyStub;
+
private:
int array_element_size(BasicType type) const;
diff --git a/hotspot/src/cpu/aarch64/vm/compiledIC_aarch64.cpp b/hotspot/src/cpu/aarch64/vm/compiledIC_aarch64.cpp
index 44e124c..b30a4a6 100644
--- a/hotspot/src/cpu/aarch64/vm/compiledIC_aarch64.cpp
+++ b/hotspot/src/cpu/aarch64/vm/compiledIC_aarch64.cpp
@@ -51,7 +51,7 @@
// ----------------------------------------------------------------------------
#define __ _masm.
-void CompiledStaticCall::emit_to_interp_stub(CodeBuffer &cbuf) {
+address CompiledStaticCall::emit_to_interp_stub(CodeBuffer &cbuf) {
// Stub is fixed up when the corresponding call is converted from
// calling compiled code to calling interpreted code.
// mov rmethod, 0
@@ -63,10 +63,11 @@
// That's why we must use the macroassembler to generate a stub.
MacroAssembler _masm(&cbuf);
- address base = __ start_a_stub(to_interp_stub_size()*2);
-
+ address base = __ start_a_stub(to_interp_stub_size());
int offset = __ offset();
- if (base == NULL) return; // CodeBuffer::expand failed
+ if (base == NULL) {
+ return NULL; // CodeBuffer::expand failed
+ }
// static stub relocation stores the instruction address of the call
__ relocate(static_stub_Relocation::spec(mark));
// static stub relocation also tags the Method* in the code-stream.
@@ -76,6 +77,7 @@
assert((__ offset() - offset) <= (int)to_interp_stub_size(), "stub too big");
__ end_a_stub();
+ return base;
}
#undef __
diff --git a/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp b/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp
index e8f0612..2bd4127 100644
--- a/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp
+++ b/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp
@@ -664,7 +664,7 @@
// Maybe emit a call via a trampoline. If the code cache is small
// trampolines won't be emitted.
-void MacroAssembler::trampoline_call(Address entry, CodeBuffer *cbuf) {
+address MacroAssembler::trampoline_call(Address entry, CodeBuffer *cbuf) {
assert(entry.rspec().type() == relocInfo::runtime_call_type
|| entry.rspec().type() == relocInfo::opt_virtual_call_type
|| entry.rspec().type() == relocInfo::static_call_type
@@ -672,7 +672,10 @@
unsigned int start_offset = offset();
if (far_branches() && !Compile::current()->in_scratch_emit_size()) {
- emit_trampoline_stub(offset(), entry.target());
+ address stub = emit_trampoline_stub(start_offset, entry.target());
+ if (stub == NULL) {
+ return NULL; // CodeCache is full
+ }
}
if (cbuf) cbuf->set_insts_mark();
@@ -682,6 +685,8 @@
} else {
bl(pc());
}
+ // just need to return a non-null address
+ return pc();
}
@@ -696,13 +701,11 @@
// load the call target from the constant pool
// branch (LR still points to the call site above)
-void MacroAssembler::emit_trampoline_stub(int insts_call_instruction_offset,
+address MacroAssembler::emit_trampoline_stub(int insts_call_instruction_offset,
address dest) {
address stub = start_a_stub(Compile::MAX_stubs_size/2);
if (stub == NULL) {
- start_a_stub(Compile::MAX_stubs_size/2);
- Compile::current()->env()->record_out_of_memory_failure();
- return;
+ return NULL; // CodeBuffer::expand failed
}
// Create a trampoline stub relocation which relates this trampoline stub
@@ -729,15 +732,16 @@
assert(is_NativeCallTrampolineStub_at(stub_start_addr), "doesn't look like a trampoline");
end_a_stub();
+ return stub;
}
-void MacroAssembler::ic_call(address entry) {
+address MacroAssembler::ic_call(address entry) {
RelocationHolder rh = virtual_call_Relocation::spec(pc());
// address const_ptr = long_constant((jlong)Universe::non_oop_word());
// unsigned long offset;
// ldr_constant(rscratch2, const_ptr);
movptr(rscratch2, (uintptr_t)Universe::non_oop_word());
- trampoline_call(Address(entry, rh));
+ return trampoline_call(Address(entry, rh));
}
// Implementation of call_VM versions
diff --git a/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.hpp b/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.hpp
index 5f90372..9711266 100644
--- a/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.hpp
+++ b/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.hpp
@@ -539,7 +539,7 @@
static int patch_oop(address insn_addr, address o);
- void emit_trampoline_stub(int insts_call_instruction_offset, address target);
+ address emit_trampoline_stub(int insts_call_instruction_offset, address target);
// The following 4 methods return the offset of the appropriate move instruction
@@ -942,7 +942,7 @@
// Calls
- void trampoline_call(Address entry, CodeBuffer *cbuf = NULL);
+ address trampoline_call(Address entry, CodeBuffer *cbuf = NULL);
static bool far_branches() {
return ReservedCodeCacheSize > branch_range;
@@ -962,7 +962,7 @@
}
// Emit the CompiledIC call idiom
- void ic_call(address entry);
+ address ic_call(address entry);
public:
diff --git a/hotspot/src/cpu/ppc/vm/compiledIC_ppc.cpp b/hotspot/src/cpu/ppc/vm/compiledIC_ppc.cpp
index 1b54594..762a329 100644
--- a/hotspot/src/cpu/ppc/vm/compiledIC_ppc.cpp
+++ b/hotspot/src/cpu/ppc/vm/compiledIC_ppc.cpp
@@ -94,7 +94,7 @@
const int IC_pos_in_java_to_interp_stub = 8;
#define __ _masm.
-void CompiledStaticCall::emit_to_interp_stub(CodeBuffer &cbuf) {
+address CompiledStaticCall::emit_to_interp_stub(CodeBuffer &cbuf) {
#ifdef COMPILER2
// Get the mark within main instrs section which is set to the address of the call.
address call_addr = cbuf.insts_mark();
@@ -106,8 +106,7 @@
// Start the stub.
address stub = __ start_a_stub(CompiledStaticCall::to_interp_stub_size());
if (stub == NULL) {
- Compile::current()->env()->record_out_of_memory_failure();
- return;
+ return NULL; // CodeCache is full
}
// For java_to_interp stubs we use R11_scratch1 as scratch register
@@ -149,6 +148,7 @@
// End the stub.
__ end_a_stub();
+ return stub;
#else
ShouldNotReachHere();
#endif
diff --git a/hotspot/src/cpu/ppc/vm/interp_masm_ppc_64.cpp b/hotspot/src/cpu/ppc/vm/interp_masm_ppc_64.cpp
index 00330ef..2c95de9 100644
--- a/hotspot/src/cpu/ppc/vm/interp_masm_ppc_64.cpp
+++ b/hotspot/src/cpu/ppc/vm/interp_masm_ppc_64.cpp
@@ -2187,7 +2187,7 @@
}
void InterpreterMacroAssembler::increment_invocation_counter(Register Rcounters, Register iv_be_count, Register Rtmp_r0) {
- assert(UseCompiler, "incrementing must be useful");
+ assert(UseCompiler || LogTouchedMethods, "incrementing must be useful");
Register invocation_count = iv_be_count;
Register backedge_count = Rtmp_r0;
int delta = InvocationCounter::count_increment;
diff --git a/hotspot/src/cpu/ppc/vm/ppc.ad b/hotspot/src/cpu/ppc/vm/ppc.ad
index a4e5f5a..5e0e977 100644
--- a/hotspot/src/cpu/ppc/vm/ppc.ad
+++ b/hotspot/src/cpu/ppc/vm/ppc.ad
@@ -1082,7 +1082,7 @@
// Start the stub.
address stub = __ start_a_stub(Compile::MAX_stubs_size/2);
if (stub == NULL) {
- Compile::current()->env()->record_out_of_memory_failure();
+ ciEnv::current()->record_failure("CodeCache is full");
return;
}
@@ -1160,7 +1160,7 @@
// Emit the trampoline stub which will be related to the branch-and-link below.
CallStubImpl::emit_trampoline_stub(_masm, entry_point_toc_offset, offsets.insts_call_instruction_offset);
- if (Compile::current()->env()->failing()) { return offsets; } // Code cache may be full.
+ if (ciEnv::current()->failing()) { return offsets; } // Code cache may be full.
__ relocate(rtype);
}
@@ -3397,7 +3397,7 @@
// Emit the trampoline stub which will be related to the branch-and-link below.
CallStubImpl::emit_trampoline_stub(_masm, entry_point_toc_offset, start_offset);
- if (Compile::current()->env()->failing()) { return; } // Code cache may be full.
+ if (ciEnv::current()->failing()) { return; } // Code cache may be full.
__ relocate(_optimized_virtual ?
relocInfo::opt_virtual_call_type : relocInfo::static_call_type);
}
@@ -3410,7 +3410,11 @@
__ bl(__ pc()); // Emits a relocation.
// The stub for call to interpreter.
- CompiledStaticCall::emit_to_interp_stub(cbuf);
+ address stub = CompiledStaticCall::emit_to_interp_stub(cbuf);
+ if (stub == NULL) {
+ ciEnv::current()->record_failure("CodeCache is full");
+ return;
+ }
}
%}
@@ -3455,7 +3459,11 @@
assert(_method, "execute next statement conditionally");
// The stub for call to interpreter.
- CompiledStaticCall::emit_to_interp_stub(cbuf);
+ address stub = CompiledStaticCall::emit_to_interp_stub(cbuf);
+ if (stub == NULL) {
+ ciEnv::current()->record_failure("CodeCache is full");
+ return;
+ }
// Restore original sp.
__ ld(R11_scratch1, 0, R1_SP); // Load caller sp.
diff --git a/hotspot/src/cpu/sparc/vm/c1_CodeStubs_sparc.cpp b/hotspot/src/cpu/sparc/vm/c1_CodeStubs_sparc.cpp
index f998a9c..4f511dc 100644
--- a/hotspot/src/cpu/sparc/vm/c1_CodeStubs_sparc.cpp
+++ b/hotspot/src/cpu/sparc/vm/c1_CodeStubs_sparc.cpp
@@ -432,6 +432,9 @@
__ mov(length()->as_register(), O4);
ce->emit_static_call_stub();
+ if (ce->compilation()->bailed_out()) {
+ return; // CodeCache is full
+ }
__ call(SharedRuntime::get_resolve_static_call_stub(), relocInfo::static_call_type);
__ delayed()->nop();
diff --git a/hotspot/src/cpu/sparc/vm/compiledIC_sparc.cpp b/hotspot/src/cpu/sparc/vm/compiledIC_sparc.cpp
index a4b2a09..b602191 100644
--- a/hotspot/src/cpu/sparc/vm/compiledIC_sparc.cpp
+++ b/hotspot/src/cpu/sparc/vm/compiledIC_sparc.cpp
@@ -53,7 +53,7 @@
// ----------------------------------------------------------------------------
#define __ _masm.
-void CompiledStaticCall::emit_to_interp_stub(CodeBuffer &cbuf) {
+address CompiledStaticCall::emit_to_interp_stub(CodeBuffer &cbuf) {
#ifdef COMPILER2
// Stub is fixed up when the corresponding call is converted from calling
// compiled code to calling interpreted code.
@@ -64,9 +64,10 @@
MacroAssembler _masm(&cbuf);
- address base =
- __ start_a_stub(to_interp_stub_size()*2);
- if (base == NULL) return; // CodeBuffer::expand failed.
+ address base = __ start_a_stub(to_interp_stub_size());
+ if (base == NULL) {
+ return NULL; // CodeBuffer::expand failed.
+ }
// Static stub relocation stores the instruction address of the call.
__ relocate(static_stub_Relocation::spec(mark));
@@ -81,6 +82,7 @@
// Update current stubs pointer and restore code_end.
__ end_a_stub();
+ return base;
#else
ShouldNotReachHere();
#endif
diff --git a/hotspot/src/cpu/sparc/vm/interp_masm_sparc.cpp b/hotspot/src/cpu/sparc/vm/interp_masm_sparc.cpp
index 153bfbd..44ad8d9 100644
--- a/hotspot/src/cpu/sparc/vm/interp_masm_sparc.cpp
+++ b/hotspot/src/cpu/sparc/vm/interp_masm_sparc.cpp
@@ -2314,7 +2314,7 @@
}
void InterpreterMacroAssembler::increment_invocation_counter( Register Rcounters, Register Rtmp, Register Rtmp2 ) {
- assert(UseCompiler, "incrementing must be useful");
+ assert(UseCompiler || LogTouchedMethods, "incrementing must be useful");
assert_different_registers(Rcounters, Rtmp, Rtmp2);
Address inv_counter(Rcounters, MethodCounters::invocation_counter_offset() +
diff --git a/hotspot/src/cpu/sparc/vm/sparc.ad b/hotspot/src/cpu/sparc/vm/sparc.ad
index 4a74275..0449190 100644
--- a/hotspot/src/cpu/sparc/vm/sparc.ad
+++ b/hotspot/src/cpu/sparc/vm/sparc.ad
@@ -1773,9 +1773,11 @@
AddressLiteral exception_blob(OptoRuntime::exception_blob()->entry_point());
MacroAssembler _masm(&cbuf);
- address base =
- __ start_a_stub(size_exception_handler());
- if (base == NULL) return 0; // CodeBuffer::expand failed
+ address base = __ start_a_stub(size_exception_handler());
+ if (base == NULL) {
+ ciEnv::current()->record_failure("CodeCache is full");
+ return 0; // CodeBuffer::expand failed
+ }
int offset = __ offset();
@@ -1796,9 +1798,11 @@
AddressLiteral deopt_blob(SharedRuntime::deopt_blob()->unpack());
MacroAssembler _masm(&cbuf);
- address base =
- __ start_a_stub(size_deopt_handler());
- if (base == NULL) return 0; // CodeBuffer::expand failed
+ address base = __ start_a_stub(size_deopt_handler());
+ if (base == NULL) {
+ ciEnv::current()->record_failure("CodeCache is full");
+ return 0; // CodeBuffer::expand failed
+ }
int offset = __ offset();
__ save_frame(0);
@@ -2599,7 +2603,12 @@
emit_call_reloc(cbuf, $meth$$method, relocInfo::static_call_type);
}
if (_method) { // Emit stub for static call.
- CompiledStaticCall::emit_to_interp_stub(cbuf);
+ address stub = CompiledStaticCall::emit_to_interp_stub(cbuf);
+ // Stub does not fit into scratch buffer if TraceJumps is enabled
+ if (stub == NULL && !(TraceJumps && Compile::current()->in_scratch_emit_size())) {
+ ciEnv::current()->record_failure("CodeCache is full");
+ return;
+ }
}
%}
diff --git a/hotspot/src/cpu/x86/vm/c1_CodeStubs_x86.cpp b/hotspot/src/cpu/x86/vm/c1_CodeStubs_x86.cpp
index 7168456..a3196fe 100644
--- a/hotspot/src/cpu/x86/vm/c1_CodeStubs_x86.cpp
+++ b/hotspot/src/cpu/x86/vm/c1_CodeStubs_x86.cpp
@@ -503,6 +503,9 @@
ce->align_call(lir_static_call);
ce->emit_static_call_stub();
+ if (ce->compilation()->bailed_out()) {
+ return; // CodeCache is full
+ }
AddressLiteral resolve(SharedRuntime::get_resolve_static_call_stub(),
relocInfo::static_call_type);
__ call(resolve);
diff --git a/hotspot/src/cpu/x86/vm/compiledIC_x86.cpp b/hotspot/src/cpu/x86/vm/compiledIC_x86.cpp
index 9537ef9..29eba2f 100644
--- a/hotspot/src/cpu/x86/vm/compiledIC_x86.cpp
+++ b/hotspot/src/cpu/x86/vm/compiledIC_x86.cpp
@@ -50,7 +50,7 @@
// ----------------------------------------------------------------------------
#define __ _masm.
-void CompiledStaticCall::emit_to_interp_stub(CodeBuffer &cbuf) {
+address CompiledStaticCall::emit_to_interp_stub(CodeBuffer &cbuf) {
// Stub is fixed up when the corresponding call is converted from
// calling compiled code to calling interpreted code.
// movq rbx, 0
@@ -62,9 +62,10 @@
// That's why we must use the macroassembler to generate a stub.
MacroAssembler _masm(&cbuf);
- address base =
- __ start_a_stub(to_interp_stub_size()*2);
- if (base == NULL) return; // CodeBuffer::expand failed.
+ address base = __ start_a_stub(to_interp_stub_size());
+ if (base == NULL) {
+ return NULL; // CodeBuffer::expand failed.
+ }
// Static stub relocation stores the instruction address of the call.
__ relocate(static_stub_Relocation::spec(mark), Assembler::imm_operand);
// Static stub relocation also tags the Method* in the code-stream.
@@ -74,6 +75,7 @@
// Update current stubs pointer and restore insts_end.
__ end_a_stub();
+ return base;
}
#undef __
diff --git a/hotspot/src/cpu/x86/vm/x86.ad b/hotspot/src/cpu/x86/vm/x86.ad
index 53825e4..c8aa50a 100644
--- a/hotspot/src/cpu/x86/vm/x86.ad
+++ b/hotspot/src/cpu/x86/vm/x86.ad
@@ -1594,7 +1594,10 @@
// That's why we must use the macroassembler to generate a handler.
MacroAssembler _masm(&cbuf);
address base = __ start_a_stub(size_exception_handler());
- if (base == NULL) return 0; // CodeBuffer::expand failed
+ if (base == NULL) {
+ ciEnv::current()->record_failure("CodeCache is full");
+ return 0; // CodeBuffer::expand failed
+ }
int offset = __ offset();
__ jump(RuntimeAddress(OptoRuntime::exception_blob()->entry_point()));
assert(__ offset() - offset <= (int) size_exception_handler(), "overflow");
@@ -1609,7 +1612,10 @@
// That's why we must use the macroassembler to generate a handler.
MacroAssembler _masm(&cbuf);
address base = __ start_a_stub(size_deopt_handler());
- if (base == NULL) return 0; // CodeBuffer::expand failed
+ if (base == NULL) {
+ ciEnv::current()->record_failure("CodeCache is full");
+ return 0; // CodeBuffer::expand failed
+ }
int offset = __ offset();
#ifdef _LP64
diff --git a/hotspot/src/cpu/x86/vm/x86_32.ad b/hotspot/src/cpu/x86/vm/x86_32.ad
index be2f7e6..dfe10d5 100644
--- a/hotspot/src/cpu/x86/vm/x86_32.ad
+++ b/hotspot/src/cpu/x86/vm/x86_32.ad
@@ -1907,7 +1907,11 @@
static_call_Relocation::spec(), RELOC_IMM32 );
}
if (_method) { // Emit stub for static call.
- CompiledStaticCall::emit_to_interp_stub(cbuf);
+ address stub = CompiledStaticCall::emit_to_interp_stub(cbuf);
+ if (stub == NULL) {
+ ciEnv::current()->record_failure("CodeCache is full");
+ return;
+ }
}
%}
diff --git a/hotspot/src/cpu/x86/vm/x86_64.ad b/hotspot/src/cpu/x86/vm/x86_64.ad
index ea8b1c8..c04661c 100644
--- a/hotspot/src/cpu/x86/vm/x86_64.ad
+++ b/hotspot/src/cpu/x86/vm/x86_64.ad
@@ -2137,7 +2137,11 @@
}
if (_method) {
// Emit stub for static call.
- CompiledStaticCall::emit_to_interp_stub(cbuf);
+ address stub = CompiledStaticCall::emit_to_interp_stub(cbuf);
+ if (stub == NULL) {
+ ciEnv::current()->record_failure("CodeCache is full");
+ return;
+ }
}
%}
diff --git a/hotspot/src/cpu/zero/vm/compiledIC_zero.cpp b/hotspot/src/cpu/zero/vm/compiledIC_zero.cpp
index 143dc31..185a8b1 100644
--- a/hotspot/src/cpu/zero/vm/compiledIC_zero.cpp
+++ b/hotspot/src/cpu/zero/vm/compiledIC_zero.cpp
@@ -60,8 +60,9 @@
// ----------------------------------------------------------------------------
-void CompiledStaticCall::emit_to_interp_stub(CodeBuffer &cbuf) {
+address CompiledStaticCall::emit_to_interp_stub(CodeBuffer &cbuf) {
ShouldNotReachHere(); // Only needed for COMPILER2.
+ return NULL;
}
int CompiledStaticCall::to_interp_stub_size() {
diff --git a/hotspot/src/os/aix/vm/os_aix.cpp b/hotspot/src/os/aix/vm/os_aix.cpp
index c78577c..f2c3933 100644
--- a/hotspot/src/os/aix/vm/os_aix.cpp
+++ b/hotspot/src/os/aix/vm/os_aix.cpp
@@ -971,34 +971,32 @@
guarantee(pthread_attr_setsuspendstate_np(&attr, PTHREAD_CREATE_SUSPENDED_NP) == 0, "???");
// calculate stack size if it's not specified by caller
- if (os::Aix::supports_variable_stack_size()) {
- if (stack_size == 0) {
- stack_size = os::Aix::default_stack_size(thr_type);
+ if (stack_size == 0) {
+ stack_size = os::Aix::default_stack_size(thr_type);
- switch (thr_type) {
- case os::java_thread:
- // Java threads use ThreadStackSize whose default value can be changed with the flag -Xss.
- assert(JavaThread::stack_size_at_create() > 0, "this should be set");
- stack_size = JavaThread::stack_size_at_create();
+ switch (thr_type) {
+ case os::java_thread:
+ // Java threads use ThreadStackSize whose default value can be changed with the flag -Xss.
+ assert(JavaThread::stack_size_at_create() > 0, "this should be set");
+ stack_size = JavaThread::stack_size_at_create();
+ break;
+ case os::compiler_thread:
+ if (CompilerThreadStackSize > 0) {
+ stack_size = (size_t)(CompilerThreadStackSize * K);
break;
- case os::compiler_thread:
- if (CompilerThreadStackSize > 0) {
- stack_size = (size_t)(CompilerThreadStackSize * K);
- break;
- } // else fall through:
- // use VMThreadStackSize if CompilerThreadStackSize is not defined
- case os::vm_thread:
- case os::pgc_thread:
- case os::cgc_thread:
- case os::watcher_thread:
- if (VMThreadStackSize > 0) stack_size = (size_t)(VMThreadStackSize * K);
- break;
- }
+ } // else fall through:
+ // use VMThreadStackSize if CompilerThreadStackSize is not defined
+ case os::vm_thread:
+ case os::pgc_thread:
+ case os::cgc_thread:
+ case os::watcher_thread:
+ if (VMThreadStackSize > 0) stack_size = (size_t)(VMThreadStackSize * K);
+ break;
}
+ }
- stack_size = MAX2(stack_size, os::Aix::min_stack_allowed);
- pthread_attr_setstacksize(&attr, stack_size);
- } //else let thread_create() pick the default value (96 K on AIX)
+ stack_size = MAX2(stack_size, os::Aix::min_stack_allowed);
+ pthread_attr_setstacksize(&attr, stack_size);
pthread_t tid;
int ret = pthread_create(&tid, &attr, (void* (*)(void*)) java_start, thread);
diff --git a/hotspot/src/os/aix/vm/os_aix.hpp b/hotspot/src/os/aix/vm/os_aix.hpp
index faba5c2..8e96dd9 100644
--- a/hotspot/src/os/aix/vm/os_aix.hpp
+++ b/hotspot/src/os/aix/vm/os_aix.hpp
@@ -131,8 +131,6 @@
static void initialize_libo4();
static void initialize_libperfstat();
- static bool supports_variable_stack_size();
-
public:
static void init_thread_fpu_state();
static pthread_t main_thread(void) { return _main_thread; }
diff --git a/hotspot/src/os/bsd/vm/os_bsd.cpp b/hotspot/src/os/bsd/vm/os_bsd.cpp
index 8f935d8..1c243ae 100644
--- a/hotspot/src/os/bsd/vm/os_bsd.cpp
+++ b/hotspot/src/os/bsd/vm/os_bsd.cpp
@@ -739,40 +739,35 @@
pthread_attr_init(&attr);
pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
- // stack size
- if (os::Bsd::supports_variable_stack_size()) {
- // calculate stack size if it's not specified by caller
- if (stack_size == 0) {
- stack_size = os::Bsd::default_stack_size(thr_type);
+ // calculate stack size if it's not specified by caller
+ if (stack_size == 0) {
+ stack_size = os::Bsd::default_stack_size(thr_type);
- switch (thr_type) {
- case os::java_thread:
- // Java threads use ThreadStackSize which default value can be
- // changed with the flag -Xss
- assert(JavaThread::stack_size_at_create() > 0, "this should be set");
- stack_size = JavaThread::stack_size_at_create();
+ switch (thr_type) {
+ case os::java_thread:
+ // Java threads use ThreadStackSize which default value can be
+ // changed with the flag -Xss
+ assert(JavaThread::stack_size_at_create() > 0, "this should be set");
+ stack_size = JavaThread::stack_size_at_create();
+ break;
+ case os::compiler_thread:
+ if (CompilerThreadStackSize > 0) {
+ stack_size = (size_t)(CompilerThreadStackSize * K);
break;
- case os::compiler_thread:
- if (CompilerThreadStackSize > 0) {
- stack_size = (size_t)(CompilerThreadStackSize * K);
- break;
- } // else fall through:
- // use VMThreadStackSize if CompilerThreadStackSize is not defined
- case os::vm_thread:
- case os::pgc_thread:
- case os::cgc_thread:
- case os::watcher_thread:
- if (VMThreadStackSize > 0) stack_size = (size_t)(VMThreadStackSize * K);
- break;
- }
+ } // else fall through:
+ // use VMThreadStackSize if CompilerThreadStackSize is not defined
+ case os::vm_thread:
+ case os::pgc_thread:
+ case os::cgc_thread:
+ case os::watcher_thread:
+ if (VMThreadStackSize > 0) stack_size = (size_t)(VMThreadStackSize * K);
+ break;
}
-
- stack_size = MAX2(stack_size, os::Bsd::min_stack_allowed);
- pthread_attr_setstacksize(&attr, stack_size);
- } else {
- // let pthread_create() pick the default value.
}
+ stack_size = MAX2(stack_size, os::Bsd::min_stack_allowed);
+ pthread_attr_setstacksize(&attr, stack_size);
+
ThreadState state;
{
diff --git a/hotspot/src/os/bsd/vm/os_bsd.hpp b/hotspot/src/os/bsd/vm/os_bsd.hpp
index 8c6dbb7..8b48cb7 100644
--- a/hotspot/src/os/bsd/vm/os_bsd.hpp
+++ b/hotspot/src/os/bsd/vm/os_bsd.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2015, 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
@@ -75,8 +75,6 @@
static julong physical_memory() { return _physical_memory; }
static void initialize_system_info();
- static bool supports_variable_stack_size();
-
static void rebuild_cpu_to_node_map();
static GrowableArray<int>* cpu_to_node() { return _cpu_to_node; }
diff --git a/hotspot/src/os/linux/vm/os_linux.cpp b/hotspot/src/os/linux/vm/os_linux.cpp
index 0af2751..bd4aa14 100644
--- a/hotspot/src/os/linux/vm/os_linux.cpp
+++ b/hotspot/src/os/linux/vm/os_linux.cpp
@@ -653,8 +653,7 @@
OSThread* osthread = thread->osthread();
Monitor* sync = osthread->startThread_lock();
- // thread_id is kernel thread id (similar to Solaris LWP id)
- osthread->set_thread_id(os::Linux::gettid());
+ osthread->set_thread_id(os::current_thread_id());
if (UseNUMA) {
int lgrp_id = os::numa_get_group_id();
@@ -712,39 +711,35 @@
pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
// stack size
- if (os::Linux::supports_variable_stack_size()) {
- // calculate stack size if it's not specified by caller
- if (stack_size == 0) {
- stack_size = os::Linux::default_stack_size(thr_type);
+ // calculate stack size if it's not specified by caller
+ if (stack_size == 0) {
+ stack_size = os::Linux::default_stack_size(thr_type);
- switch (thr_type) {
- case os::java_thread:
- // Java threads use ThreadStackSize which default value can be
- // changed with the flag -Xss
- assert(JavaThread::stack_size_at_create() > 0, "this should be set");
- stack_size = JavaThread::stack_size_at_create();
+ switch (thr_type) {
+ case os::java_thread:
+ // Java threads use ThreadStackSize which default value can be
+ // changed with the flag -Xss
+ assert(JavaThread::stack_size_at_create() > 0, "this should be set");
+ stack_size = JavaThread::stack_size_at_create();
+ break;
+ case os::compiler_thread:
+ if (CompilerThreadStackSize > 0) {
+ stack_size = (size_t)(CompilerThreadStackSize * K);
break;
- case os::compiler_thread:
- if (CompilerThreadStackSize > 0) {
- stack_size = (size_t)(CompilerThreadStackSize * K);
- break;
- } // else fall through:
- // use VMThreadStackSize if CompilerThreadStackSize is not defined
- case os::vm_thread:
- case os::pgc_thread:
- case os::cgc_thread:
- case os::watcher_thread:
- if (VMThreadStackSize > 0) stack_size = (size_t)(VMThreadStackSize * K);
- break;
- }
+ } // else fall through:
+ // use VMThreadStackSize if CompilerThreadStackSize is not defined
+ case os::vm_thread:
+ case os::pgc_thread:
+ case os::cgc_thread:
+ case os::watcher_thread:
+ if (VMThreadStackSize > 0) stack_size = (size_t)(VMThreadStackSize * K);
+ break;
}
-
- stack_size = MAX2(stack_size, os::Linux::min_stack_allowed);
- pthread_attr_setstacksize(&attr, stack_size);
- } else {
- // let pthread_create() pick the default value.
}
+ stack_size = MAX2(stack_size, os::Linux::min_stack_allowed);
+ pthread_attr_setstacksize(&attr, stack_size);
+
// glibc guard page
pthread_attr_setguardsize(&attr, os::Linux::default_guard_size(thr_type));
@@ -1424,7 +1419,8 @@
return n;
}
-intx os::current_thread_id() { return (intx)pthread_self(); }
+// thread_id is kernel thread id (similar to Solaris LWP id)
+intx os::current_thread_id() { return os::Linux::gettid(); }
int os::current_process_id() {
return ::getpid();
}
diff --git a/hotspot/src/os/linux/vm/os_linux.hpp b/hotspot/src/os/linux/vm/os_linux.hpp
index 9128344..b8104e7 100644
--- a/hotspot/src/os/linux/vm/os_linux.hpp
+++ b/hotspot/src/os/linux/vm/os_linux.hpp
@@ -83,8 +83,6 @@
static void set_glibc_version(const char *s) { _glibc_version = s; }
static void set_libpthread_version(const char *s) { _libpthread_version = s; }
- static bool supports_variable_stack_size();
-
static void rebuild_cpu_to_node_map();
static GrowableArray<int>* cpu_to_node() { return _cpu_to_node; }
diff --git a/hotspot/src/os_cpu/aix_ppc/vm/os_aix_ppc.cpp b/hotspot/src/os_cpu/aix_ppc/vm/os_aix_ppc.cpp
index 9381b5d..d8829b5 100644
--- a/hotspot/src/os_cpu/aix_ppc/vm/os_aix_ppc.cpp
+++ b/hotspot/src/os_cpu/aix_ppc/vm/os_aix_ppc.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright 2012, 2014 SAP AG. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -489,10 +489,6 @@
size_t os::Aix::min_stack_allowed = 128*K;
-// Aix is always in floating stack mode. The stack size for a new
-// thread can be set via pthread_attr_setstacksize().
-bool os::Aix::supports_variable_stack_size() { return true; }
-
// return default stack size for thr_type
size_t os::Aix::default_stack_size(os::ThreadType thr_type) {
// default stack size (compiler thread needs larger stack)
diff --git a/hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp b/hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp
index 4b2da94..423fea3 100644
--- a/hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp
+++ b/hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2015, 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
@@ -780,9 +780,6 @@
#ifdef AMD64
size_t os::Bsd::min_stack_allowed = 64 * K;
-
-// amd64: pthread on amd64 is always in floating stack mode
-bool os::Bsd::supports_variable_stack_size() { return true; }
#else
size_t os::Bsd::min_stack_allowed = (48 DEBUG_ONLY(+4))*K;
@@ -790,7 +787,6 @@
#define GET_GS() ({int gs; __asm__ volatile("movw %%gs, %w0":"=q"(gs)); gs&0xffff;})
#endif
-bool os::Bsd::supports_variable_stack_size() { return true; }
#endif // AMD64
// return default stack size for thr_type
diff --git a/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp b/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
index 0ed05eb..9b2db23 100644
--- a/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
+++ b/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -290,10 +290,6 @@
size_t os::Bsd::min_stack_allowed = 64 * K;
-bool os::Bsd::supports_variable_stack_size() {
- return true;
-}
-
size_t os::Bsd::default_stack_size(os::ThreadType thr_type) {
#ifdef _LP64
size_t s = (thr_type == os::compiler_thread ? 4 * M : 1 * M);
diff --git a/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp b/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp
index 2d116ef..3a3ffd9 100644
--- a/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp
+++ b/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, Red Hat Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -496,9 +496,6 @@
size_t os::Linux::min_stack_allowed = 64 * K;
-// aarch64: pthread on aarch64 is always in floating stack mode
-bool os::Linux::supports_variable_stack_size() { return true; }
-
// return default stack size for thr_type
size_t os::Linux::default_stack_size(os::ThreadType thr_type) {
// default stack size (compiler thread needs larger stack)
diff --git a/hotspot/src/os_cpu/linux_ppc/vm/os_linux_ppc.cpp b/hotspot/src/os_cpu/linux_ppc/vm/os_linux_ppc.cpp
index a605d14..ebf67a0 100644
--- a/hotspot/src/os_cpu/linux_ppc/vm/os_linux_ppc.cpp
+++ b/hotspot/src/os_cpu/linux_ppc/vm/os_linux_ppc.cpp
@@ -467,8 +467,6 @@
size_t os::Linux::min_stack_allowed = 128*K;
-bool os::Linux::supports_variable_stack_size() { return true; }
-
// return default stack size for thr_type
size_t os::Linux::default_stack_size(os::ThreadType thr_type) {
// default stack size (compiler thread needs larger stack)
diff --git a/hotspot/src/os_cpu/linux_sparc/vm/os_linux_sparc.cpp b/hotspot/src/os_cpu/linux_sparc/vm/os_linux_sparc.cpp
index e733cc9..0c1c626 100644
--- a/hotspot/src/os_cpu/linux_sparc/vm/os_linux_sparc.cpp
+++ b/hotspot/src/os_cpu/linux_sparc/vm/os_linux_sparc.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2015, 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
@@ -733,9 +733,6 @@
size_t os::Linux::min_stack_allowed = 128 * K;
-// pthread on Ubuntu is always in floating stack mode
-bool os::Linux::supports_variable_stack_size() { return true; }
-
// return default stack size for thr_type
size_t os::Linux::default_stack_size(os::ThreadType thr_type) {
// default stack size (compiler thread needs larger stack)
diff --git a/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp b/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
index 700c6a7..decb51e 100644
--- a/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
+++ b/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
@@ -623,11 +623,6 @@
size_t os::Linux::min_stack_allowed = (48 DEBUG_ONLY(+4))*K;
#endif // AMD64
-// Test if pthread library can support variable thread stack size.
-bool os::Linux::supports_variable_stack_size() {
- return true;
-}
-
// return default stack size for thr_type
size_t os::Linux::default_stack_size(os::ThreadType thr_type) {
// default stack size (compiler thread needs larger stack)
diff --git a/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp b/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
index 08c4615..5473f8a 100644
--- a/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
+++ b/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -305,10 +305,6 @@
size_t os::Linux::min_stack_allowed = 64 * K;
-bool os::Linux::supports_variable_stack_size() {
- return true;
-}
-
size_t os::Linux::default_stack_size(os::ThreadType thr_type) {
#ifdef _LP64
size_t s = (thr_type == os::compiler_thread ? 4 * M : 1 * M);
diff --git a/hotspot/src/share/vm/c1/c1_Compiler.cpp b/hotspot/src/share/vm/c1/c1_Compiler.cpp
index 84a7bd0..dad6edb3 100644
--- a/hotspot/src/share/vm/c1/c1_Compiler.cpp
+++ b/hotspot/src/share/vm/c1/c1_Compiler.cpp
@@ -239,25 +239,6 @@
return true;
}
-bool Compiler::is_intrinsic_disabled_by_flag(methodHandle method) {
- vmIntrinsics::ID id = method->intrinsic_id();
- assert(id != vmIntrinsics::_none, "must be a VM intrinsic");
-
- if (vmIntrinsics::is_disabled_by_flags(id)) {
- return true;
- }
-
- if (!InlineNatives && id != vmIntrinsics::_Reference_get) {
- return true;
- }
-
- if (!InlineClassNatives && id == vmIntrinsics::_getClass) {
- return true;
- }
-
- return false;
-}
-
void Compiler::compile_method(ciEnv* env, ciMethod* method, int entry_bci) {
BufferBlob* buffer_blob = CompilerThread::current()->get_buffer_blob();
assert(buffer_blob != NULL, "Must exist");
@@ -275,7 +256,3 @@
void Compiler::print_timers() {
Compilation::print_timers();
}
-
-bool Compiler::is_intrinsic_available(methodHandle method, methodHandle compilation_context) {
- return is_intrinsic_supported(method) && !is_intrinsic_disabled_by_flag(method);
-}
diff --git a/hotspot/src/share/vm/c1/c1_Compiler.hpp b/hotspot/src/share/vm/c1/c1_Compiler.hpp
index 8b8c8d4..96a6bad 100644
--- a/hotspot/src/share/vm/c1/c1_Compiler.hpp
+++ b/hotspot/src/share/vm/c1/c1_Compiler.hpp
@@ -55,18 +55,9 @@
// Print compilation timers and statistics
virtual void print_timers();
- // Check the availability of an intrinsic for 'method' given a compilation context.
- // The compilation context is needed to support per-method usage of the
- // DisableIntrinsic flag. However, as C1 ignores the DisableIntrinsic flag, it
- // ignores the compilation context.
- virtual bool is_intrinsic_available(methodHandle method, methodHandle compilation_context);
-
// Check if the C1 compiler supports an intrinsic for 'method'.
virtual bool is_intrinsic_supported(methodHandle method);
- // Processing of command-line flags specific to the C1 compiler.
- virtual bool is_intrinsic_disabled_by_flag(methodHandle method);
-
// Size of the code buffer
static int code_buffer_size();
};
diff --git a/hotspot/src/share/vm/c1/c1_GraphBuilder.cpp b/hotspot/src/share/vm/c1/c1_GraphBuilder.cpp
index e607b02..f3b25e8 100644
--- a/hotspot/src/share/vm/c1/c1_GraphBuilder.cpp
+++ b/hotspot/src/share/vm/c1/c1_GraphBuilder.cpp
@@ -3491,8 +3491,16 @@
bool GraphBuilder::try_inline_intrinsics(ciMethod* callee) {
// For calling is_intrinsic_available we need to transition to
// the '_thread_in_vm' state because is_intrinsic_available()
- // does not accesses critical VM-internal data.
- if (!_compilation->compiler()->is_intrinsic_available(callee->get_Method(), NULL)) {
+ // accesses critical VM-internal data.
+ bool is_available = false;
+ {
+ VM_ENTRY_MARK;
+ methodHandle mh(THREAD, callee->get_Method());
+ methodHandle ct(THREAD, method()->get_Method());
+ is_available = _compilation->compiler()->is_intrinsic_available(mh, ct);
+ }
+
+ if (!is_available) {
if (!InlineNatives) {
// Return false and also set message that the inlining of
// intrinsics has been disabled in general.
diff --git a/hotspot/src/share/vm/c1/c1_LIRAssembler.cpp b/hotspot/src/share/vm/c1/c1_LIRAssembler.cpp
index f82913e..2f99452 100644
--- a/hotspot/src/share/vm/c1/c1_LIRAssembler.cpp
+++ b/hotspot/src/share/vm/c1/c1_LIRAssembler.cpp
@@ -443,6 +443,7 @@
// emit the static call stub stuff out of line
emit_static_call_stub();
+ CHECK_BAILOUT();
switch (op->code()) {
case lir_static_call:
diff --git a/hotspot/src/share/vm/classfile/imageDecompressor.cpp b/hotspot/src/share/vm/classfile/imageDecompressor.cpp
index 68c5c56..d633950 100644
--- a/hotspot/src/share/vm/classfile/imageDecompressor.cpp
+++ b/hotspot/src/share/vm/classfile/imageDecompressor.cpp
@@ -22,8 +22,8 @@
*
*/
-#include "runtime/thread.inline.hpp"
#include "precompiled.hpp"
+#include "runtime/thread.inline.hpp"
#include "classfile/imageDecompressor.hpp"
#include "runtime/thread.hpp"
#include "utilities/bytes.hpp"
diff --git a/hotspot/src/share/vm/classfile/imageDecompressor.hpp b/hotspot/src/share/vm/classfile/imageDecompressor.hpp
index c57a852..6fca341 100644
--- a/hotspot/src/share/vm/classfile/imageDecompressor.hpp
+++ b/hotspot/src/share/vm/classfile/imageDecompressor.hpp
@@ -26,7 +26,6 @@
#define SHARE_VM_CLASSFILE_IMAGEDECOMPRESSOR_HPP
#include "runtime/thread.inline.hpp"
-#include "precompiled.hpp"
#include "classfile/classLoader.hpp"
#include "classfile/imageFile.hpp"
#include "classfile/symbolTable.hpp"
diff --git a/hotspot/src/share/vm/classfile/vmSymbols.cpp b/hotspot/src/share/vm/classfile/vmSymbols.cpp
index 1a968ac..cbbc412 100644
--- a/hotspot/src/share/vm/classfile/vmSymbols.cpp
+++ b/hotspot/src/share/vm/classfile/vmSymbols.cpp
@@ -417,8 +417,59 @@
}
}
-bool vmIntrinsics::is_disabled_by_flags(vmIntrinsics::ID id) {
+bool vmIntrinsics::is_disabled_by_flags(methodHandle method, methodHandle compilation_context) {
+ vmIntrinsics::ID id = method->intrinsic_id();
assert(id != vmIntrinsics::_none, "must be a VM intrinsic");
+
+ // Check if the intrinsic corresponding to 'method' has been disabled on
+ // the command line by using the DisableIntrinsic flag (either globally
+ // or on a per-method level, see src/share/vm/compiler/abstractCompiler.hpp
+ // for details).
+ // Usually, the compilation context is the caller of the method 'method'.
+ // The only case when for a non-recursive method 'method' the compilation context
+ // is not the caller of the 'method' (but it is the method itself) is
+ // java.lang.ref.Referene::get.
+ // For java.lang.ref.Reference::get, the intrinsic version is used
+ // instead of the compiled version so that the value in the referent
+ // field can be registered by the G1 pre-barrier code. The intrinsified
+ // version of Reference::get also adds a memory barrier to prevent
+ // commoning reads from the referent field across safepoint since GC
+ // can change the referent field's value. See Compile::Compile()
+ // in src/share/vm/opto/compile.cpp or
+ // GraphBuilder::GraphBuilder() in src/share/vm/c1/c1_GraphBuilder.cpp
+ // for more details.
+ ccstr disable_intr = NULL;
+ if ((DisableIntrinsic[0] != '\0' && strstr(DisableIntrinsic, vmIntrinsics::name_at(id)) != NULL) ||
+ (!compilation_context.is_null() &&
+ CompilerOracle::has_option_value(compilation_context, "DisableIntrinsic", disable_intr) &&
+ strstr(disable_intr, vmIntrinsics::name_at(id)) != NULL)
+ ) {
+ return true;
+ }
+
+ // -XX:-InlineNatives disables nearly all intrinsics except the ones listed in
+ // the following switch statement.
+ if (!InlineNatives) {
+ switch (id) {
+ case vmIntrinsics::_indexOf:
+ case vmIntrinsics::_compareTo:
+ case vmIntrinsics::_equals:
+ case vmIntrinsics::_equalsC:
+ case vmIntrinsics::_getAndAddInt:
+ case vmIntrinsics::_getAndAddLong:
+ case vmIntrinsics::_getAndSetInt:
+ case vmIntrinsics::_getAndSetLong:
+ case vmIntrinsics::_getAndSetObject:
+ case vmIntrinsics::_loadFence:
+ case vmIntrinsics::_storeFence:
+ case vmIntrinsics::_fullFence:
+ case vmIntrinsics::_Reference_get:
+ break;
+ default:
+ return true;
+ }
+ }
+
switch (id) {
case vmIntrinsics::_isInstance:
case vmIntrinsics::_isAssignableFrom:
@@ -430,6 +481,7 @@
case vmIntrinsics::_Class_cast:
case vmIntrinsics::_getLength:
case vmIntrinsics::_newArray:
+ case vmIntrinsics::_getClass:
if (!InlineClassNatives) return true;
break;
case vmIntrinsics::_currentThread:
@@ -522,6 +574,12 @@
case vmIntrinsics::_getAndSetInt:
case vmIntrinsics::_getAndSetLong:
case vmIntrinsics::_getAndSetObject:
+ case vmIntrinsics::_loadFence:
+ case vmIntrinsics::_storeFence:
+ case vmIntrinsics::_fullFence:
+ case vmIntrinsics::_compareAndSwapObject:
+ case vmIntrinsics::_compareAndSwapLong:
+ case vmIntrinsics::_compareAndSwapInt:
if (!InlineUnsafeOps) return true;
break;
case vmIntrinsics::_getShortUnaligned:
@@ -584,8 +642,8 @@
if (!InlineObjectCopy || !InlineArrayCopy) return true;
break;
case vmIntrinsics::_compareTo:
- if (!SpecialStringCompareTo) return true;
- break;
+ if (!SpecialStringCompareTo) return true;
+ break;
case vmIntrinsics::_indexOf:
if (!SpecialStringIndexOf) return true;
break;
@@ -602,8 +660,8 @@
if (!InlineReflectionGetCallerClass) return true;
break;
case vmIntrinsics::_multiplyToLen:
- if (!UseMultiplyToLenIntrinsic) return true;
- break;
+ if (!UseMultiplyToLenIntrinsic) return true;
+ break;
case vmIntrinsics::_squareToLen:
if (!UseSquareToLenIntrinsic) return true;
break;
diff --git a/hotspot/src/share/vm/classfile/vmSymbols.hpp b/hotspot/src/share/vm/classfile/vmSymbols.hpp
index 9e67c50..e012469 100644
--- a/hotspot/src/share/vm/classfile/vmSymbols.hpp
+++ b/hotspot/src/share/vm/classfile/vmSymbols.hpp
@@ -568,6 +568,11 @@
template(java_lang_management_ThreadInfo_constructor_signature, "(Ljava/lang/Thread;ILjava/lang/Object;Ljava/lang/Thread;JJJJ[Ljava/lang/StackTraceElement;)V") \
template(java_lang_management_ThreadInfo_with_locks_constructor_signature, "(Ljava/lang/Thread;ILjava/lang/Object;Ljava/lang/Thread;JJJJ[Ljava/lang/StackTraceElement;[Ljava/lang/Object;[I[Ljava/lang/Object;)V") \
template(long_long_long_long_void_signature, "(JJJJ)V") \
+ template(finalizer_histogram_klass, "java/lang/ref/FinalizerHistogram") \
+ template(void_finalizer_histogram_entry_array_signature, "()[Ljava/lang/ref/FinalizerHistogram$Entry;") \
+ template(get_finalizer_histogram_name, "getFinalizerHistogram") \
+ template(finalizer_histogram_entry_name_field, "className") \
+ template(finalizer_histogram_entry_count_field, "instanceCount") \
\
template(java_lang_management_MemoryPoolMXBean, "java/lang/management/MemoryPoolMXBean") \
template(java_lang_management_MemoryManagerMXBean, "java/lang/management/MemoryManagerMXBean") \
@@ -1384,10 +1389,9 @@
// 'method' requires predicated logic.
static int predicates_needed(vmIntrinsics::ID id);
- // Returns true if an intrinsic is disabled by command-line flags and
- // false otherwise. Implements functionality common to the C1
- // and the C2 compiler.
- static bool is_disabled_by_flags(vmIntrinsics::ID id);
+ // Returns true if a compiler intrinsic is disabled by command-line flags
+ // and false otherwise.
+ static bool is_disabled_by_flags(methodHandle method, methodHandle compilation_context);
};
#endif // SHARE_VM_CLASSFILE_VMSYMBOLS_HPP
diff --git a/hotspot/src/share/vm/code/compiledIC.hpp b/hotspot/src/share/vm/code/compiledIC.hpp
index 5d14381..56d37c0 100644
--- a/hotspot/src/share/vm/code/compiledIC.hpp
+++ b/hotspot/src/share/vm/code/compiledIC.hpp
@@ -306,7 +306,7 @@
friend CompiledStaticCall* compiledStaticCall_at(Relocation* call_site);
// Code
- static void emit_to_interp_stub(CodeBuffer &cbuf);
+ static address emit_to_interp_stub(CodeBuffer &cbuf);
static int to_interp_stub_size();
static int reloc_to_interp_stub();
diff --git a/hotspot/src/share/vm/compiler/abstractCompiler.hpp b/hotspot/src/share/vm/compiler/abstractCompiler.hpp
index e3a727b..41c155d 100644
--- a/hotspot/src/share/vm/compiler/abstractCompiler.hpp
+++ b/hotspot/src/share/vm/compiler/abstractCompiler.hpp
@@ -75,8 +75,8 @@
//
// The second parameter, 'compilation_context', is needed to implement functionality
// related to the DisableIntrinsic command-line flag. The DisableIntrinsic flag can
- // be used to prohibit the C2 compiler (but not the C1 compiler) to use an intrinsic.
- // There are three ways to disable an intrinsic using the DisableIntrinsic flag:
+ // be used to prohibit the compilers to use an intrinsic. There are three ways to
+ // disable an intrinsic using the DisableIntrinsic flag:
//
// (1) -XX:DisableIntrinsic=_hashCode,_getClass
// Disables intrinsification of _hashCode and _getClass globally
@@ -96,7 +96,8 @@
// compilation context is aClass::aMethod and java.lang.ref.Reference::get,
// respectively.
virtual bool is_intrinsic_available(methodHandle method, methodHandle compilation_context) {
- return false;
+ return is_intrinsic_supported(method) &&
+ !vmIntrinsics::is_disabled_by_flags(method, compilation_context);
}
// Determines if an intrinsic is supported by the compiler, that is,
@@ -111,13 +112,6 @@
return false;
}
- // Implements compiler-specific processing of command-line flags.
- // Processing of command-line flags common to all compilers is implemented
- // in vmIntrinsicss::is_disabled_by_flag.
- virtual bool is_intrinsic_disabled_by_flag(methodHandle method) {
- return false;
- }
-
// Compiler type queries.
bool is_c1() { return _type == c1; }
bool is_c2() { return _type == c2; }
diff --git a/hotspot/src/share/vm/opto/arraycopynode.cpp b/hotspot/src/share/vm/opto/arraycopynode.cpp
index b09cecc..0672fc8 100644
--- a/hotspot/src/share/vm/opto/arraycopynode.cpp
+++ b/hotspot/src/share/vm/opto/arraycopynode.cpp
@@ -79,10 +79,15 @@
#ifndef PRODUCT
const char* ArrayCopyNode::_kind_names[] = {"arraycopy", "arraycopy, validated arguments", "clone", "oop array clone", "CopyOf", "CopyOfRange"};
+
void ArrayCopyNode::dump_spec(outputStream *st) const {
CallNode::dump_spec(st);
st->print(" (%s%s)", _kind_names[_kind], _alloc_tightly_coupled ? ", tightly coupled allocation" : "");
}
+
+void ArrayCopyNode::dump_compact_spec(outputStream* st) const {
+ st->print("%s%s", _kind_names[_kind], _alloc_tightly_coupled ? ",tight" : "");
+}
#endif
intptr_t ArrayCopyNode::get_length_if_constant(PhaseGVN *phase) const {
diff --git a/hotspot/src/share/vm/opto/arraycopynode.hpp b/hotspot/src/share/vm/opto/arraycopynode.hpp
index 967ae55..a2237cd 100644
--- a/hotspot/src/share/vm/opto/arraycopynode.hpp
+++ b/hotspot/src/share/vm/opto/arraycopynode.hpp
@@ -164,6 +164,7 @@
#ifndef PRODUCT
virtual void dump_spec(outputStream *st) const;
+ virtual void dump_compact_spec(outputStream* st) const;
#endif
};
#endif // SHARE_VM_OPTO_ARRAYCOPYNODE_HPP
diff --git a/hotspot/src/share/vm/opto/c2_globals.hpp b/hotspot/src/share/vm/opto/c2_globals.hpp
index dbdfc53..61abb9c 100644
--- a/hotspot/src/share/vm/opto/c2_globals.hpp
+++ b/hotspot/src/share/vm/opto/c2_globals.hpp
@@ -623,9 +623,6 @@
diagnostic(bool, PrintIntrinsics, false, \
"prints attempted and successful inlining of intrinsics") \
\
- diagnostic(ccstrlist, DisableIntrinsic, "", \
- "do not expand intrinsics whose (internal) names appear here") \
- \
develop(bool, StressReflectiveCode, false, \
"Use inexact types at allocations, etc., to test reflection") \
\
diff --git a/hotspot/src/share/vm/opto/c2compiler.cpp b/hotspot/src/share/vm/opto/c2compiler.cpp
index 64ac374..8da6995 100644
--- a/hotspot/src/share/vm/opto/c2compiler.cpp
+++ b/hotspot/src/share/vm/opto/c2compiler.cpp
@@ -157,14 +157,6 @@
Compile::print_timers();
}
-bool C2Compiler::is_intrinsic_available(methodHandle method, methodHandle compilation_context) {
- // Assume a non-virtual dispatch. A virtual dispatch is
- // possible for only a limited set of available intrinsics whereas
- // a non-virtual dispatch is possible for all available intrinsics.
- return is_intrinsic_supported(method, false) &&
- !is_intrinsic_disabled_by_flag(method, compilation_context);
-}
-
bool C2Compiler::is_intrinsic_supported(methodHandle method, bool is_virtual) {
vmIntrinsics::ID id = method->intrinsic_id();
assert(id != vmIntrinsics::_none, "must be a VM intrinsic");
@@ -436,78 +428,6 @@
return true;
}
-bool C2Compiler::is_intrinsic_disabled_by_flag(methodHandle method, methodHandle compilation_context) {
- vmIntrinsics::ID id = method->intrinsic_id();
- assert(id != vmIntrinsics::_none, "must be a VM intrinsic");
-
- if (vmIntrinsics::is_disabled_by_flags(method->intrinsic_id())) {
- return true;
- }
-
- // Check if the intrinsic corresponding to 'method' has been disabled on
- // the command line by using the DisableIntrinsic flag (either globally
- // or on a per-method level, see src/share/vm/compiler/abstractCompiler.hpp
- // for details).
- // Usually, the compilation context is the caller of the method 'method'.
- // The only case when for a non-recursive method 'method' the compilation context
- // is not the caller of the 'method' (but it is the method itself) is
- // java.lang.ref.Referene::get.
- // For java.lang.ref.Reference::get, the intrinsic version is used
- // instead of the C2-compiled version so that the value in the referent
- // field can be registered by the G1 pre-barrier code. The intrinsified
- // version of Reference::get also adds a memory barrier to prevent
- // commoning reads from the referent field across safepoint since GC
- // can change the referent field's value. See Compile::Compile()
- // in src/share/vm/opto/compile.cpp for more details.
- ccstr disable_intr = NULL;
- if ((DisableIntrinsic[0] != '\0' && strstr(DisableIntrinsic, vmIntrinsics::name_at(id)) != NULL) ||
- (!compilation_context.is_null() &&
- CompilerOracle::has_option_value(compilation_context, "DisableIntrinsic", disable_intr) &&
- strstr(disable_intr, vmIntrinsics::name_at(id)) != NULL)
- ) {
- return true;
- }
-
- // -XX:-InlineNatives disables nearly all intrinsics except the ones listed in
- // the following switch statement.
- if (!InlineNatives) {
- switch (id) {
- case vmIntrinsics::_indexOf:
- case vmIntrinsics::_compareTo:
- case vmIntrinsics::_equals:
- case vmIntrinsics::_equalsC:
- case vmIntrinsics::_getAndAddInt:
- case vmIntrinsics::_getAndAddLong:
- case vmIntrinsics::_getAndSetInt:
- case vmIntrinsics::_getAndSetLong:
- case vmIntrinsics::_getAndSetObject:
- case vmIntrinsics::_loadFence:
- case vmIntrinsics::_storeFence:
- case vmIntrinsics::_fullFence:
- case vmIntrinsics::_Reference_get:
- break;
- default:
- return true;
- }
- }
-
- if (!InlineUnsafeOps) {
- switch (id) {
- case vmIntrinsics::_loadFence:
- case vmIntrinsics::_storeFence:
- case vmIntrinsics::_fullFence:
- case vmIntrinsics::_compareAndSwapObject:
- case vmIntrinsics::_compareAndSwapLong:
- case vmIntrinsics::_compareAndSwapInt:
- return true;
- default:
- return false;
- }
- }
-
- return false;
-}
-
int C2Compiler::initial_code_buffer_size() {
assert(SegmentedCodeCache, "Should be only used with a segmented code cache");
return Compile::MAX_inst_size + Compile::MAX_locs_size + initial_const_capacity;
diff --git a/hotspot/src/share/vm/opto/c2compiler.hpp b/hotspot/src/share/vm/opto/c2compiler.hpp
index d651b1d..f830819 100644
--- a/hotspot/src/share/vm/opto/c2compiler.hpp
+++ b/hotspot/src/share/vm/opto/c2compiler.hpp
@@ -51,11 +51,11 @@
// Print compilation timers and statistics
void print_timers();
- // Check the availability of an intrinsic for 'method' given a compilation context.
- virtual bool is_intrinsic_available(methodHandle method, methodHandle compilation_context);
-
// Return true if the intrinsification of a method supported by the compiler
- // assuming a non-virtual dispatch. Return false otherwise.
+ // assuming a non-virtual dispatch. (A virtual dispatch is
+ // possible for only a limited set of available intrinsics whereas
+ // a non-virtual dispatch is possible for all available intrinsics.)
+ // Return false otherwise.
virtual bool is_intrinsic_supported(methodHandle method) {
return is_intrinsic_supported(method, false);
}
@@ -64,13 +64,6 @@
// the dispatch mode specified by the 'is_virtual' parameter.
virtual bool is_intrinsic_supported(methodHandle method, bool is_virtual);
- // Processing of command-line flags specific to the C2 compiler.
- virtual bool is_intrinsic_disabled_by_flag(methodHandle method) {
- return is_intrinsic_disabled_by_flag(method, NULL);
- }
-
- virtual bool is_intrinsic_disabled_by_flag(methodHandle method, methodHandle compilation_context);
-
// Initial size of the code buffer (may be increased at runtime)
static int initial_code_buffer_size();
};
diff --git a/hotspot/src/share/vm/opto/callnode.cpp b/hotspot/src/share/vm/opto/callnode.cpp
index b0b7383..3e44fec 100644
--- a/hotspot/src/share/vm/opto/callnode.cpp
+++ b/hotspot/src/share/vm/opto/callnode.cpp
@@ -52,6 +52,7 @@
const Type *StartNode::Value(PhaseTransform *phase) const { return _domain; }
#ifndef PRODUCT
void StartNode::dump_spec(outputStream *st) const { st->print(" #"); _domain->dump_on(st);}
+void StartNode::dump_compact_spec(outputStream *st) const { /* empty */ }
#endif
//------------------------------Ideal------------------------------------------
@@ -121,6 +122,23 @@
if( !Verbose && !WizardMode ) bottom_type()->dump_on(st);
}
}
+
+void ParmNode::dump_compact_spec(outputStream *st) const {
+ if (_con < TypeFunc::Parms) {
+ st->print("%s", names[_con]);
+ } else {
+ st->print("%d:", _con-TypeFunc::Parms);
+ // unconditionally dump bottom_type
+ bottom_type()->dump_on(st);
+ }
+}
+
+// For a ParmNode, all immediate inputs and outputs are considered relevant
+// both in compact and standard representation.
+void ParmNode::related(GrowableArray<Node*> *in_rel, GrowableArray<Node*> *out_rel, bool compact) const {
+ this->collect_nodes(in_rel, 1, false, false);
+ this->collect_nodes(out_rel, -1, false, false);
+}
#endif
uint ParmNode::ideal_reg() const {
@@ -948,6 +966,14 @@
if( _method ) _method->print_short_name(st);
CallNode::dump_spec(st);
}
+
+void CallJavaNode::dump_compact_spec(outputStream* st) const {
+ if (_method) {
+ _method->print_short_name(st);
+ } else {
+ st->print("<?>");
+ }
+}
#endif
//=============================================================================
@@ -995,6 +1021,16 @@
}
CallJavaNode::dump_spec(st);
}
+
+void CallStaticJavaNode::dump_compact_spec(outputStream* st) const {
+ if (_method) {
+ _method->print_short_name(st);
+ } else if (_name) {
+ st->print("%s", _name);
+ } else {
+ st->print("<?>");
+ }
+}
#endif
//=============================================================================
@@ -1130,6 +1166,19 @@
st->print(" SafePoint ");
_replaced_nodes.dump(st);
}
+
+// The related nodes of a SafepointNode are all data inputs, excluding the
+// control boundary, as well as all outputs till level 2 (to include projection
+// nodes and targets). In compact mode, just include inputs till level 1 and
+// outputs as before.
+void SafePointNode::related(GrowableArray<Node*> *in_rel, GrowableArray<Node*> *out_rel, bool compact) const {
+ if (compact) {
+ this->collect_nodes(in_rel, 1, false, false);
+ } else {
+ this->collect_nodes_in_all_data(in_rel, false);
+ }
+ this->collect_nodes(out_rel, -2, false, false);
+}
#endif
const RegMask &SafePointNode::in_RegMask(uint idx) const {
@@ -1676,6 +1725,27 @@
_counter->set_tag(NamedCounter::EliminatedLockCounter);
}
}
+
+const char* AbstractLockNode::_kind_names[] = {"Regular", "NonEscObj", "Coarsened", "Nested"};
+
+void AbstractLockNode::dump_spec(outputStream* st) const {
+ st->print("%s ", _kind_names[_kind]);
+ CallNode::dump_spec(st);
+}
+
+void AbstractLockNode::dump_compact_spec(outputStream* st) const {
+ st->print("%s", _kind_names[_kind]);
+}
+
+// The related set of lock nodes includes the control boundary.
+void AbstractLockNode::related(GrowableArray<Node*> *in_rel, GrowableArray<Node*> *out_rel, bool compact) const {
+ if (compact) {
+ this->collect_nodes(in_rel, 1, false, false);
+ } else {
+ this->collect_nodes_in_all_data(in_rel, true);
+ }
+ this->collect_nodes(out_rel, -2, false, false);
+}
#endif
//=============================================================================
diff --git a/hotspot/src/share/vm/opto/callnode.hpp b/hotspot/src/share/vm/opto/callnode.hpp
index 9909621..2c788e5 100644
--- a/hotspot/src/share/vm/opto/callnode.hpp
+++ b/hotspot/src/share/vm/opto/callnode.hpp
@@ -84,6 +84,7 @@
virtual uint ideal_reg() const { return 0; }
#ifndef PRODUCT
virtual void dump_spec(outputStream *st) const;
+ virtual void dump_compact_spec(outputStream *st) const;
#endif
};
@@ -110,6 +111,8 @@
virtual uint ideal_reg() const;
#ifndef PRODUCT
virtual void dump_spec(outputStream *st) const;
+ virtual void dump_compact_spec(outputStream *st) const;
+ virtual void related(GrowableArray<Node*> *in_rel, GrowableArray<Node*> *out_rel, bool compact) const;
#endif
};
@@ -476,6 +479,7 @@
#ifndef PRODUCT
virtual void dump_spec(outputStream *st) const;
+ virtual void related(GrowableArray<Node*> *in_rel, GrowableArray<Node*> *out_rel, bool compact) const;
#endif
};
@@ -675,6 +679,7 @@
#ifndef PRODUCT
virtual void dump_spec(outputStream *st) const;
+ virtual void dump_compact_spec(outputStream *st) const;
#endif
};
@@ -730,6 +735,7 @@
virtual int Opcode() const;
#ifndef PRODUCT
virtual void dump_spec(outputStream *st) const;
+ virtual void dump_compact_spec(outputStream *st) const;
#endif
};
@@ -951,6 +957,7 @@
} _kind;
#ifndef PRODUCT
NamedCounter* _counter;
+ static const char* _kind_names[Nested+1];
#endif
protected:
@@ -1005,6 +1012,9 @@
#ifndef PRODUCT
void create_lock_counter(JVMState* s);
NamedCounter* counter() const { return _counter; }
+ virtual void dump_spec(outputStream* st) const;
+ virtual void dump_compact_spec(outputStream* st) const;
+ virtual void related(GrowableArray<Node*> *in_rel, GrowableArray<Node*> *out_rel, bool compact) const;
#endif
};
diff --git a/hotspot/src/share/vm/opto/cfgnode.cpp b/hotspot/src/share/vm/opto/cfgnode.cpp
index fcb3fcd..9014eb6 100644
--- a/hotspot/src/share/vm/opto/cfgnode.cpp
+++ b/hotspot/src/share/vm/opto/cfgnode.cpp
@@ -2023,6 +2023,14 @@
}
#ifndef PRODUCT
+void PhiNode::related(GrowableArray<Node*> *in_rel, GrowableArray<Node*> *out_rel, bool compact) const {
+ // For a PhiNode, the set of related nodes includes all inputs till level 2,
+ // and all outputs till level 1. In compact mode, inputs till level 1 are
+ // collected.
+ this->collect_nodes(in_rel, compact ? 1 : 2, false, false);
+ this->collect_nodes(out_rel, -1, false, false);
+}
+
void PhiNode::dump_spec(outputStream *st) const {
TypeNode::dump_spec(st);
if (is_tripcount()) {
@@ -2047,11 +2055,33 @@
return RegMask::Empty;
}
+#ifndef PRODUCT
+//-----------------------------related-----------------------------------------
+// The related nodes of a GotoNode are all inputs at level 1, as well as the
+// outputs at level 1. This is regardless of compact mode.
+void GotoNode::related(GrowableArray<Node*> *in_rel, GrowableArray<Node*> *out_rel, bool compact) const {
+ this->collect_nodes(in_rel, 1, false, false);
+ this->collect_nodes(out_rel, -1, false, false);
+}
+#endif
+
+
//=============================================================================
const RegMask &JumpNode::out_RegMask() const {
return RegMask::Empty;
}
+#ifndef PRODUCT
+//-----------------------------related-----------------------------------------
+// The related nodes of a JumpNode are all inputs at level 1, as well as the
+// outputs at level 2 (to include actual jump targets beyond projection nodes).
+// This is regardless of compact mode.
+void JumpNode::related(GrowableArray<Node*> *in_rel, GrowableArray<Node*> *out_rel, bool compact) const {
+ this->collect_nodes(in_rel, 1, false, false);
+ this->collect_nodes(out_rel, -2, false, false);
+}
+#endif
+
//=============================================================================
const RegMask &JProjNode::out_RegMask() const {
return RegMask::Empty;
@@ -2105,7 +2135,18 @@
#ifndef PRODUCT
void JumpProjNode::dump_spec(outputStream *st) const {
ProjNode::dump_spec(st);
- st->print("@bci %d ",_dest_bci);
+ st->print("@bci %d ",_dest_bci);
+}
+
+void JumpProjNode::dump_compact_spec(outputStream *st) const {
+ ProjNode::dump_compact_spec(st);
+ st->print("(%d)%d@%d", _switch_val, _proj_no, _dest_bci);
+}
+
+void JumpProjNode::related(GrowableArray<Node*> *in_rel, GrowableArray<Node*> *out_rel, bool compact) const {
+ // The related nodes of a JumpProjNode are its inputs and outputs at level 1.
+ this->collect_nodes(in_rel, 1, false, false);
+ this->collect_nodes(out_rel, -1, false, false);
}
#endif
diff --git a/hotspot/src/share/vm/opto/cfgnode.hpp b/hotspot/src/share/vm/opto/cfgnode.hpp
index 7d851b5..33a378e 100644
--- a/hotspot/src/share/vm/opto/cfgnode.hpp
+++ b/hotspot/src/share/vm/opto/cfgnode.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -204,6 +204,7 @@
virtual const RegMask &out_RegMask() const;
virtual const RegMask &in_RegMask(uint) const;
#ifndef PRODUCT
+ virtual void related(GrowableArray<Node*> *in_rel, GrowableArray<Node*> *out_rel, bool compact) const;
virtual void dump_spec(outputStream *st) const;
#endif
#ifdef ASSERT
@@ -229,6 +230,10 @@
virtual const Type *Value( PhaseTransform *phase ) const;
virtual Node *Identity( PhaseTransform *phase );
virtual const RegMask &out_RegMask() const;
+
+#ifndef PRODUCT
+ virtual void related(GrowableArray<Node*> *in_rel, GrowableArray<Node*> *out_rel, bool compact) const;
+#endif
};
//------------------------------CProjNode--------------------------------------
@@ -382,6 +387,7 @@
#ifndef PRODUCT
virtual void dump_spec(outputStream *st) const;
+ virtual void related(GrowableArray <Node *> *in_rel, GrowableArray <Node *> *out_rel, bool compact) const;
#endif
};
@@ -393,6 +399,11 @@
protected:
// Type of If input when this branch is always taken
virtual bool always_taken(const TypeTuple* t) const = 0;
+
+#ifndef PRODUCT
+public:
+ virtual void related(GrowableArray<Node*> *in_rel, GrowableArray<Node*> *out_rel, bool compact) const;
+#endif
};
class IfTrueNode : public IfProjNode {
@@ -455,6 +466,9 @@
virtual int Opcode() const;
virtual const RegMask& out_RegMask() const;
virtual const Node* is_block_proj() const { return this; }
+#ifndef PRODUCT
+ virtual void related(GrowableArray<Node*> *in_rel, GrowableArray<Node*> *out_rel, bool compact) const;
+#endif
};
class JumpProjNode : public JProjNode {
@@ -479,6 +493,8 @@
uint proj_no() const { return _proj_no; }
#ifndef PRODUCT
virtual void dump_spec(outputStream *st) const;
+ virtual void dump_compact_spec(outputStream *st) const;
+ virtual void related(GrowableArray<Node*> *in_rel, GrowableArray<Node*> *out_rel, bool compact) const;
#endif
};
diff --git a/hotspot/src/share/vm/opto/compile.cpp b/hotspot/src/share/vm/opto/compile.cpp
index 5025d83..3cf18d1 100644
--- a/hotspot/src/share/vm/opto/compile.cpp
+++ b/hotspot/src/share/vm/opto/compile.cpp
@@ -594,6 +594,10 @@
n->as_MachBranch()->label_set(&fakeL, 0);
}
n->emit(buf, this->regalloc());
+
+ // Emitting into the scratch buffer should not fail
+ assert (!failing(), err_msg_res("Must not have pending failure. Reason is: %s", failure_reason()));
+
if (is_branch) // Restore label.
n->as_MachBranch()->label_set(saveL, save_bnum);
diff --git a/hotspot/src/share/vm/opto/ifnode.cpp b/hotspot/src/share/vm/opto/ifnode.cpp
index bc107f4..cd60f19 100644
--- a/hotspot/src/share/vm/opto/ifnode.cpp
+++ b/hotspot/src/share/vm/opto/ifnode.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2015, 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
@@ -1601,11 +1601,41 @@
return this;
}
-//------------------------------dump_spec--------------------------------------
#ifndef PRODUCT
+//-------------------------------related---------------------------------------
+// An IfProjNode's related node set consists of its input (an IfNode) including
+// the IfNode's condition, plus all of its outputs at level 1. In compact mode,
+// the restrictions for IfNode apply (see IfNode::rel).
+void IfProjNode::related(GrowableArray<Node*> *in_rel, GrowableArray<Node*> *out_rel, bool compact) const {
+ Node* ifNode = this->in(0);
+ in_rel->append(ifNode);
+ if (compact) {
+ ifNode->collect_nodes(in_rel, 3, false, true);
+ } else {
+ ifNode->collect_nodes_in_all_data(in_rel, false);
+ }
+ this->collect_nodes(out_rel, -1, false, false);
+}
+
+//------------------------------dump_spec--------------------------------------
void IfNode::dump_spec(outputStream *st) const {
st->print("P=%f, C=%f",_prob,_fcnt);
}
+
+//-------------------------------related---------------------------------------
+// For an IfNode, the set of related output nodes is just the output nodes till
+// depth 2, i.e, the IfTrue/IfFalse projection nodes plus the nodes they refer.
+// The related input nodes contain no control nodes, but all data nodes
+// pertaining to the condition. In compact mode, the input nodes are collected
+// up to a depth of 3.
+void IfNode::related(GrowableArray <Node *> *in_rel, GrowableArray <Node *> *out_rel, bool compact) const {
+ if (compact) {
+ this->collect_nodes(in_rel, 3, false, true);
+ } else {
+ this->collect_nodes_in_all_data(in_rel, false);
+ }
+ this->collect_nodes(out_rel, -2, false, false);
+}
#endif
//------------------------------idealize_test----------------------------------
diff --git a/hotspot/src/share/vm/opto/library_call.cpp b/hotspot/src/share/vm/opto/library_call.cpp
index 23b993e..417135b 100644
--- a/hotspot/src/share/vm/opto/library_call.cpp
+++ b/hotspot/src/share/vm/opto/library_call.cpp
@@ -327,7 +327,7 @@
methodHandle mh(THREAD, m->get_Method());
methodHandle ct(THREAD, method()->get_Method());
is_available = compiler->is_intrinsic_supported(mh, is_virtual) &&
- !compiler->is_intrinsic_disabled_by_flag(mh, ct);
+ !vmIntrinsics::is_disabled_by_flags(mh, ct);
}
if (is_available) {
diff --git a/hotspot/src/share/vm/opto/movenode.cpp b/hotspot/src/share/vm/opto/movenode.cpp
index 234cdeb..8fe9b02 100644
--- a/hotspot/src/share/vm/opto/movenode.cpp
+++ b/hotspot/src/share/vm/opto/movenode.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -396,3 +396,17 @@
return TypeLong::make( v.get_jlong() );
}
+#ifndef PRODUCT
+//----------------------------BinaryNode---------------------------------------
+// The set of related nodes for a BinaryNode is all data inputs and all outputs
+// till level 2 (i.e., one beyond the associated CMoveNode). In compact mode,
+// it's the inputs till level 1 and the outputs till level 2.
+void BinaryNode::related(GrowableArray<Node*> *in_rel, GrowableArray<Node*> *out_rel, bool compact) const {
+ if (compact) {
+ this->collect_nodes(in_rel, 1, false, true);
+ } else {
+ this->collect_nodes_in_all_data(in_rel, false);
+ }
+ this->collect_nodes(out_rel, -2, false, false);
+}
+#endif
diff --git a/hotspot/src/share/vm/opto/movenode.hpp b/hotspot/src/share/vm/opto/movenode.hpp
index bb99f7b..4cd9418 100644
--- a/hotspot/src/share/vm/opto/movenode.hpp
+++ b/hotspot/src/share/vm/opto/movenode.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -145,6 +145,10 @@
BinaryNode( Node *n1, Node *n2 ) : Node(0,n1,n2) { }
virtual int Opcode() const;
virtual uint ideal_reg() const { return 0; }
+
+#ifndef PRODUCT
+ virtual void related(GrowableArray<Node*> *in_rel, GrowableArray<Node*> *out_rel, bool compact) const;
+#endif
};
diff --git a/hotspot/src/share/vm/opto/multnode.cpp b/hotspot/src/share/vm/opto/multnode.cpp
index 00ff009..3648fef 100644
--- a/hotspot/src/share/vm/opto/multnode.cpp
+++ b/hotspot/src/share/vm/opto/multnode.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -118,6 +118,20 @@
bool ProjNode::pinned() const { return in(0)->pinned(); }
#ifndef PRODUCT
void ProjNode::dump_spec(outputStream *st) const { st->print("#%d",_con); if(_is_io_use) st->print(" (i_o_use)");}
+
+void ProjNode::dump_compact_spec(outputStream *st) const {
+ for (DUIterator i = this->outs(); this->has_out(i); i++) {
+ Node* o = this->out(i);
+ if (NotANode(o)) {
+ st->print("[?]");
+ } else if (o == NULL) {
+ st->print("[_]");
+ } else {
+ st->print("[%d]", o->_idx);
+ }
+ }
+ st->print("#%d", _con);
+}
#endif
//----------------------------check_con----------------------------------------
diff --git a/hotspot/src/share/vm/opto/multnode.hpp b/hotspot/src/share/vm/opto/multnode.hpp
index 02558db..25f8c50 100644
--- a/hotspot/src/share/vm/opto/multnode.hpp
+++ b/hotspot/src/share/vm/opto/multnode.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -87,6 +87,7 @@
#ifndef PRODUCT
virtual void dump_spec(outputStream *st) const;
+ virtual void dump_compact_spec(outputStream *st) const;
#endif
// Return uncommon trap call node if proj is for "proj->[region->..]call_uct"
diff --git a/hotspot/src/share/vm/opto/node.cpp b/hotspot/src/share/vm/opto/node.cpp
index 5b2aa14..a331ac6 100644
--- a/hotspot/src/share/vm/opto/node.cpp
+++ b/hotspot/src/share/vm/opto/node.cpp
@@ -1489,16 +1489,6 @@
#ifndef PRODUCT
-//----------------------------NotANode----------------------------------------
-// Used in debugging code to avoid walking across dead or uninitialized edges.
-static inline bool NotANode(const Node* n) {
- if (n == NULL) return true;
- if (((intptr_t)n & 1) != 0) return true; // uninitialized, etc.
- if (*(address*)n == badAddress) return true; // kill by Node::destruct
- return false;
-}
-
-
//------------------------------find------------------------------------------
// Find a neighbor of this Node with the given _idx
// If idx is negative, find its absolute value, following both _in and _out.
@@ -1636,11 +1626,11 @@
//------------------------------dump------------------------------------------
// Dump a Node
-void Node::dump(const char* suffix, outputStream *st) const {
+void Node::dump(const char* suffix, bool mark, outputStream *st) const {
Compile* C = Compile::current();
bool is_new = C->node_arena()->contains(this);
C->_in_dump_cnt++;
- st->print("%c%d\t%s\t=== ", is_new ? ' ' : 'o', _idx, Name());
+ st->print("%c%d%s\t%s\t=== ", is_new ? ' ' : 'o', _idx, mark ? " >" : "", Name());
// Dump the required and precedence inputs
dump_req(st);
@@ -1760,42 +1750,60 @@
st->print("]] ");
}
-//------------------------------dump_nodes-------------------------------------
-static void dump_nodes(const Node* start, int d, bool only_ctrl) {
- Node* s = (Node*)start; // remove const
- if (NotANode(s)) return;
-
- uint depth = (uint)ABS(d);
- int direction = d;
- Compile* C = Compile::current();
- GrowableArray <Node *> nstack(C->unique());
-
- nstack.append(s);
+//----------------------------collect_nodes_i----------------------------------
+// Collects nodes from an Ideal graph, starting from a given start node and
+// moving in a given direction until a certain depth (distance from the start
+// node) is reached. Duplicates are ignored.
+// Arguments:
+// nstack: the nodes are collected into this array.
+// start: the node at which to start collecting.
+// direction: if this is a positive number, collect input nodes; if it is
+// a negative number, collect output nodes.
+// depth: collect nodes up to this distance from the start node.
+// include_start: whether to include the start node in the result collection.
+// only_ctrl: whether to regard control edges only during traversal.
+// only_data: whether to regard data edges only during traversal.
+static void collect_nodes_i(GrowableArray<Node*> *nstack, const Node* start, int direction, uint depth, bool include_start, bool only_ctrl, bool only_data) {
+ Node* s = (Node*) start; // remove const
+ nstack->append(s);
int begin = 0;
int end = 0;
for(uint i = 0; i < depth; i++) {
- end = nstack.length();
+ end = nstack->length();
for(int j = begin; j < end; j++) {
- Node* tp = nstack.at(j);
+ Node* tp = nstack->at(j);
uint limit = direction > 0 ? tp->len() : tp->outcnt();
for(uint k = 0; k < limit; k++) {
Node* n = direction > 0 ? tp->in(k) : tp->raw_out(k);
if (NotANode(n)) continue;
// do not recurse through top or the root (would reach unrelated stuff)
- if (n->is_Root() || n->is_top()) continue;
+ if (n->is_Root() || n->is_top()) continue;
if (only_ctrl && !n->is_CFG()) continue;
+ if (only_data && n->is_CFG()) continue;
- bool on_stack = nstack.contains(n);
+ bool on_stack = nstack->contains(n);
if (!on_stack) {
- nstack.append(n);
+ nstack->append(n);
}
}
}
begin = end;
}
- end = nstack.length();
- if (direction > 0) {
+ if (!include_start) {
+ nstack->remove(s);
+ }
+}
+
+//------------------------------dump_nodes-------------------------------------
+static void dump_nodes(const Node* start, int d, bool only_ctrl) {
+ if (NotANode(start)) return;
+
+ GrowableArray <Node *> nstack(Compile::current()->unique());
+ collect_nodes_i(&nstack, start, d, (uint) ABS(d), true, only_ctrl, false);
+
+ int end = nstack.length();
+ if (d > 0) {
for(int j = end-1; j >= 0; j--) {
nstack.at(j)->dump();
}
@@ -1817,6 +1825,221 @@
dump_nodes(this, d, true);
}
+//-----------------------------dump_compact------------------------------------
+void Node::dump_comp() const {
+ this->dump_comp("\n");
+}
+
+//-----------------------------dump_compact------------------------------------
+// Dump a Node in compact representation, i.e., just print its name and index.
+// Nodes can specify additional specifics to print in compact representation by
+// implementing dump_compact_spec.
+void Node::dump_comp(const char* suffix, outputStream *st) const {
+ Compile* C = Compile::current();
+ C->_in_dump_cnt++;
+ st->print("%s(%d)", Name(), _idx);
+ this->dump_compact_spec(st);
+ if (suffix) {
+ st->print("%s", suffix);
+ }
+ C->_in_dump_cnt--;
+}
+
+//----------------------------dump_related-------------------------------------
+// Dump a Node's related nodes - the notion of "related" depends on the Node at
+// hand and is determined by the implementation of the virtual method rel.
+void Node::dump_related() const {
+ Compile* C = Compile::current();
+ GrowableArray <Node *> in_rel(C->unique());
+ GrowableArray <Node *> out_rel(C->unique());
+ this->related(&in_rel, &out_rel, false);
+ for (int i = in_rel.length() - 1; i >= 0; i--) {
+ in_rel.at(i)->dump();
+ }
+ this->dump("\n", true);
+ for (int i = 0; i < out_rel.length(); i++) {
+ out_rel.at(i)->dump();
+ }
+}
+
+//----------------------------dump_related-------------------------------------
+// Dump a Node's related nodes up to a given depth (distance from the start
+// node).
+// Arguments:
+// d_in: depth for input nodes.
+// d_out: depth for output nodes (note: this also is a positive number).
+void Node::dump_related(uint d_in, uint d_out) const {
+ Compile* C = Compile::current();
+ GrowableArray <Node *> in_rel(C->unique());
+ GrowableArray <Node *> out_rel(C->unique());
+
+ // call collect_nodes_i directly
+ collect_nodes_i(&in_rel, this, 1, d_in, false, false, false);
+ collect_nodes_i(&out_rel, this, -1, d_out, false, false, false);
+
+ for (int i = in_rel.length() - 1; i >= 0; i--) {
+ in_rel.at(i)->dump();
+ }
+ this->dump("\n", true);
+ for (int i = 0; i < out_rel.length(); i++) {
+ out_rel.at(i)->dump();
+ }
+}
+
+//------------------------dump_related_compact---------------------------------
+// Dump a Node's related nodes in compact representation. The notion of
+// "related" depends on the Node at hand and is determined by the implementation
+// of the virtual method rel.
+void Node::dump_related_compact() const {
+ Compile* C = Compile::current();
+ GrowableArray <Node *> in_rel(C->unique());
+ GrowableArray <Node *> out_rel(C->unique());
+ this->related(&in_rel, &out_rel, true);
+ int n_in = in_rel.length();
+ int n_out = out_rel.length();
+
+ this->dump_comp(n_in == 0 ? "\n" : " ");
+ for (int i = 0; i < n_in; i++) {
+ in_rel.at(i)->dump_comp(i == n_in - 1 ? "\n" : " ");
+ }
+ for (int i = 0; i < n_out; i++) {
+ out_rel.at(i)->dump_comp(i == n_out - 1 ? "\n" : " ");
+ }
+}
+
+//------------------------------related----------------------------------------
+// Collect a Node's related nodes. The default behaviour just collects the
+// inputs and outputs at depth 1, including both control and data flow edges,
+// regardless of whether the presentation is compact or not. For data nodes,
+// the default is to collect all data inputs (till level 1 if compact), and
+// outputs till level 1.
+void Node::related(GrowableArray<Node*> *in_rel, GrowableArray<Node*> *out_rel, bool compact) const {
+ if (this->is_CFG()) {
+ collect_nodes_i(in_rel, this, 1, 1, false, false, false);
+ collect_nodes_i(out_rel, this, -1, 1, false, false, false);
+ } else {
+ if (compact) {
+ this->collect_nodes(in_rel, 1, false, true);
+ } else {
+ this->collect_nodes_in_all_data(in_rel, false);
+ }
+ this->collect_nodes(out_rel, -1, false, false);
+ }
+}
+
+//---------------------------collect_nodes-------------------------------------
+// An entry point to the low-level node collection facility, to start from a
+// given node in the graph. The start node is by default not included in the
+// result.
+// Arguments:
+// ns: collect the nodes into this data structure.
+// d: the depth (distance from start node) to which nodes should be
+// collected. A value >0 indicates input nodes, a value <0, output
+// nodes.
+// ctrl: include only control nodes.
+// data: include only data nodes.
+void Node::collect_nodes(GrowableArray<Node*> *ns, int d, bool ctrl, bool data) const {
+ if (ctrl && data) {
+ // ignore nonsensical combination
+ return;
+ }
+ collect_nodes_i(ns, this, d, (uint) ABS(d), false, ctrl, data);
+}
+
+//--------------------------collect_nodes_in-----------------------------------
+static void collect_nodes_in(Node* start, GrowableArray<Node*> *ns, bool primary_is_data, bool collect_secondary) {
+ // The maximum depth is determined using a BFS that visits all primary (data
+ // or control) inputs and increments the depth at each level.
+ uint d_in = 0;
+ GrowableArray<Node*> nodes(Compile::current()->unique());
+ nodes.push(start);
+ int nodes_at_current_level = 1;
+ int n_idx = 0;
+ while (nodes_at_current_level > 0) {
+ // Add all primary inputs reachable from the current level to the list, and
+ // increase the depth if there were any.
+ int nodes_at_next_level = 0;
+ bool nodes_added = false;
+ while (nodes_at_current_level > 0) {
+ nodes_at_current_level--;
+ Node* current = nodes.at(n_idx++);
+ for (uint i = 0; i < current->len(); i++) {
+ Node* n = current->in(i);
+ if (NotANode(n)) {
+ continue;
+ }
+ if ((primary_is_data && n->is_CFG()) || (!primary_is_data && !n->is_CFG())) {
+ continue;
+ }
+ if (!nodes.contains(n)) {
+ nodes.push(n);
+ nodes_added = true;
+ nodes_at_next_level++;
+ }
+ }
+ }
+ if (nodes_added) {
+ d_in++;
+ }
+ nodes_at_current_level = nodes_at_next_level;
+ }
+ start->collect_nodes(ns, d_in, !primary_is_data, primary_is_data);
+ if (collect_secondary) {
+ // Now, iterate over the secondary nodes in ns and add the respective
+ // boundary reachable from them.
+ GrowableArray<Node*> sns(Compile::current()->unique());
+ for (GrowableArrayIterator<Node*> it = ns->begin(); it != ns->end(); ++it) {
+ Node* n = *it;
+ n->collect_nodes(&sns, 1, primary_is_data, !primary_is_data);
+ for (GrowableArrayIterator<Node*> d = sns.begin(); d != sns.end(); ++d) {
+ ns->append_if_missing(*d);
+ }
+ sns.clear();
+ }
+ }
+}
+
+//---------------------collect_nodes_in_all_data-------------------------------
+// Collect the entire data input graph. Include the control boundary if
+// requested.
+// Arguments:
+// ns: collect the nodes into this data structure.
+// ctrl: if true, include the control boundary.
+void Node::collect_nodes_in_all_data(GrowableArray<Node*> *ns, bool ctrl) const {
+ collect_nodes_in((Node*) this, ns, true, ctrl);
+}
+
+//--------------------------collect_nodes_in_all_ctrl--------------------------
+// Collect the entire control input graph. Include the data boundary if
+// requested.
+// ns: collect the nodes into this data structure.
+// data: if true, include the control boundary.
+void Node::collect_nodes_in_all_ctrl(GrowableArray<Node*> *ns, bool data) const {
+ collect_nodes_in((Node*) this, ns, false, data);
+}
+
+//------------------collect_nodes_out_all_ctrl_boundary------------------------
+// Collect the entire output graph until hitting control node boundaries, and
+// include those.
+void Node::collect_nodes_out_all_ctrl_boundary(GrowableArray<Node*> *ns) const {
+ // Perform a BFS and stop at control nodes.
+ GrowableArray<Node*> nodes(Compile::current()->unique());
+ nodes.push((Node*) this);
+ while (nodes.length() > 0) {
+ Node* current = nodes.pop();
+ if (NotANode(current)) {
+ continue;
+ }
+ ns->append_if_missing(current);
+ if (!current->is_CFG()) {
+ for (DUIterator i = current->outs(); current->has_out(i); i++) {
+ nodes.push(current->out(i));
+ }
+ }
+ }
+ ns->remove((Node*) this);
+}
+
// VERIFICATION CODE
// For each input edge to a node (ie - for each Use-Def edge), verify that
// there is a corresponding Def-Use edge.
@@ -2173,6 +2396,11 @@
st->print(" #"); _type->dump_on(st);
}
}
+
+void TypeNode::dump_compact_spec(outputStream *st) const {
+ st->print("#");
+ _type->dump_on(st);
+}
#endif
uint TypeNode::hash() const {
return Node::hash() + _type->hash();
diff --git a/hotspot/src/share/vm/opto/node.hpp b/hotspot/src/share/vm/opto/node.hpp
index 2dfedbc..97c8448 100644
--- a/hotspot/src/share/vm/opto/node.hpp
+++ b/hotspot/src/share/vm/opto/node.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -1038,13 +1038,35 @@
Node* find(int idx) const; // Search the graph for the given idx.
Node* find_ctrl(int idx) const; // Search control ancestors for the given idx.
void dump() const { dump("\n"); } // Print this node.
- void dump(const char* suffix, outputStream *st = tty) const;// Print this node.
+ void dump(const char* suffix, bool mark = false, outputStream *st = tty) const; // Print this node.
void dump(int depth) const; // Print this node, recursively to depth d
void dump_ctrl(int depth) const; // Print control nodes, to depth d
- virtual void dump_req(outputStream *st = tty) const; // Print required-edge info
- virtual void dump_prec(outputStream *st = tty) const; // Print precedence-edge info
- virtual void dump_out(outputStream *st = tty) const; // Print the output edge info
- virtual void dump_spec(outputStream *st) const {}; // Print per-node info
+ void dump_comp() const; // Print this node in compact representation.
+ // Print this node in compact representation.
+ void dump_comp(const char* suffix, outputStream *st = tty) const;
+ virtual void dump_req(outputStream *st = tty) const; // Print required-edge info
+ virtual void dump_prec(outputStream *st = tty) const; // Print precedence-edge info
+ virtual void dump_out(outputStream *st = tty) const; // Print the output edge info
+ virtual void dump_spec(outputStream *st) const {}; // Print per-node info
+ // Print compact per-node info
+ virtual void dump_compact_spec(outputStream *st) const { dump_spec(st); }
+ void dump_related() const; // Print related nodes (depends on node at hand).
+ // Print related nodes up to given depths for input and output nodes.
+ void dump_related(uint d_in, uint d_out) const;
+ void dump_related_compact() const; // Print related nodes in compact representation.
+ // Collect related nodes.
+ virtual void related(GrowableArray<Node*> *in_rel, GrowableArray<Node*> *out_rel, bool compact) const;
+ // Collect nodes starting from this node, explicitly including/excluding control and data links.
+ void collect_nodes(GrowableArray<Node*> *ns, int d, bool ctrl, bool data) const;
+
+ // Node collectors, to be used in implementations of Node::rel().
+ // Collect the entire data input graph. Include control inputs if requested.
+ void collect_nodes_in_all_data(GrowableArray<Node*> *ns, bool ctrl) const;
+ // Collect the entire control input graph. Include data inputs if requested.
+ void collect_nodes_in_all_ctrl(GrowableArray<Node*> *ns, bool data) const;
+ // Collect the entire output graph until hitting and including control nodes.
+ void collect_nodes_out_all_ctrl_boundary(GrowableArray<Node*> *ns) const;
+
void verify_edges(Unique_Node_List &visited); // Verify bi-directional edges
void verify() const; // Check Def-Use info for my subgraph
static void verify_recur(const Node *n, int verify_depth, VectorSet &old_space, VectorSet &new_space);
@@ -1091,6 +1113,20 @@
#endif
};
+
+#ifndef PRODUCT
+
+// Used in debugging code to avoid walking across dead or uninitialized edges.
+inline bool NotANode(const Node* n) {
+ if (n == NULL) return true;
+ if (((intptr_t)n & 1) != 0) return true; // uninitialized, etc.
+ if (*(address*)n == badAddress) return true; // kill by Node::destruct
+ return false;
+}
+
+#endif
+
+
//-----------------------------------------------------------------------------
// Iterators over DU info, and associated Node functions.
@@ -1618,6 +1654,7 @@
virtual uint ideal_reg() const;
#ifndef PRODUCT
virtual void dump_spec(outputStream *st) const;
+ virtual void dump_compact_spec(outputStream *st) const;
#endif
};
diff --git a/hotspot/src/share/vm/opto/output.cpp b/hotspot/src/share/vm/opto/output.cpp
index 4c9ccaa..7423155 100644
--- a/hotspot/src/share/vm/opto/output.cpp
+++ b/hotspot/src/share/vm/opto/output.cpp
@@ -1504,6 +1504,13 @@
n->emit(*cb, _regalloc);
current_offset = cb->insts_size();
+ // Above we only verified that there is enough space in the instruction section.
+ // However, the instruction may emit stubs that cause code buffer expansion.
+ // Bail out here if expansion failed due to a lack of code cache space.
+ if (failing()) {
+ return;
+ }
+
#ifdef ASSERT
if (n->size(_regalloc) < (current_offset-instr_offset)) {
n->dump();
@@ -1632,11 +1639,14 @@
if (_method) {
// Emit the exception handler code.
_code_offsets.set_value(CodeOffsets::Exceptions, HandlerImpl::emit_exception_handler(*cb));
+ if (failing()) {
+ return; // CodeBuffer::expand failed
+ }
// Emit the deopt handler code.
_code_offsets.set_value(CodeOffsets::Deopt, HandlerImpl::emit_deopt_handler(*cb));
// Emit the MethodHandle deopt handler code (if required).
- if (has_method_handle_invokes()) {
+ if (has_method_handle_invokes() && !failing()) {
// We can use the same code as for the normal deopt handler, we
// just need a different entry point address.
_code_offsets.set_value(CodeOffsets::DeoptMH, HandlerImpl::emit_deopt_handler(*cb));
diff --git a/hotspot/src/share/vm/opto/rootnode.cpp b/hotspot/src/share/vm/opto/rootnode.cpp
index 4cf5152..e5542f6 100644
--- a/hotspot/src/share/vm/opto/rootnode.cpp
+++ b/hotspot/src/share/vm/opto/rootnode.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -88,3 +88,18 @@
const RegMask &HaltNode::out_RegMask() const {
return RegMask::Empty;
}
+
+#ifndef PRODUCT
+//-----------------------------related-----------------------------------------
+// Include all control inputs in the related set, and also the input data
+// boundary. In compact mode, include all inputs till level 2. Also include
+// all outputs at level 1.
+void HaltNode::related(GrowableArray<Node*> *in_rel, GrowableArray<Node*> *out_rel, bool compact) const {
+ if (compact) {
+ this->collect_nodes(in_rel, 2, false, false);
+ } else {
+ this->collect_nodes_in_all_ctrl(in_rel, true);
+ }
+ this->collect_nodes(out_rel, -1, false, false);
+}
+#endif
diff --git a/hotspot/src/share/vm/opto/rootnode.hpp b/hotspot/src/share/vm/opto/rootnode.hpp
index cef207d..3be5dfa 100644
--- a/hotspot/src/share/vm/opto/rootnode.hpp
+++ b/hotspot/src/share/vm/opto/rootnode.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -64,6 +64,10 @@
virtual const RegMask &out_RegMask() const;
virtual uint ideal_reg() const { return NotAMachineReg; }
virtual uint match_edge(uint idx) const { return 0; }
+
+#ifndef PRODUCT
+ virtual void related(GrowableArray<Node*> *in_rel, GrowableArray<Node*> *out_rel, bool compact) const;
+#endif
};
#endif // SHARE_VM_OPTO_ROOTNODE_HPP
diff --git a/hotspot/src/share/vm/opto/subnode.cpp b/hotspot/src/share/vm/opto/subnode.cpp
index 27cf544..a41538d 100644
--- a/hotspot/src/share/vm/opto/subnode.cpp
+++ b/hotspot/src/share/vm/opto/subnode.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -498,6 +498,37 @@
return this;
}
+#ifndef PRODUCT
+//----------------------------related------------------------------------------
+// Related nodes of comparison nodes include all data inputs (until hitting a
+// control boundary) as well as all outputs until and including control nodes
+// as well as their projections. In compact mode, data inputs till depth 1 and
+// all outputs till depth 1 are considered.
+void CmpNode::related(GrowableArray<Node*> *in_rel, GrowableArray<Node*> *out_rel, bool compact) const {
+ if (compact) {
+ this->collect_nodes(in_rel, 1, false, true);
+ this->collect_nodes(out_rel, -1, false, false);
+ } else {
+ this->collect_nodes_in_all_data(in_rel, false);
+ this->collect_nodes_out_all_ctrl_boundary(out_rel);
+ // Now, find all control nodes in out_rel, and include their projections
+ // and projection targets (if any) in the result.
+ GrowableArray<Node*> proj(Compile::current()->unique());
+ for (GrowableArrayIterator<Node*> it = out_rel->begin(); it != out_rel->end(); ++it) {
+ Node* n = *it;
+ if (n->is_CFG() && !n->is_Proj()) {
+ // Assume projections and projection targets are found at levels 1 and 2.
+ n->collect_nodes(&proj, -2, false, false);
+ for (GrowableArrayIterator<Node*> p = proj.begin(); p != proj.end(); ++p) {
+ out_rel->append_if_missing(*p);
+ }
+ proj.clear();
+ }
+ }
+ }
+}
+#endif
+
//=============================================================================
//------------------------------cmp--------------------------------------------
// Simplify a CmpI (compare 2 integers) node, based on local information.
@@ -1396,17 +1427,31 @@
return _test.cc2logical( phase->type( in(1) ) );
}
+#ifndef PRODUCT
//------------------------------dump_spec--------------------------------------
// Dump special per-node info
-#ifndef PRODUCT
void BoolNode::dump_spec(outputStream *st) const {
st->print("[");
_test.dump_on(st);
st->print("]");
}
+
+//-------------------------------related---------------------------------------
+// A BoolNode's related nodes are all of its data inputs, and all of its
+// outputs until control nodes are hit, which are included. In compact
+// representation, inputs till level 3 and immediate outputs are included.
+void BoolNode::related(GrowableArray<Node*> *in_rel, GrowableArray<Node*> *out_rel, bool compact) const {
+ if (compact) {
+ this->collect_nodes(in_rel, 3, false, true);
+ this->collect_nodes(out_rel, -1, false, false);
+ } else {
+ this->collect_nodes_in_all_data(in_rel, false);
+ this->collect_nodes_out_all_ctrl_boundary(out_rel);
+ }
+}
#endif
-//------------------------------is_counted_loop_exit_test--------------------------------------
+//----------------------is_counted_loop_exit_test------------------------------
// Returns true if node is used by a counted loop node.
bool BoolNode::is_counted_loop_exit_test() {
for( DUIterator_Fast imax, i = fast_outs(imax); i < imax; i++ ) {
diff --git a/hotspot/src/share/vm/opto/subnode.hpp b/hotspot/src/share/vm/opto/subnode.hpp
index 485cd17..a287ffa 100644
--- a/hotspot/src/share/vm/opto/subnode.hpp
+++ b/hotspot/src/share/vm/opto/subnode.hpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -60,7 +60,6 @@
// Supplied function to return the additive identity type.
// This is returned whenever the subtracts inputs are the same.
virtual const Type *add_id() const = 0;
-
};
@@ -140,6 +139,13 @@
const Type *add_id() const { return TypeInt::ZERO; }
const Type *bottom_type() const { return TypeInt::CC; }
virtual uint ideal_reg() const { return Op_RegFlags; }
+
+#ifndef PRODUCT
+ // CmpNode and subclasses include all data inputs (until hitting a control
+ // boundary) in their related node set, as well as all outputs until and
+ // including eventual control nodes and their projections.
+ virtual void related(GrowableArray<Node*> *in_rel, GrowableArray<Node*> *out_rel, bool compact) const;
+#endif
};
//------------------------------CmpINode---------------------------------------
@@ -311,6 +317,7 @@
bool is_counted_loop_exit_test();
#ifndef PRODUCT
virtual void dump_spec(outputStream *st) const;
+ virtual void related(GrowableArray<Node*> *in_rel, GrowableArray<Node*> *out_rel, bool compact) const;
#endif
};
diff --git a/hotspot/src/share/vm/runtime/commandLineFlagConstraintsCompiler.cpp b/hotspot/src/share/vm/runtime/commandLineFlagConstraintsCompiler.cpp
index 83e371c..f0e43a4 100644
--- a/hotspot/src/share/vm/runtime/commandLineFlagConstraintsCompiler.cpp
+++ b/hotspot/src/share/vm/runtime/commandLineFlagConstraintsCompiler.cpp
@@ -70,7 +70,10 @@
#endif
// The default CICompilerCount's value is CI_COMPILER_COUNT.
- assert(min_number_of_compiler_threads <= CI_COMPILER_COUNT, "minimum should be less or equal default number");
+ // With a client VM, -XX:+TieredCompilation causes TieredCompilation
+ // to be true here (the option is validated later) and
+ // min_number_of_compiler_threads to exceed CI_COMPILER_COUNT.
+ min_number_of_compiler_threads = MIN2(min_number_of_compiler_threads, CI_COMPILER_COUNT);
if (*value < (intx)min_number_of_compiler_threads) {
if (verbose == true) {
diff --git a/hotspot/src/share/vm/runtime/globals.hpp b/hotspot/src/share/vm/runtime/globals.hpp
index d2982e0..2009805 100644
--- a/hotspot/src/share/vm/runtime/globals.hpp
+++ b/hotspot/src/share/vm/runtime/globals.hpp
@@ -848,6 +848,9 @@
product(bool, UseCRC32CIntrinsics, false, \
"use intrinsics for java.util.zip.CRC32C") \
\
+ diagnostic(ccstrlist, DisableIntrinsic, "", \
+ "do not expand intrinsics whose (internal) names appear here") \
+ \
develop(bool, TraceCallFixup, false, \
"Trace all call fixups") \
\
@@ -3913,7 +3916,7 @@
product(bool, PerfDisableSharedMem, false, \
"Store performance data in standard memory") \
\
- product(intx, PerfDataMemorySize, 32*K, \
+ product(intx, PerfDataMemorySize, 64*K, \
"Size of performance data memory region. Will be rounded " \
"up to a multiple of the native os page size.") \
\
diff --git a/hotspot/src/share/vm/services/diagnosticCommand.cpp b/hotspot/src/share/vm/services/diagnosticCommand.cpp
index e0fa219..8c326cf 100644
--- a/hotspot/src/share/vm/services/diagnosticCommand.cpp
+++ b/hotspot/src/share/vm/services/diagnosticCommand.cpp
@@ -37,6 +37,7 @@
#include "services/management.hpp"
#include "services/writeableFlags.hpp"
#include "utilities/macros.hpp"
+#include "oops/objArrayOop.inline.hpp"
PRAGMA_FORMAT_MUTE_WARNINGS_FOR_GCC
@@ -57,6 +58,8 @@
DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<VMUptimeDCmd>(full_export, true, false));
DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<SystemGCDCmd>(full_export, true, false));
DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<RunFinalizationDCmd>(full_export, true, false));
+ DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<HeapInfoDCmd>(full_export, true, false));
+ DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<FinalizerInfoDCmd>(full_export, true, false));
#if INCLUDE_SERVICES // Heap dumping/inspection supported
DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<HeapDumpDCmd>(DCmd_Source_Internal | DCmd_Source_AttachAPI, true, false));
DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<ClassHistogramDCmd>(full_export, true, false));
@@ -333,6 +336,60 @@
vmSymbols::void_method_signature(), CHECK);
}
+void HeapInfoDCmd::execute(DCmdSource source, TRAPS) {
+ Universe::heap()->print_on(output());
+}
+
+void FinalizerInfoDCmd::execute(DCmdSource source, TRAPS) {
+ ResourceMark rm;
+
+
+ Klass* k = SystemDictionary::resolve_or_null(
+ vmSymbols::finalizer_histogram_klass(), THREAD);
+ assert(k != NULL, "FinalizerHistogram class is not accessible");
+
+ instanceKlassHandle klass(THREAD, k);
+ JavaValue result(T_ARRAY);
+
+ // We are calling lang.ref.FinalizerHistogram.getFinalizerHistogram() method
+ // and expect it to return array of FinalizerHistogramEntry as Object[]
+
+ JavaCalls::call_static(&result, klass,
+ vmSymbols::get_finalizer_histogram_name(),
+ vmSymbols::void_finalizer_histogram_entry_array_signature(), CHECK);
+
+ objArrayOop result_oop = (objArrayOop) result.get_jobject();
+ if (result_oop->length() == 0) {
+ output()->print_cr("No instances waiting for finalization found");
+ return;
+ }
+
+ oop foop = result_oop->obj_at(0);
+ InstanceKlass* ik = InstanceKlass::cast(foop->klass());
+
+ fieldDescriptor count_fd, name_fd;
+
+ Klass* count_res = ik->find_field(
+ vmSymbols::finalizer_histogram_entry_count_field(), vmSymbols::int_signature(), &count_fd);
+
+ Klass* name_res = ik->find_field(
+ vmSymbols::finalizer_histogram_entry_name_field(), vmSymbols::string_signature(), &name_fd);
+
+ assert(count_res != NULL && name_res != NULL, "Unexpected layout of FinalizerHistogramEntry");
+
+ output()->print_cr("Unreachable instances waiting for finalization");
+ output()->print_cr("#instances class name");
+ output()->print_cr("-----------------------");
+
+ for (int i = 0; i < result_oop->length(); ++i) {
+ oop element_oop = result_oop->obj_at(i);
+ oop str_oop = element_oop->obj_field(name_fd.offset());
+ char *name = java_lang_String::as_utf8_string(str_oop);
+ int count = element_oop->int_field(count_fd.offset());
+ output()->print_cr("%10d %s", count, name);
+ }
+}
+
#if INCLUDE_SERVICES // Heap dumping/inspection supported
HeapDumpDCmd::HeapDumpDCmd(outputStream* output, bool heap) :
DCmdWithParser(output, heap),
diff --git a/hotspot/src/share/vm/services/diagnosticCommand.hpp b/hotspot/src/share/vm/services/diagnosticCommand.hpp
index 9362687..3106c0c 100644
--- a/hotspot/src/share/vm/services/diagnosticCommand.hpp
+++ b/hotspot/src/share/vm/services/diagnosticCommand.hpp
@@ -241,6 +241,46 @@
virtual void execute(DCmdSource source, TRAPS);
};
+class HeapInfoDCmd : public DCmd {
+public:
+ HeapInfoDCmd(outputStream* output, bool heap) : DCmd(output, heap) { }
+ static const char* name() { return "GC.heap_info"; }
+ static const char* description() {
+ return "Provide generic Java heap information.";
+ }
+ static const char* impact() {
+ return "Medium";
+ }
+ static int num_arguments() { return 0; }
+ static const JavaPermission permission() {
+ JavaPermission p = {"java.lang.management.ManagementPermission",
+ "monitor", NULL};
+ return p;
+ }
+
+ virtual void execute(DCmdSource source, TRAPS);
+};
+
+class FinalizerInfoDCmd : public DCmd {
+public:
+ FinalizerInfoDCmd(outputStream* output, bool heap) : DCmd(output, heap) { }
+ static const char* name() { return "GC.finalizer_info"; }
+ static const char* description() {
+ return "Provide information about Java finalization queue.";
+ }
+ static const char* impact() {
+ return "Medium";
+ }
+ static int num_arguments() { return 0; }
+ static const JavaPermission permission() {
+ JavaPermission p = {"java.lang.management.ManagementPermission",
+ "monitor", NULL};
+ return p;
+ }
+
+ virtual void execute(DCmdSource source, TRAPS);
+};
+
#if INCLUDE_SERVICES // Heap dumping supported
// See also: dump_heap in attachListener.cpp
class HeapDumpDCmd : public DCmdWithParser {
diff --git a/hotspot/test/compiler/arguments/CheckCICompilerCount.java b/hotspot/test/compiler/arguments/CheckCICompilerCount.java
index 4f50e3b..ed32ade 100644
--- a/hotspot/test/compiler/arguments/CheckCICompilerCount.java
+++ b/hotspot/test/compiler/arguments/CheckCICompilerCount.java
@@ -26,6 +26,7 @@
/*
* @test CheckCheckCICompilerCount
* @bug 8130858
+ * @bug 8132525
* @summary Check that correct range of values for CICompilerCount are allowed depending on whether tiered is enabled or not
* @library /testlibrary
* @modules java.base/sun.misc
@@ -36,12 +37,28 @@
public class CheckCICompilerCount {
private static final String[][] NON_TIERED_ARGUMENTS = {
{
+ "-server",
"-XX:-TieredCompilation",
"-XX:+PrintFlagsFinal",
"-XX:CICompilerCount=0",
"-version"
},
{
+ "-server",
+ "-XX:-TieredCompilation",
+ "-XX:+PrintFlagsFinal",
+ "-XX:CICompilerCount=1",
+ "-version"
+ },
+ {
+ "-client",
+ "-XX:-TieredCompilation",
+ "-XX:+PrintFlagsFinal",
+ "-XX:CICompilerCount=0",
+ "-version"
+ },
+ {
+ "-client",
"-XX:-TieredCompilation",
"-XX:+PrintFlagsFinal",
"-XX:CICompilerCount=1",
@@ -56,22 +73,47 @@
},
{
"intx CICompilerCount := 1 {product}"
+ },
+ {
+ "CICompilerCount=0 must be at least 1",
+ "Improperly specified VM option 'CICompilerCount=0'"
+ },
+ {
+ "intx CICompilerCount := 1 {product}"
}
};
private static final int[] NON_TIERED_EXIT = {
1,
+ 0,
+ 1,
0
};
private static final String[][] TIERED_ARGUMENTS = {
{
+ "-server",
"-XX:+TieredCompilation",
"-XX:+PrintFlagsFinal",
"-XX:CICompilerCount=1",
"-version"
},
{
+ "-server",
+ "-XX:+TieredCompilation",
+ "-XX:+PrintFlagsFinal",
+ "-XX:CICompilerCount=2",
+ "-version"
+ },
+ {
+ "-client",
+ "-XX:+TieredCompilation",
+ "-XX:+PrintFlagsFinal",
+ "-XX:CICompilerCount=1",
+ "-version"
+ },
+ {
+ "-client",
"-XX:+TieredCompilation",
"-XX:+PrintFlagsFinal",
"-XX:CICompilerCount=2",
@@ -86,11 +128,20 @@
},
{
"intx CICompilerCount := 2 {product}"
+ },
+ {
+ "CICompilerCount=1 must be at least 2",
+ "Improperly specified VM option 'CICompilerCount=1'"
+ },
+ {
+ "intx CICompilerCount := 2 {product}"
}
};
private static final int[] TIERED_EXIT = {
1,
+ 0,
+ 1,
0
};
diff --git a/hotspot/test/runtime/CommandLine/PrintTouchedMethods.java b/hotspot/test/runtime/CommandLine/PrintTouchedMethods.java
index 0eb1852..7bae35e 100644
--- a/hotspot/test/runtime/CommandLine/PrintTouchedMethods.java
+++ b/hotspot/test/runtime/CommandLine/PrintTouchedMethods.java
@@ -87,6 +87,24 @@
output.shouldNotContain("TestLogTouchedMethods.methodB:()V");
output.shouldHaveExitValue(0);
+ String[] javaArgs4 = {"-XX:+UnlockDiagnosticVMOptions", "-Xint", "-XX:+LogTouchedMethods", "-XX:+PrintTouchedMethodsAtExit", "-XX:-TieredCompilation", "TestLogTouchedMethods"};
+ pb = ProcessTools.createJavaProcessBuilder(javaArgs4);
+ output = new OutputAnalyzer(pb.start());
+ lines = output.asLines();
+
+ if (lines.size() < 1) {
+ throw new Exception("Empty output");
+ }
+
+ first = lines.get(0);
+ if (!first.equals("# Method::print_touched_methods version 1")) {
+ throw new Exception("First line mismatch");
+ }
+
+ output.shouldContain("TestLogTouchedMethods.methodA:()V");
+ output.shouldNotContain("TestLogTouchedMethods.methodB:()V");
+ output.shouldHaveExitValue(0);
+
// Test jcmd PrintTouchedMethods VM.print_touched_methods
String pid = Integer.toString(ProcessTools.getProcessId());
pb = new ProcessBuilder();
diff --git a/hotspot/test/serviceability/dcmd/gc/FinalizerInfoTest.java b/hotspot/test/serviceability/dcmd/gc/FinalizerInfoTest.java
new file mode 100644
index 0000000..1e53a23
--- /dev/null
+++ b/hotspot/test/serviceability/dcmd/gc/FinalizerInfoTest.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2015, 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 org.testng.annotations.Test;
+import org.testng.Assert;
+
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.ReentrantLock;
+
+import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.dcmd.CommandExecutor;
+import jdk.test.lib.dcmd.PidJcmdExecutor;
+
+/*
+ * @test
+ * @summary
+ * @library /testlibrary
+ * @build jdk.test.lib.*
+ * @build jdk.test.lib.dcmd.*
+ * @run testng FinalizerInfoTest
+ */
+public class FinalizerInfoTest {
+ static ReentrantLock lock = new ReentrantLock();
+ static volatile int wasInitialized = 0;
+ static volatile int wasTrapped = 0;
+ static final String cmd = "GC.finalizer_info";
+ static final int objectsCount = 1000;
+
+ class MyObject {
+ public MyObject() {
+ // Make sure object allocation/deallocation is not optimized out
+ wasInitialized += 1;
+ }
+
+ protected void finalize() {
+ // Trap the object in a finalization queue
+ wasTrapped += 1;
+ lock.lock();
+ }
+ }
+
+ public void run(CommandExecutor executor) {
+ try {
+ lock.lock();
+ for(int i = 0; i < objectsCount; ++i) {
+ new MyObject();
+ }
+ System.out.println("Objects initialized: " + objectsCount);
+ System.gc();
+
+ while(wasTrapped < 1) {
+ // Waiting for gc thread.
+ }
+
+ OutputAnalyzer output = executor.execute(cmd);
+ output.shouldContain("MyObject");
+ } finally {
+ lock.unlock();
+ }
+ }
+
+ @Test
+ public void pid() {
+ run(new PidJcmdExecutor());
+ }
+}
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/JdkXmlDomTest.java b/hotspot/test/serviceability/dcmd/gc/HeapInfoTest.java
similarity index 65%
copy from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/JdkXmlDomTest.java
copy to hotspot/test/serviceability/dcmd/gc/HeapInfoTest.java
index b65b4fd..daedf12 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/JdkXmlDomTest.java
+++ b/hotspot/test/serviceability/dcmd/gc/HeapInfoTest.java
@@ -20,21 +20,35 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
-package org.w3c.dom;
-import org.testng.Assert;
import org.testng.annotations.Test;
+import org.testng.Assert;
+
+import java.io.IOException;
+
+import jdk.test.lib.dcmd.CommandExecutor;
+import jdk.test.lib.dcmd.PidJcmdExecutor;
+import jdk.test.lib.OutputAnalyzer;
+
/*
- * @bug 8078139
- * @summary Verifies that jdk.xml.dom classes are loaded by the ext class loader.
+ * @test
+ * @summary Test of diagnostic command GC.heap_info
+ * @library /testlibrary
+ * @build jdk.test.lib.*
+ * @build jdk.test.lib.dcmd.*
+ * @run testng HeapInfoTest
*/
-public class JdkXmlDomTest {
- @Test
- public void test() throws ClassNotFoundException {
- ClassLoader cl = ClassLoader.getSystemClassLoader().getParent();
- Class<?> cls = Class.forName("org.w3c.dom.xpath.XPathEvaluator", false, cl);
+public class HeapInfoTest {
+ public void run(CommandExecutor executor) {
+ String cmd = "GC.heap_info";
+ OutputAnalyzer output = executor.execute(cmd);
+ output.shouldContain("Metaspace");
+ }
- Assert.assertTrue(cls.getClassLoader() != null);
+ @Test
+ public void pid() {
+ run(new PidJcmdExecutor());
}
}
+
diff --git a/hotspot/test/serviceability/dcmd/gc/RunFinalizationTest.java b/hotspot/test/serviceability/dcmd/gc/RunFinalizationTest.java
index 21606a8..bc34351 100644
--- a/hotspot/test/serviceability/dcmd/gc/RunFinalizationTest.java
+++ b/hotspot/test/serviceability/dcmd/gc/RunFinalizationTest.java
@@ -21,15 +21,13 @@
* questions.
*/
-import org.testng.annotations.Test;
-import org.testng.Assert;
-
+import java.util.concurrent.Phaser;
import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.Condition;
-import java.util.concurrent.locks.ReentrantLock;
+import java.util.concurrent.TimeoutException;
import jdk.test.lib.dcmd.CommandExecutor;
import jdk.test.lib.dcmd.JMXExecutor;
+import jdk.test.lib.Utils;
/*
* @test
@@ -41,62 +39,71 @@
* jdk.jvmstat/sun.jvmstat.monitor
* @build jdk.test.lib.*
* @build jdk.test.lib.dcmd.*
- * @run testng RunFinalizationTest
+ * @run main/othervm RunFinalizationTest
*/
public class RunFinalizationTest {
- static ReentrantLock lock = new ReentrantLock();
- static Condition cond = lock.newCondition();
+ private static final long TIMEOUT = Utils.adjustTimeout(15000); // 15s
+ private static final Phaser ph = new Phaser(3);
static volatile boolean wasFinalized = false;
static volatile boolean wasInitialized = false;
- class MyObject {
+ static class MyObject {
public MyObject() {
/* Make sure object allocation/deallocation is not optimized out */
wasInitialized = true;
}
protected void finalize() {
- lock.lock();
- wasFinalized = true;
- cond.signalAll();
- lock.unlock();
+ if (!Thread.currentThread().getName().equals("Finalizer")) {
+ wasFinalized = true;
+ ph.arrive();
+ } else {
+ ph.arriveAndAwaitAdvance();
+ }
}
}
public static MyObject o;
- public void run(CommandExecutor executor) {
- lock.lock();
+ private static void run(CommandExecutor executor) {
o = new MyObject();
o = null;
System.gc();
executor.execute("GC.run_finalization");
- int waited = 0;
- int waitTime = 15;
+ System.out.println("Waiting for signal from finalizer");
- try {
- System.out.println("Waiting for signal from finalizer");
-
- while (!cond.await(waitTime, TimeUnit.SECONDS)) {
- waited += waitTime;
- System.out.println(String.format("Waited %d seconds", waited));
+ long targetTime = System.currentTimeMillis() + TIMEOUT;
+ while (System.currentTimeMillis() < targetTime) {
+ try {
+ ph.awaitAdvanceInterruptibly(ph.arrive(), 200, TimeUnit.MILLISECONDS);
+ System.out.println("Received signal");
+ break;
+ } catch (InterruptedException e) {
+ fail("Test error: Interrupted while waiting for signal from finalizer", e);
+ } catch (TimeoutException e) {
+ System.out.println("Haven't received signal in 200ms. Retrying ...");
}
-
- System.out.println("Received signal");
- } catch (InterruptedException e) {
- Assert.fail("Test error: Interrupted while waiting for signal from finalizer", e);
- } finally {
- lock.unlock();
}
if (!wasFinalized) {
- Assert.fail("Test failure: Object was not finalized");
+ fail("Test failure: Object was not finalized");
}
}
- @Test
- public void jmx() {
- run(new JMXExecutor());
+ public static void main(String ... args) {
+ MyObject o = new MyObject();
+ o = null;
+ Runtime.getRuntime().addShutdownHook(new Thread(()->{
+ run(new JMXExecutor());
+ }));
+ }
+
+ private static void fail(String msg, Exception e) {
+ throw new Error(msg, e);
+ }
+
+ private static void fail(String msg) {
+ throw new Error(msg);
}
}
diff --git a/hotspot/test/testlibrary/jdk/test/lib/Utils.java b/hotspot/test/testlibrary/jdk/test/lib/Utils.java
index 73027cb..eb9ae00 100644
--- a/hotspot/test/testlibrary/jdk/test/lib/Utils.java
+++ b/hotspot/test/testlibrary/jdk/test/lib/Utils.java
@@ -314,9 +314,8 @@
*/
public static String fileAsString(String filename) throws IOException {
Path filePath = Paths.get(filename);
- return Files.exists(filePath)
- ? Files.lines(filePath).collect(Collectors.joining(NEW_LINE))
- : null;
+ if (!Files.exists(filePath)) return null;
+ return new String(Files.readAllBytes(filePath));
}
/**
diff --git a/jaxp/.hgtags b/jaxp/.hgtags
index 6165f21..e3b3c61 100644
--- a/jaxp/.hgtags
+++ b/jaxp/.hgtags
@@ -319,3 +319,4 @@
eadcb2b55cd1daf77625813aad0f6f3967b1528a jdk9-b74
16b5e696f948cd8aa9b3afdb686ddffd48bd17a8 jdk9-b75
36801a89a04201b59874ec776ffe85d6253c9ab5 jdk9-b76
+be357705874c4ba1a69c38fb211e5e31e35bf9cb jdk9-b77
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/common/Bug6350682.java b/jaxp/test/javax/xml/jaxp/unittest/common/Bug6350682.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/common/Bug6350682.java
rename to jaxp/test/javax/xml/jaxp/unittest/common/Bug6350682.java
index 04d4f25..e955df4 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/common/Bug6350682.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/common/Bug6350682.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.common;
+package common;
import javax.xml.parsers.SAXParserFactory;
import javax.xml.transform.TransformerFactory;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/common/Bug6723276Test.java b/jaxp/test/javax/xml/jaxp/unittest/common/Bug6723276Test.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/common/Bug6723276Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/common/Bug6723276Test.java
index 7e1ecd8..63ac73d 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/common/Bug6723276Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/common/Bug6723276Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.common;
+package common;
import org.testng.annotations.Test;
import org.testng.Assert;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/common/Bug6941169.xml b/jaxp/test/javax/xml/jaxp/unittest/common/Bug6941169.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/common/Bug6941169.xml
rename to jaxp/test/javax/xml/jaxp/unittest/common/Bug6941169.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/common/Bug6941169.xsd b/jaxp/test/javax/xml/jaxp/unittest/common/Bug6941169.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/common/Bug6941169.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/common/Bug6941169.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/common/Bug6941169Test.java b/jaxp/test/javax/xml/jaxp/unittest/common/Bug6941169Test.java
similarity index 99%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/common/Bug6941169Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/common/Bug6941169Test.java
index fa35c3a..8f03995 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/common/Bug6941169Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/common/Bug6941169Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.common;
+package common;
import java.io.InputStream;
import java.io.StringWriter;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/common/Bug7143711Test.java b/jaxp/test/javax/xml/jaxp/unittest/common/Bug7143711Test.java
similarity index 99%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/common/Bug7143711Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/common/Bug7143711Test.java
index 7b38db0..5074da2 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/common/Bug7143711Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/common/Bug7143711Test.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.common;
+package common;
import java.security.AllPermission;
import java.security.Permission;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/Bug6320118.java b/jaxp/test/javax/xml/jaxp/unittest/datatype/Bug6320118.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/Bug6320118.java
rename to jaxp/test/javax/xml/jaxp/unittest/datatype/Bug6320118.java
index 959a978..87d3829 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/Bug6320118.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/datatype/Bug6320118.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.datatype;
+package datatype;
import javax.xml.datatype.DatatypeConfigurationException;
import javax.xml.datatype.DatatypeFactory;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/Bug6937951Test.java b/jaxp/test/javax/xml/jaxp/unittest/datatype/Bug6937951Test.java
similarity index 88%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/Bug6937951Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/datatype/Bug6937951Test.java
index a733564..161f127 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/Bug6937951Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/datatype/Bug6937951Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,11 @@
* questions.
*/
-package javax.xml.datatype;
+package datatype;
+
+import javax.xml.datatype.DatatypeConfigurationException;
+import javax.xml.datatype.DatatypeFactory;
+import javax.xml.datatype.XMLGregorianCalendar;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/Bug6937964Test.java b/jaxp/test/javax/xml/jaxp/unittest/datatype/Bug6937964Test.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/Bug6937964Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/datatype/Bug6937964Test.java
index 31aff05..73ea293 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/Bug6937964Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/datatype/Bug6937964Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,11 +21,15 @@
* questions.
*/
-package javax.xml.datatype;
+package datatype;
import java.math.BigDecimal;
import java.math.BigInteger;
+import javax.xml.datatype.DatatypeConfigurationException;
+import javax.xml.datatype.DatatypeConstants;
+import javax.xml.datatype.DatatypeFactory;
+import javax.xml.datatype.Duration;
import javax.xml.namespace.QName;
import org.testng.Assert;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/Bug7042647Test.java b/jaxp/test/javax/xml/jaxp/unittest/datatype/Bug7042647Test.java
similarity index 89%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/Bug7042647Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/datatype/Bug7042647Test.java
index 3643826..3bf98f6 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/Bug7042647Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/datatype/Bug7042647Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,11 +21,15 @@
* questions.
*/
-package javax.xml.datatype;
+package datatype;
import java.util.Calendar;
import java.util.GregorianCalendar;
+import javax.xml.datatype.DatatypeConfigurationException;
+import javax.xml.datatype.DatatypeFactory;
+import javax.xml.datatype.XMLGregorianCalendar;
+
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/DatatypeFactoryTest.java b/jaxp/test/javax/xml/jaxp/unittest/datatype/DatatypeFactoryTest.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/DatatypeFactoryTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/datatype/DatatypeFactoryTest.java
index 67e458e..c6977e9 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/DatatypeFactoryTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/datatype/DatatypeFactoryTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,11 +21,16 @@
* questions.
*/
-package javax.xml.datatype;
+package datatype;
import java.math.BigDecimal;
import java.math.BigInteger;
+import javax.xml.datatype.DatatypeConfigurationException;
+import javax.xml.datatype.DatatypeConstants;
+import javax.xml.datatype.DatatypeFactory;
+import javax.xml.datatype.Duration;
+import javax.xml.datatype.XMLGregorianCalendar;
import javax.xml.namespace.QName;
import org.testng.Assert;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/DurationTest.java b/jaxp/test/javax/xml/jaxp/unittest/datatype/DurationTest.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/DurationTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/datatype/DurationTest.java
index f97536c..ece77ad 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/DurationTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/datatype/DurationTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.datatype;
+package datatype;
import java.math.BigDecimal;
import java.math.BigInteger;
@@ -30,6 +30,10 @@
import java.util.GregorianCalendar;
import java.util.TimeZone;
+import javax.xml.datatype.DatatypeConfigurationException;
+import javax.xml.datatype.DatatypeConstants;
+import javax.xml.datatype.DatatypeFactory;
+import javax.xml.datatype.Duration;
import javax.xml.namespace.QName;
import org.testng.Assert;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/FactoryFindTest.java b/jaxp/test/javax/xml/jaxp/unittest/datatype/FactoryFindTest.java
similarity index 94%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/FactoryFindTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/datatype/FactoryFindTest.java
index e9e84bd..87e4637 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/FactoryFindTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/datatype/FactoryFindTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,11 +21,13 @@
* questions.
*/
-package javax.xml.datatype;
+package datatype;
import java.net.URL;
import java.net.URLClassLoader;
+import javax.xml.datatype.DatatypeFactory;
+
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/XMLGregorianCalendarTest.java b/jaxp/test/javax/xml/jaxp/unittest/datatype/XMLGregorianCalendarTest.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/XMLGregorianCalendarTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/datatype/XMLGregorianCalendarTest.java
index b842fd5..4c3deb9 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/datatype/XMLGregorianCalendarTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/datatype/XMLGregorianCalendarTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,12 @@
* questions.
*/
-package javax.xml.datatype;
+package datatype;
+
+import javax.xml.datatype.DatatypeConfigurationException;
+import javax.xml.datatype.DatatypeConstants;
+import javax.xml.datatype.DatatypeFactory;
+import javax.xml.datatype.XMLGregorianCalendar;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4915524.java b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4915524.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4915524.java
rename to jaxp/test/javax/xml/jaxp/unittest/dom/Bug4915524.java
index f496447..3540089 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4915524.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4915524.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package org.w3c.dom;
+package dom;
import java.io.StringReader;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4915748.java b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4915748.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4915748.java
rename to jaxp/test/javax/xml/jaxp/unittest/dom/Bug4915748.java
index 9e04b08..8c8f717 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4915748.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4915748.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package org.w3c.dom;
+package dom;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4966082.java b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966082.java
similarity index 94%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4966082.java
rename to jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966082.java
index 3bc3c35..b18f809 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4966082.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966082.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package org.w3c.dom;
+package dom;
import javax.xml.parsers.DocumentBuilderFactory;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4966082.xml b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966082.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4966082.xml
rename to jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966082.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4966138.java b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966138.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4966138.java
rename to jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966138.java
index ddd0bf5..5244112 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4966138.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966138.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package org.w3c.dom;
+package dom;
import javax.xml.XMLConstants;
import javax.xml.parsers.DocumentBuilderFactory;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4966142.java b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966142.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4966142.java
rename to jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966142.java
index dd55013..890ada5 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4966142.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966142.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package org.w3c.dom;
+package dom;
import javax.xml.XMLConstants;
import javax.xml.parsers.DocumentBuilderFactory;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4966142.xml b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966142.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4966142.xml
rename to jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966142.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4966142.xsd b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966142.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4966142.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966142.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4966143.java b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966143.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4966143.java
rename to jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966143.java
index 7133089..9cf87b2 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4966143.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966143.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package org.w3c.dom;
+package dom;
import javax.xml.XMLConstants;
import javax.xml.parsers.DocumentBuilderFactory;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4966143.xml b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966143.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4966143.xml
rename to jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966143.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4966143.xsd b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966143.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug4966143.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966143.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6339023.java b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6339023.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6339023.java
rename to jaxp/test/javax/xml/jaxp/unittest/dom/Bug6339023.java
index 273708c..7b611bd 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6339023.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6339023.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package org.w3c.dom;
+package dom;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6355326.java b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6355326.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6355326.java
rename to jaxp/test/javax/xml/jaxp/unittest/dom/Bug6355326.java
index 911baf4..cea41cc 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6355326.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6355326.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package org.w3c.dom;
+package dom;
import java.io.ByteArrayInputStream;
import java.io.IOException;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6367542.java b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6367542.java
similarity index 94%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6367542.java
rename to jaxp/test/javax/xml/jaxp/unittest/dom/Bug6367542.java
index fa77a70..c0a3e16 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6367542.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6367542.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package org.w3c.dom;
+package dom;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6520131.java b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6520131.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6520131.java
rename to jaxp/test/javax/xml/jaxp/unittest/dom/Bug6520131.java
index c30f430..982d481 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6520131.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6520131.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package org.w3c.dom;
+package dom;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6521260.java b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6521260.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6521260.java
rename to jaxp/test/javax/xml/jaxp/unittest/dom/Bug6521260.java
index bcfa894..3c9a9764 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6521260.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6521260.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package org.w3c.dom;
+package dom;
import java.io.ByteArrayInputStream;
import java.io.IOException;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6582545.xml b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6582545.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6582545.xml
rename to jaxp/test/javax/xml/jaxp/unittest/dom/Bug6582545.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6582545Test.java b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6582545Test.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6582545Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/dom/Bug6582545Test.java
index 2966d0a..fec67cd 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6582545Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6582545Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package org.w3c.dom;
+package dom;
import java.io.File;
import java.io.IOException;
@@ -32,6 +32,9 @@
import org.testng.Assert;
import org.testng.annotations.Test;
+import org.w3c.dom.Document;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;
/*
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6879614.xml b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6879614.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6879614.xml
rename to jaxp/test/javax/xml/jaxp/unittest/dom/Bug6879614.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6879614Test.java b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6879614Test.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6879614Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/dom/Bug6879614Test.java
index 7c66969..b19a28b 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/Bug6879614Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6879614Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package org.w3c.dom;
+package dom;
import java.io.File;
import java.io.IOException;
@@ -31,6 +31,7 @@
import javax.xml.parsers.ParserConfigurationException;
import org.testng.annotations.Test;
+import org.w3c.dom.Document;
import org.xml.sax.SAXException;
/*
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/CR6333993Test.java b/jaxp/test/javax/xml/jaxp/unittest/dom/CR6333993Test.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/CR6333993Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/dom/CR6333993Test.java
index b54e9c6..84c06b8 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/CR6333993Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/CR6333993Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package org.w3c.dom;
+package dom;
import java.io.ByteArrayInputStream;
@@ -34,6 +34,8 @@
import org.testng.Assert;
import org.testng.annotations.Test;
+import org.w3c.dom.Document;
+import org.w3c.dom.NodeList;
/*
* @bug 6333993
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/CR6517707Test.java b/jaxp/test/javax/xml/jaxp/unittest/dom/CR6517707Test.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/CR6517707Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/dom/CR6517707Test.java
index 67241c8..9bc2c6c 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/CR6517707Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/CR6517707Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package org.w3c.dom;
+package dom;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -33,6 +33,9 @@
import org.testng.Assert;
import org.testng.annotations.Test;
+import org.w3c.dom.DOMException;
+import org.w3c.dom.Document;
+import org.w3c.dom.Entity;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/CR6517717Test.java b/jaxp/test/javax/xml/jaxp/unittest/dom/CR6517717Test.java
similarity index 94%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/CR6517717Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/dom/CR6517717Test.java
index 02e1972..44bab9c 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/CR6517717Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/CR6517717Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package org.w3c.dom;
+package dom;
import java.io.IOException;
import java.io.StringReader;
@@ -32,6 +32,9 @@
import org.testng.Assert;
import org.testng.annotations.Test;
+import org.w3c.dom.DOMException;
+import org.w3c.dom.Document;
+import org.w3c.dom.Entity;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/CR6909336Test.java b/jaxp/test/javax/xml/jaxp/unittest/dom/CR6909336Test.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/CR6909336Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/dom/CR6909336Test.java
index 85e90cd..15dc963 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/CR6909336Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/CR6909336Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package org.w3c.dom;
+package dom;
import javax.xml.stream.XMLOutputFactory;
import javax.xml.stream.XMLStreamException;
@@ -30,6 +30,7 @@
import org.testng.Assert;
import org.testng.annotations.Test;
+import org.w3c.dom.Document;
import org.w3c.dom.bootstrap.DOMImplementationRegistry;
/*
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/DOMConfigurationTest.java b/jaxp/test/javax/xml/jaxp/unittest/dom/DOMConfigurationTest.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/DOMConfigurationTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/dom/DOMConfigurationTest.java
index 6a4fba6..0bc4669 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/DOMConfigurationTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/DOMConfigurationTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -20,7 +20,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
-package org.w3c.dom;
+package dom;
import java.io.IOException;
import java.io.StringReader;
@@ -34,6 +34,21 @@
import org.testng.Assert;
import org.testng.annotations.Test;
+import org.w3c.dom.Attr;
+import org.w3c.dom.CDATASection;
+import org.w3c.dom.Comment;
+import org.w3c.dom.DOMConfiguration;
+import org.w3c.dom.DOMError;
+import org.w3c.dom.DOMErrorHandler;
+import org.w3c.dom.DOMException;
+import org.w3c.dom.DOMImplementation;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Entity;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.ProcessingInstruction;
+import org.w3c.dom.Text;
import org.w3c.dom.ls.DOMImplementationLS;
import org.w3c.dom.ls.LSInput;
import org.w3c.dom.ls.LSParser;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/DOMConfigurationTest.xsd b/jaxp/test/javax/xml/jaxp/unittest/dom/DOMConfigurationTest.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/DOMConfigurationTest.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/dom/DOMConfigurationTest.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/DOMXPathTest.java b/jaxp/test/javax/xml/jaxp/unittest/dom/DOMXPathTest.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/DOMXPathTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/dom/DOMXPathTest.java
index fa92dc7..ebd97fa 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/DOMXPathTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/DOMXPathTest.java
@@ -20,12 +20,14 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
-package org.w3c.dom;
+package dom;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
+
import org.testng.Assert;
import org.testng.annotations.Test;
+import org.w3c.dom.DOMImplementation;
/*
* @bug 8042244
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/JdkXmlDomTest.java b/jaxp/test/javax/xml/jaxp/unittest/dom/JdkXmlDomTest.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/JdkXmlDomTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/dom/JdkXmlDomTest.java
index b65b4fd..4c1269c 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/JdkXmlDomTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/JdkXmlDomTest.java
@@ -20,7 +20,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
-package org.w3c.dom;
+package dom;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/TCKEncodingTest.java b/jaxp/test/javax/xml/jaxp/unittest/dom/TCKEncodingTest.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/TCKEncodingTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/dom/TCKEncodingTest.java
index a5148fb..4f4ece1 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/TCKEncodingTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/TCKEncodingTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package org.w3c.dom;
+package dom;
import java.io.IOException;
import java.io.StringReader;
@@ -32,6 +32,7 @@
import org.testng.Assert;
import org.testng.annotations.Test;
+import org.w3c.dom.Document;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/Bug4973153.java b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug4973153.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/Bug4973153.java
rename to jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug4973153.java
index 6b9b44c..b16d06c 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/Bug4973153.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug4973153.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package org.w3c.dom.ls;
+package dom.ls;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/Bug6290947.java b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6290947.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/Bug6290947.java
rename to jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6290947.java
index 065dfcb..9ef9145 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/Bug6290947.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6290947.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package org.w3c.dom.ls;
+package dom.ls;
import java.io.StringBufferInputStream;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/Bug6354955.java b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6354955.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/Bug6354955.java
rename to jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6354955.java
index d184cf8..cdaa0cf 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/Bug6354955.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6354955.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package org.w3c.dom.ls;
+package dom.ls;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/Bug6376823.java b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6376823.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/Bug6376823.java
rename to jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6376823.java
index f3ba84e..d4fcc32 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/Bug6376823.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6376823.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package org.w3c.dom.ls;
+package dom.ls;
import java.io.StringBufferInputStream;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/Bug6710741Test.java b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6710741Test.java
similarity index 93%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/Bug6710741Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6710741Test.java
index 3f70fb7..d0b95b9 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/Bug6710741Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6710741Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package org.w3c.dom.ls;
+package dom.ls;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
@@ -30,6 +30,8 @@
import org.testng.annotations.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+import org.w3c.dom.ls.DOMImplementationLS;
+import org.w3c.dom.ls.LSException;
/*
* @bug 6710741
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/LSParserTCKTest.java b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/LSParserTCKTest.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/LSParserTCKTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/dom/ls/LSParserTCKTest.java
index 69e27e1..8c609fc 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/LSParserTCKTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/LSParserTCKTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package org.w3c.dom.ls;
+package dom.ls;
import java.io.IOException;
import java.io.StringBufferInputStream;
@@ -39,6 +39,10 @@
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
+import org.w3c.dom.ls.DOMImplementationLS;
+import org.w3c.dom.ls.LSInput;
+import org.w3c.dom.ls.LSParser;
+import org.w3c.dom.ls.LSParserFilter;
import org.w3c.dom.traversal.NodeFilter;
import org.xml.sax.SAXException;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/LSParserTest.java b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/LSParserTest.java
similarity index 94%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/LSParserTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/dom/ls/LSParserTest.java
index 3d0c199..bf24b87 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/LSParserTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/LSParserTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package org.w3c.dom.ls;
+package dom.ls;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
@@ -33,6 +33,10 @@
import org.w3c.dom.DOMErrorHandler;
import org.w3c.dom.DOMException;
import org.w3c.dom.DOMImplementation;
+import org.w3c.dom.ls.DOMImplementationLS;
+import org.w3c.dom.ls.LSInput;
+import org.w3c.dom.ls.LSParser;
+import org.w3c.dom.ls.LSResourceResolver;
/*
* @summary Test LSParser's DOMConfiguration for supported properties.
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/LSSerializerTest.java b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/LSSerializerTest.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/LSSerializerTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/dom/ls/LSSerializerTest.java
index 9df924a..172d329 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/LSSerializerTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/LSSerializerTest.java
@@ -21,7 +21,7 @@
* questions.
*/
-package org.w3c.dom.ls;
+package dom.ls;
import java.io.IOException;
import java.io.OutputStream;
@@ -39,6 +39,10 @@
import org.w3c.dom.DOMErrorHandler;
import org.w3c.dom.DOMImplementation;
import org.w3c.dom.Document;
+import org.w3c.dom.ls.DOMImplementationLS;
+import org.w3c.dom.ls.LSException;
+import org.w3c.dom.ls.LSOutput;
+import org.w3c.dom.ls.LSSerializer;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/note_in_dtd.xml b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/note_in_dtd.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/ls/note_in_dtd.xml
rename to jaxp/test/javax/xml/jaxp/unittest/dom/ls/note_in_dtd.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/test.xml b/jaxp/test/javax/xml/jaxp/unittest/dom/test.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/test.xml
rename to jaxp/test/javax/xml/jaxp/unittest/dom/test.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/test.xsd b/jaxp/test/javax/xml/jaxp/unittest/dom/test.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/org/w3c/dom/test.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/dom/test.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/ExternalDTD.dtd.bak b/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/ExternalDTD.dtd.bak
deleted file mode 100644
index 6fbfdfe..0000000
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/ExternalDTD.dtd.bak
+++ /dev/null
@@ -1,13 +0,0 @@
-<!ELEMENT document ANY>
-<!ELEMENT title (#PCDATA)>
-<!ELEMENT publisher (#PCDATA)>
-<!ELEMENT book (#PCDATA)>
-<!ELEMENT bookurn (#PCDATA)>
-<!ELEMENT xmlns:pages (#PCDATA)>
-<!ATTLIST book price CDATA "$100">
-<!ATTLIST book author CDATA "Herold">
-<!ATTLIST book number ID #REQUIRED>
-<!ATTLIST bookurn xmlns CDATA "10">
-<!ATTLIST bookurn xmlns:isbn CDATA "10">
-<!ENTITY mkm "I am Krishna">
-<!ENTITY km "I am KrishnaMohan">
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/ExternalDTD.xml.bak b/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/ExternalDTD.xml.bak
deleted file mode 100644
index c4fab83..0000000
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/ExternalDTD.xml.bak
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding ="utf-8"?>
-<!DOCTYPE document SYSTEM "ExternalDTD.dtd" [
-<!ENTITY max "Substituted text">
-]>
-<!-- ExternalDTD throws a Negative array size Exception when
-trying to parse with the above DTD reference AND an entity declaration-->
-<document>
- <title>The Publishers </title>
- <publisher>
- Alfred Publishing
- 15535 Morrison
- South Oaks CA 91403
- &max;
- </publisher>
- <book price="$100" author = "Herold" number = "no_11">eXtensible Markup Language</book>
- <bookurn xmlns='urn:loc.gov:books' xmlns:isbn='urn:ISBN:0-395-36341-6'/>
- <pb/>
- <pages />
-</document>
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4674384_MAX_OCCURS_Test.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4674384_MAX_OCCURS_Test.java
similarity index 92%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4674384_MAX_OCCURS_Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4674384_MAX_OCCURS_Test.java
index 7978e5c..5c8248a 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4674384_MAX_OCCURS_Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4674384_MAX_OCCURS_Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,10 +21,13 @@
* questions.
*/
-package javax.xml.parsers;
+package parsers;
import java.io.File;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+
import org.testng.Assert;
import org.testng.annotations.Test;
import org.xml.sax.helpers.DefaultHandler;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4674384_MAX_OCCURS_Test.xml b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4674384_MAX_OCCURS_Test.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4674384_MAX_OCCURS_Test.xml
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4674384_MAX_OCCURS_Test.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4674384_MAX_OCCURS_Test.xsd b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4674384_MAX_OCCURS_Test.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4674384_MAX_OCCURS_Test.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4674384_MAX_OCCURS_Test.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4934208.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4934208.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4934208.java
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4934208.java
index 8e77af0..50f5514 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4934208.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4934208.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.parsers;
+package parsers;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4967002.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4967002.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4967002.java
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4967002.java
index 3fd09a7..0843234 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4967002.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4967002.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.parsers;
+package parsers;
import java.io.StringReader;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4985486.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4985486.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4985486.java
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4985486.java
index b8ab86e..c87f471 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4985486.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4985486.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.parsers;
+package parsers;
import javax.xml.parsers.SAXParserFactory;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4985486.xml b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4985486.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4985486.xml
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4985486.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4991020.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4991020.java
similarity index 94%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4991020.java
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4991020.java
index 38036a7..6a50919 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4991020.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4991020.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.parsers;
+package parsers;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4991020.xml b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4991020.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4991020.xml
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4991020.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4991020.xsd b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4991020.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4991020.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4991020.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4991946.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4991946.java
similarity index 94%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4991946.java
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4991946.java
index 3909180..f48e0bd 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4991946.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4991946.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.parsers;
+package parsers;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4991946.xml b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4991946.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4991946.xml
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4991946.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4991946.xsd b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4991946.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug4991946.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4991946.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug5010072.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug5010072.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug5010072.java
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug5010072.java
index 292a304..68d9a17 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug5010072.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug5010072.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.parsers;
+package parsers;
import javax.xml.validation.SchemaFactory;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug5010072.xsd b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug5010072.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug5010072.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug5010072.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug5025825.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug5025825.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug5025825.java
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug5025825.java
index a291208..9a87104 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug5025825.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug5025825.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.parsers;
+package parsers;
import java.io.StringReader;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6309988.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6309988.java
similarity index 99%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6309988.java
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6309988.java
index 499dc2a..fc38d41 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6309988.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6309988.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.parsers;
+package parsers;
import java.io.File;
import java.io.InputStream;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6341770.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6341770.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6341770.java
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6341770.java
index e5b1f74..94873df 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6341770.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6341770.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.parsers;
+package parsers;
import java.io.File;
import java.io.FileWriter;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6361283.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6361283.java
similarity index 94%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6361283.java
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6361283.java
index 8a0f3c9..f3bfb88 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6361283.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6361283.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.parsers;
+package parsers;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6506304Test.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6506304Test.java
similarity index 92%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6506304Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6506304Test.java
index b93e7333..a7e82d5 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6506304Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6506304Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,10 @@
* questions.
*/
-package javax.xml.parsers;
+package parsers;
+
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6518733.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6518733.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6518733.java
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6518733.java
index c1d141e..c6a0354 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6518733.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6518733.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.parsers;
+package parsers;
import java.io.FileReader;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6518733.xml b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6518733.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6518733.xml
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6518733.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6564400.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6564400.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6564400.java
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6564400.java
index c76304d..e7aa719 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6564400.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6564400.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.parsers;
+package parsers;
import java.io.File;
import java.io.IOException;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6564400.xml b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6564400.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6564400.xml
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6564400.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6564400.xsd b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6564400.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6564400.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6564400.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6573786.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6573786.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6573786.java
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6573786.java
index 4948836..ff3d193 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6573786.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6573786.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.parsers;
+package parsers;
import java.io.InputStream;
import java.io.StringBufferInputStream;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6573786ErrorHandler.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6573786ErrorHandler.java
similarity index 94%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6573786ErrorHandler.java
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6573786ErrorHandler.java
index 5d55cea..b938eb6 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6573786ErrorHandler.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6573786ErrorHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.parsers;
+package parsers;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6594813.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6594813.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6594813.java
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6594813.java
index d660f95..a89d834 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6594813.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6594813.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.parsers;
+package parsers;
import java.io.StringReader;
import java.io.StringWriter;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6608841.dtd b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6608841.dtd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6608841.dtd
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6608841.dtd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6608841.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6608841.java
similarity index 94%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6608841.java
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6608841.java
index d688377..db724d8 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6608841.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6608841.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.parsers;
+package parsers;
import java.io.File;
import java.io.IOException;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6608841.xml b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6608841.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6608841.xml
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6608841.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6608841_xhtml11-flat.dtd b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6608841_xhtml11-flat.dtd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6608841_xhtml11-flat.dtd
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6608841_xhtml11-flat.dtd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6690015.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6690015.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6690015.java
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6690015.java
index 50838e8..25f536f 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6690015.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6690015.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.parsers;
+package parsers;
import java.io.FileInputStream;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6760982.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6760982.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6760982.java
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6760982.java
index 1a2bc04..cfd2fe2 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6760982.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6760982.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.parsers;
+package parsers;
import java.io.File;
import java.io.FileReader;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6849942Test.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6849942Test.java
similarity index 93%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6849942Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6849942Test.java
index 3a28a09..c65bd1b 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug6849942Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6849942Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,10 +21,13 @@
* questions.
*/
-package javax.xml.parsers;
+package parsers;
import java.io.ByteArrayInputStream;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+
import org.testng.Assert;
import org.testng.annotations.Test;
import org.w3c.dom.Document;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug7157608.dtd b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug7157608.dtd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug7157608.dtd
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug7157608.dtd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug7157608.xml b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug7157608.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug7157608.xml
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug7157608.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug7157608Test.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug7157608Test.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug7157608Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug7157608Test.java
index c4a7f7a..bd1e303 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug7157608Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug7157608Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,11 +21,14 @@
* questions.
*/
-package javax.xml.parsers;
+package parsers;
import java.io.File;
import java.io.IOException;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug7157608_1.xml b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug7157608_1.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug7157608_1.xml
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug7157608_1.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug7166896Test.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug7166896Test.java
similarity index 91%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug7166896Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug7166896Test.java
index e886bca..7230f9c 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug7166896Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug7166896Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,10 +21,14 @@
* questions.
*/
-package javax.xml.parsers;
+package parsers;
import java.io.IOException;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
import org.testng.Assert;
import org.testng.annotations.Test;
import org.w3c.dom.Document;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug8073385.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug8073385.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug8073385.java
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug8073385.java
index 1d3aa66..5a034c3 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/Bug8073385.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug8073385.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.parsers;
+package parsers;
import java.io.StringReader;
import java.util.Locale;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/DosTest.xml b/jaxp/test/javax/xml/jaxp/unittest/parsers/DosTest.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/DosTest.xml
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/DosTest.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/DosTest3.xml b/jaxp/test/javax/xml/jaxp/unittest/parsers/DosTest3.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/DosTest3.xml
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/DosTest3.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/FactoryFindTest.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/FactoryFindTest.java
similarity index 94%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/FactoryFindTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/FactoryFindTest.java
index 6f76971..031b0fe 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/FactoryFindTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/FactoryFindTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,11 +21,13 @@
* questions.
*/
-package javax.xml.parsers;
+package parsers;
import java.net.URL;
import java.net.URLClassLoader;
+import javax.xml.parsers.SAXParserFactory;
+
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/MyDefaultHandler.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/MyDefaultHandler.java
similarity index 93%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/MyDefaultHandler.java
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/MyDefaultHandler.java
index a63bcd4..c690163 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/MyDefaultHandler.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/MyDefaultHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.parsers;
+package parsers;
import org.xml.sax.Attributes;
import org.xml.sax.Locator;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/MyErrorHandler.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/MyErrorHandler.java
similarity index 94%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/MyErrorHandler.java
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/MyErrorHandler.java
index 3dc24dc..695c932 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/MyErrorHandler.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/MyErrorHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.parsers;
+package parsers;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/ParseEmptyStream.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/ParseEmptyStream.java
similarity index 93%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/ParseEmptyStream.java
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/ParseEmptyStream.java
index cc9ba34..a6dafcc 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/ParseEmptyStream.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/ParseEmptyStream.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,10 +21,13 @@
* questions.
*/
-package javax.xml.parsers;
+package parsers;
import java.io.StringReader;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+
import org.testng.Assert;
import org.testng.annotations.Test;
import org.xml.sax.InputSource;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/bug6690015.xml b/jaxp/test/javax/xml/jaxp/unittest/parsers/bug6690015.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/bug6690015.xml
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/bug6690015.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/bug6760982.xml b/jaxp/test/javax/xml/jaxp/unittest/parsers/bug6760982.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/bug6760982.xml
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/bug6760982.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/catalog.xml b/jaxp/test/javax/xml/jaxp/unittest/parsers/catalog.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/catalog.xml
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/catalog.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/catalog.xsd b/jaxp/test/javax/xml/jaxp/unittest/parsers/catalog.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/catalog.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/catalog.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/entity.xml b/jaxp/test/javax/xml/jaxp/unittest/parsers/entity.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/entity.xml
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/entity.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/entity64K.xml b/jaxp/test/javax/xml/jaxp/unittest/parsers/entity64K.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/entity64K.xml
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/entity64K.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/test.xsd b/jaxp/test/javax/xml/jaxp/unittest/parsers/test.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/test.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/test.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/test1.xml b/jaxp/test/javax/xml/jaxp/unittest/parsers/test1.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/test1.xml
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/test1.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/test2.xml b/jaxp/test/javax/xml/jaxp/unittest/parsers/test2.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/test2.xml
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/test2.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/toys.xml b/jaxp/test/javax/xml/jaxp/unittest/parsers/toys.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/toys.xml
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/toys.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/toys.xsd b/jaxp/test/javax/xml/jaxp/unittest/parsers/toys.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/toys.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/toys.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/toys3002.xsd b/jaxp/test/javax/xml/jaxp/unittest/parsers/toys3002.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/toys3002.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/toys3002.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/xinclude/Bug6794483Test.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/xinclude/Bug6794483Test.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/xinclude/Bug6794483Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/xinclude/Bug6794483Test.java
index ee5e258..8411917 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/xinclude/Bug6794483Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/xinclude/Bug6794483Test.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.parsers.xinclude;
+package parsers.xinclude;
import static java.lang.System.lineSeparator;
import static org.testng.Assert.assertEquals;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/xinclude/test1.xml b/jaxp/test/javax/xml/jaxp/unittest/parsers/xinclude/test1.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/xinclude/test1.xml
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/xinclude/test1.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/xinclude/test2.xml b/jaxp/test/javax/xml/jaxp/unittest/parsers/xinclude/test2.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/parsers/xinclude/test2.xml
rename to jaxp/test/javax/xml/jaxp/unittest/parsers/xinclude/test2.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/Attributes2ImplTest.java b/jaxp/test/javax/xml/jaxp/unittest/sax/Attributes2ImplTest.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/Attributes2ImplTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/sax/Attributes2ImplTest.java
index 362440f..e8a1bba 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/Attributes2ImplTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/sax/Attributes2ImplTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package org.xml.sax;
+package sax;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/Bug6889654Test.java b/jaxp/test/javax/xml/jaxp/unittest/sax/Bug6889654Test.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/Bug6889654Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/sax/Bug6889654Test.java
index ece2b16..e5043aa 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/Bug6889654Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/sax/Bug6889654Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package org.xml.sax;
+package sax;
import java.io.IOException;
import java.io.StringReader;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/Bug6925410Test.java b/jaxp/test/javax/xml/jaxp/unittest/sax/Bug6925410Test.java
similarity index 94%
rename from jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/Bug6925410Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/sax/Bug6925410Test.java
index 280d2c8..5679ed6 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/Bug6925410Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/sax/Bug6925410Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package org.xml.sax;
+package sax;
import javax.xml.datatype.DatatypeConfigurationException;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/Bug6949607Test.java b/jaxp/test/javax/xml/jaxp/unittest/sax/Bug6949607Test.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/Bug6949607Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/sax/Bug6949607Test.java
index 800788a..d8fd89c 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/Bug6949607Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/sax/Bug6949607Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package org.xml.sax;
+package sax;
import java.io.ByteArrayInputStream;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/Bug6992561Test.java b/jaxp/test/javax/xml/jaxp/unittest/sax/Bug6992561Test.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/Bug6992561Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/sax/Bug6992561Test.java
index f4761bf..d82fe10 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/Bug6992561Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/sax/Bug6992561Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package org.xml.sax;
+package sax;
import java.io.ByteArrayInputStream;
import java.io.IOException;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/Bug7057778.xml b/jaxp/test/javax/xml/jaxp/unittest/sax/Bug7057778.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/Bug7057778.xml
rename to jaxp/test/javax/xml/jaxp/unittest/sax/Bug7057778.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/Bug7057778Test.java b/jaxp/test/javax/xml/jaxp/unittest/sax/Bug7057778Test.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/Bug7057778Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/sax/Bug7057778Test.java
index 39039dd..7780976 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/Bug7057778Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/sax/Bug7057778Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package org.xml.sax;
+package sax;
import java.io.File;
import java.io.FileInputStream;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/DefaultHandler2Test.java b/jaxp/test/javax/xml/jaxp/unittest/sax/DefaultHandler2Test.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/DefaultHandler2Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/sax/DefaultHandler2Test.java
index ecce290..15205d7 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/DefaultHandler2Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/sax/DefaultHandler2Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package org.xml.sax;
+package sax;
import java.io.IOException;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/IssueTracker56Test.java b/jaxp/test/javax/xml/jaxp/unittest/sax/IssueTracker56Test.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/IssueTracker56Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/sax/IssueTracker56Test.java
index 9b26c5d..b5a4647 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/IssueTracker56Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/sax/IssueTracker56Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package org.xml.sax;
+package sax;
import java.io.IOException;
import java.io.StringReader;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/MyDefaultHandler2.java b/jaxp/test/javax/xml/jaxp/unittest/sax/MyDefaultHandler2.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/MyDefaultHandler2.java
rename to jaxp/test/javax/xml/jaxp/unittest/sax/MyDefaultHandler2.java
index 548d662..44ac9fd 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/MyDefaultHandler2.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/sax/MyDefaultHandler2.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package org.xml.sax;
+package sax;
import java.io.IOException;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/NSSupportTest.java b/jaxp/test/javax/xml/jaxp/unittest/sax/NSSupportTest.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/NSSupportTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/sax/NSSupportTest.java
index b2c5221..c04ecc7 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/NSSupportTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/sax/NSSupportTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package org.xml.sax;
+package sax;
import java.util.Enumeration;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/SAXExceptionExt.java b/jaxp/test/javax/xml/jaxp/unittest/sax/SAXExceptionExt.java
similarity index 92%
rename from jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/SAXExceptionExt.java
rename to jaxp/test/javax/xml/jaxp/unittest/sax/SAXExceptionExt.java
index 3e5421c..9b9800d 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/SAXExceptionExt.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/sax/SAXExceptionExt.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package org.xml.sax;
+package sax;
import org.xml.sax.SAXException;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/externalDTD.dtd b/jaxp/test/javax/xml/jaxp/unittest/sax/externalDTD.dtd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/externalDTD.dtd
rename to jaxp/test/javax/xml/jaxp/unittest/sax/externalDTD.dtd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/toys.xml b/jaxp/test/javax/xml/jaxp/unittest/sax/toys.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/toys.xml
rename to jaxp/test/javax/xml/jaxp/unittest/sax/toys.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/toys_error.xml b/jaxp/test/javax/xml/jaxp/unittest/sax/toys_error.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/org/xml/sax/toys_error.xml
rename to jaxp/test/javax/xml/jaxp/unittest/sax/toys_error.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/AttributeLocalNameTest/AttributeLocalNameTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/AttributeLocalNameTest/AttributeLocalNameTest.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/AttributeLocalNameTest/AttributeLocalNameTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/AttributeLocalNameTest/AttributeLocalNameTest.java
index dd2570c..01d54e0 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/AttributeLocalNameTest/AttributeLocalNameTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/AttributeLocalNameTest/AttributeLocalNameTest.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream.AttributeLocalNameTest;
+package stream.AttributeLocalNameTest;
import java.io.StringReader;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Bug6370703.java b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6370703.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Bug6370703.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/Bug6370703.java
index 0366b2e..f386e5d 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Bug6370703.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6370703.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream;
+package stream;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamReader;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Bug6378422.java b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6378422.java
similarity index 93%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Bug6378422.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/Bug6378422.java
index be4e230..f273d1f 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Bug6378422.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6378422.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream;
+package stream;
import javax.xml.stream.XMLInputFactory;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Bug6380870.java b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6380870.java
similarity index 94%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Bug6380870.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/Bug6380870.java
index 8f8cfa4..8eb6a7f 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Bug6380870.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6380870.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream;
+package stream;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamReader;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Bug6489502.java b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6489502.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Bug6489502.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/Bug6489502.java
index 1c07939..9cc264a 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Bug6489502.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6489502.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream;
+package stream;
import javax.xml.stream.XMLEventReader;
import javax.xml.stream.XMLInputFactory;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Bug6509774.java b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6509774.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Bug6509774.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/Bug6509774.java
index 711775f..b92f4bf 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Bug6509774.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6509774.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream;
+package stream;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamConstants;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Bug6688002Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6688002Test.java
similarity index 92%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Bug6688002Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/Bug6688002Test.java
index 5945462..57bb97e 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Bug6688002Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6688002Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,13 +21,18 @@
* questions.
*/
-package javax.xml.stream;
+package stream;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.InputStream;
import java.io.OutputStream;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLOutputFactory;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLStreamWriter;
+
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Bug6976938.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6976938.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Bug6976938.xml
rename to jaxp/test/javax/xml/jaxp/unittest/stream/Bug6976938.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Bug6976938Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6976938Test.java
similarity index 92%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Bug6976938Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/Bug6976938Test.java
index 08be1fe..ac31746 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Bug6976938Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6976938Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,9 +21,13 @@
* questions.
*/
-package javax.xml.stream;
+package stream;
import javax.xml.namespace.QName;
+import javax.xml.stream.EventFilter;
+import javax.xml.stream.XMLEventReader;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamException;
import javax.xml.stream.events.XMLEvent;
import org.testng.Assert;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/CoalesceTest/CoalesceTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/CoalesceTest/CoalesceTest.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/CoalesceTest/CoalesceTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/CoalesceTest/CoalesceTest.java
index 899e270..70f286c 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/CoalesceTest/CoalesceTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/CoalesceTest/CoalesceTest.java
@@ -20,7 +20,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
-package javax.xml.stream.CoalesceTest;
+package stream.CoalesceTest;
import java.io.File;
import java.io.FileInputStream;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/CoalesceTest/coalesce.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/CoalesceTest/coalesce.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/CoalesceTest/coalesce.xml
rename to jaxp/test/javax/xml/jaxp/unittest/stream/CoalesceTest/coalesce.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/EntitiesTest/EntityTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/EntitiesTest/EntityTest.java
similarity index 99%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/EntitiesTest/EntityTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/EntitiesTest/EntityTest.java
index 0da8153..aa72e3f 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/EntitiesTest/EntityTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/EntitiesTest/EntityTest.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream.EntitiesTest;
+package stream.EntitiesTest;
import java.io.IOException;
import java.io.InputStreamReader;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/EntitiesTest/testCharRef.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/EntitiesTest/testCharRef.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/EntitiesTest/testCharRef.xml
rename to jaxp/test/javax/xml/jaxp/unittest/stream/EntitiesTest/testCharRef.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/EntitiesTest/testCharRef.xml.output b/jaxp/test/javax/xml/jaxp/unittest/stream/EntitiesTest/testCharRef.xml.output
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/EntitiesTest/testCharRef.xml.output
rename to jaxp/test/javax/xml/jaxp/unittest/stream/EntitiesTest/testCharRef.xml.output
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/EventReaderDelegateTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/EventReaderDelegateTest.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/EventReaderDelegateTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/EventReaderDelegateTest.java
index 77186ae..b314ff7 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/EventReaderDelegateTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/EventReaderDelegateTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,14 +21,20 @@
* questions.
*/
-package javax.xml.stream;
+package stream;
import org.testng.annotations.Test;
import org.testng.Assert;
+
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
+import javax.xml.stream.FactoryConfigurationError;
+import javax.xml.stream.XMLEventReader;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamConstants;
+import javax.xml.stream.XMLStreamException;
import javax.xml.stream.events.XMLEvent;
import javax.xml.stream.util.EventReaderDelegate;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Events/Issue41Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue41Test.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Events/Issue41Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue41Test.java
index 87d3ad4..738f4e33 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Events/Issue41Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue41Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream.Events;
+package stream.EventsTest;
import java.io.StringReader;
import java.io.StringWriter;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Events/Issue48Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue48Test.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Events/Issue48Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue48Test.java
index b10b6cd..b567302 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Events/Issue48Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue48Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream.Events;
+package stream.EventsTest;
import java.io.StringReader;
import java.util.Iterator;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Events/Issue53Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue53Test.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Events/Issue53Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue53Test.java
index c9c1dee..7193d27 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Events/Issue53Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue53Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream.Events;
+package stream.EventsTest;
import javax.xml.stream.XMLEventFactory;
import javax.xml.stream.events.StartDocument;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Events/Issue58Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue58Test.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Events/Issue58Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue58Test.java
index 30ce600..3c46741 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/Events/Issue58Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue58Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream.Events;
+package stream.EventsTest;
import java.io.StringReader;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/FactoryFindTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/FactoryFindTest.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/FactoryFindTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/FactoryFindTest.java
index 555c8a8..f016df3 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/FactoryFindTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/FactoryFindTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream;
+package stream;
import java.io.File;
import java.io.FileInputStream;
@@ -32,6 +32,9 @@
import java.net.URLClassLoader;
import java.util.Properties;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLOutputFactory;
+
import org.testng.Assert;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/FactoryFindTest.policy b/jaxp/test/javax/xml/jaxp/unittest/stream/FactoryFindTest.policy
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/FactoryFindTest.policy
rename to jaxp/test/javax/xml/jaxp/unittest/stream/FactoryFindTest.policy
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/IgnoreExternalDTDTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/IgnoreExternalDTDTest.java
similarity index 90%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/IgnoreExternalDTDTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/IgnoreExternalDTDTest.java
index 79b6c89..5475cba 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/IgnoreExternalDTDTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/IgnoreExternalDTDTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,10 +21,15 @@
* questions.
*/
-package javax.xml.stream;
+package stream;
import java.io.StringReader;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamConstants;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+
import org.testng.annotations.Test;
/*
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/ProcessingInstruction/ProcessingInstructionTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/ProcessingInstructionTest/ProcessingInstructionTest.java
similarity index 94%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/ProcessingInstruction/ProcessingInstructionTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/ProcessingInstructionTest/ProcessingInstructionTest.java
index 9dc297f..1234a37 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/ProcessingInstruction/ProcessingInstructionTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/ProcessingInstructionTest/ProcessingInstructionTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream.ProcessingInstruction;
+package stream.ProcessingInstructionTest;
import java.io.InputStream;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/StreamReaderDelegateTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/StreamReaderDelegateTest.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/StreamReaderDelegateTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/StreamReaderDelegateTest.java
index b1f76f9..d7f9f48 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/StreamReaderDelegateTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/StreamReaderDelegateTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream;
+package stream;
import java.io.File;
import java.io.FileInputStream;
@@ -30,6 +30,11 @@
import java.util.Iterator;
import javax.xml.namespace.NamespaceContext;
+import javax.xml.stream.FactoryConfigurationError;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamConstants;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.util.StreamReaderDelegate;
import org.testng.Assert;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventLocationTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventLocationTest.java
similarity index 92%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventLocationTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventLocationTest.java
index eccc7ff..6c76038 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventLocationTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventLocationTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,8 +21,10 @@
* questions.
*/
-package javax.xml.stream;
+package stream;
+import javax.xml.stream.Location;
+import javax.xml.stream.XMLEventFactory;
import javax.xml.stream.events.XMLEvent;
import org.testng.Assert;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/Bug6489890.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6489890.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/Bug6489890.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6489890.java
index 84a49f9..0d55480 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/Bug6489890.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6489890.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream.XMLEventReaderTest;
+package stream.XMLEventReaderTest;
import javax.xml.stream.XMLEventReader;
import javax.xml.stream.XMLInputFactory;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/Bug6555001.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6555001.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/Bug6555001.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6555001.java
index dfd95e3..566186c 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/Bug6555001.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6555001.java
@@ -20,7 +20,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
-package javax.xml.stream.XMLEventReaderTest;
+package stream.XMLEventReaderTest;
import java.io.StringReader;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/Bug6586466Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6586466Test.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/Bug6586466Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6586466Test.java
index c348442..319c50a 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/Bug6586466Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6586466Test.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream.XMLEventReaderTest;
+package stream.XMLEventReaderTest;
import org.testng.annotations.Test;
import org.testng.Assert;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/Bug6613059Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6613059Test.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/Bug6613059Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6613059Test.java
index 73fe8c4..88d0be0 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/Bug6613059Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6613059Test.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream.XMLEventReaderTest;
+package stream.XMLEventReaderTest;
import org.testng.annotations.Test;
import org.testng.Assert;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/Bug6668115Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6668115Test.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/Bug6668115Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6668115Test.java
index a66ec74..c56e756 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/Bug6668115Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6668115Test.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream.XMLEventReaderTest;
+package stream.XMLEventReaderTest;
import java.io.File;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/Bug6846133Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6846133Test.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/Bug6846133Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6846133Test.java
index 0470a6b..16bf959 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/Bug6846133Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6846133Test.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream.XMLEventReaderTest;
+package stream.XMLEventReaderTest;
import javax.xml.stream.XMLStreamException;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/Issue40Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Issue40Test.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/Issue40Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Issue40Test.java
index 48ecebc..161b6e6 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/Issue40Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Issue40Test.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream.XMLEventReaderTest;
+package stream.XMLEventReaderTest;
import java.io.File;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/bug6613059.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/bug6613059.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/bug6613059.xml
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/bug6613059.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/play.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/play.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/play.xml
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/play.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/play2.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/play2.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/play2.xml
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/play2.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/sgml.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/sgml.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventReaderTest/sgml.xml
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/sgml.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventWriterTest/ReaderToWriterTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/ReaderToWriterTest.java
similarity index 99%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventWriterTest/ReaderToWriterTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/ReaderToWriterTest.java
index 9c2df03..1805e99 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventWriterTest/ReaderToWriterTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/ReaderToWriterTest.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream.XMLEventWriterTest;
+package stream.XMLEventWriterTest;
import java.io.ByteArrayOutputStream;
import java.io.File;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventWriterTest/ReaderToWriterTest.wsdl b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/ReaderToWriterTest.wsdl
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventWriterTest/ReaderToWriterTest.wsdl
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/ReaderToWriterTest.wsdl
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventWriterTest/ReaderToWriterTest.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/ReaderToWriterTest.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventWriterTest/ReaderToWriterTest.xml
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/ReaderToWriterTest.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventWriterTest/W2JDLR4002TestService.wsdl.data b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/W2JDLR4002TestService.wsdl.data
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventWriterTest/W2JDLR4002TestService.wsdl.data
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/W2JDLR4002TestService.wsdl.data
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventWriterTest/XMLEventWriterTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/XMLEventWriterTest.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventWriterTest/XMLEventWriterTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/XMLEventWriterTest.java
index d12ca93..ab076f2 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventWriterTest/XMLEventWriterTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/XMLEventWriterTest.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream.XMLEventWriterTest;
+package stream.XMLEventWriterTest;
import java.io.File;
import java.io.FileInputStream;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventWriterTest/XMLEventWriterTest.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/XMLEventWriterTest.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventWriterTest/XMLEventWriterTest.xml
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/XMLEventWriterTest.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventWriterTest/merge-1.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/merge-1.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventWriterTest/merge-1.xml
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/merge-1.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventWriterTest/merge-2.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/merge-2.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventWriterTest/merge-2.xml
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/merge-2.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventWriterTest/replace1.txt b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/replace1.txt
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventWriterTest/replace1.txt
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/replace1.txt
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLInputFactoryTest/Bug6756677Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/Bug6756677Test.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLInputFactoryTest/Bug6756677Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/Bug6756677Test.java
index 569d6c5..17604ac 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLInputFactoryTest/Bug6756677Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/Bug6756677Test.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream.XMLInputFactoryTest;
+package stream.XMLInputFactoryTest;
import javax.xml.stream.XMLInputFactory;
@@ -36,7 +36,7 @@
@Test
public void testNewInstance() {
- String myFactory = "javax.xml.stream.XMLInputFactoryTest.MyInputFactory";
+ String myFactory = "stream.XMLInputFactoryTest.MyInputFactory";
try {
System.setProperty("MyInputFactory", myFactory);
XMLInputFactory xif = XMLInputFactory.newInstance("MyInputFactory", null);
@@ -52,7 +52,7 @@
// newFactory was added in StAX 1.2
@Test
public void testNewFactory() {
- String myFactory = "javax.xml.stream.XMLInputFactoryTest.MyInputFactory";
+ String myFactory = "stream.XMLInputFactoryTest.MyInputFactory";
ClassLoader cl = null;
try {
System.setProperty("MyInputFactory", myFactory);
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLInputFactoryTest/Bug6909759Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/Bug6909759Test.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLInputFactoryTest/Bug6909759Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/Bug6909759Test.java
index 1c699c8..36cc136 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLInputFactoryTest/Bug6909759Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/Bug6909759Test.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream.XMLInputFactoryTest;
+package stream.XMLInputFactoryTest;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamException;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLInputFactoryTest/IssueTracker38.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/IssueTracker38.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLInputFactoryTest/IssueTracker38.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/IssueTracker38.java
index f468d7a..448a854 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLInputFactoryTest/IssueTracker38.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/IssueTracker38.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream.XMLInputFactoryTest;
+package stream.XMLInputFactoryTest;
import javax.xml.stream.XMLEventReader;
import javax.xml.stream.XMLInputFactory;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLInputFactoryTest/MyInputFactory.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/MyInputFactory.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLInputFactoryTest/MyInputFactory.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/MyInputFactory.java
index 581c122..551d3f0 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLInputFactoryTest/MyInputFactory.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/MyInputFactory.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream.XMLInputFactoryTest;
+package stream.XMLInputFactoryTest;
import java.io.InputStream;
import java.io.Reader;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLInputFactoryTest/play.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/play.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLInputFactoryTest/play.xml
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/play.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLOutputFactoryTest/Bug6846132Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/Bug6846132Test.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLOutputFactoryTest/Bug6846132Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/Bug6846132Test.java
index 9e5093d..15afdaf 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLOutputFactoryTest/Bug6846132Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/Bug6846132Test.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream.XMLOutputFactoryTest;
+package stream.XMLOutputFactoryTest;
import javax.xml.stream.XMLEventWriter;
import javax.xml.stream.XMLOutputFactory;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLOutputFactoryTest/DuplicateNSDeclarationTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/DuplicateNSDeclarationTest.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLOutputFactoryTest/DuplicateNSDeclarationTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/DuplicateNSDeclarationTest.java
index 64517c3..884c923 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLOutputFactoryTest/DuplicateNSDeclarationTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/DuplicateNSDeclarationTest.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream.XMLOutputFactoryTest;
+package stream.XMLOutputFactoryTest;
import java.io.ByteArrayOutputStream;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLOutputFactoryTest/StreamResultTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/StreamResultTest.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLOutputFactoryTest/StreamResultTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/StreamResultTest.java
index 368c80c..96d928c 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLOutputFactoryTest/StreamResultTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/StreamResultTest.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream.XMLOutputFactoryTest;
+package stream.XMLOutputFactoryTest;
import java.io.ByteArrayOutputStream;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLResolverTest/XMLResolverTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLResolverTest/XMLResolverTest.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLResolverTest/XMLResolverTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLResolverTest/XMLResolverTest.java
index 9d4ca30..1a07803 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLResolverTest/XMLResolverTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLResolverTest/XMLResolverTest.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream.XMLResolverTest;
+package stream.XMLResolverTest;
import java.io.File;
import java.io.FileInputStream;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLResolverTest/XMLResolverTest.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLResolverTest/XMLResolverTest.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLResolverTest/XMLResolverTest.xml
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLResolverTest/XMLResolverTest.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLResolverTest/replace1.txt b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLResolverTest/replace1.txt
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLResolverTest/replace1.txt
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLResolverTest/replace1.txt
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLResolverTest/replace2.txt b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLResolverTest/replace2.txt
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLResolverTest/replace2.txt
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLResolverTest/replace2.txt
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamExceptionTest/ExceptionTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamExceptionTest/ExceptionTest.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamExceptionTest/ExceptionTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamExceptionTest/ExceptionTest.java
index a64d93f..3e0dda7 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamExceptionTest/ExceptionTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamExceptionTest/ExceptionTest.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream.XMLStreamExceptionTest;
+package stream.XMLStreamExceptionTest;
import java.io.IOException;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamFilterTest/Bug6481615.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/Bug6481615.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamFilterTest/Bug6481615.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/Bug6481615.java
index 25bc88d..1aa2219 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamFilterTest/Bug6481615.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/Bug6481615.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream.XMLStreamFilterTest;
+package stream.XMLStreamFilterTest;
import java.io.StringReader;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamFilterTest/Bug6481678.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/Bug6481678.java
similarity index 99%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamFilterTest/Bug6481678.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/Bug6481678.java
index 1f697b7..9b3273a 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamFilterTest/Bug6481678.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/Bug6481678.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream.XMLStreamFilterTest;
+package stream.XMLStreamFilterTest;
import java.io.InputStream;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamFilterTest/HasNextTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/HasNextTest.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamFilterTest/HasNextTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/HasNextTest.java
index 5625f78..3df73ae 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamFilterTest/HasNextTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/HasNextTest.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream.XMLStreamFilterTest;
+package stream.XMLStreamFilterTest;
import javax.xml.stream.StreamFilter;
import javax.xml.stream.XMLInputFactory;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamFilterTest/HasNextTest.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/HasNextTest.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamFilterTest/HasNextTest.xml
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/HasNextTest.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamFilterTest/HasNextTypeFilter.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/HasNextTypeFilter.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamFilterTest/HasNextTypeFilter.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/HasNextTypeFilter.java
index 95b3f50..1fd6e20 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamFilterTest/HasNextTypeFilter.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/HasNextTypeFilter.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream.XMLStreamFilterTest;
+package stream.XMLStreamFilterTest;
import javax.xml.stream.EventFilter;
import javax.xml.stream.StreamFilter;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/BOMTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/BOMTest.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/BOMTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/BOMTest.java
index eb7c3b4..b253e95 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/BOMTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/BOMTest.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream.XMLStreamReaderTest;
+package stream.XMLStreamReaderTest;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamReader;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Bug6388460.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6388460.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Bug6388460.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6388460.java
index 4d6b58a..c73348c 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Bug6388460.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6388460.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream.XMLStreamReaderTest;
+package stream.XMLStreamReaderTest;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Bug6472982Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6472982Test.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Bug6472982Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6472982Test.java
index 830718f..c22dde7 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Bug6472982Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6472982Test.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream.XMLStreamReaderTest;
+package stream.XMLStreamReaderTest;
import java.io.InputStream;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Bug6767322.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6767322.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Bug6767322.xml
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6767322.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Bug6767322Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6767322Test.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Bug6767322Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6767322Test.java
index fe0da55..b9ffde7 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Bug6767322Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6767322Test.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream.XMLStreamReaderTest;
+package stream.XMLStreamReaderTest;
import java.io.ByteArrayInputStream;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Bug6847819Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6847819Test.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Bug6847819Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6847819Test.java
index c9211c0..2480b72 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Bug6847819Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6847819Test.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream.XMLStreamReaderTest;
+package stream.XMLStreamReaderTest;
import org.testng.annotations.Test;
import org.testng.Assert;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/BugTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/BugTest.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/BugTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/BugTest.java
index 2499a07..15e01a2 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/BugTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/BugTest.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream.XMLStreamReaderTest;
+package stream.XMLStreamReaderTest;
import java.io.StringReader;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/DefaultAttributeTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/DefaultAttributeTest.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/DefaultAttributeTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/DefaultAttributeTest.java
index 33e8c5b..6ce3bd4 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/DefaultAttributeTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/DefaultAttributeTest.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream.XMLStreamReaderTest;
+package stream.XMLStreamReaderTest;
import java.util.Iterator;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/DoubleXmlnsTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/DoubleXmlnsTest.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/DoubleXmlnsTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/DoubleXmlnsTest.java
index da73bd6..df1ced6 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/DoubleXmlnsTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/DoubleXmlnsTest.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream.XMLStreamReaderTest;
+package stream.XMLStreamReaderTest;
import java.io.StringReader;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/ExternalDTD.dtd b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/ExternalDTD.dtd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/ExternalDTD.dtd
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/ExternalDTD.dtd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/ExternalDTD.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/ExternalDTD.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/ExternalDTD.xml
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/ExternalDTD.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Hello.wsdl.data b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Hello.wsdl.data
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Hello.wsdl.data
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Hello.wsdl.data
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/IsValidatingTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IsValidatingTest.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/IsValidatingTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IsValidatingTest.java
index dcd2d39..06dc266 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/IsValidatingTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IsValidatingTest.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream.XMLStreamReaderTest;
+package stream.XMLStreamReaderTest;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamReader;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/IsValidatingTest.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IsValidatingTest.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/IsValidatingTest.xml
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IsValidatingTest.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/IsValidatingTestInternalSubset.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IsValidatingTestInternalSubset.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/IsValidatingTestInternalSubset.xml
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IsValidatingTestInternalSubset.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Issue44Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Issue44Test.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Issue44Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Issue44Test.java
index 47ed0bc..082aa87 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Issue44Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Issue44Test.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream.XMLStreamReaderTest;
+package stream.XMLStreamReaderTest;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamReader;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Issue47Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Issue47Test.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Issue47Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Issue47Test.java
index 736971d..7d86842 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Issue47Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Issue47Test.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream.XMLStreamReaderTest;
+package stream.XMLStreamReaderTest;
import java.io.StringReader;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/IssueTracker24.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker24.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/IssueTracker24.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker24.java
index 0d2f723..dd0fb1a 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/IssueTracker24.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker24.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream.XMLStreamReaderTest;
+package stream.XMLStreamReaderTest;
import java.io.StringReader;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/IssueTracker35.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker35.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/IssueTracker35.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker35.java
index 2f93c98..1aa8d6b 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/IssueTracker35.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker35.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream.XMLStreamReaderTest;
+package stream.XMLStreamReaderTest;
import java.io.InputStream;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/IssueTracker70.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker70.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/IssueTracker70.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker70.java
index ed9dc28..c616a3a 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/IssueTracker70.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker70.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream.XMLStreamReaderTest;
+package stream.XMLStreamReaderTest;
import java.io.File;
import java.io.FileInputStream;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/IssueTracker70.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker70.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/IssueTracker70.xml
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker70.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Jsr173MR1Req5.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Jsr173MR1Req5.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Jsr173MR1Req5.xml
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Jsr173MR1Req5.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Jsr173MR1Req5Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Jsr173MR1Req5Test.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Jsr173MR1Req5Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Jsr173MR1Req5Test.java
index c58fd03..50dfed8 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Jsr173MR1Req5Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Jsr173MR1Req5Test.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream.XMLStreamReaderTest;
+package stream.XMLStreamReaderTest;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamConstants;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Jsr173MR1Req8.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Jsr173MR1Req8.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Jsr173MR1Req8.xml
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Jsr173MR1Req8.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Jsr173MR1Req8Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Jsr173MR1Req8Test.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Jsr173MR1Req8Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Jsr173MR1Req8Test.java
index c39106f..d1c0074 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/Jsr173MR1Req8Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Jsr173MR1Req8Test.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream.XMLStreamReaderTest;
+package stream.XMLStreamReaderTest;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamConstants;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/NamespaceTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/NamespaceTest.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/NamespaceTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/NamespaceTest.java
index 75d3270..5c9440d 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/NamespaceTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/NamespaceTest.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream.XMLStreamReaderTest;
+package stream.XMLStreamReaderTest;
import java.io.InputStream;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/StreamReaderTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/StreamReaderTest.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/StreamReaderTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/StreamReaderTest.java
index 8b7475d..cbaa378 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/StreamReaderTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/StreamReaderTest.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream.XMLStreamReaderTest;
+package stream.XMLStreamReaderTest;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamConstants;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/SupportDTDTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/SupportDTDTest.java
similarity index 99%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/SupportDTDTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/SupportDTDTest.java
index 7b8e28e..1a2e325 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/SupportDTDTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/SupportDTDTest.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream.XMLStreamReaderTest;
+package stream.XMLStreamReaderTest;
import java.io.File;
import java.io.FileInputStream;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/UTF16-BE.wsdl.data b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/UTF16-BE.wsdl.data
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/UTF16-BE.wsdl.data
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/UTF16-BE.wsdl.data
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/UTF8-BOM.xml.data b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/UTF8-BOM.xml.data
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/UTF8-BOM.xml.data
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/UTF8-BOM.xml.data
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/VoiceXMLDTDTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/VoiceXMLDTDTest.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/VoiceXMLDTDTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/VoiceXMLDTDTest.java
index 5e193f6..5befcb7 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/VoiceXMLDTDTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/VoiceXMLDTDTest.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream.XMLStreamReaderTest;
+package stream.XMLStreamReaderTest;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamReader;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/XML11Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/XML11Test.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/XML11Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/XML11Test.java
index 2293aac..ac98279 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/XML11Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/XML11Test.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream.XMLStreamReaderTest;
+package stream.XMLStreamReaderTest;
import javax.xml.stream.XMLEventReader;
import javax.xml.stream.XMLInputFactory;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/XMLSchema.dtd b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/XMLSchema.dtd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/XMLSchema.dtd
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/XMLSchema.dtd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/XMLSchema.xsd b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/XMLSchema.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/XMLSchema.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/XMLSchema.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/datatypes.dtd b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/datatypes.dtd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/datatypes.dtd
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/datatypes.dtd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/report.dtd b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/report.dtd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/report.dtd
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/report.dtd
Binary files differ
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/sgml.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/sgml.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/sgml.xml
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/sgml.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/voicexml.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/voicexml.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/voicexml.xml
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/voicexml.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/vxml.dtd b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/vxml.dtd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/vxml.dtd
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/vxml.dtd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/xml11.xml.data b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/xml11.xml.data
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamReaderTest/xml11.xml.data
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/xml11.xml.data
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/AttributeEscapeTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/AttributeEscapeTest.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/AttributeEscapeTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/AttributeEscapeTest.java
index 0cd9466..7a426c9 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/AttributeEscapeTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/AttributeEscapeTest.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream.XMLStreamWriterTest;
+package stream.XMLStreamWriterTest;
import java.io.IOException;
import java.io.StringReader;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/Bug6452107.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6452107.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/Bug6452107.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6452107.java
index 2d45aa2..b3148c6 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/Bug6452107.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6452107.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream.XMLStreamWriterTest;
+package stream.XMLStreamWriterTest;
import java.io.ByteArrayOutputStream;
import java.io.OutputStream;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/Bug6600882Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6600882Test.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/Bug6600882Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6600882Test.java
index 3b22705..f34b559 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/Bug6600882Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6600882Test.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream.XMLStreamWriterTest;
+package stream.XMLStreamWriterTest;
import java.io.ByteArrayOutputStream;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/Bug6675332Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6675332Test.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/Bug6675332Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6675332Test.java
index a225806..e52fb4a 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/Bug6675332Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6675332Test.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream.XMLStreamWriterTest;
+package stream.XMLStreamWriterTest;
import java.io.StringWriter;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/Bug7037352Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug7037352Test.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/Bug7037352Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug7037352Test.java
index a15b7a61..7c1e502 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/Bug7037352Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug7037352Test.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream.XMLStreamWriterTest;
+package stream.XMLStreamWriterTest;
import javax.xml.XMLConstants;
import javax.xml.namespace.NamespaceContext;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/DOMUtil.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/DOMUtil.java
similarity index 99%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/DOMUtil.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/DOMUtil.java
index 674e00d..f59ef01 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/DOMUtil.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/DOMUtil.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream.XMLStreamWriterTest;
+package stream.XMLStreamWriterTest;
import java.io.IOException;
import java.io.InputStream;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/DomUtilTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/DomUtilTest.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/DomUtilTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/DomUtilTest.java
index 76d5c98..d2c2491 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/DomUtilTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/DomUtilTest.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream.XMLStreamWriterTest;
+package stream.XMLStreamWriterTest;
import java.io.ByteArrayOutputStream;
import java.io.File;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/EmptyElementTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/EmptyElementTest.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/EmptyElementTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/EmptyElementTest.java
index 475c3ed..b813ef5 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/EmptyElementTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/EmptyElementTest.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream.XMLStreamWriterTest;
+package stream.XMLStreamWriterTest;
import java.io.ByteArrayOutputStream;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/EncodingTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/EncodingTest.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/EncodingTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/EncodingTest.java
index d79a233..5097315 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/EncodingTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/EncodingTest.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream.XMLStreamWriterTest;
+package stream.XMLStreamWriterTest;
import java.io.ByteArrayOutputStream;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/NamespaceTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/NamespaceTest.java
similarity index 99%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/NamespaceTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/NamespaceTest.java
index 7f036de..24d89a0 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/NamespaceTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/NamespaceTest.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream.XMLStreamWriterTest;
+package stream.XMLStreamWriterTest;
import java.io.ByteArrayOutputStream;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/NullUriDetectionTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/NullUriDetectionTest.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/NullUriDetectionTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/NullUriDetectionTest.java
index 9dbb40c..3eb0222 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/NullUriDetectionTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/NullUriDetectionTest.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream.XMLStreamWriterTest;
+package stream.XMLStreamWriterTest;
import java.io.StringWriter;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/SqeLinuxTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/SqeLinuxTest.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/SqeLinuxTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/SqeLinuxTest.java
index fa53214..90ca0f3 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/SqeLinuxTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/SqeLinuxTest.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream.XMLStreamWriterTest;
+package stream.XMLStreamWriterTest;
import java.io.ByteArrayOutputStream;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/UnprefixedNameTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/UnprefixedNameTest.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/UnprefixedNameTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/UnprefixedNameTest.java
index c4174cf..5e05fd8 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/UnprefixedNameTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/UnprefixedNameTest.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream.XMLStreamWriterTest;
+package stream.XMLStreamWriterTest;
import javax.xml.stream.XMLOutputFactory;
import javax.xml.stream.XMLStreamException;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/WriterTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/WriterTest.java
similarity index 99%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/WriterTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/WriterTest.java
index 05f777d..adb43d9 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/WriterTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/WriterTest.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream.XMLStreamWriterTest;
+package stream.XMLStreamWriterTest;
import java.io.FileInputStream;
import java.io.FileOutputStream;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/XMLStreamWriterTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/XMLStreamWriterTest.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/XMLStreamWriterTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/XMLStreamWriterTest.java
index 4fa7821..2bc71a3 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/XMLStreamWriterTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/XMLStreamWriterTest.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.stream.XMLStreamWriterTest;
+package stream.XMLStreamWriterTest;
import java.io.StringWriter;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/message_12.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/message_12.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/message_12.xml
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/message_12.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/testEight.xml.org b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/testEight.xml.org
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/testEight.xml.org
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/testEight.xml.org
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/testFive.xml.org b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/testFive.xml.org
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/testFive.xml.org
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/testFive.xml.org
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/testFour.xml.org b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/testFour.xml.org
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/testFour.xml.org
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/testFour.xml.org
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/testOne.xml.org b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/testOne.xml.org
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/testOne.xml.org
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/testOne.xml.org
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/testSeven.xml.org b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/testSeven.xml.org
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/testSeven.xml.org
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/testSeven.xml.org
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/testSix.xml.org b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/testSix.xml.org
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/testSix.xml.org
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/testSix.xml.org
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/testThree.xml.org b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/testThree.xml.org
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLStreamWriterTest/testThree.xml.org
rename to jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/testThree.xml.org
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/basic-form.vxml b/jaxp/test/javax/xml/jaxp/unittest/stream/basic-form.vxml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/basic-form.vxml
rename to jaxp/test/javax/xml/jaxp/unittest/stream/basic-form.vxml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/report.dtd b/jaxp/test/javax/xml/jaxp/unittest/stream/report.dtd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/report.dtd
rename to jaxp/test/javax/xml/jaxp/unittest/stream/report.dtd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/sgml-bad-systemId.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/sgml-bad-systemId.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/sgml-bad-systemId.xml
rename to jaxp/test/javax/xml/jaxp/unittest/stream/sgml-bad-systemId.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/sgml.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/sgml.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/sgml.xml
rename to jaxp/test/javax/xml/jaxp/unittest/stream/sgml.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/sgml_Bug6509774.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/sgml_Bug6509774.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/sgml_Bug6509774.xml
rename to jaxp/test/javax/xml/jaxp/unittest/stream/sgml_Bug6509774.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/testfile1.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/testfile1.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/testfile1.xml
rename to jaxp/test/javax/xml/jaxp/unittest/stream/testfile1.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/testfile2.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/testfile2.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/testfile2.xml
rename to jaxp/test/javax/xml/jaxp/unittest/stream/testfile2.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/testfile3.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/testfile3.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/testfile3.xml
rename to jaxp/test/javax/xml/jaxp/unittest/stream/testfile3.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/testfile4.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/testfile4.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/testfile4.xml
rename to jaxp/test/javax/xml/jaxp/unittest/stream/testfile4.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/toys.xml b/jaxp/test/javax/xml/jaxp/unittest/stream/toys.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/toys.xml
rename to jaxp/test/javax/xml/jaxp/unittest/stream/toys.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/vxml.dtd b/jaxp/test/javax/xml/jaxp/unittest/stream/vxml.dtd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/stream/vxml.dtd
rename to jaxp/test/javax/xml/jaxp/unittest/stream/vxml.dtd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/5368141.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/5368141.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/5368141.xml
rename to jaxp/test/javax/xml/jaxp/unittest/transform/5368141.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug4693341.dtd b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug4693341.dtd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug4693341.dtd
rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug4693341.dtd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug4693341.out b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug4693341.out
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug4693341.out
rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug4693341.out
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug4693341.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug4693341.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug4693341.xml
rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug4693341.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug4693341Test.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug4693341Test.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug4693341Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug4693341Test.java
index 605baf8..f0dc71f 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug4693341Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug4693341Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.transform;
+package transform;
import java.io.File;
import java.io.FileInputStream;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug4693341_golden.dtd b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug4693341_golden.dtd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug4693341_golden.dtd
rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug4693341_golden.dtd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug4693341_golden.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug4693341_golden.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug4693341_golden.xml
rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug4693341_golden.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug4892774.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug4892774.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug4892774.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug4892774.java
index c4b54f8..e65bdaf 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug4892774.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug4892774.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.transform;
+package transform;
import java.io.File;
@@ -32,16 +32,17 @@
import javax.xml.transform.sax.SAXResult;
import javax.xml.transform.stax.StAXResult;
import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.util.DOMUtil;
-import javax.xml.transform.util.SAXUtil;
-import javax.xml.transform.util.StAXUtil;
-import javax.xml.transform.util.StreamUtil;
import org.testng.Assert;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
+import transform.util.DOMUtil;
+import transform.util.SAXUtil;
+import transform.util.StAXUtil;
+import transform.util.StreamUtil;
+
/*
* @bug 4892774
* @summary Test identity transformer with all possible types of Source and Result combinations for doucment version and encoding information.
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug5073477.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug5073477.java
similarity index 94%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug5073477.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug5073477.java
index 7d061c2..4d40674 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug5073477.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug5073477.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.transform;
+package transform;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug5073477.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug5073477.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug5073477.xml
rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug5073477.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6175602.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6175602.java
similarity index 93%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6175602.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug6175602.java
index ae56834..bb3c7d6 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6175602.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6175602.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.transform;
+package transform;
import java.io.File;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6206491.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6206491.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6206491.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug6206491.java
index 9b50879..eaaa3f7 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6206491.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6206491.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.transform;
+package transform;
import java.io.File;
import java.io.IOException;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6206491.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6206491.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6206491.xml
rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug6206491.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6206491.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6206491.xsl
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6206491.xsl
rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug6206491.xsl
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6206491_2.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6206491_2.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6206491_2.xml
rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug6206491_2.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6216226Test.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6216226Test.java
similarity index 91%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6216226Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug6216226Test.java
index ec856b7..275fd8c 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6216226Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6216226Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,11 +21,13 @@
* questions.
*/
-package javax.xml.transform;
+package transform;
import java.io.File;
import java.io.StringReader;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6311448.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6311448.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6311448.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug6311448.java
index 5b39517..db6925d 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6311448.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6311448.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.transform;
+package transform;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6384805.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6384805.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6384805.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug6384805.java
index c59b955..680398b 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6384805.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6384805.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.transform;
+package transform;
import java.util.Iterator;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6465722.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6465722.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6465722.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug6465722.java
index 3a26109..80d5139 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6465722.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6465722.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.transform;
+package transform;
import java.io.StringReader;
import java.io.StringWriter;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6467808.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6467808.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6467808.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug6467808.java
index e32947c..7a7fb1a 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6467808.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6467808.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.transform;
+package transform;
import java.io.StringReader;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6490380.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6490380.java
similarity index 94%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6490380.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug6490380.java
index 5ec65e8..4385fb2 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6490380.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6490380.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.transform;
+package transform;
import java.io.StringWriter;
import java.net.URL;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6490921.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6490921.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6490921.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug6490921.java
index b8ec881..38f72d5 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6490921.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6490921.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.transform;
+package transform;
import java.io.IOException;
import java.io.StringReader;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6505031.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6505031.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6505031.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug6505031.java
index 931bf6d..d3fa4fd 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6505031.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6505031.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.transform;
+package transform;
import java.io.StringWriter;
import java.util.HashMap;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6513892.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6513892.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6513892.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug6513892.java
index ac9fab1..da26d64 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6513892.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6513892.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.transform;
+package transform;
import java.io.File;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6537167.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6537167.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6537167.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug6537167.java
index f64c672..c75ff71 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6537167.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6537167.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.transform;
+package transform;
import java.io.File;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6540545.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6540545.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6540545.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug6540545.java
index e9ddaee..2c76ad6 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6540545.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6540545.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.transform;
+package transform;
import java.io.StringWriter;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6559595.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6559595.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6559595.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug6559595.java
index 1c568b1..162c92a 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6559595.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6559595.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.transform;
+package transform;
import java.io.StringReader;
import java.io.StringWriter;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6565260.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6565260.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6565260.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug6565260.java
index d6a548b..3b0f636 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6565260.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6565260.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.transform;
+package transform;
import java.io.StringWriter;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6940416.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6940416.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6940416.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug6940416.java
index 5c881e1..41f7279 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Bug6940416.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6940416.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.transform;
+package transform;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/BugDB12665704.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/BugDB12665704.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/BugDB12665704.xml
rename to jaxp/test/javax/xml/jaxp/unittest/transform/BugDB12665704.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/BugDB12665704.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/BugDB12665704.xsl
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/BugDB12665704.xsl
rename to jaxp/test/javax/xml/jaxp/unittest/transform/BugDB12665704.xsl
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/BugDB12665704Test.java b/jaxp/test/javax/xml/jaxp/unittest/transform/BugDB12665704Test.java
similarity index 93%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/BugDB12665704Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/BugDB12665704Test.java
index 6099296..5f5fa0e 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/BugDB12665704Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/BugDB12665704Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.transform;
+package transform;
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
@@ -33,6 +33,12 @@
import java.io.StringReader;
import java.io.StringWriter;
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6401137.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6401137.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6401137.xml
rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR6401137.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6401137.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6401137.xsl
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6401137.xsl
rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR6401137.xsl
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6401137Test.java b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6401137Test.java
similarity index 91%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6401137Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR6401137Test.java
index c74fb35..7a2c542 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6401137Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6401137Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.transform;
+package transform;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -29,6 +29,10 @@
import java.io.FileReader;
import java.io.InputStream;
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6551600.policy b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6551600.policy
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6551600.policy
rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR6551600.policy
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6551600Test.java b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6551600Test.java
similarity index 93%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6551600Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR6551600Test.java
index 4211bdf..f364f5d 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6551600Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6551600Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,12 +21,14 @@
* questions.
*/
-package javax.xml.transform;
+package transform;
import java.io.File;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6577667.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6577667.xsl
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6577667.xsl
rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR6577667.xsl
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6577667Test.java b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6577667Test.java
similarity index 90%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6577667Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR6577667Test.java
index b6039c1..70767a4 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6577667Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6577667Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,10 +21,12 @@
* questions.
*/
-package javax.xml.transform;
+package transform;
import java.io.InputStream;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
import javax.xml.transform.stream.StreamSource;
import org.testng.Assert;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6652519Test.java b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6652519Test.java
similarity index 93%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6652519Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR6652519Test.java
index afec164..9be065f 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6652519Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6652519Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,12 +21,14 @@
* questions.
*/
-package javax.xml.transform;
+package transform;
import java.io.File;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMResult;
import javax.xml.transform.stream.StreamSource;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6689809Test.java b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6689809Test.java
similarity index 93%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6689809Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR6689809Test.java
index dec6b4e..91da2f6 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6689809Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6689809Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,10 +21,11 @@
* questions.
*/
-package javax.xml.transform;
+package transform;
import java.io.CharArrayWriter;
+import javax.xml.transform.TransformerFactory;
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6905829.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6905829.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6905829.xml
rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR6905829.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6905829.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6905829.xsl
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6905829.xsl
rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR6905829.xsl
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6905829Inc.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6905829Inc.xsl
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6905829Inc.xsl
rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR6905829Inc.xsl
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6905829Test.java b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6905829Test.java
similarity index 91%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6905829Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR6905829Test.java
index 9a77ed1..60de73f 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6905829Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6905829Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,11 +21,13 @@
* questions.
*/
-package javax.xml.transform;
+package transform;
import java.io.File;
import java.io.StringWriter;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6935697.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6935697.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6935697.xml
rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR6935697.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6935697.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6935697.xsl
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6935697.xsl
rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR6935697.xsl
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6935697Test.java b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6935697Test.java
similarity index 89%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6935697Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR6935697Test.java
index 646043f..6742d3f 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6935697Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6935697Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,10 +21,15 @@
* questions.
*/
-package javax.xml.transform;
+package transform;
import java.io.FileOutputStream;
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
+import javax.xml.transform.Templates;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6941869.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6941869.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6941869.xml
rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR6941869.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6941869.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6941869.xsl
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6941869.xsl
rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR6941869.xsl
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6941869Test.java b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6941869Test.java
similarity index 93%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6941869Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR6941869Test.java
index d2e6eba..07a18b6 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6941869Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6941869Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,11 +21,13 @@
* questions.
*/
-package javax.xml.transform;
+package transform;
import java.io.File;
import java.io.StringWriter;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6957215.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6957215.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6957215.xml
rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR6957215.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6957215.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6957215.xsl
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6957215.xsl
rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR6957215.xsl
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6957215Test.java b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6957215Test.java
similarity index 87%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6957215Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR6957215Test.java
index 2a8460a..3d9a740 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR6957215Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6957215Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,12 +21,20 @@
* questions.
*/
-package javax.xml.transform;
+package transform;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.StringWriter;
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
+import javax.xml.transform.SourceLocator;
+import javax.xml.transform.Templates;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR7098746.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/CR7098746.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR7098746.xml
rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR7098746.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR7098746.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/CR7098746.xsl
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR7098746.xsl
rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR7098746.xsl
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR7098746Test.java b/jaxp/test/javax/xml/jaxp/unittest/transform/CR7098746Test.java
similarity index 90%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR7098746Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/CR7098746Test.java
index 5b3e71c..d67a58a 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/CR7098746Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/CR7098746Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,10 +21,15 @@
* questions.
*/
-package javax.xml.transform;
+package transform;
import java.io.StringWriter;
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
+import javax.xml.transform.Templates;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/DOMResultTest.java b/jaxp/test/javax/xml/jaxp/unittest/transform/DOMResultTest.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/DOMResultTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/DOMResultTest.java
index b08d532..b21fadd 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/DOMResultTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/DOMResultTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,10 +21,11 @@
* questions.
*/
-package javax.xml.transform;
+package transform;
import org.testng.annotations.Test;
import org.testng.Assert;
+
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
@@ -33,6 +34,10 @@
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMResult;
import javax.xml.transform.dom.DOMSource;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/DocumentExtFunc.java b/jaxp/test/javax/xml/jaxp/unittest/transform/DocumentExtFunc.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/DocumentExtFunc.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/DocumentExtFunc.java
index 44976ed..81227c7 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/DocumentExtFunc.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/DocumentExtFunc.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.transform;
+package transform;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/FactoryFindTest.java b/jaxp/test/javax/xml/jaxp/unittest/transform/FactoryFindTest.java
similarity index 94%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/FactoryFindTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/FactoryFindTest.java
index 370f0ff..c0f17b8 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/FactoryFindTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/FactoryFindTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,11 +21,13 @@
* questions.
*/
-package javax.xml.transform;
+package transform;
import java.net.URL;
import java.net.URLClassLoader;
+import javax.xml.transform.TransformerFactory;
+
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Issue2204.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/Issue2204.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Issue2204.xml
rename to jaxp/test/javax/xml/jaxp/unittest/transform/Issue2204.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Issue2204.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/Issue2204.xsl
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Issue2204.xsl
rename to jaxp/test/javax/xml/jaxp/unittest/transform/Issue2204.xsl
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Issue2204Test.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Issue2204Test.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Issue2204Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/Issue2204Test.java
index 35bcab3..b0912eb 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Issue2204Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Issue2204Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.transform;
+package transform;
import java.io.StringWriter;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Issue2290.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/Issue2290.xsl
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Issue2290.xsl
rename to jaxp/test/javax/xml/jaxp/unittest/transform/Issue2290.xsl
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Issue2290Test.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Issue2290Test.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Issue2290Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/Issue2290Test.java
index 1c63d97..b2be968 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/Issue2290Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Issue2290Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.transform;
+package transform;
import java.io.StringReader;
import java.io.StringWriter;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/MsWordXMLImport.xsl.data b/jaxp/test/javax/xml/jaxp/unittest/transform/MsWordXMLImport.xsl.data
similarity index 99%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/MsWordXMLImport.xsl.data
rename to jaxp/test/javax/xml/jaxp/unittest/transform/MsWordXMLImport.xsl.data
index 9ba0802..07e9541 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/MsWordXMLImport.xsl.data
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/MsWordXMLImport.xsl.data
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/NCAA_Conference_Schedule_XML.dtd b/jaxp/test/javax/xml/jaxp/unittest/transform/NCAA_Conference_Schedule_XML.dtd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/NCAA_Conference_Schedule_XML.dtd
rename to jaxp/test/javax/xml/jaxp/unittest/transform/NCAA_Conference_Schedule_XML.dtd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/OpenJDK100017Test.java b/jaxp/test/javax/xml/jaxp/unittest/transform/OpenJDK100017Test.java
similarity index 91%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/OpenJDK100017Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/OpenJDK100017Test.java
index b7bb1ac..abe964f 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/OpenJDK100017Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/OpenJDK100017Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,10 +21,12 @@
* questions.
*/
-package javax.xml.transform;
+package transform;
import java.io.IOException;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerFactory;
import javax.xml.transform.sax.SAXTransformerFactory;
import javax.xml.transform.sax.TransformerHandler;
import javax.xml.transform.stream.StreamResult;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/PredicateInKeyTest.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/PredicateInKeyTest.xml
similarity index 93%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/PredicateInKeyTest.xml
rename to jaxp/test/javax/xml/jaxp/unittest/transform/PredicateInKeyTest.xml
index 10886c5..2c6015b 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/PredicateInKeyTest.xml
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/PredicateInKeyTest.xml
@@ -3,7 +3,7 @@
* PredicateInKeyTest.xml - XSLT test input file for PredicatInKeyTest.xsl
*
*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/PredicateInKeyTest.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/PredicateInKeyTest.xsl
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/PredicateInKeyTest.xsl
rename to jaxp/test/javax/xml/jaxp/unittest/transform/PredicateInKeyTest.xsl
index 77d3095..358c0af 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/PredicateInKeyTest.xsl
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/PredicateInKeyTest.xsl
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!--
*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/SAX2DOMTest.java b/jaxp/test/javax/xml/jaxp/unittest/transform/SAX2DOMTest.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/SAX2DOMTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/SAX2DOMTest.java
index fb480e1..6e3a9af 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/SAX2DOMTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/SAX2DOMTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.transform;
+package transform;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/SAX2DOMTest.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/SAX2DOMTest.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/SAX2DOMTest.xml
rename to jaxp/test/javax/xml/jaxp/unittest/transform/SAX2DOMTest.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/SecureProcessingTest.java b/jaxp/test/javax/xml/jaxp/unittest/transform/SecureProcessingTest.java
similarity index 94%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/SecureProcessingTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/SecureProcessingTest.java
index c158d7a..888f278 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/SecureProcessingTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/SecureProcessingTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.transform;
+package transform;
import java.io.IOException;
import java.io.InputStream;
@@ -31,6 +31,10 @@
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/SecureProcessingTest.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/SecureProcessingTest.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/SecureProcessingTest.xml
rename to jaxp/test/javax/xml/jaxp/unittest/transform/SecureProcessingTest.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/SecureProcessingTest.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/SecureProcessingTest.xsl
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/SecureProcessingTest.xsl
rename to jaxp/test/javax/xml/jaxp/unittest/transform/SecureProcessingTest.xsl
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/SourceTest.java b/jaxp/test/javax/xml/jaxp/unittest/transform/SourceTest.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/SourceTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/SourceTest.java
index 142fbd2..d0e7ae3 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/SourceTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/SourceTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,11 +21,14 @@
* questions.
*/
-package javax.xml.transform;
+package transform;
import java.io.File;
import java.io.StringWriter;
+import javax.xml.transform.Source;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.sax.SAXSource;
import javax.xml.transform.stream.StreamResult;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/SourceTest.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/SourceTest.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/SourceTest.xml
rename to jaxp/test/javax/xml/jaxp/unittest/transform/SourceTest.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/SourceTest.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/SourceTest.xsl
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/SourceTest.xsl
rename to jaxp/test/javax/xml/jaxp/unittest/transform/SourceTest.xsl
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/StAXSourceTest.java b/jaxp/test/javax/xml/jaxp/unittest/transform/StAXSourceTest.java
similarity index 94%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/StAXSourceTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/StAXSourceTest.java
index a1b9bc2..dc149f4 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/StAXSourceTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/StAXSourceTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.transform;
+package transform;
import java.io.StringReader;
import java.io.StringWriter;
@@ -31,6 +31,10 @@
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLOutputFactory;
import javax.xml.stream.XMLStreamException;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMResult;
import javax.xml.transform.stax.StAXResult;
import javax.xml.transform.stax.StAXSource;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/TransformerFactoryTest.java b/jaxp/test/javax/xml/jaxp/unittest/transform/TransformerFactoryTest.java
similarity index 92%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/TransformerFactoryTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/TransformerFactoryTest.java
index 16f9499..62b8497 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/TransformerFactoryTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/TransformerFactoryTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.transform;
+package transform;
import java.io.IOException;
import java.io.InputStream;
@@ -29,6 +29,13 @@
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.Source;
+import javax.xml.transform.Templates;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.URIResolver;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stax.StAXResult;
import javax.xml.transform.stax.StAXSource;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/TransformerTest.java b/jaxp/test/javax/xml/jaxp/unittest/transform/TransformerTest.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/TransformerTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/TransformerTest.java
index d331d2a..18229dc 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/TransformerTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/TransformerTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.transform;
+package transform;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -29,6 +29,9 @@
import java.io.StringReader;
import java.io.StringWriter;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMResult;
import javax.xml.transform.sax.SAXSource;
import javax.xml.transform.stream.StreamResult;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/TransformerUtilFactory.java b/jaxp/test/javax/xml/jaxp/unittest/transform/TransformerUtilFactory.java
similarity index 84%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/TransformerUtilFactory.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/TransformerUtilFactory.java
index a234aa0..793dd7a 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/TransformerUtilFactory.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/TransformerUtilFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,13 +21,13 @@
* questions.
*/
-package javax.xml.transform;
+package transform;
-import javax.xml.transform.util.DOMUtil;
-import javax.xml.transform.util.SAXUtil;
-import javax.xml.transform.util.StAXUtil;
-import javax.xml.transform.util.StreamUtil;
-import javax.xml.transform.util.TransformerUtil;
+import transform.util.DOMUtil;
+import transform.util.SAXUtil;
+import transform.util.StAXUtil;
+import transform.util.StreamUtil;
+import transform.util.TransformerUtil;
public class TransformerUtilFactory {
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/VersionDefaultHandler.java b/jaxp/test/javax/xml/jaxp/unittest/transform/VersionDefaultHandler.java
similarity index 94%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/VersionDefaultHandler.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/VersionDefaultHandler.java
index 26bda31..ff8fbfe 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/VersionDefaultHandler.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/VersionDefaultHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.transform;
+package transform;
import org.xml.sax.Attributes;
import org.xml.sax.Locator;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/VersionEventWriter.java b/jaxp/test/javax/xml/jaxp/unittest/transform/VersionEventWriter.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/VersionEventWriter.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/VersionEventWriter.java
index c7589da..51ff18c 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/VersionEventWriter.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/VersionEventWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.transform;
+package transform;
import javax.xml.namespace.NamespaceContext;
import javax.xml.stream.XMLEventReader;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/ViewEditor1.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/ViewEditor1.xsl
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/ViewEditor1.xsl
rename to jaxp/test/javax/xml/jaxp/unittest/transform/ViewEditor1.xsl
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/XSLTFunctionsTest.java b/jaxp/test/javax/xml/jaxp/unittest/transform/XSLTFunctionsTest.java
similarity index 92%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/XSLTFunctionsTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/XSLTFunctionsTest.java
index ce00db3..90e02cb 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/XSLTFunctionsTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/XSLTFunctionsTest.java
@@ -21,16 +21,22 @@
* questions.
*/
-package javax.xml.transform;
+package transform;
import java.io.StringReader;
import java.io.StringWriter;
+import javax.xml.transform.Source;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.URIResolver;
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
+
import static org.testng.Assert.assertEquals;
/*
@@ -112,9 +118,9 @@
+ "<xsl:element name=\"root\">"
+ "<xsl:variable name=\"other_doc\" select=\"document('externalDoc')\"/>"
+ "<!-- Source -->"
- + "<xsl:value-of select=\"cfunc:javax.xml.transform.DocumentExtFunc.test(/Test)\"/>"
+ + "<xsl:value-of select=\"cfunc:transform.DocumentExtFunc.test(/Test)\"/>"
+ "<!-- document() -->"
- + "<xsl:value-of select=\"cfunc:javax.xml.transform.DocumentExtFunc.test($other_doc/Test)\"/>"
+ + "<xsl:value-of select=\"cfunc:transform.DocumentExtFunc.test($other_doc/Test)\"/>"
+ "</xsl:element></xsl:template></xsl:transform>";
static final String documentTesteExpectedResult = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/attribset27.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/attribset27.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/attribset27.xml
rename to jaxp/test/javax/xml/jaxp/unittest/transform/attribset27.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/attribset27.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/attribset27.xsl
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/attribset27.xsl
rename to jaxp/test/javax/xml/jaxp/unittest/transform/attribset27.xsl
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/catalog.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/catalog.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/catalog.xml
rename to jaxp/test/javax/xml/jaxp/unittest/transform/catalog.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/catalog.xsd b/jaxp/test/javax/xml/jaxp/unittest/transform/catalog.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/catalog.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/transform/catalog.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/catalog_10.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/catalog_10.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/catalog_10.xml
rename to jaxp/test/javax/xml/jaxp/unittest/transform/catalog_10.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/config.dtd b/jaxp/test/javax/xml/jaxp/unittest/transform/config.dtd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/config.dtd
rename to jaxp/test/javax/xml/jaxp/unittest/transform/config.dtd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/config.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/config.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/config.xml
rename to jaxp/test/javax/xml/jaxp/unittest/transform/config.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/default-layout.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/default-layout.xsl
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/default-layout.xsl
rename to jaxp/test/javax/xml/jaxp/unittest/transform/default-layout.xsl
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/global-variables.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/global-variables.xsl
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/global-variables.xsl
rename to jaxp/test/javax/xml/jaxp/unittest/transform/global-variables.xsl
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/global.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/global.xsl
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/global.xsl
rename to jaxp/test/javax/xml/jaxp/unittest/transform/global.xsl
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/home.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/home.xsl
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/home.xsl
rename to jaxp/test/javax/xml/jaxp/unittest/transform/home.xsl
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/in.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/in.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/in.xml
rename to jaxp/test/javax/xml/jaxp/unittest/transform/in.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/inner.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/inner.xsl
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/inner.xsl
rename to jaxp/test/javax/xml/jaxp/unittest/transform/inner.xsl
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/logon.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/logon.xsl
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/logon.xsl
rename to jaxp/test/javax/xml/jaxp/unittest/transform/logon.xsl
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/maps.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/maps.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/maps.xml
rename to jaxp/test/javax/xml/jaxp/unittest/transform/maps.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/msgAttach.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/msgAttach.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/msgAttach.xml
rename to jaxp/test/javax/xml/jaxp/unittest/transform/msgAttach.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/numbering63.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/numbering63.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/numbering63.xml
rename to jaxp/test/javax/xml/jaxp/unittest/transform/numbering63.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/numbering63.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/numbering63.xsl
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/numbering63.xsl
rename to jaxp/test/javax/xml/jaxp/unittest/transform/numbering63.xsl
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/outer.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/outer.xsl
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/outer.xsl
rename to jaxp/test/javax/xml/jaxp/unittest/transform/outer.xsl
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/redirect.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/redirect.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/redirect.xml
rename to jaxp/test/javax/xml/jaxp/unittest/transform/redirect.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/redirect.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/redirect.xsl
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/redirect.xsl
rename to jaxp/test/javax/xml/jaxp/unittest/transform/redirect.xsl
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/sax/Bug6451633.java b/jaxp/test/javax/xml/jaxp/unittest/transform/sax/Bug6451633.java
similarity index 94%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/sax/Bug6451633.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/sax/Bug6451633.java
index 855fa6e..a299656 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/sax/Bug6451633.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/sax/Bug6451633.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.transform.sax;
+package transform.sax;
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMResult;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/src.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/src.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/src.xml
rename to jaxp/test/javax/xml/jaxp/unittest/transform/src.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/template.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/template.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/template.xml
rename to jaxp/test/javax/xml/jaxp/unittest/transform/template.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/tigertest-in.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/tigertest-in.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/tigertest-in.xml
rename to jaxp/test/javax/xml/jaxp/unittest/transform/tigertest-in.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/tigertest.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/tigertest.xsl
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/tigertest.xsl
rename to jaxp/test/javax/xml/jaxp/unittest/transform/tigertest.xsl
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/tmp.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/tmp.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/tmp.xml
rename to jaxp/test/javax/xml/jaxp/unittest/transform/tmp.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/toys.xml b/jaxp/test/javax/xml/jaxp/unittest/transform/toys.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/toys.xml
rename to jaxp/test/javax/xml/jaxp/unittest/transform/toys.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/transform.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/transform.xsl
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/transform.xsl
rename to jaxp/test/javax/xml/jaxp/unittest/transform/transform.xsl
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/upload-media-form.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/upload-media-form.xsl
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/upload-media-form.xsl
rename to jaxp/test/javax/xml/jaxp/unittest/transform/upload-media-form.xsl
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/upload-media.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/upload-media.xsl
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/upload-media.xsl
rename to jaxp/test/javax/xml/jaxp/unittest/transform/upload-media.xsl
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/util.xsl b/jaxp/test/javax/xml/jaxp/unittest/transform/util.xsl
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/util.xsl
rename to jaxp/test/javax/xml/jaxp/unittest/transform/util.xsl
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/util/DOMUtil.java b/jaxp/test/javax/xml/jaxp/unittest/transform/util/DOMUtil.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/util/DOMUtil.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/util/DOMUtil.java
index 1881299..988da74 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/util/DOMUtil.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/util/DOMUtil.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.transform.util;
+package transform.util;
import java.io.InputStream;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/util/SAXUtil.java b/jaxp/test/javax/xml/jaxp/unittest/transform/util/SAXUtil.java
similarity index 93%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/util/SAXUtil.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/util/SAXUtil.java
index fd7421c..9e257eb 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/util/SAXUtil.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/util/SAXUtil.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,19 +21,20 @@
* questions.
*/
-package javax.xml.transform.util;
+package transform.util;
import java.io.InputStream;
import javax.xml.transform.Result;
import javax.xml.transform.Source;
-import javax.xml.transform.VersionDefaultHandler;
import javax.xml.transform.sax.SAXResult;
import javax.xml.transform.sax.SAXSource;
import org.testng.Assert;
import org.xml.sax.InputSource;
+import transform.VersionDefaultHandler;
+
public class SAXUtil extends TransformerUtil {
private static SAXUtil instance = null;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/util/StAXUtil.java b/jaxp/test/javax/xml/jaxp/unittest/transform/util/StAXUtil.java
similarity index 94%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/util/StAXUtil.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/util/StAXUtil.java
index 6c17ffa..26374d7 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/util/StAXUtil.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/util/StAXUtil.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.transform.util;
+package transform.util;
import java.io.FileInputStream;
import java.io.FileOutputStream;
@@ -34,13 +34,14 @@
import javax.xml.stream.XMLStreamWriter;
import javax.xml.transform.Result;
import javax.xml.transform.Source;
-import javax.xml.transform.TransformerUtilFactory;
-import javax.xml.transform.VersionEventWriter;
import javax.xml.transform.stax.StAXResult;
import javax.xml.transform.stax.StAXSource;
import org.testng.Assert;
+import transform.TransformerUtilFactory;
+import transform.VersionEventWriter;
+
public class StAXUtil extends TransformerUtil {
private static StAXUtil instance = null;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/util/StreamUtil.java b/jaxp/test/javax/xml/jaxp/unittest/transform/util/StreamUtil.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/util/StreamUtil.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/util/StreamUtil.java
index 7bbf93f..019c2f1 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/util/StreamUtil.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/util/StreamUtil.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.transform.util;
+package transform.util;
import java.io.File;
import java.io.FileInputStream;
@@ -33,13 +33,14 @@
import javax.xml.parsers.SAXParserFactory;
import javax.xml.transform.Result;
import javax.xml.transform.Source;
-import javax.xml.transform.VersionDefaultHandler;
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
import org.testng.Assert;
import org.w3c.dom.Document;
+import transform.VersionDefaultHandler;
+
public class StreamUtil extends TransformerUtil {
DocumentBuilder docBuilder = null;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/util/TransformerUtil.java b/jaxp/test/javax/xml/jaxp/unittest/transform/util/TransformerUtil.java
similarity index 94%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/util/TransformerUtil.java
rename to jaxp/test/javax/xml/jaxp/unittest/transform/util/TransformerUtil.java
index 5a92fe7..61d7bfe 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/util/TransformerUtil.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/util/TransformerUtil.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.transform.util;
+package transform.util;
import java.io.InputStream;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/6773084.policy b/jaxp/test/javax/xml/jaxp/unittest/validation/6773084.policy
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/6773084.policy
rename to jaxp/test/javax/xml/jaxp/unittest/validation/6773084.policy
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/AnyElementTest.java b/jaxp/test/javax/xml/jaxp/unittest/validation/AnyElementTest.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/AnyElementTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/AnyElementTest.java
index f37f0bf..a1218b1 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/AnyElementTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/AnyElementTest.java
@@ -20,7 +20,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
-package javax.xml.validation;
+package validation;
/*
* @bug 8080907
@@ -31,6 +31,8 @@
import java.net.URISyntaxException;
import javax.xml.transform.stream.StreamSource;
+import javax.xml.validation.SchemaFactory;
+import javax.xml.validation.Validator;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4966232.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4966232.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4966232.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4966232.java
index 925bf2c..1e9d473 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4966232.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4966232.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.validation;
+package validation;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.transform.dom.DOMSource;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4966254.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4966254.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4966254.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4966254.java
index 6d1f0ad..e081f37 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4966254.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4966254.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.validation;
+package validation;
import javax.xml.transform.stream.StreamSource;
import javax.xml.validation.Schema;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4966254.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4966254.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4966254.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4966254.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4966254.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4966254.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4966254.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4966254.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969042.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969042.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969042.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969042.java
index 71ad30d..d04395e 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969042.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969042.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.validation;
+package validation;
import java.io.IOException;
import java.io.StringReader;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969089.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969089.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969089.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969089.java
index 32477a2..4b7f0b5 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969089.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969089.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.validation;
+package validation;
import java.io.StringReader;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969110.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969110.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969110.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969110.java
index f9fb0f4..ace534e 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969110.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969110.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.validation;
+package validation;
import javax.xml.validation.SchemaFactory;
import javax.xml.validation.ValidatorHandler;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969689.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969689.java
similarity index 94%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969689.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969689.java
index 6790321..85cc249 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969689.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969689.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.validation;
+package validation;
import javax.xml.validation.SchemaFactory;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969692.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969692.java
similarity index 94%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969692.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969692.java
index e193722..2e14612 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969692.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969692.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.validation;
+package validation;
import javax.xml.validation.SchemaFactory;
import javax.xml.validation.Validator;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969693.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969693.java
similarity index 94%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969693.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969693.java
index 026da4a..18512dd 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969693.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969693.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.validation;
+package validation;
import javax.xml.validation.SchemaFactory;
import javax.xml.validation.Validator;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969695.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969695.java
similarity index 94%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969695.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969695.java
index 39ea1b7..db69416 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969695.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969695.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.validation;
+package validation;
import javax.xml.validation.SchemaFactory;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969732.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969732.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969732.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969732.java
index 5f298af..3fe2dcf 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969732.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969732.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.validation;
+package validation;
import java.io.StringReader;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4970380.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970380.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4970380.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970380.java
index b9a0656..b9d0555 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4970380.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970380.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.validation;
+package validation;
import javax.xml.validation.SchemaFactory;
import javax.xml.validation.ValidatorHandler;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4970383.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970383.java
similarity index 94%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4970383.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970383.java
index 3ac1527..f536153 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4970383.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970383.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.validation;
+package validation;
import javax.xml.validation.SchemaFactory;
import javax.xml.validation.ValidatorHandler;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4970400.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970400.java
similarity index 93%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4970400.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970400.java
index d0c57b2..c457567 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4970400.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970400.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.validation;
+package validation;
import javax.xml.validation.SchemaFactory;
import javax.xml.validation.ValidatorHandler;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4970402.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970402.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4970402.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970402.java
index 55f3d1d..e66e010 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4970402.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970402.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.validation;
+package validation;
import java.io.IOException;
import java.io.StringReader;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4970951.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970951.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4970951.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970951.java
index 4f986a8..e033d49 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4970951.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4970951.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.validation;
+package validation;
import java.io.IOException;
import java.io.StringReader;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4971605.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4971605.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4971605.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4971605.java
index 09cd588..566f17c 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4971605.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4971605.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.validation;
+package validation;
import java.io.StringReader;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4971607.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4971607.java
similarity index 94%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4971607.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4971607.java
index e33b040..870e7a7 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4971607.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4971607.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.validation;
+package validation;
import javax.xml.validation.SchemaFactory;
import javax.xml.validation.ValidatorHandler;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4972882.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4972882.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4972882.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4972882.java
index 8e84e84..8b3ce66 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4972882.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4972882.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.validation;
+package validation;
import javax.xml.XMLConstants;
import javax.xml.parsers.DocumentBuilder;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4986844.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4986844.java
similarity index 94%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4986844.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4986844.java
index 7304954..f98f6d5 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4986844.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4986844.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.validation;
+package validation;
import javax.xml.validation.SchemaFactory;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4986844.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4986844.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4986844.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4986844.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4987574.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4987574.java
similarity index 94%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4987574.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4987574.java
index a56806a..d479455 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4987574.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4987574.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.validation;
+package validation;
import java.io.File;
import java.io.FileWriter;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4988267.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4988267.java
similarity index 94%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4988267.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4988267.java
index 4c372f5..ef57585 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4988267.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4988267.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.validation;
+package validation;
import javax.xml.validation.SchemaFactory;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4988267.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4988267.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4988267.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4988267.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4988268.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4988268.java
similarity index 92%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4988268.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4988268.java
index d999606..0005f17 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4988268.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4988268.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.validation;
+package validation;
import javax.xml.validation.SchemaFactory;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4988268.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4988268.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4988268.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4988268.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4988387.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4988387.java
similarity index 93%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4988387.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4988387.java
index 9ca2521..b7b889b 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4988387.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4988387.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.validation;
+package validation;
import javax.xml.validation.SchemaFactory;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4988387.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4988387.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4988387.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4988387.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4996446.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4996446.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4996446.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4996446.java
index e381e65..4ea0afe 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4996446.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4996446.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.validation;
+package validation;
import java.net.URL;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4996446.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4996446.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4996446.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4996446.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4997818.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4997818.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4997818.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug4997818.java
index 7330d49..b46bf36 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4997818.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4997818.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.validation;
+package validation;
import java.io.StringReader;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug5011500.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug5011500.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug5011500.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug5011500.java
index bc65b4d..6d79fb2 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug5011500.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug5011500.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.validation;
+package validation;
import java.io.ByteArrayInputStream;
import java.io.InputStreamReader;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug5072946.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug5072946.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug5072946.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug5072946.java
index 327a387..9769d1d 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug5072946.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug5072946.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.validation;
+package validation;
import javax.xml.XMLConstants;
import javax.xml.parsers.DocumentBuilder;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug5072946.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug5072946.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug5072946.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug5072946.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug5072946.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug5072946.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug5072946.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug5072946.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6378043.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6378043.java
similarity index 93%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6378043.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6378043.java
index 6078724..c561bb1 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6378043.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6378043.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.validation;
+package validation;
import javax.xml.validation.Schema;
import javax.xml.validation.SchemaFactory;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6449797.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6449797.java
similarity index 93%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6449797.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6449797.java
index ca24b94..3b797ed 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6449797.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6449797.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -20,7 +20,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
-package javax.xml.validation;
+package validation;
import javax.xml.XMLConstants;
import javax.xml.validation.SchemaFactory;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6449797.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6449797.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6449797.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6449797.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6457662.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6457662.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6457662.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6457662.java
index 84bfa26..3518a0e 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6457662.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6457662.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.validation;
+package validation;
import java.io.File;
import java.io.FileOutputStream;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6467424.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6467424.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6467424.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6467424.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6467424.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6467424.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6467424.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6467424.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6467424Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6467424Test.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6467424Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6467424Test.java
index 76cf2a3..4ebce56 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6467424Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6467424Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.validation;
+package validation;
import java.io.File;
import java.io.IOException;
@@ -38,6 +38,9 @@
import javax.xml.transform.dom.DOMResult;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
+import javax.xml.validation.Schema;
+import javax.xml.validation.SchemaFactory;
+import javax.xml.validation.Validator;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6483188.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6483188.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6483188.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6483188.java
index 848a545..f594713 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6483188.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6483188.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.validation;
+package validation;
import java.net.URL;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6493687.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6493687.java
similarity index 93%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6493687.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6493687.java
index 5034d3d..2da6c45 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6493687.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6493687.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.validation;
+package validation;
import org.testng.annotations.Test;
import org.w3c.dom.Document;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6493687.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6493687.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6493687.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6493687.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6493687.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6493687.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6493687.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6493687.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6509668.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6509668.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6509668.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6509668.java
index 094c8a6..2c9906c 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6509668.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6509668.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.validation;
+package validation;
import java.io.ByteArrayInputStream;
import java.io.IOException;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6526547.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6526547.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6526547.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6526547.java
index dfbf550..e737d75 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6526547.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6526547.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.validation;
+package validation;
import javax.xml.XMLConstants;
import javax.xml.parsers.DocumentBuilder;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6526547.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6526547.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6526547.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6526547.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6526547.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6526547.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6526547.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6526547.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6531160.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6531160.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6531160.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6531160.java
index 7c682db..53cea01 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6531160.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6531160.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.validation;
+package validation;
import java.io.StringReader;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6695843.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6695843.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6695843.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6695843.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6695843.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6695843.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6695843.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6695843.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6695843Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6695843Test.java
similarity index 93%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6695843Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6695843Test.java
index fde9fb2..e70dbff 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6695843Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6695843Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.validation;
+package validation;
import java.io.IOException;
@@ -30,6 +30,9 @@
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.dom.DOMSource;
+import javax.xml.validation.Schema;
+import javax.xml.validation.SchemaFactory;
+import javax.xml.validation.Validator;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_1.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_1.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_1.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_1.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_10.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_10.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_10.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_10.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_11.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_11.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_11.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_11.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_12.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_12.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_12.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_12.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_13.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_13.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_13.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_13.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_14.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_14.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_14.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_14.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_15.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_15.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_15.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_15.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_16.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_16.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_16.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_16.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_17.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_17.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_17.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_17.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_18.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_18.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_18.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_18.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_19.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_19.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_19.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_19.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_2.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_2.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_2.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_2.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_20.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_20.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_20.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_20.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_21.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_21.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_21.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_21.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_22.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_22.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_22.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_22.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_23.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_23.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_23.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_23.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_24.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_24.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_24.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_24.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_25.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_25.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_25.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_25.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_3.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_3.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_3.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_3.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_4.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_4.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_4.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_4.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_5.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_5.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_5.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_5.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_6.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_6.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_6.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_6.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_7.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_7.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_7.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_7.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_8.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_8.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_8.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_8.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_9.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_9.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084In/Bug6773084_9.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084In/Bug6773084_9.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084Test.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084Test.java
index 41103d2..98737ed 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6773084Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.validation;
+package validation;
import java.io.File;
import java.io.FileFilter;
@@ -38,6 +38,9 @@
import javax.xml.transform.Source;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamSource;
+import javax.xml.validation.Schema;
+import javax.xml.validation.SchemaFactory;
+import javax.xml.validation.Validator;
import org.testng.Assert;
import org.testng.annotations.BeforeClass;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6859210.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6859210.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6859210.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6859210.java
index 322a7dc..1bb0d04 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6859210.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6859210.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.validation;
+package validation;
import java.io.File;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6925531Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6925531Test.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6925531Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6925531Test.java
index 03b2efd..b3fad32 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6925531Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6925531Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.validation;
+package validation;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -35,6 +35,9 @@
import javax.xml.XMLConstants;
import javax.xml.transform.sax.SAXSource;
import javax.xml.transform.stream.StreamSource;
+import javax.xml.validation.Schema;
+import javax.xml.validation.SchemaFactory;
+import javax.xml.validation.Validator;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6946312.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6946312.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6946312.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6946312.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6946312Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6946312Test.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6946312Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6946312Test.java
index b93c1ac..5f0b19d 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6946312Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6946312Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.validation;
+package validation;
import java.io.IOException;
import java.io.InputStream;
@@ -31,6 +31,8 @@
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
import javax.xml.transform.stream.StreamSource;
+import javax.xml.validation.Schema;
+import javax.xml.validation.SchemaFactory;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6954738.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6954738.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6954738.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6954738.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6954738.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6954738.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6954738.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6954738.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6954738_Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6954738_Test.java
similarity index 92%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6954738_Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Bug6954738_Test.java
index da5bb1a..5118754 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug6954738_Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6954738_Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,12 +21,15 @@
* questions.
*/
-package javax.xml.validation;
+package validation;
import java.io.IOException;
import javax.xml.XMLConstants;
import javax.xml.transform.stream.StreamSource;
+import javax.xml.validation.Schema;
+import javax.xml.validation.SchemaFactory;
+import javax.xml.validation.Validator;
import org.testng.annotations.Test;
import org.xml.sax.ErrorHandler;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/CR6708840Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/CR6708840Test.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/CR6708840Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/CR6708840Test.java
index 932c8fb..7c9b0bd 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/CR6708840Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/CR6708840Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.validation;
+package validation;
import java.io.File;
import java.io.FileWriter;
@@ -33,6 +33,9 @@
import javax.xml.transform.Result;
import javax.xml.transform.Source;
import javax.xml.transform.stax.StAXSource;
+import javax.xml.validation.Schema;
+import javax.xml.validation.SchemaFactory;
+import javax.xml.validation.Validator;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/CR6740048.java b/jaxp/test/javax/xml/jaxp/unittest/validation/CR6740048.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/CR6740048.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/CR6740048.java
index 7ef779e..26a239b 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/CR6740048.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/CR6740048.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.validation;
+package validation;
import java.io.IOException;
import java.io.InputStream;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/CR6740048.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/CR6740048.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/CR6740048.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/CR6740048.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/CR6740048.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/CR6740048.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/CR6740048.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/CR6740048.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/CREMAS01.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/CREMAS01.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/CREMAS01.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/CREMAS01.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/CREMAS01.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/CREMAS01.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/CREMAS01.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/CREMAS01.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/ErrorHandlerImpl.java b/jaxp/test/javax/xml/jaxp/unittest/validation/ErrorHandlerImpl.java
similarity index 93%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/ErrorHandlerImpl.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/ErrorHandlerImpl.java
index 6fbd857..95806ed 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/ErrorHandlerImpl.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/ErrorHandlerImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.validation;
+package validation;
import org.xml.sax.ErrorHandler;
import org.xml.sax.SAXException;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Issue682.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/Issue682.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Issue682.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Issue682.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Issue682.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/Issue682.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Issue682.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Issue682.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Issue682Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Issue682Test.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Issue682Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/Issue682Test.java
index 9301f3b..e1753f0 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/Issue682Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Issue682Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.validation;
+package validation;
import java.io.File;
import java.io.InputStream;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/IssueTracker30.java b/jaxp/test/javax/xml/jaxp/unittest/validation/IssueTracker30.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/IssueTracker30.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/IssueTracker30.java
index afde0f0..765fa13 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/IssueTracker30.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/IssueTracker30.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.validation;
+package validation;
import java.io.File;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/IssueTracker30_occurs-error.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs-error.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/IssueTracker30_occurs-error.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs-error.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/IssueTracker30_occurs-ok.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs-ok.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/IssueTracker30_occurs-ok.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs-ok.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/IssueTracker30_occurs-optimize-error.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs-optimize-error.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/IssueTracker30_occurs-optimize-error.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs-optimize-error.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/IssueTracker30_occurs-optimize-ok.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs-optimize-ok.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/IssueTracker30_occurs-optimize-ok.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs-optimize-ok.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/IssueTracker30_occurs-optimize.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs-optimize.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/IssueTracker30_occurs-optimize.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs-optimize.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/IssueTracker30_occurs.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/IssueTracker30_occurs.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/IssueTracker30_occurs.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/JaxpIssue43Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/JaxpIssue43Test.java
similarity index 92%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/JaxpIssue43Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/JaxpIssue43Test.java
index 5a451ca..e590b22 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/JaxpIssue43Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/JaxpIssue43Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.validation;
+package validation;
import java.io.FileInputStream;
import java.util.ArrayList;
@@ -34,6 +34,9 @@
import javax.xml.transform.dom.DOMResult;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamSource;
+import javax.xml.validation.Schema;
+import javax.xml.validation.SchemaFactory;
+import javax.xml.validation.Validator;
import org.testng.annotations.Test;
import org.w3c.dom.Document;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/JaxpIssue49.java b/jaxp/test/javax/xml/jaxp/unittest/validation/JaxpIssue49.java
similarity index 93%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/JaxpIssue49.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/JaxpIssue49.java
index 85522e9..aec3631 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/JaxpIssue49.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/JaxpIssue49.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.validation;
+package validation;
import java.io.FileInputStream;
@@ -33,6 +33,9 @@
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
+import javax.xml.validation.Schema;
+import javax.xml.validation.SchemaFactory;
+import javax.xml.validation.Validator;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/JaxpIssue49.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/JaxpIssue49.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/JaxpIssue49.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/JaxpIssue49.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/LargeMaxOccursTest.java b/jaxp/test/javax/xml/jaxp/unittest/validation/LargeMaxOccursTest.java
similarity index 94%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/LargeMaxOccursTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/LargeMaxOccursTest.java
index 4a4e062..d783227 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/LargeMaxOccursTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/LargeMaxOccursTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,11 +21,14 @@
* questions.
*/
-package javax.xml.validation;
+package validation;
import java.io.File;
import javax.xml.XMLConstants;
+import javax.xml.validation.Schema;
+import javax.xml.validation.SchemaFactory;
+import javax.xml.validation.Validator;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/MultiOccursTest.java b/jaxp/test/javax/xml/jaxp/unittest/validation/MultiOccursTest.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/MultiOccursTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/MultiOccursTest.java
index 7f0dbdd..014e8af 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/MultiOccursTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/MultiOccursTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.validation;
+package validation;
import java.io.File;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/MultiOccursUnboundedTest.java b/jaxp/test/javax/xml/jaxp/unittest/validation/MultiOccursUnboundedTest.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/MultiOccursUnboundedTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/MultiOccursUnboundedTest.java
index 8d7d516..b6069c2 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/MultiOccursUnboundedTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/MultiOccursUnboundedTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.validation;
+package validation;
import java.io.File;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/OccursTest.java b/jaxp/test/javax/xml/jaxp/unittest/validation/OccursTest.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/OccursTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/OccursTest.java
index be3ed12..0cb9177 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/OccursTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/OccursTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.validation;
+package validation;
import java.io.File;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/OccursUnboundedTest.java b/jaxp/test/javax/xml/jaxp/unittest/validation/OccursUnboundedTest.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/OccursUnboundedTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/OccursUnboundedTest.java
index 47d1ba9..df0e078 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/OccursUnboundedTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/OccursUnboundedTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.validation;
+package validation;
import java.io.File;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/OccursWildcardTest.java b/jaxp/test/javax/xml/jaxp/unittest/validation/OccursWildcardTest.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/OccursWildcardTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/OccursWildcardTest.java
index 36b21cd..36b97cf 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/OccursWildcardTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/OccursWildcardTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.validation;
+package validation;
import java.io.File;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/OccursWildcardUnbounded.java b/jaxp/test/javax/xml/jaxp/unittest/validation/OccursWildcardUnbounded.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/OccursWildcardUnbounded.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/OccursWildcardUnbounded.java
index e11fa92..b454db97 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/OccursWildcardUnbounded.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/OccursWildcardUnbounded.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.validation;
+package validation;
import java.io.File;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/ParticlesId005Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/ParticlesId005Test.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/ParticlesId005Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/ParticlesId005Test.java
index 429ea2d..74169f4 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/ParticlesId005Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/ParticlesId005Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.validation;
+package validation;
import java.io.File;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/ParticlesIg004Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/ParticlesIg004Test.java
similarity index 88%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/ParticlesIg004Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/ParticlesIg004Test.java
index c161850..2fe1a30 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/ParticlesIg004Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/ParticlesIg004Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,11 +21,14 @@
* questions.
*/
-package javax.xml.validation;
+package validation;
import java.io.File;
import javax.xml.XMLConstants;
+import javax.xml.validation.Schema;
+import javax.xml.validation.SchemaFactory;
+import javax.xml.validation.Validator;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/ParticlesQ013Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/ParticlesQ013Test.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/ParticlesQ013Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/ParticlesQ013Test.java
index ef589d1..33e73d5 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/ParticlesQ013Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/ParticlesQ013Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.validation;
+package validation;
import java.io.File;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/ProcessContents-lax-error.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/ProcessContents-lax-error.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/ProcessContents-lax-error.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/ProcessContents-lax-error.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/ProcessContents-ok.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/ProcessContents-ok.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/ProcessContents-ok.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/ProcessContents-ok.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/ProcessContents.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/ProcessContents.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/ProcessContents.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/ProcessContents.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/TCKGroupA008Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/TCKGroupA008Test.java
similarity index 89%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/TCKGroupA008Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/TCKGroupA008Test.java
index e097422..c88c09b 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/TCKGroupA008Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/TCKGroupA008Test.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,10 +21,14 @@
* questions.
*/
-package javax.xml.validation;
+package validation;
import java.io.File;
+import javax.xml.validation.Schema;
+import javax.xml.validation.SchemaFactory;
+import javax.xml.validation.Validator;
+
import org.testng.Assert;
import org.testng.annotations.Test;
import org.xml.sax.SAXException;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/ValidatorTest.java b/jaxp/test/javax/xml/jaxp/unittest/validation/ValidatorTest.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/ValidatorTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/ValidatorTest.java
index 5a84c52..9dd421a 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/ValidatorTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/ValidatorTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.validation;
+package validation;
import java.io.File;
import java.io.FileInputStream;
@@ -34,6 +34,9 @@
import javax.xml.transform.Result;
import javax.xml.transform.Source;
import javax.xml.transform.stax.StAXResult;
+import javax.xml.validation.Schema;
+import javax.xml.validation.SchemaFactory;
+import javax.xml.validation.Validator;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/XMLDocBuilder.java b/jaxp/test/javax/xml/jaxp/unittest/validation/XMLDocBuilder.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/XMLDocBuilder.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/XMLDocBuilder.java
index f0513bb..de9b0d9 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/XMLDocBuilder.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/XMLDocBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.validation;
+package validation;
import java.io.IOException;
import java.io.InputStreamReader;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/XMLSchemaValidator.java b/jaxp/test/javax/xml/jaxp/unittest/validation/XMLSchemaValidator.java
similarity index 94%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/XMLSchemaValidator.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/XMLSchemaValidator.java
index c1722a1..beb05e5 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/XMLSchemaValidator.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/XMLSchemaValidator.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.validation;
+package validation;
import java.io.IOException;
import java.io.Reader;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/gMonths-invalid.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/gMonths-invalid.xml
similarity index 93%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/gMonths-invalid.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/gMonths-invalid.xml
index a3071b5..ce13a88 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/gMonths-invalid.xml
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/gMonths-invalid.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/gMonths.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/gMonths.xml
similarity index 93%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/gMonths.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/gMonths.xml
index 65020ee..93f823b 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/gMonths.xml
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/gMonths.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/gMonths.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/gMonths.xsd
similarity index 94%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/gMonths.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/gMonths.xsd
index c18b5dc..e8f22d2 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/gMonths.xsd
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/gMonths.xsd
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!--
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/groupA008.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/groupA008.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/groupA008.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/groupA008.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/groupA008ea.red b/jaxp/test/javax/xml/jaxp/unittest/validation/groupA008ea.red
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/groupA008ea.red
rename to jaxp/test/javax/xml/jaxp/unittest/validation/groupA008ea.red
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/groupA008eb.red b/jaxp/test/javax/xml/jaxp/unittest/validation/groupA008eb.red
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/groupA008eb.red
rename to jaxp/test/javax/xml/jaxp/unittest/validation/groupA008eb.red
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/hello_literal.wsdl b/jaxp/test/javax/xml/jaxp/unittest/validation/hello_literal.wsdl
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/hello_literal.wsdl
rename to jaxp/test/javax/xml/jaxp/unittest/validation/hello_literal.wsdl
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/idI009.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/idI009.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/idI009.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/idI009.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/idIimp.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/idIimp.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/idIimp.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/idIimp.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/idIxpns.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/idIxpns.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/idIxpns.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/idIxpns.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/idIxpns1.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/idIxpns1.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/idIxpns1.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/idIxpns1.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/mgG014.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/mgG014.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/mgG014.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/mgG014.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/mgJ014.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/mgJ014.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/mgJ014.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/mgJ014.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/multi-occurs-error-max.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/multi-occurs-error-max.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/multi-occurs-error-max.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/multi-occurs-error-max.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/multi-occurs-error-min-max.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/multi-occurs-error-min-max.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/multi-occurs-error-min-max.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/multi-occurs-error-min-max.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/multi-occurs-error-min.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/multi-occurs-error-min.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/multi-occurs-error-min.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/multi-occurs-error-min.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/multi-occurs-ok.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/multi-occurs-ok.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/multi-occurs-ok.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/multi-occurs-ok.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/multi-occurs-unbounded-error-min.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/multi-occurs-unbounded-error-min.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/multi-occurs-unbounded-error-min.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/multi-occurs-unbounded-error-min.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/multi-occurs-unbounded-ok.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/multi-occurs-unbounded-ok.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/multi-occurs-unbounded-ok.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/multi-occurs-unbounded-ok.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/multi-occurs-unbounded.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/multi-occurs-unbounded.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/multi-occurs-unbounded.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/multi-occurs-unbounded.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/multi-occurs.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/multi-occurs.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/multi-occurs.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/multi-occurs.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/occurs-error-max.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/occurs-error-max.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/occurs-error-max.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/occurs-error-max.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/occurs-error-min-max.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/occurs-error-min-max.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/occurs-error-min-max.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/occurs-error-min-max.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/occurs-error-min.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/occurs-error-min.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/occurs-error-min.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/occurs-error-min.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/occurs-ok.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/occurs-ok.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/occurs-ok.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/occurs-ok.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/occurs-unbounded-error-min.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/occurs-unbounded-error-min.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/occurs-unbounded-error-min.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/occurs-unbounded-error-min.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/occurs-unbounded-ok.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/occurs-unbounded-ok.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/occurs-unbounded-ok.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/occurs-unbounded-ok.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/occurs-unbounded.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/occurs-unbounded.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/occurs-unbounded.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/occurs-unbounded.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/occurs-wildcard-unbounded.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/occurs-wildcard-unbounded.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/occurs-wildcard-unbounded.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/occurs-wildcard-unbounded.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/occurs-wildcard.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/occurs-wildcard.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/occurs-wildcard.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/occurs-wildcard.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/occurs.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/occurs.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/occurs.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/occurs.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/particlesId005.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/particlesId005.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/particlesId005.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/particlesId005.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/particlesId005.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/particlesId005.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/particlesId005.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/particlesId005.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/particlesIe003.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/particlesIe003.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/particlesIe003.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/particlesIe003.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/particlesIg004.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/particlesIg004.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/particlesIg004.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/particlesIg004.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/particlesOptimize.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/particlesOptimize.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/particlesOptimize.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/particlesOptimize.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/particlesQ013.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/particlesQ013.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/particlesQ013.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/particlesQ013.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/particlesQ013.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/particlesQ013.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/particlesQ013.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/particlesQ013.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/particlesR005.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/particlesR005.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/particlesR005.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/particlesR005.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/targetNS00101m2.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/targetNS00101m2.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/targetNS00101m2.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/targetNS00101m2.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/targetNS00101m2_stub.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/targetNS00101m2_stub.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/targetNS00101m2_stub.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/targetNS00101m2_stub.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/targetNS00101m2_stub.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/targetNS00101m2_stub.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/targetNS00101m2_stub.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/targetNS00101m2_stub.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/targetNS00101m2a.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/targetNS00101m2a.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/targetNS00101m2a.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/targetNS00101m2a.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/byte_fractionDigits004.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/byte_fractionDigits004.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/byte_fractionDigits004.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/byte_fractionDigits004.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/byte_fractionDigits007.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/byte_fractionDigits007.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/byte_fractionDigits007.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/byte_fractionDigits007.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/int_fractionDigits004.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/int_fractionDigits004.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/int_fractionDigits004.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/int_fractionDigits004.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/int_fractionDigits007.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/int_fractionDigits007.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/int_fractionDigits007.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/int_fractionDigits007.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/integer_fractionDigits004.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/integer_fractionDigits004.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/integer_fractionDigits004.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/integer_fractionDigits004.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/integer_fractionDigits007.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/integer_fractionDigits007.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/integer_fractionDigits007.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/integer_fractionDigits007.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/long_fractionDigits004.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/long_fractionDigits004.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/long_fractionDigits004.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/long_fractionDigits004.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/long_fractionDigits007.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/long_fractionDigits007.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/long_fractionDigits007.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/long_fractionDigits007.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/negativeInteger_fractionDigits004.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/negativeInteger_fractionDigits004.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/negativeInteger_fractionDigits004.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/negativeInteger_fractionDigits004.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/negativeInteger_fractionDigits007.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/negativeInteger_fractionDigits007.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/negativeInteger_fractionDigits007.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/negativeInteger_fractionDigits007.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/nonNegativeInteger_fractionDigits004.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/nonNegativeInteger_fractionDigits004.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/nonNegativeInteger_fractionDigits004.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/nonNegativeInteger_fractionDigits004.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/nonNegativeInteger_fractionDigits007.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/nonNegativeInteger_fractionDigits007.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/nonNegativeInteger_fractionDigits007.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/nonNegativeInteger_fractionDigits007.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/nonPositiveInteger_fractionDigits004.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/nonPositiveInteger_fractionDigits004.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/nonPositiveInteger_fractionDigits004.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/nonPositiveInteger_fractionDigits004.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/nonPositiveInteger_fractionDigits007.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/nonPositiveInteger_fractionDigits007.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/nonPositiveInteger_fractionDigits007.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/nonPositiveInteger_fractionDigits007.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/positiveInteger_fractionDigits004.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/positiveInteger_fractionDigits004.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/positiveInteger_fractionDigits004.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/positiveInteger_fractionDigits004.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/positiveInteger_fractionDigits007.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/positiveInteger_fractionDigits007.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/positiveInteger_fractionDigits007.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/positiveInteger_fractionDigits007.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/short_fractionDigits004.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/short_fractionDigits004.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/short_fractionDigits004.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/short_fractionDigits004.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/short_fractionDigits007.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/short_fractionDigits007.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/short_fractionDigits007.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/short_fractionDigits007.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/unsignedByte_fractionDigits004.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/unsignedByte_fractionDigits004.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/unsignedByte_fractionDigits004.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/unsignedByte_fractionDigits004.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/unsignedByte_fractionDigits007.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/unsignedByte_fractionDigits007.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/unsignedByte_fractionDigits007.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/unsignedByte_fractionDigits007.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/unsignedInt_fractionDigits004.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/unsignedInt_fractionDigits004.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/unsignedInt_fractionDigits004.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/unsignedInt_fractionDigits004.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/unsignedInt_fractionDigits007.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/unsignedInt_fractionDigits007.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/unsignedInt_fractionDigits007.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/unsignedInt_fractionDigits007.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/unsignedLong_fractionDigits004.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/unsignedLong_fractionDigits004.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/unsignedLong_fractionDigits004.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/unsignedLong_fractionDigits004.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/unsignedLong_fractionDigits007.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/unsignedLong_fractionDigits007.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/unsignedLong_fractionDigits007.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/unsignedLong_fractionDigits007.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/unsignedShort_fractionDigits004.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/unsignedShort_fractionDigits004.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/unsignedShort_fractionDigits004.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/unsignedShort_fractionDigits004.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/unsignedShort_fractionDigits007.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/unsignedShort_fractionDigits007.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252In/unsignedShort_fractionDigits007.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252In/unsignedShort_fractionDigits007.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252Test.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252Test.java
index c9de30f..67dbb9a 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6943252Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252Test.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.validation.tck;
+package validation.tck;
import java.io.File;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6963124.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6963124.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6963124.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6963124.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6963124Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6963124Test.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6963124Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6963124Test.java
index fc1f328..1734c53 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6963124Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6963124Test.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.validation.tck;
+package validation.tck;
import javax.xml.XMLConstants;
import javax.xml.transform.stream.StreamSource;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6963468.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6963468.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6963468.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6963468.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6963468.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6963468.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6963468.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6963468.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6963468Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6963468Test.java
similarity index 99%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6963468Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6963468Test.java
index 59fab2b..269d7b3 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6963468Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6963468Test.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.validation.tck;
+package validation.tck;
import java.io.File;
import java.io.IOException;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6964720.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6964720.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6964720.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6964720.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6964720Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6964720Test.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6964720Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6964720Test.java
index 4c287f7..ca0b650 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6964720Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6964720Test.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.validation.tck;
+package validation.tck;
import javax.xml.XMLConstants;
import javax.xml.transform.stream.StreamSource;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6967214/RegexTest_1258.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6967214/RegexTest_1258.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6967214/RegexTest_1258.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6967214/RegexTest_1258.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6967214/reD10.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6967214/reD10.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6967214/reD10.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6967214/reD10.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6967214/reD11.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6967214/reD11.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6967214/reD11.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6967214/reD11.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6967214/reD12.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6967214/reD12.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6967214/reD12.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6967214/reD12.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6967214/reE9.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6967214/reE9.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6967214/reE9.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6967214/reE9.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6967214Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6967214Test.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6967214Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6967214Test.java
index 6f9a819..66d2e0b 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6967214Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6967214Test.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.validation.tck;
+package validation.tck;
import java.io.File;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6970890.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6970890.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6970890.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6970890.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6970890Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6970890Test.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6970890Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6970890Test.java
index 6daab87..460989a 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6970890Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6970890Test.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.validation.tck;
+package validation.tck;
import javax.xml.XMLConstants;
import javax.xml.transform.stream.StreamSource;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6970890_1.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6970890_1.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6970890_1.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6970890_1.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6971190.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6971190.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6971190.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6971190.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6971190.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6971190.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6971190.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6971190.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6971190Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6971190Test.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6971190Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6971190Test.java
index 0d20968..89e1c3d 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6971190Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6971190Test.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.validation.tck;
+package validation.tck;
import java.io.IOException;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6971190_v.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6971190_v.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6971190_v.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6971190_v.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6971190_v.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6971190_v.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6971190_v.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6971190_v.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6974551.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6974551.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6974551.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6974551.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6974551.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6974551.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6974551.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6974551.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6974551Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6974551Test.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6974551Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6974551Test.java
index 0b4f7e5..f2248a4 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6974551Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6974551Test.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.validation.tck;
+package validation.tck;
import java.io.IOException;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6975265/notatF025.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6975265/notatF025.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6975265/notatF025.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6975265/notatF025.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6975265/notatF037.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6975265/notatF037.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6975265/notatF037.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6975265/notatF037.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6975265/notatF041.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6975265/notatF041.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6975265/notatF041.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6975265/notatF041.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6975265/notatF045.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6975265/notatF045.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6975265/notatF045.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6975265/notatF045.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6975265/notatF049.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6975265/notatF049.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6975265/notatF049.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6975265/notatF049.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6975265Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6975265Test.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6975265Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6975265Test.java
index 8149e38..2a5f557 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6975265Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6975265Test.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.validation.tck;
+package validation.tck;
import java.io.File;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6977201/reA2.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA2.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6977201/reA2.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA2.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6977201/reA2.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA2.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6977201/reA2.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA2.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6977201/reA3.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA3.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6977201/reA3.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA3.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6977201/reA3.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA3.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6977201/reA3.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA3.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6977201/reA4.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA4.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6977201/reA4.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA4.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6977201/reA4.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA4.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6977201/reA4.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA4.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6977201/reA5.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA5.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6977201/reA5.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA5.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6977201/reA5.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA5.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6977201/reA5.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA5.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6977201/reA6.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA6.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6977201/reA6.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA6.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6977201/reA6.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA6.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6977201/reA6.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201/reA6.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6977201Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201Test.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6977201Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201Test.java
index 2b886fd..f5b6e49 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6977201Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201Test.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.validation.tck;
+package validation.tck;
import javax.xml.XMLConstants;
import javax.xml.transform.stream.StreamSource;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6989956.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6989956.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6989956.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6989956.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6989956.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6989956.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6989956.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6989956.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6989956Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6989956Test.java
similarity index 99%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6989956Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6989956Test.java
index 82cdf3f..94682bb 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug6989956Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6989956Test.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.validation.tck;
+package validation.tck;
import java.io.File;
import java.io.IOException;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug7014246.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug7014246.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug7014246.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug7014246.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug7014246Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug7014246Test.java
similarity index 98%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug7014246Test.java
rename to jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug7014246Test.java
index 0da53f6..f6316c9 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/tck/Bug7014246Test.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug7014246Test.java
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.validation.tck;
+package validation.tck;
import javax.xml.XMLConstants;
import javax.xml.transform.stream.StreamSource;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/test-element.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/test-element.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/test-element.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/test-element.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/test-sequence.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/test-sequence.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/test-sequence.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/test-sequence.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/test.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/test.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/test.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/test.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/toys.xml b/jaxp/test/javax/xml/jaxp/unittest/validation/toys.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/toys.xml
rename to jaxp/test/javax/xml/jaxp/unittest/validation/toys.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/toys.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/toys.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/toys.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/toys.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/types.xsd b/jaxp/test/javax/xml/jaxp/unittest/validation/types.xsd
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/validation/types.xsd
rename to jaxp/test/javax/xml/jaxp/unittest/validation/types.xsd
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/Bug4991857.java b/jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4991857.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/Bug4991857.java
rename to jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4991857.java
index 9c71f19..aa37ec7 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/Bug4991857.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4991857.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.xpath;
+package xpath;
import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathConstants;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/Bug4991939.java b/jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4991939.java
similarity index 94%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/Bug4991939.java
rename to jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4991939.java
index 55ad3df..206c6aa 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/Bug4991939.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4991939.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.xpath;
+package xpath;
import javax.xml.XMLConstants;
import javax.xml.namespace.QName;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/Bug4992788.java b/jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4992788.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/Bug4992788.java
rename to jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4992788.java
index 3fe5f92..2b4f9c2 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/Bug4992788.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4992788.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.xpath;
+package xpath;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/Bug4992793.java b/jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4992793.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/Bug4992793.java
rename to jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4992793.java
index 8552559..5810cd6 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/Bug4992793.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4992793.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.xpath;
+package xpath;
import java.io.StringReader;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/Bug4992805.java b/jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4992805.java
similarity index 95%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/Bug4992805.java
rename to jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4992805.java
index 71ab8d6..b847feb 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/Bug4992805.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4992805.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.xpath;
+package xpath;
import java.io.StringReader;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/ClassLoaderTest.java b/jaxp/test/javax/xml/jaxp/unittest/xpath/ClassLoaderTest.java
similarity index 93%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/ClassLoaderTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/xpath/ClassLoaderTest.java
index 3ae3585..9a3a66a 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/ClassLoaderTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/xpath/ClassLoaderTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.xpath;
+package xpath;
import javax.xml.xpath.XPathFactory;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/MyClassLoader.java b/jaxp/test/javax/xml/jaxp/unittest/xpath/MyClassLoader.java
similarity index 93%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/MyClassLoader.java
rename to jaxp/test/javax/xml/jaxp/unittest/xpath/MyClassLoader.java
index 73b8654..d333e70 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/MyClassLoader.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/xpath/MyClassLoader.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -20,7 +20,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
-package javax.xml.xpath;
+package xpath;
import java.io.IOException;
import java.net.URL;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/SecureProcessingTest.java b/jaxp/test/javax/xml/jaxp/unittest/xpath/SecureProcessingTest.java
similarity index 94%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/SecureProcessingTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/xpath/SecureProcessingTest.java
index 50eea27..cbd44e9 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/SecureProcessingTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/xpath/SecureProcessingTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,7 +21,7 @@
* questions.
*/
-package javax.xml.xpath;
+package xpath;
import java.io.IOException;
import java.io.InputStream;
@@ -34,6 +34,13 @@
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathExpressionException;
+import javax.xml.xpath.XPathFactory;
+import javax.xml.xpath.XPathFactoryConfigurationException;
+import javax.xml.xpath.XPathFunction;
+import javax.xml.xpath.XPathFunctionException;
+import javax.xml.xpath.XPathFunctionResolver;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/SecureProcessingTest.xml b/jaxp/test/javax/xml/jaxp/unittest/xpath/SecureProcessingTest.xml
similarity index 100%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/SecureProcessingTest.xml
rename to jaxp/test/javax/xml/jaxp/unittest/xpath/SecureProcessingTest.xml
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/XPathAnyTypeTest.java b/jaxp/test/javax/xml/jaxp/unittest/xpath/XPathAnyTypeTest.java
similarity index 97%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/XPathAnyTypeTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/xpath/XPathAnyTypeTest.java
index ef56ca9..c42101a 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/XPathAnyTypeTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/xpath/XPathAnyTypeTest.java
@@ -20,12 +20,18 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
-package javax.xml.xpath;
+package xpath;
import java.io.File;
-import javax.xml.xpath.*;
+
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathNodes;
+import javax.xml.xpath.XPathEvaluationResult;
+import javax.xml.xpath.XPathExpressionException;
+
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertTrue;
+
import org.testng.annotations.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/XPathExpAnyTypeTest.java b/jaxp/test/javax/xml/jaxp/unittest/xpath/XPathExpAnyTypeTest.java
similarity index 96%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/XPathExpAnyTypeTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/xpath/XPathExpAnyTypeTest.java
index 0eb8047..ab97507 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/XPathExpAnyTypeTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/xpath/XPathExpAnyTypeTest.java
@@ -21,12 +21,19 @@
* questions.
*/
-package javax.xml.xpath;
+package xpath;
import java.io.File;
-import javax.xml.xpath.*;
+
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathExpression;
+import javax.xml.xpath.XPathExpressionException;
+import javax.xml.xpath.XPathNodes;
+import javax.xml.xpath.XPathEvaluationResult;
+
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertTrue;
+
import org.testng.annotations.Test;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/XPathTest.java b/jaxp/test/javax/xml/jaxp/unittest/xpath/XPathTest.java
similarity index 89%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/XPathTest.java
rename to jaxp/test/javax/xml/jaxp/unittest/xpath/XPathTest.java
index 34fe8e3..ee66879 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/XPathTest.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/xpath/XPathTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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
@@ -21,9 +21,11 @@
* questions.
*/
-package javax.xml.xpath;
+package xpath;
import javax.xml.namespace.NamespaceContext;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathFactory;
import org.testng.annotations.Test;
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/XPathTestBase.java b/jaxp/test/javax/xml/jaxp/unittest/xpath/XPathTestBase.java
similarity index 92%
rename from jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/XPathTestBase.java
rename to jaxp/test/javax/xml/jaxp/unittest/xpath/XPathTestBase.java
index 0f06242..4d9666a 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/xpath/XPathTestBase.java
+++ b/jaxp/test/javax/xml/jaxp/unittest/xpath/XPathTestBase.java
@@ -20,17 +20,29 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
-package javax.xml.xpath;
+package xpath;
import java.io.ByteArrayInputStream;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
+
import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathFactory;
+import static javax.xml.xpath.XPathConstants.BOOLEAN;
+import static javax.xml.xpath.XPathConstants.NUMBER;
+import static javax.xml.xpath.XPathConstants.STRING;
+import static javax.xml.xpath.XPathConstants.NODE;
+import static javax.xml.xpath.XPathConstants.NODESET;
+import javax.xml.xpath.XPathNodes;
+import javax.xml.xpath.XPathEvaluationResult;
+
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
+
import org.testng.annotations.DataProvider;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
diff --git a/jaxws/.hgtags b/jaxws/.hgtags
index 5db1d65..4344d1a 100644
--- a/jaxws/.hgtags
+++ b/jaxws/.hgtags
@@ -322,3 +322,4 @@
6232472e51418757f7b2bf05332678ea78096e6b jdk9-b74
086bcd5e4a531a350c84668c8dc019461588ee3d jdk9-b75
55bb88306dc57d07f2c854803465f6d9a7eb4aba jdk9-b76
+bd6ece68cf8aca34c8d992569892060c82cfd3f1 jdk9-b77
diff --git a/jdk/.hgtags b/jdk/.hgtags
index a4e7142..4678301 100644
--- a/jdk/.hgtags
+++ b/jdk/.hgtags
@@ -319,3 +319,4 @@
6dd82d2e4a104f4d204b2890f33ef11ec3e3f8d0 jdk9-b74
4dd09cb5f7c2a2a23a9958ea7a602dd74d5709b2 jdk9-b75
4526c0da8fb362eebd7e88f4d44e86858cf9b80b jdk9-b76
+7fd081100f48828431e7c1bff65c906ee759069b jdk9-b77
diff --git a/jdk/make/launcher/Launcher-jdk.scripting.nashorn.gmk b/jdk/make/launcher/Launcher-jdk.scripting.nashorn.gmk
index 1a9f71c..efc2230d 100644
--- a/jdk/make/launcher/Launcher-jdk.scripting.nashorn.gmk
+++ b/jdk/make/launcher/Launcher-jdk.scripting.nashorn.gmk
@@ -26,5 +26,5 @@
include LauncherCommon.gmk
$(eval $(call SetupLauncher,jjs, \
- -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "jdk.nashorn.tools.Shell"$(COMMA) }'))
+ -DJAVA_ARGS='{ "-J-ms8m"$(COMMA) "jdk.nashorn.tools.jjs.Main"$(COMMA) }'))
diff --git a/jdk/make/lib/NioLibraries.gmk b/jdk/make/lib/NioLibraries.gmk
index 81d6e0f..d78f4a7 100644
--- a/jdk/make/lib/NioLibraries.gmk
+++ b/jdk/make/lib/NioLibraries.gmk
@@ -24,6 +24,7 @@
#
BUILD_LIBNIO_SRC := \
+ $(JDK_TOPDIR)/src/java.base/share/native/libnio \
$(JDK_TOPDIR)/src/java.base/share/native/libnio/ch \
$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libnio \
$(sort $(wildcard \
diff --git a/jdk/make/lib/SoundLibraries.gmk b/jdk/make/lib/SoundLibraries.gmk
index 08bb21b..df8190e 100644
--- a/jdk/make/lib/SoundLibraries.gmk
+++ b/jdk/make/lib/SoundLibraries.gmk
@@ -123,9 +123,6 @@
CFLAGS := $(CFLAGS_JDKLIB) \
$(LIBJSOUND_CFLAGS), \
CXXFLAGS := $(CXXFLAGS_JDKLIB) $(LIBJSOUND_CFLAGS), \
- DISABLED_WARNINGS_clang := implicit-function-declaration \
- deprecated-writable-strings, \
- WARNINGS_AS_ERRORS_clang := false, \
MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjsound/mapfile-vers, \
LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN), \
@@ -171,7 +168,6 @@
-DUSE_PORTS=TRUE \
-DUSE_PLATFORM_MIDI_OUT=TRUE \
-DUSE_PLATFORM_MIDI_IN=TRUE, \
- DISABLED_WARNINGS_gcc := parentheses, \
MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjsoundalsa/mapfile-vers, \
LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN), \
diff --git a/jdk/make/mapfiles/libnio/mapfile-linux b/jdk/make/mapfiles/libnio/mapfile-linux
index e1928c4..c00f6dd 100644
--- a/jdk/make/mapfiles/libnio/mapfile-linux
+++ b/jdk/make/mapfiles/libnio/mapfile-linux
@@ -25,6 +25,7 @@
SUNWprivate_1.1 {
global:
+ JNI_OnLoad;
Java_java_nio_MappedByteBuffer_force0;
Java_java_nio_MappedByteBuffer_isLoaded0;
Java_java_nio_MappedByteBuffer_load0;
diff --git a/jdk/make/mapfiles/libnio/mapfile-macosx b/jdk/make/mapfiles/libnio/mapfile-macosx
index d4b6dc5..7ce9c50 100644
--- a/jdk/make/mapfiles/libnio/mapfile-macosx
+++ b/jdk/make/mapfiles/libnio/mapfile-macosx
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2001, 2015, 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
@@ -25,6 +25,7 @@
SUNWprivate_1.1 {
global:
+ JNI_OnLoad;
Java_java_nio_MappedByteBuffer_force0;
Java_java_nio_MappedByteBuffer_isLoaded0;
Java_java_nio_MappedByteBuffer_load0;
diff --git a/jdk/make/mapfiles/libnio/mapfile-solaris b/jdk/make/mapfiles/libnio/mapfile-solaris
index 92d62d2..9c5da0e 100644
--- a/jdk/make/mapfiles/libnio/mapfile-solaris
+++ b/jdk/make/mapfiles/libnio/mapfile-solaris
@@ -25,6 +25,7 @@
SUNWprivate_1.1 {
global:
+ JNI_OnLoad;
Java_java_nio_MappedByteBuffer_force0;
Java_java_nio_MappedByteBuffer_isLoaded0;
Java_java_nio_MappedByteBuffer_load0;
diff --git a/jdk/src/java.base/share/classes/java/lang/RuntimePermission.java b/jdk/src/java.base/share/classes/java/lang/RuntimePermission.java
index 0df77f5..36b48b7 100644
--- a/jdk/src/java.base/share/classes/java/lang/RuntimePermission.java
+++ b/jdk/src/java.base/share/classes/java/lang/RuntimePermission.java
@@ -31,22 +31,19 @@
import java.util.StringTokenizer;
/**
- * This class is for runtime permissions. A RuntimePermission
- * contains a name (also referred to as a "target name") but
- * no actions list; you either have the named permission
- * or you don't.
- *
- * <P>
+ * This class is for runtime permissions. A {@code RuntimePermission}
+ * contains a name (also referred to as a "target name") but no actions
+ * list; you either have the named permission or you don't.
+ * <p>
* The target name is the name of the runtime permission (see below). The
* naming convention follows the hierarchical property naming convention.
- * Also, an asterisk
- * may appear at the end of the name, following a ".", or by itself, to
- * signify a wildcard match. For example: "loadLibrary.*" and "*" signify a
- * wildcard match, while "*loadLibrary" and "a*b" do not.
- * <P>
- * The following table lists all the possible RuntimePermission target names,
- * and for each provides a description of what the permission allows
- * and a discussion of the risks of granting code the permission.
+ * Also, an asterisk may appear at the end of the name, following a ".",
+ * or by itself, to signify a wildcard match. For example: "loadLibrary.*"
+ * and "*" signify a wildcard match, while "*loadLibrary" and "a*b" do not.
+ * <p>
+ * The following table lists the standard {@code RuntimePermission}
+ * target names, and for each provides a description of what the permission
+ * allows and a discussion of the risks of granting code the permission.
*
* <table border=1 cellpadding=5 summary="permission target name,
* what the target allows,and associated risks">
@@ -353,6 +350,10 @@
* </tr>
* </table>
*
+ * @implNote
+ * Implementations may define additional target names, but should use naming
+ * conventions such as reverse domain name notation to avoid name clashes.
+ *
* @see java.security.BasicPermission
* @see java.security.Permission
* @see java.security.Permissions
diff --git a/jdk/src/java.base/share/classes/java/lang/ref/Finalizer.java b/jdk/src/java.base/share/classes/java/lang/ref/Finalizer.java
index d9cabe6..3bd6312 100644
--- a/jdk/src/java.base/share/classes/java/lang/ref/Finalizer.java
+++ b/jdk/src/java.base/share/classes/java/lang/ref/Finalizer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -83,6 +83,10 @@
add();
}
+ static ReferenceQueue<Object> getQueue() {
+ return queue;
+ }
+
/* Invoked by VM */
static void register(Object finalizee) {
new Finalizer(finalizee);
diff --git a/jdk/src/java.base/share/classes/java/lang/ref/FinalizerHistogram.java b/jdk/src/java.base/share/classes/java/lang/ref/FinalizerHistogram.java
new file mode 100644
index 0000000..e5c95c1
--- /dev/null
+++ b/jdk/src/java.base/share/classes/java/lang/ref/FinalizerHistogram.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2015, 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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 java.lang.ref;
+
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Arrays;
+import java.util.Comparator;
+
+/**
+ * This FinalizerHistogram class is for GC.finalizer_info diagnostic command support.
+ * It is invoked by the VM.
+ */
+
+final class FinalizerHistogram {
+
+ private static final class Entry {
+ private int instanceCount;
+ private final String className;
+
+ int getInstanceCount() {
+ return instanceCount;
+ }
+
+ void increment() {
+ instanceCount += 1;
+ }
+
+ Entry(String className) {
+ this.className = className;
+ }
+ }
+
+ // Method below is called by VM and VM expect certain
+ // entry class layout.
+
+ static Entry[] getFinalizerHistogram() {
+ Map<String, Entry> countMap = new HashMap<>();
+ ReferenceQueue<Object> queue = Finalizer.getQueue();
+ queue.forEach(r -> {
+ Object referent = r.get();
+ if (referent != null) {
+ countMap.computeIfAbsent(
+ referent.getClass().getName(), Entry::new).increment();
+ /* Clear stack slot containing this variable, to decrease
+ the chances of false retention with a conservative GC */
+ referent = null;
+ }
+ });
+
+ Entry fhe[] = countMap.values().toArray(new Entry[countMap.size()]);
+ Arrays.sort(fhe,
+ Comparator.comparingInt(Entry::getInstanceCount).reversed());
+ return fhe;
+ }
+}
diff --git a/jdk/src/java.base/share/classes/java/lang/ref/Reference.java b/jdk/src/java.base/share/classes/java/lang/ref/Reference.java
index 7f6456f..854cdd6 100644
--- a/jdk/src/java.base/share/classes/java/lang/ref/Reference.java
+++ b/jdk/src/java.base/share/classes/java/lang/ref/Reference.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -101,7 +101,7 @@
* Inactive: this
*/
@SuppressWarnings("rawtypes")
- Reference next;
+ volatile Reference next;
/* When active: next element in a discovered reference list maintained by GC (or this if last)
* pending: next element in the pending list (or null if last)
diff --git a/jdk/src/java.base/share/classes/java/lang/ref/ReferenceQueue.java b/jdk/src/java.base/share/classes/java/lang/ref/ReferenceQueue.java
index 2466956..9d1df2d 100644
--- a/jdk/src/java.base/share/classes/java/lang/ref/ReferenceQueue.java
+++ b/jdk/src/java.base/share/classes/java/lang/ref/ReferenceQueue.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -25,6 +25,8 @@
package java.lang.ref;
+import java.util.function.Consumer;
+
/**
* Reference queues, to which registered reference objects are appended by the
* garbage collector after the appropriate reachability changes are detected.
@@ -75,13 +77,12 @@
}
}
- @SuppressWarnings("unchecked")
private Reference<? extends T> reallyPoll() { /* Must hold lock */
Reference<? extends T> r = head;
if (r != null) {
- head = (r.next == r) ?
- null :
- r.next; // Unchecked due to the next field having a raw type in Reference
+ @SuppressWarnings("unchecked")
+ Reference<? extends T> rn = r.next;
+ head = (rn == r) ? null : rn;
r.queue = NULL;
r.next = r;
queueLength--;
@@ -164,4 +165,32 @@
return remove(0);
}
+ /**
+ * Iterate queue and invoke given action with each Reference.
+ * Suitable for diagnostic purposes.
+ * WARNING: any use of this method should make sure to not
+ * retain the referents of iterated references (in case of
+ * FinalReference(s)) so that their life is not prolonged more
+ * than necessary.
+ */
+ void forEach(Consumer<? super Reference<? extends T>> action) {
+ for (Reference<? extends T> r = head; r != null;) {
+ action.accept(r);
+ @SuppressWarnings("unchecked")
+ Reference<? extends T> rn = r.next;
+ if (rn == r) {
+ if (r.queue == ENQUEUED) {
+ // still enqueued -> we reached end of chain
+ r = null;
+ } else {
+ // already dequeued: r.queue == NULL; ->
+ // restart from head when overtaken by queue poller(s)
+ r = head;
+ }
+ } else {
+ // next in chain
+ r = rn;
+ }
+ }
+ }
}
diff --git a/jdk/src/java.base/share/classes/java/nio/Buffer.java b/jdk/src/java.base/share/classes/java/nio/Buffer.java
index ba72f28..8669242 100644
--- a/jdk/src/java.base/share/classes/java/nio/Buffer.java
+++ b/jdk/src/java.base/share/classes/java/nio/Buffer.java
@@ -96,10 +96,10 @@
* capacity values:
*
* <blockquote>
- * <tt>0</tt> <tt><=</tt>
- * <i>mark</i> <tt><=</tt>
- * <i>position</i> <tt><=</tt>
- * <i>limit</i> <tt><=</tt>
+ * {@code 0} {@code <=}
+ * <i>mark</i> {@code <=}
+ * <i>position</i> {@code <=}
+ * <i>limit</i> {@code <=}
* <i>capacity</i>
* </blockquote>
*
@@ -229,7 +229,7 @@
* The new buffer's capacity, in $type$s
*
* @throws IllegalArgumentException
- * If the <tt>capacity</tt> is a negative integer
+ * If the {@code capacity} is a negative integer
*/
static IllegalArgumentException createCapacityException(int capacity) {
assert capacity < 0 : "capacity expected to be negative";
@@ -266,7 +266,7 @@
* @return This buffer
*
* @throws IllegalArgumentException
- * If the preconditions on <tt>newPosition</tt> do not hold
+ * If the preconditions on {@code newPosition} do not hold
*/
public Buffer position(int newPosition) {
if (newPosition > limit | newPosition < 0)
@@ -319,7 +319,7 @@
* @return This buffer
*
* @throws IllegalArgumentException
- * If the preconditions on <tt>newLimit</tt> do not hold
+ * If the preconditions on {@code newLimit} do not hold
*/
public Buffer limit(int newLimit) {
if (newLimit > capacity | newLimit < 0)
@@ -468,7 +468,7 @@
* Tells whether there are any elements between the current position and
* the limit.
*
- * @return <tt>true</tt> if, and only if, there is at least one element
+ * @return {@code true} if, and only if, there is at least one element
* remaining in this buffer
*/
public final boolean hasRemaining() {
@@ -478,7 +478,7 @@
/**
* Tells whether or not this buffer is read-only.
*
- * @return <tt>true</tt> if, and only if, this buffer is read-only
+ * @return {@code true} if, and only if, this buffer is read-only
*/
public abstract boolean isReadOnly();
@@ -486,11 +486,11 @@
* Tells whether or not this buffer is backed by an accessible
* array.
*
- * <p> If this method returns <tt>true</tt> then the {@link #array() array}
+ * <p> If this method returns {@code true} then the {@link #array() array}
* and {@link #arrayOffset() arrayOffset} methods may safely be invoked.
* </p>
*
- * @return <tt>true</tt> if, and only if, this buffer
+ * @return {@code true} if, and only if, this buffer
* is backed by an array and is not read-only
*
* @since 1.6
@@ -529,7 +529,7 @@
* element of the buffer <i>(optional operation)</i>.
*
* <p> If this buffer is backed by an array then buffer position <i>p</i>
- * corresponds to array index <i>p</i> + <tt>arrayOffset()</tt>.
+ * corresponds to array index <i>p</i> + {@code arrayOffset()}.
*
* <p> Invoke the {@link #hasArray hasArray} method before invoking this
* method in order to ensure that this buffer has an accessible backing
@@ -552,7 +552,7 @@
* Tells whether or not this buffer is
* <a href="ByteBuffer.html#direct"><i>direct</i></a>.
*
- * @return <tt>true</tt> if, and only if, this buffer is direct
+ * @return {@code true} if, and only if, this buffer is direct
*
* @since 1.6
*/
diff --git a/jdk/src/java.base/share/classes/java/nio/ByteOrder.java b/jdk/src/java.base/share/classes/java/nio/ByteOrder.java
index a20cacc..97dc16b 100644
--- a/jdk/src/java.base/share/classes/java/nio/ByteOrder.java
+++ b/jdk/src/java.base/share/classes/java/nio/ByteOrder.java
@@ -75,9 +75,9 @@
/**
* Constructs a string describing this object.
*
- * <p> This method returns the string <tt>"BIG_ENDIAN"</tt> for {@link
- * #BIG_ENDIAN} and <tt>"LITTLE_ENDIAN"</tt> for {@link #LITTLE_ENDIAN}.
- * </p>
+ * <p> This method returns the string
+ * {@code "BIG_ENDIAN"} for {@link #BIG_ENDIAN} and
+ * {@code "LITTLE_ENDIAN"} for {@link #LITTLE_ENDIAN}.
*
* @return The specified string
*/
diff --git a/jdk/src/java.base/share/classes/java/nio/MappedByteBuffer.java b/jdk/src/java.base/share/classes/java/nio/MappedByteBuffer.java
index 5331cb3..953a78b 100644
--- a/jdk/src/java.base/share/classes/java/nio/MappedByteBuffer.java
+++ b/jdk/src/java.base/share/classes/java/nio/MappedByteBuffer.java
@@ -116,10 +116,10 @@
* Tells whether or not this buffer's content is resident in physical
* memory.
*
- * <p> A return value of <tt>true</tt> implies that it is highly likely
+ * <p> A return value of {@code true} implies that it is highly likely
* that all of the data in this buffer is resident in physical memory and
* may therefore be accessed without incurring any virtual-memory page
- * faults or I/O operations. A return value of <tt>false</tt> does not
+ * faults or I/O operations. A return value of {@code false} does not
* necessarily imply that the buffer's content is not resident in physical
* memory.
*
@@ -127,7 +127,7 @@
* underlying operating system may have paged out some of the buffer's data
* by the time that an invocation of this method returns. </p>
*
- * @return <tt>true</tt> if it is likely that this buffer's content
+ * @return {@code true} if it is likely that this buffer's content
* is resident in physical memory
*/
public final boolean isLoaded() {
diff --git a/jdk/src/java.base/share/classes/java/nio/X-Buffer-bin.java.template b/jdk/src/java.base/share/classes/java/nio/X-Buffer-bin.java.template
index 44d2c4e..3473e2d 100644
--- a/jdk/src/java.base/share/classes/java/nio/X-Buffer-bin.java.template
+++ b/jdk/src/java.base/share/classes/java/nio/X-Buffer-bin.java.template
@@ -78,7 +78,7 @@
* @return The $type$ value at the given index
*
* @throws IndexOutOfBoundsException
- * If <tt>index</tt> is negative
+ * If {@code index} is negative
* or not smaller than the buffer's limit,
* minus $nbytesButOne$
*/
@@ -100,7 +100,7 @@
* @return This buffer
*
* @throws IndexOutOfBoundsException
- * If <tt>index</tt> is negative
+ * If {@code index} is negative
* or not smaller than the buffer's limit,
* minus $nbytesButOne$
*
diff --git a/jdk/src/java.base/share/classes/java/nio/X-Buffer.java.template b/jdk/src/java.base/share/classes/java/nio/X-Buffer.java.template
index 78afa40..d34f975 100644
--- a/jdk/src/java.base/share/classes/java/nio/X-Buffer.java.template
+++ b/jdk/src/java.base/share/classes/java/nio/X-Buffer.java.template
@@ -133,7 +133,7 @@
* <h2> Access to binary data </h2>
*
* <p> This class defines methods for reading and writing values of all other
- * primitive types, except <tt>boolean</tt>. Primitive values are translated
+ * primitive types, except {@code boolean}. Primitive values are translated
* to (or from) sequences of bytes according to the buffer's current byte
* order, which may be retrieved and modified via the {@link #order order}
* methods. Specific byte orders are represented by instances of the {@link
@@ -151,8 +151,8 @@
* void {@link #putFloat(float) putFloat(float f)}
* void {@link #putFloat(int,float) putFloat(int index, float f)}</pre></blockquote>
*
- * <p> Corresponding methods are defined for the types <tt>char</tt>,
- * <tt>short</tt>, <tt>int</tt>, <tt>long</tt>, and <tt>double</tt>. The index
+ * <p> Corresponding methods are defined for the types {@code char,
+ * short, int, long}, and {@code double}. The index
* parameters of the absolute <i>get</i> and <i>put</i> methods are in terms of
* bytes rather than of the type being read or written.
*
@@ -167,8 +167,7 @@
* #asFloatBuffer() asFloatBuffer} method, for example, creates an instance of
* the {@link FloatBuffer} class that is backed by the byte buffer upon which
* the method is invoked. Corresponding view-creation methods are defined for
- * the types <tt>char</tt>, <tt>short</tt>, <tt>int</tt>, <tt>long</tt>, and
- * <tt>double</tt>.
+ * the types {@code char, short, int, long}, and {@code double}.
*
* <p> View buffers have three important advantages over the families of
* type-specific <i>get</i> and <i>put</i> methods described above:
@@ -196,7 +195,7 @@
*
* <p> Like a byte buffer, $a$ $type$ buffer is either <a
* href="ByteBuffer.html#direct"><i>direct</i> or <i>non-direct</i></a>. A
- * $type$ buffer created via the <tt>wrap</tt> methods of this class will
+ * $type$ buffer created via the {@code wrap} methods of this class will
* be non-direct. $A$ $type$ buffer created as a view of a byte buffer will
* be direct if, and only if, the byte buffer itself is direct. Whether or not
* $a$ $type$ buffer is direct may be determined by invoking the {@link
@@ -208,7 +207,7 @@
*
* <p> This class implements the {@link CharSequence} interface so that
* character buffers may be used wherever character sequences are accepted, for
- * example in the regular-expression package <tt>{@link java.util.regex}</tt>.
+ * example in the regular-expression package {@link java.util.regex}.
* </p>
*
#end[char]
@@ -306,7 +305,7 @@
* @return The new $type$ buffer
*
* @throws IllegalArgumentException
- * If the <tt>capacity</tt> is a negative integer
+ * If the {@code capacity} is a negative integer
*/
public static $Type$Buffer allocateDirect(int capacity) {
return new Direct$Type$Buffer(capacity);
@@ -335,7 +334,7 @@
* @return The new $type$ buffer
*
* @throws IllegalArgumentException
- * If the <tt>capacity</tt> is a negative integer
+ * If the {@code capacity} is a negative integer
*/
public static $Type$Buffer allocate(int capacity) {
if (capacity < 0)
@@ -349,8 +348,8 @@
* <p> The new buffer will be backed by the given $type$ array;
* that is, modifications to the buffer will cause the array to be modified
* and vice versa. The new buffer's capacity will be
- * <tt>array.length</tt>, its position will be <tt>offset</tt>, its limit
- * will be <tt>offset + length</tt>, its mark will be undefined, and its
+ * {@code array.length}, its position will be {@code offset}, its limit
+ * will be {@code offset + length}, its mark will be undefined, and its
* byte order will be
#if[byte]
* {@link ByteOrder#BIG_ENDIAN BIG_ENDIAN}.
@@ -366,19 +365,19 @@
*
* @param offset
* The offset of the subarray to be used; must be non-negative and
- * no larger than <tt>array.length</tt>. The new buffer's position
+ * no larger than {@code array.length}. The new buffer's position
* will be set to this value.
*
* @param length
* The length of the subarray to be used;
* must be non-negative and no larger than
- * <tt>array.length - offset</tt>.
- * The new buffer's limit will be set to <tt>offset + length</tt>.
+ * {@code array.length - offset}.
+ * The new buffer's limit will be set to {@code offset + length}.
*
* @return The new $type$ buffer
*
* @throws IndexOutOfBoundsException
- * If the preconditions on the <tt>offset</tt> and <tt>length</tt>
+ * If the preconditions on the {@code offset} and {@code length}
* parameters do not hold
*/
public static $Type$Buffer wrap($type$[] array,
@@ -397,7 +396,7 @@
* <p> The new buffer will be backed by the given $type$ array;
* that is, modifications to the buffer will cause the array to be modified
* and vice versa. The new buffer's capacity and limit will be
- * <tt>array.length</tt>, its position will be zero, its mark will be
+ * {@code array.length}, its position will be zero, its mark will be
* undefined, and its byte order will be
#if[byte]
* {@link ByteOrder#BIG_ENDIAN BIG_ENDIAN}.
@@ -458,8 +457,8 @@
*
* <p> The content of the new, read-only buffer will be the content of the
* given character sequence. The buffer's capacity will be
- * <tt>csq.length()</tt>, its position will be <tt>start</tt>, its limit
- * will be <tt>end</tt>, and its mark will be undefined. </p>
+ * {@code csq.length()}, its position will be {@code start}, its limit
+ * will be {@code end}, and its mark will be undefined. </p>
*
* @param csq
* The character sequence from which the new character buffer is to
@@ -467,19 +466,19 @@
*
* @param start
* The index of the first character to be used;
- * must be non-negative and no larger than <tt>csq.length()</tt>.
+ * must be non-negative and no larger than {@code csq.length()}.
* The new buffer's position will be set to this value.
*
* @param end
* The index of the character following the last character to be
- * used; must be no smaller than <tt>start</tt> and no larger
- * than <tt>csq.length()</tt>.
+ * used; must be no smaller than {@code start} and no larger
+ * than {@code csq.length()}.
* The new buffer's limit will be set to this value.
*
* @return The new character buffer
*
* @throws IndexOutOfBoundsException
- * If the preconditions on the <tt>start</tt> and <tt>end</tt>
+ * If the preconditions on the {@code start} and {@code end}
* parameters do not hold
*/
public static CharBuffer wrap(CharSequence csq, int start, int end) {
@@ -495,7 +494,7 @@
*
* <p> The content of the new, read-only buffer will be the content of the
* given character sequence. The new buffer's capacity and limit will be
- * <tt>csq.length()</tt>, its position will be zero, and its mark will be
+ * {@code csq.length()}, its position will be zero, and its mark will be
* undefined. </p>
*
* @param csq
@@ -624,7 +623,7 @@
* @return The $type$ at the given index
*
* @throws IndexOutOfBoundsException
- * If <tt>index</tt> is negative
+ * If {@code index} is negative
* or not smaller than the buffer's limit
*/
public abstract $type$ get(int index);
@@ -657,7 +656,7 @@
* @return This buffer
*
* @throws IndexOutOfBoundsException
- * If <tt>index</tt> is negative
+ * If {@code index} is negative
* or not smaller than the buffer's limit
*
* @throws ReadOnlyBufferException
@@ -674,17 +673,17 @@
* <p> This method transfers $type$s from this buffer into the given
* destination array. If there are fewer $type$s remaining in the
* buffer than are required to satisfy the request, that is, if
- * <tt>length</tt> <tt>></tt> <tt>remaining()</tt>, then no
+ * {@code length} {@code >} {@code remaining()}, then no
* $type$s are transferred and a {@link BufferUnderflowException} is
* thrown.
*
- * <p> Otherwise, this method copies <tt>length</tt> $type$s from this
+ * <p> Otherwise, this method copies {@code length} $type$s from this
* buffer into the given array, starting at the current position of this
* buffer and at the given offset in the array. The position of this
- * buffer is then incremented by <tt>length</tt>.
+ * buffer is then incremented by {@code length}.
*
* <p> In other words, an invocation of this method of the form
- * <tt>src.get(dst, off, len)</tt> has exactly the same effect as
+ * <code>src.get(dst, off, len)</code> has exactly the same effect as
* the loop
*
* <pre>{@code
@@ -701,21 +700,21 @@
* @param offset
* The offset within the array of the first $type$ to be
* written; must be non-negative and no larger than
- * <tt>dst.length</tt>
+ * {@code dst.length}
*
* @param length
* The maximum number of $type$s to be written to the given
* array; must be non-negative and no larger than
- * <tt>dst.length - offset</tt>
+ * {@code dst.length - offset}
*
* @return This buffer
*
* @throws BufferUnderflowException
- * If there are fewer than <tt>length</tt> $type$s
+ * If there are fewer than {@code length} $type$s
* remaining in this buffer
*
* @throws IndexOutOfBoundsException
- * If the preconditions on the <tt>offset</tt> and <tt>length</tt>
+ * If the preconditions on the {@code offset} and {@code length}
* parameters do not hold
*/
public $Type$Buffer get($type$[] dst, int offset, int length) {
@@ -733,7 +732,7 @@
*
* <p> This method transfers $type$s from this buffer into the given
* destination array. An invocation of this method of the form
- * <tt>src.get(a)</tt> behaves in exactly the same way as the invocation
+ * {@code src.get(a)} behaves in exactly the same way as the invocation
*
* <pre>
* src.get(a, 0, a.length) </pre>
@@ -744,7 +743,7 @@
* @return This buffer
*
* @throws BufferUnderflowException
- * If there are fewer than <tt>length</tt> $type$s
+ * If there are fewer than {@code length} $type$s
* remaining in this buffer
*/
public $Type$Buffer get($type$[] dst) {
@@ -760,17 +759,17 @@
* <p> This method transfers the $type$s remaining in the given source
* buffer into this buffer. If there are more $type$s remaining in the
* source buffer than in this buffer, that is, if
- * <tt>src.remaining()</tt> <tt>></tt> <tt>remaining()</tt>,
+ * {@code src.remaining()} {@code >} {@code remaining()},
* then no $type$s are transferred and a {@link
* BufferOverflowException} is thrown.
*
* <p> Otherwise, this method copies
- * <i>n</i> = <tt>src.remaining()</tt> $type$s from the given
+ * <i>n</i> = {@code src.remaining()} $type$s from the given
* buffer into this buffer, starting at each buffer's current position.
* The positions of both buffers are then incremented by <i>n</i>.
*
* <p> In other words, an invocation of this method of the form
- * <tt>dst.put(src)</tt> has exactly the same effect as the loop
+ * {@code dst.put(src)} has exactly the same effect as the loop
*
* <pre>
* while (src.hasRemaining())
@@ -814,17 +813,17 @@
* <p> This method transfers $type$s into this buffer from the given
* source array. If there are more $type$s to be copied from the array
* than remain in this buffer, that is, if
- * <tt>length</tt> <tt>></tt> <tt>remaining()</tt>, then no
+ * {@code length} {@code >} {@code remaining()}, then no
* $type$s are transferred and a {@link BufferOverflowException} is
* thrown.
*
- * <p> Otherwise, this method copies <tt>length</tt> $type$s from the
+ * <p> Otherwise, this method copies {@code length} $type$s from the
* given array into this buffer, starting at the given offset in the array
* and at the current position of this buffer. The position of this buffer
- * is then incremented by <tt>length</tt>.
+ * is then incremented by {@code length}.
*
* <p> In other words, an invocation of this method of the form
- * <tt>dst.put(src, off, len)</tt> has exactly the same effect as
+ * <code>dst.put(src, off, len)</code> has exactly the same effect as
* the loop
*
* <pre>{@code
@@ -840,12 +839,12 @@
*
* @param offset
* The offset within the array of the first $type$ to be read;
- * must be non-negative and no larger than <tt>array.length</tt>
+ * must be non-negative and no larger than {@code array.length}
*
* @param length
* The number of $type$s to be read from the given array;
* must be non-negative and no larger than
- * <tt>array.length - offset</tt>
+ * {@code array.length - offset}
*
* @return This buffer
*
@@ -853,7 +852,7 @@
* If there is insufficient space in this buffer
*
* @throws IndexOutOfBoundsException
- * If the preconditions on the <tt>offset</tt> and <tt>length</tt>
+ * If the preconditions on the {@code offset} and {@code length}
* parameters do not hold
*
* @throws ReadOnlyBufferException
@@ -874,7 +873,7 @@
*
* <p> This method transfers the entire content of the given source
* $type$ array into this buffer. An invocation of this method of the
- * form <tt>dst.put(a)</tt> behaves in exactly the same way as the
+ * form {@code dst.put(a)} behaves in exactly the same way as the
* invocation
*
* <pre>
@@ -903,18 +902,18 @@
* <p> This method transfers $type$s from the given string into this
* buffer. If there are more $type$s to be copied from the string than
* remain in this buffer, that is, if
- * <tt>end - start</tt> <tt>></tt> <tt>remaining()</tt>,
+ * <code>end - start</code> {@code >} {@code remaining()},
* then no $type$s are transferred and a {@link
* BufferOverflowException} is thrown.
*
* <p> Otherwise, this method copies
- * <i>n</i> = <tt>end</tt> - <tt>start</tt> $type$s
+ * <i>n</i> = {@code end} - {@code start} $type$s
* from the given string into this buffer, starting at the given
- * <tt>start</tt> index and at the current position of this buffer. The
+ * {@code start} index and at the current position of this buffer. The
* position of this buffer is then incremented by <i>n</i>.
*
* <p> In other words, an invocation of this method of the form
- * <tt>dst.put(src, start, end)</tt> has exactly the same effect
+ * <code>dst.put(src, start, end)</code> has exactly the same effect
* as the loop
*
* <pre>{@code
@@ -931,12 +930,12 @@
* @param start
* The offset within the string of the first $type$ to be read;
* must be non-negative and no larger than
- * <tt>string.length()</tt>
+ * {@code string.length()}
*
* @param end
* The offset within the string of the last $type$ to be read,
* plus one; must be non-negative and no larger than
- * <tt>string.length()</tt>
+ * {@code string.length()}
*
* @return This buffer
*
@@ -944,7 +943,7 @@
* If there is insufficient space in this buffer
*
* @throws IndexOutOfBoundsException
- * If the preconditions on the <tt>start</tt> and <tt>end</tt>
+ * If the preconditions on the {@code start} and {@code end}
* parameters do not hold
*
* @throws ReadOnlyBufferException
@@ -966,7 +965,7 @@
*
* <p> This method transfers the entire content of the given source string
* into this buffer. An invocation of this method of the form
- * <tt>dst.put(s)</tt> behaves in exactly the same way as the invocation
+ * {@code dst.put(s)} behaves in exactly the same way as the invocation
*
* <pre>
* dst.put(s, 0, s.length()) </pre>
@@ -995,11 +994,11 @@
* Tells whether or not this buffer is backed by an accessible $type$
* array.
*
- * <p> If this method returns <tt>true</tt> then the {@link #array() array}
+ * <p> If this method returns {@code true} then the {@link #array() array}
* and {@link #arrayOffset() arrayOffset} methods may safely be invoked.
* </p>
*
- * @return <tt>true</tt> if, and only if, this buffer
+ * @return {@code true} if, and only if, this buffer
* is backed by an array and is not read-only
*/
public final boolean hasArray() {
@@ -1038,7 +1037,7 @@
* element of the buffer <i>(optional operation)</i>.
*
* <p> If this buffer is backed by an array then buffer position <i>p</i>
- * corresponds to array index <i>p</i> + <tt>arrayOffset()</tt>.
+ * corresponds to array index <i>p</i> + {@code arrayOffset()}.
*
* <p> Invoke the {@link #hasArray hasArray} method before invoking this
* method in order to ensure that this buffer has an accessible backing
@@ -1166,11 +1165,11 @@
*
* <p> The $type$s between the buffer's current position and its limit,
* if any, are copied to the beginning of the buffer. That is, the
- * $type$ at index <i>p</i> = <tt>position()</tt> is copied
+ * $type$ at index <i>p</i> = {@code position()} is copied
* to index zero, the $type$ at index <i>p</i> + 1 is copied
* to index one, and so forth until the $type$ at index
- * <tt>limit()</tt> - 1 is copied to index
- * <i>n</i> = <tt>limit()</tt> - <tt>1</tt> - <i>p</i>.
+ * {@code limit()} - 1 is copied to index
+ * <i>n</i> = {@code limit()} - {@code 1} - <i>p</i>.
* The buffer's position is then set to <i>n+1</i> and its limit is set to
* its capacity. The mark, if defined, is discarded.
*
@@ -1183,7 +1182,7 @@
*
* <p> Invoke this method after writing data from a buffer in case the
* write was incomplete. The following loop, for example, copies bytes
- * from one channel to another via the buffer <tt>buf</tt>:
+ * from one channel to another via the buffer {@code buf}:
*
* <blockquote><pre>{@code
* buf.clear(); // Prepare buffer for use
@@ -1206,7 +1205,7 @@
/**
* Tells whether or not this $type$ buffer is direct.
*
- * @return <tt>true</tt> if, and only if, this buffer is direct
+ * @return {@code true} if, and only if, this buffer is direct
*/
public abstract boolean isDirect();
@@ -1239,8 +1238,8 @@
* Returns the current hash code of this buffer.
*
* <p> The hash code of a $type$ buffer depends only upon its remaining
- * elements; that is, upon the elements from <tt>position()</tt> up to, and
- * including, the element at <tt>limit()</tt> - <tt>1</tt>.
+ * elements; that is, upon the elements from {@code position()} up to, and
+ * including, the element at {@code limit()} - {@code 1}.
*
* <p> Because buffer hash codes are content-dependent, it is inadvisable
* to use buffers as keys in hash maps or similar data structures unless it
@@ -1289,7 +1288,7 @@
*
* @param ob The object to which this buffer is to be compared
*
- * @return <tt>true</tt> if, and only if, this buffer is equal to the
+ * @return {@code true} if, and only if, this buffer is equal to the
* given object
*/
public boolean equals(Object ob) {
@@ -1368,7 +1367,7 @@
*
* <p> The first character of the resulting string will be the character at
* this buffer's position, while the last character will be the character
- * at index <tt>limit()</tt> - 1. Invoking this method does not
+ * at index {@code limit()} - 1. Invoking this method does not
* change the buffer's position. </p>
*
* @return The specified string
@@ -1388,7 +1387,7 @@
* <p> When viewed as a character sequence, the length of a character
* buffer is simply the number of characters between the position
* (inclusive) and the limit (exclusive); that is, it is equivalent to
- * <tt>remaining()</tt>. </p>
+ * {@code remaining()}. </p>
*
* @return The length of this character buffer
*/
@@ -1402,13 +1401,13 @@
*
* @param index
* The index of the character to be read, relative to the position;
- * must be non-negative and smaller than <tt>remaining()</tt>
+ * must be non-negative and smaller than {@code remaining()}
*
* @return The character at index
- * <tt>position() + index</tt>
+ * <code>position() + index</code>
*
* @throws IndexOutOfBoundsException
- * If the preconditions on <tt>index</tt> do not hold
+ * If the preconditions on {@code index} do not hold
*/
public final char charAt(int index) {
return get(position() + checkIndex(index, 1));
@@ -1422,26 +1421,26 @@
* content of this buffer is mutable then modifications to one buffer will
* cause the other to be modified. The new buffer's capacity will be that
* of this buffer, its position will be
- * <tt>position()</tt> + <tt>start</tt>, and its limit will be
- * <tt>position()</tt> + <tt>end</tt>. The new buffer will be
+ * {@code position()} + {@code start}, and its limit will be
+ * {@code position()} + {@code end}. The new buffer will be
* direct if, and only if, this buffer is direct, and it will be read-only
* if, and only if, this buffer is read-only. </p>
*
* @param start
* The index, relative to the current position, of the first
* character in the subsequence; must be non-negative and no larger
- * than <tt>remaining()</tt>
+ * than {@code remaining()}
*
* @param end
* The index, relative to the current position, of the character
* following the last character in the subsequence; must be no
- * smaller than <tt>start</tt> and no larger than
- * <tt>remaining()</tt>
+ * smaller than {@code start} and no larger than
+ * {@code remaining()}
*
* @return The new character buffer
*
* @throws IndexOutOfBoundsException
- * If the preconditions on <tt>start</tt> and <tt>end</tt>
+ * If the preconditions on {@code start} and {@code end}
* do not hold
*/
public abstract CharBuffer subSequence(int start, int end);
@@ -1453,21 +1452,21 @@
* Appends the specified character sequence to this
* buffer <i>(optional operation)</i>.
*
- * <p> An invocation of this method of the form <tt>dst.append(csq)</tt>
+ * <p> An invocation of this method of the form {@code dst.append(csq)}
* behaves in exactly the same way as the invocation
*
* <pre>
* dst.put(csq.toString()) </pre>
*
- * <p> Depending on the specification of <tt>toString</tt> for the
- * character sequence <tt>csq</tt>, the entire sequence may not be
+ * <p> Depending on the specification of {@code toString} for the
+ * character sequence {@code csq}, the entire sequence may not be
* appended. For instance, invoking the {@link $Type$Buffer#toString()
* toString} method of a character buffer will return a subsequence whose
* content depends upon the buffer's position and limit.
*
* @param csq
- * The character sequence to append. If <tt>csq</tt> is
- * <tt>null</tt>, then the four characters <tt>"null"</tt> are
+ * The character sequence to append. If {@code csq} is
+ * {@code null}, then the four characters {@code "null"} are
* appended to this character buffer.
*
* @return This buffer
@@ -1491,8 +1490,8 @@
* Appends a subsequence of the specified character sequence to this
* buffer <i>(optional operation)</i>.
*
- * <p> An invocation of this method of the form <tt>dst.append(csq, start,
- * end)</tt> when <tt>csq</tt> is not <tt>null</tt>, behaves in exactly the
+ * <p> An invocation of this method of the form {@code dst.append(csq, start,
+ * end)} when {@code csq} is not {@code null}, behaves in exactly the
* same way as the invocation
*
* <pre>
@@ -1500,9 +1499,9 @@
*
* @param csq
* The character sequence from which a subsequence will be
- * appended. If <tt>csq</tt> is <tt>null</tt>, then characters
- * will be appended as if <tt>csq</tt> contained the four
- * characters <tt>"null"</tt>.
+ * appended. If {@code csq} is {@code null}, then characters
+ * will be appended as if {@code csq} contained the four
+ * characters {@code "null"}.
*
* @return This buffer
*
@@ -1510,9 +1509,9 @@
* If there is insufficient space in this buffer
*
* @throws IndexOutOfBoundsException
- * If <tt>start</tt> or <tt>end</tt> are negative, <tt>start</tt>
- * is greater than <tt>end</tt>, or <tt>end</tt> is greater than
- * <tt>csq.length()</tt>
+ * If {@code start} or {@code end} are negative, {@code start}
+ * is greater than {@code end}, or {@code end} is greater than
+ * {@code csq.length()}
*
* @throws ReadOnlyBufferException
* If this buffer is read-only
@@ -1528,7 +1527,7 @@
* Appends the specified $type$ to this
* buffer <i>(optional operation)</i>.
*
- * <p> An invocation of this method of the form <tt>dst.append($x$)</tt>
+ * <p> An invocation of this method of the form {@code dst.append($x$)}
* behaves in exactly the same way as the invocation
*
* <pre>
@@ -1562,7 +1561,7 @@
* Retrieves this buffer's byte order.
*
* <p> The byte order of $a$ $type$ buffer created by allocation or by
- * wrapping an existing <tt>$type$</tt> array is the {@link
+ * wrapping an existing {@code $type$} array is the {@link
* ByteOrder#nativeOrder native order} of the underlying
* hardware. The byte order of $a$ $type$ buffer created as a <a
* href="ByteBuffer.html#views">view</a> of a byte buffer is that of the
diff --git a/jdk/src/java.base/share/classes/java/nio/channels/AsynchronousByteChannel.java b/jdk/src/java.base/share/classes/java/nio/channels/AsynchronousByteChannel.java
index b96a239..56003d5 100644
--- a/jdk/src/java.base/share/classes/java/nio/channels/AsynchronousByteChannel.java
+++ b/jdk/src/java.base/share/classes/java/nio/channels/AsynchronousByteChannel.java
@@ -70,13 +70,13 @@
* {@code 0} without initiating an I/O operation.
*
* <p> Suppose that a byte sequence of length <i>n</i> is read, where
- * <tt>0</tt> <tt><</tt> <i>n</i> <tt><=</tt> <i>r</i>.
+ * {@code 0} {@code <} <i>n</i> {@code <=} <i>r</i>.
* This byte sequence will be transferred into the buffer so that the first
* byte in the sequence is at index <i>p</i> and the last byte is at index
- * <i>p</i> <tt>+</tt> <i>n</i> <tt>-</tt> <tt>1</tt>,
+ * <i>p</i> {@code +} <i>n</i> {@code -} {@code 1},
* where <i>p</i> is the buffer's position at the moment the read is
* performed. Upon completion the buffer's position will be equal to
- * <i>p</i> <tt>+</tt> <i>n</i>; its limit will not have changed.
+ * <i>p</i> {@code +} <i>n</i>; its limit will not have changed.
*
* <p> Buffers are not safe for use by multiple concurrent threads so care
* should be taken to not access the buffer until the operation has
@@ -151,13 +151,13 @@
* {@code 0} without initiating an I/O operation.
*
* <p> Suppose that a byte sequence of length <i>n</i> is written, where
- * <tt>0</tt> <tt><</tt> <i>n</i> <tt><=</tt> <i>r</i>.
+ * {@code 0} {@code <} <i>n</i> {@code <=} <i>r</i>.
* This byte sequence will be transferred from the buffer starting at index
* <i>p</i>, where <i>p</i> is the buffer's position at the moment the
* write is performed; the index of the last byte written will be
- * <i>p</i> <tt>+</tt> <i>n</i> <tt>-</tt> <tt>1</tt>.
+ * <i>p</i> {@code +} <i>n</i> {@code -} {@code 1}.
* Upon completion the buffer's position will be equal to
- * <i>p</i> <tt>+</tt> <i>n</i>; its limit will not have changed.
+ * <i>p</i> {@code +} <i>n</i>; its limit will not have changed.
*
* <p> Buffers are not safe for use by multiple concurrent threads so care
* should be taken to not access the buffer until the operation has
diff --git a/jdk/src/java.base/share/classes/java/nio/channels/AsynchronousServerSocketChannel.java b/jdk/src/java.base/share/classes/java/nio/channels/AsynchronousServerSocketChannel.java
index 29ecbd6..44a2460 100644
--- a/jdk/src/java.base/share/classes/java/nio/channels/AsynchronousServerSocketChannel.java
+++ b/jdk/src/java.base/share/classes/java/nio/channels/AsynchronousServerSocketChannel.java
@@ -41,7 +41,7 @@
* by invoking the {@link #bind(SocketAddress,int) bind} method. Once bound,
* the {@link #accept(Object,CompletionHandler) accept} method
* is used to initiate the accepting of connections to the channel's socket.
- * An attempt to invoke the <tt>accept</tt> method on an unbound channel will
+ * An attempt to invoke the {@code accept} method on an unbound channel will
* cause a {@link NotYetBoundException} to be thrown.
*
* <p> Channels of this type are safe for use by multiple concurrent threads
@@ -122,13 +122,13 @@
* java.nio.channels.spi.AsynchronousChannelProvider#openAsynchronousServerSocketChannel
* openAsynchronousServerSocketChannel} method on the {@link
* java.nio.channels.spi.AsynchronousChannelProvider} object that created
- * the given group. If the group parameter is <tt>null</tt> then the
+ * the given group. If the group parameter is {@code null} then the
* resulting channel is created by the system-wide default provider, and
* bound to the <em>default group</em>.
*
* @param group
* The group to which the newly constructed channel should be bound,
- * or <tt>null</tt> for the default group
+ * or {@code null} for the default group
*
* @return A new asynchronous server socket channel
*
@@ -176,7 +176,7 @@
* </pre></blockquote>
*
* @param local
- * The local address to bind the socket, or <tt>null</tt> to bind
+ * The local address to bind the socket, or {@code null} to bind
* to an automatically assigned socket address
*
* @return This channel
diff --git a/jdk/src/java.base/share/classes/java/nio/channels/AsynchronousSocketChannel.java b/jdk/src/java.base/share/classes/java/nio/channels/AsynchronousSocketChannel.java
index 1ed1e86..d5e2abe 100644
--- a/jdk/src/java.base/share/classes/java/nio/channels/AsynchronousSocketChannel.java
+++ b/jdk/src/java.base/share/classes/java/nio/channels/AsynchronousSocketChannel.java
@@ -452,11 +452,11 @@
* at the moment that the read is attempted.
*
* <p> Suppose that a byte sequence of length <i>n</i> is read, where
- * <tt>0</tt> <tt><</tt> <i>n</i> <tt><=</tt> <i>r</i>.
- * Up to the first <tt>dsts[offset].remaining()</tt> bytes of this sequence
- * are transferred into buffer <tt>dsts[offset]</tt>, up to the next
- * <tt>dsts[offset+1].remaining()</tt> bytes are transferred into buffer
- * <tt>dsts[offset+1]</tt>, and so forth, until the entire byte sequence
+ * {@code 0} {@code <} <i>n</i> {@code <=} <i>r</i>.
+ * Up to the first {@code dsts[offset].remaining()} bytes of this sequence
+ * are transferred into buffer {@code dsts[offset]}, up to the next
+ * {@code dsts[offset+1].remaining()} bytes are transferred into buffer
+ * {@code dsts[offset+1]}, and so forth, until the entire byte sequence
* is transferred into the given buffers. As many bytes as possible are
* transferred into each buffer, hence the final position of each updated
* buffer, except the last updated buffer, is guaranteed to be equal to
@@ -606,11 +606,11 @@
* at the moment that the write is attempted.
*
* <p> Suppose that a byte sequence of length <i>n</i> is written, where
- * <tt>0</tt> <tt><</tt> <i>n</i> <tt><=</tt> <i>r</i>.
- * Up to the first <tt>srcs[offset].remaining()</tt> bytes of this sequence
- * are written from buffer <tt>srcs[offset]</tt>, up to the next
- * <tt>srcs[offset+1].remaining()</tt> bytes are written from buffer
- * <tt>srcs[offset+1]</tt>, and so forth, until the entire byte sequence is
+ * {@code 0} {@code <} <i>n</i> {@code <=} <i>r</i>.
+ * Up to the first {@code srcs[offset].remaining()} bytes of this sequence
+ * are written from buffer {@code srcs[offset]}, up to the next
+ * {@code srcs[offset+1].remaining()} bytes are written from buffer
+ * {@code srcs[offset+1]}, and so forth, until the entire byte sequence is
* written. As many bytes as possible are written from each buffer, hence
* the final position of each updated buffer, except the last updated
* buffer, is guaranteed to be equal to that buffer's limit. The underlying
diff --git a/jdk/src/java.base/share/classes/java/nio/channels/Channel.java b/jdk/src/java.base/share/classes/java/nio/channels/Channel.java
index 663d0e0..5cca15e0 100644
--- a/jdk/src/java.base/share/classes/java/nio/channels/Channel.java
+++ b/jdk/src/java.base/share/classes/java/nio/channels/Channel.java
@@ -58,7 +58,7 @@
/**
* Tells whether or not this channel is open.
*
- * @return <tt>true</tt> if, and only if, this channel is open
+ * @return {@code true} if, and only if, this channel is open
*/
public boolean isOpen();
diff --git a/jdk/src/java.base/share/classes/java/nio/channels/DatagramChannel.java b/jdk/src/java.base/share/classes/java/nio/channels/DatagramChannel.java
index b85c98c..0b3278b 100644
--- a/jdk/src/java.base/share/classes/java/nio/channels/DatagramChannel.java
+++ b/jdk/src/java.base/share/classes/java/nio/channels/DatagramChannel.java
@@ -187,8 +187,8 @@
* operations.
*
* <p> Datagram channels support reading and writing, so this method
- * returns <tt>(</tt>{@link SelectionKey#OP_READ} <tt>|</tt> {@link
- * SelectionKey#OP_WRITE}<tt>)</tt>. </p>
+ * returns {@code (}{@link SelectionKey#OP_READ} {@code |} {@link
+ * SelectionKey#OP_WRITE}{@code )}.
*
* @return The valid-operation set
*/
@@ -341,7 +341,7 @@
* copied into the given byte buffer and its source address is returned.
* If this channel is in non-blocking mode and a datagram is not
* immediately available then this method immediately returns
- * <tt>null</tt>.
+ * {@code null}.
*
* <p> The datagram is transferred into the given byte buffer starting at
* its current position, as if by a regular {@link
@@ -371,7 +371,7 @@
* The buffer into which the datagram is to be transferred
*
* @return The datagram's source address,
- * or <tt>null</tt> if this channel is in non-blocking mode
+ * or {@code null} if this channel is in non-blocking mode
* and no datagram was immediately available
*
* @throws ClosedChannelException
diff --git a/jdk/src/java.base/share/classes/java/nio/channels/FileChannel.java b/jdk/src/java.base/share/classes/java/nio/channels/FileChannel.java
index eb3934d..066ef8a 100644
--- a/jdk/src/java.base/share/classes/java/nio/channels/FileChannel.java
+++ b/jdk/src/java.base/share/classes/java/nio/channels/FileChannel.java
@@ -63,7 +63,7 @@
*
* <li><p> A region of a file may be {@link #map <i>mapped</i>}
* directly into memory; for large files this is often much more efficient
- * than invoking the usual <tt>read</tt> or <tt>write</tt> methods.
+ * than invoking the usual {@code read} or {@code write} methods.
* </p></li>
*
* <li><p> Updates made to a file may be {@link #force <i>forced
@@ -107,10 +107,10 @@
* existing {@link java.io.FileInputStream#getChannel FileInputStream}, {@link
* java.io.FileOutputStream#getChannel FileOutputStream}, or {@link
* java.io.RandomAccessFile#getChannel RandomAccessFile} object by invoking
- * that object's <tt>getChannel</tt> method, which returns a file channel that
+ * that object's {@code getChannel} method, which returns a file channel that
* is connected to the same underlying file. Where the file channel is obtained
* from an existing stream or random access file then the state of the file
- * channel is intimately connected to that of the object whose <tt>getChannel</tt>
+ * channel is intimately connected to that of the object whose {@code getChannel}
* method returned the channel. Changing the channel's position, whether
* explicitly or by reading or writing bytes, will change the file position of
* the originating object, and vice versa. Changing the file's length via the
@@ -128,14 +128,14 @@
* writing. Finally, a channel obtained via the {@link
* java.io.RandomAccessFile#getChannel getChannel} method of a {@link
* java.io.RandomAccessFile} instance will be open for reading if the instance
- * was created with mode <tt>"r"</tt> and will be open for reading and writing
- * if the instance was created with mode <tt>"rw"</tt>.
+ * was created with mode {@code "r"} and will be open for reading and writing
+ * if the instance was created with mode {@code "rw"}.
*
* <a name="append-mode"></a><p> A file channel that is open for writing may be in
* <i>append mode</i>, for example if it was obtained from a file-output stream
* that was created by invoking the {@link
* java.io.FileOutputStream#FileOutputStream(java.io.File,boolean)
- * FileOutputStream(File,boolean)} constructor and passing <tt>true</tt> for
+ * FileOutputStream(File,boolean)} constructor and passing {@code true} for
* the second parameter. In this mode each invocation of a relative write
* operation first advances the position to the end of the file and then writes
* the requested data. Whether the advancement of the position and the writing
@@ -516,10 +516,10 @@
* <p> If the file does not reside on a local device then no such guarantee
* is made.
*
- * <p> The <tt>metaData</tt> parameter can be used to limit the number of
+ * <p> The {@code metaData} parameter can be used to limit the number of
* I/O operations that this method is required to perform. Passing
- * <tt>false</tt> for this parameter indicates that only updates to the
- * file's content need be written to storage; passing <tt>true</tt>
+ * {@code false} for this parameter indicates that only updates to the
+ * file's content need be written to storage; passing {@code true}
* indicates that updates to both the file's content and metadata must be
* written, which generally requires at least one more I/O operation.
* Whether this parameter actually has any effect is dependent upon the
@@ -540,7 +540,7 @@
* force changes made to the buffer's content to be written. </p>
*
* @param metaData
- * If <tt>true</tt> then this method is required to force changes
+ * If {@code true} then this method is required to force changes
* to both the file's content and metadata to be written to
* storage; otherwise, it need only force content changes to be
* written
@@ -557,14 +557,14 @@
* Transfers bytes from this channel's file to the given writable byte
* channel.
*
- * <p> An attempt is made to read up to <tt>count</tt> bytes starting at
- * the given <tt>position</tt> in this channel's file and write them to the
+ * <p> An attempt is made to read up to {@code count} bytes starting at
+ * the given {@code position} in this channel's file and write them to the
* target channel. An invocation of this method may or may not transfer
* all of the requested bytes; whether or not it does so depends upon the
* natures and states of the channels. Fewer than the requested number of
* bytes are transferred if this channel's file contains fewer than
- * <tt>count</tt> bytes starting at the given <tt>position</tt>, or if the
- * target channel is non-blocking and it has fewer than <tt>count</tt>
+ * {@code count} bytes starting at the given {@code position}, or if the
+ * target channel is non-blocking and it has fewer than {@code count}
* bytes free in its output buffer.
*
* <p> This method does not modify this channel's position. If the given
@@ -624,14 +624,14 @@
* Transfers bytes into this channel's file from the given readable byte
* channel.
*
- * <p> An attempt is made to read up to <tt>count</tt> bytes from the
+ * <p> An attempt is made to read up to {@code count} bytes from the
* source channel and write them to this channel's file starting at the
- * given <tt>position</tt>. An invocation of this method may or may not
+ * given {@code position}. An invocation of this method may or may not
* transfer all of the requested bytes; whether or not it does so depends
* upon the natures and states of the channels. Fewer than the requested
* number of bytes will be transferred if the source channel has fewer than
- * <tt>count</tt> bytes remaining, or if the source channel is non-blocking
- * and has fewer than <tt>count</tt> bytes immediately available in its
+ * {@code count} bytes remaining, or if the source channel is non-blocking
+ * and has fewer than {@code count} bytes immediately available in its
* input buffer.
*
* <p> This method does not modify this channel's position. If the given
@@ -704,7 +704,7 @@
* The file position at which the transfer is to begin;
* must be non-negative
*
- * @return The number of bytes read, possibly zero, or <tt>-1</tt> if the
+ * @return The number of bytes read, possibly zero, or {@code -1} if the
* given position is greater than or equal to the file's current
* size
*
@@ -855,7 +855,7 @@
*
* <p> The {@link MappedByteBuffer <i>mapped byte buffer</i>}
* returned by this method will have a position of zero and a limit and
- * capacity of <tt>size</tt>; its mark will be undefined. The buffer and
+ * capacity of {@code size}; its mark will be undefined. The buffer and
* the mapping that it represents will remain valid until the buffer itself
* is garbage-collected.
*
@@ -895,11 +895,11 @@
* @return The mapped byte buffer
*
* @throws NonReadableChannelException
- * If the <tt>mode</tt> is {@link MapMode#READ_ONLY READ_ONLY} but
+ * If the {@code mode} is {@link MapMode#READ_ONLY READ_ONLY} but
* this channel was not opened for reading
*
* @throws NonWritableChannelException
- * If the <tt>mode</tt> is {@link MapMode#READ_WRITE READ_WRITE} or
+ * If the {@code mode} is {@link MapMode#READ_WRITE READ_WRITE} or
* {@link MapMode#PRIVATE PRIVATE} but this channel was not opened
* for both reading and writing
*
@@ -936,7 +936,7 @@
* will be thrown immediately; the thread's interrupt status will not be
* changed.
*
- * <p> The region specified by the <tt>position</tt> and <tt>size</tt>
+ * <p> The region specified by the {@code position} and {@code size}
* parameters need not be contained within, or even overlap, the actual
* underlying file. Lock regions are fixed in size; if a locked region
* initially contains the end of the file and the file grows beyond the
@@ -963,12 +963,12 @@
*
* @param size
* The size of the locked region; must be non-negative, and the sum
- * <tt>position</tt> + <tt>size</tt> must be non-negative
+ * {@code position} + {@code size} must be non-negative
*
* @param shared
- * <tt>true</tt> to request a shared lock, in which case this
+ * {@code true} to request a shared lock, in which case this
* channel must be open for reading (and possibly writing);
- * <tt>false</tt> to request an exclusive lock, in which case this
+ * {@code false} to request an exclusive lock, in which case this
* channel must be open for writing (and possibly reading)
*
* @return A lock object representing the newly-acquired lock
@@ -994,11 +994,11 @@
* region
*
* @throws NonReadableChannelException
- * If <tt>shared</tt> is <tt>true</tt> this channel was not
+ * If {@code shared} is {@code true} this channel was not
* opened for reading
*
* @throws NonWritableChannelException
- * If <tt>shared</tt> is <tt>false</tt> but this channel was not
+ * If {@code shared} is {@code false} but this channel was not
* opened for writing
*
* @throws IOException
@@ -1014,7 +1014,7 @@
/**
* Acquires an exclusive lock on this channel's file.
*
- * <p> An invocation of this method of the form <tt>fc.lock()</tt> behaves
+ * <p> An invocation of this method of the form {@code fc.lock()} behaves
* in exactly the same way as the invocation
*
* <pre>
@@ -1060,10 +1060,10 @@
* immediately, either having acquired a lock on the requested region or
* having failed to do so. If it fails to acquire a lock because an
* overlapping lock is held by another program then it returns
- * <tt>null</tt>. If it fails to acquire a lock for any other reason then
+ * {@code null}. If it fails to acquire a lock for any other reason then
* an appropriate exception is thrown.
*
- * <p> The region specified by the <tt>position</tt> and <tt>size</tt>
+ * <p> The region specified by the {@code position} and {@code size}
* parameters need not be contained within, or even overlap, the actual
* underlying file. Lock regions are fixed in size; if a locked region
* initially contains the end of the file and the file grows beyond the
@@ -1090,14 +1090,14 @@
*
* @param size
* The size of the locked region; must be non-negative, and the sum
- * <tt>position</tt> + <tt>size</tt> must be non-negative
+ * {@code position} + {@code size} must be non-negative
*
* @param shared
- * <tt>true</tt> to request a shared lock,
- * <tt>false</tt> to request an exclusive lock
+ * {@code true} to request a shared lock,
+ * {@code false} to request an exclusive lock
*
* @return A lock object representing the newly-acquired lock,
- * or <tt>null</tt> if the lock could not be acquired
+ * or {@code null} if the lock could not be acquired
* because another program holds an overlapping lock
*
* @throws IllegalArgumentException
@@ -1125,14 +1125,14 @@
/**
* Attempts to acquire an exclusive lock on this channel's file.
*
- * <p> An invocation of this method of the form <tt>fc.tryLock()</tt>
+ * <p> An invocation of this method of the form {@code fc.tryLock()}
* behaves in exactly the same way as the invocation
*
* <pre>
* fc.{@link #tryLock(long,long,boolean) tryLock}(0L, Long.MAX_VALUE, false) </pre>
*
* @return A lock object representing the newly-acquired lock,
- * or <tt>null</tt> if the lock could not be acquired
+ * or {@code null} if the lock could not be acquired
* because another program holds an overlapping lock
*
* @throws ClosedChannelException
diff --git a/jdk/src/java.base/share/classes/java/nio/channels/FileLock.java b/jdk/src/java.base/share/classes/java/nio/channels/FileLock.java
index 73e3511..3a5c6a1 100644
--- a/jdk/src/java.base/share/classes/java/nio/channels/FileLock.java
+++ b/jdk/src/java.base/share/classes/java/nio/channels/FileLock.java
@@ -136,11 +136,11 @@
*
* @param size
* The size of the locked region; must be non-negative, and the sum
- * <tt>position</tt> + <tt>size</tt> must be non-negative
+ * {@code position} + {@code size} must be non-negative
*
* @param shared
- * <tt>true</tt> if this lock is shared,
- * <tt>false</tt> if it is exclusive
+ * {@code true} if this lock is shared,
+ * {@code false} if it is exclusive
*
* @throws IllegalArgumentException
* If the preconditions on the parameters do not hold
@@ -173,11 +173,11 @@
*
* @param size
* The size of the locked region; must be non-negative, and the sum
- * <tt>position</tt> + <tt>size</tt> must be non-negative
+ * {@code position} + {@code size} must be non-negative
*
* @param shared
- * <tt>true</tt> if this lock is shared,
- * <tt>false</tt> if it is exclusive
+ * {@code true} if this lock is shared,
+ * {@code false} if it is exclusive
*
* @throws IllegalArgumentException
* If the preconditions on the parameters do not hold
@@ -254,8 +254,8 @@
/**
* Tells whether this lock is shared.
*
- * @return <tt>true</tt> if lock is shared,
- * <tt>false</tt> if it is exclusive
+ * @return {@code true} if lock is shared,
+ * {@code false} if it is exclusive
*/
public final boolean isShared() {
return shared;
@@ -269,7 +269,7 @@
* @param size
* The size of the lock range
*
- * @return <tt>true</tt> if, and only if, this lock and the given lock
+ * @return {@code true} if, and only if, this lock and the given lock
* range overlap by at least one byte
*/
public final boolean overlaps(long position, long size) {
@@ -286,7 +286,7 @@
* <p> A lock object remains valid until it is released or the associated
* file channel is closed, whichever comes first. </p>
*
- * @return <tt>true</tt> if, and only if, this lock is valid
+ * @return {@code true} if, and only if, this lock is valid
*/
public abstract boolean isValid();
diff --git a/jdk/src/java.base/share/classes/java/nio/channels/GatheringByteChannel.java b/jdk/src/java.base/share/classes/java/nio/channels/GatheringByteChannel.java
index 9c50d93..f2ae40e 100644
--- a/jdk/src/java.base/share/classes/java/nio/channels/GatheringByteChannel.java
+++ b/jdk/src/java.base/share/classes/java/nio/channels/GatheringByteChannel.java
@@ -66,11 +66,11 @@
* at the moment that this method is invoked.
*
* <p> Suppose that a byte sequence of length <i>n</i> is written, where
- * <tt>0</tt> <tt><=</tt> <i>n</i> <tt><=</tt> <i>r</i>.
- * Up to the first <tt>srcs[offset].remaining()</tt> bytes of this sequence
- * are written from buffer <tt>srcs[offset]</tt>, up to the next
- * <tt>srcs[offset+1].remaining()</tt> bytes are written from buffer
- * <tt>srcs[offset+1]</tt>, and so forth, until the entire byte sequence is
+ * {@code 0} {@code <=} <i>n</i> {@code <=} <i>r</i>.
+ * Up to the first {@code srcs[offset].remaining()} bytes of this sequence
+ * are written from buffer {@code srcs[offset]}, up to the next
+ * {@code srcs[offset+1].remaining()} bytes are written from buffer
+ * {@code srcs[offset+1]}, and so forth, until the entire byte sequence is
* written. As many bytes as possible are written from each buffer, hence
* the final position of each updated buffer, except the last updated
* buffer, is guaranteed to be equal to that buffer's limit.
@@ -92,17 +92,17 @@
* @param offset
* The offset within the buffer array of the first buffer from
* which bytes are to be retrieved; must be non-negative and no
- * larger than <tt>srcs.length</tt>
+ * larger than {@code srcs.length}
*
* @param length
* The maximum number of buffers to be accessed; must be
* non-negative and no larger than
- * <tt>srcs.length</tt> - <tt>offset</tt>
+ * {@code srcs.length} - {@code offset}
*
* @return The number of bytes written, possibly zero
*
* @throws IndexOutOfBoundsException
- * If the preconditions on the <tt>offset</tt> and <tt>length</tt>
+ * If the preconditions on the {@code offset} and {@code length}
* parameters do not hold
*
* @throws NonWritableChannelException
@@ -131,7 +131,7 @@
/**
* Writes a sequence of bytes to this channel from the given buffers.
*
- * <p> An invocation of this method of the form <tt>c.write(srcs)</tt>
+ * <p> An invocation of this method of the form {@code c.write(srcs)}
* behaves in exactly the same manner as the invocation
*
* <blockquote><pre>
diff --git a/jdk/src/java.base/share/classes/java/nio/channels/InterruptibleChannel.java b/jdk/src/java.base/share/classes/java/nio/channels/InterruptibleChannel.java
index 0e49aa6..d13a37a 100644
--- a/jdk/src/java.base/share/classes/java/nio/channels/InterruptibleChannel.java
+++ b/jdk/src/java.base/share/classes/java/nio/channels/InterruptibleChannel.java
@@ -54,7 +54,7 @@
*
* <p> A channel supports asynchronous closing and interruption if, and only
* if, it implements this interface. This can be tested at runtime, if
- * necessary, via the <tt>instanceof</tt> operator.
+ * necessary, via the {@code instanceof} operator.
*
*
* @author Mark Reinhold
diff --git a/jdk/src/java.base/share/classes/java/nio/channels/ReadableByteChannel.java b/jdk/src/java.base/share/classes/java/nio/channels/ReadableByteChannel.java
index 4cd99c0..83fd12b 100644
--- a/jdk/src/java.base/share/classes/java/nio/channels/ReadableByteChannel.java
+++ b/jdk/src/java.base/share/classes/java/nio/channels/ReadableByteChannel.java
@@ -52,16 +52,16 @@
*
* <p> An attempt is made to read up to <i>r</i> bytes from the channel,
* where <i>r</i> is the number of bytes remaining in the buffer, that is,
- * <tt>dst.remaining()</tt>, at the moment this method is invoked.
+ * {@code dst.remaining()}, at the moment this method is invoked.
*
* <p> Suppose that a byte sequence of length <i>n</i> is read, where
- * <tt>0</tt> <tt><=</tt> <i>n</i> <tt><=</tt> <i>r</i>.
+ * {@code 0} {@code <=} <i>n</i> {@code <=} <i>r</i>.
* This byte sequence will be transferred into the buffer so that the first
* byte in the sequence is at index <i>p</i> and the last byte is at index
- * <i>p</i> <tt>+</tt> <i>n</i> <tt>-</tt> <tt>1</tt>,
+ * <i>p</i> {@code +} <i>n</i> {@code -} {@code 1},
* where <i>p</i> is the buffer's position at the moment this method is
* invoked. Upon return the buffer's position will be equal to
- * <i>p</i> <tt>+</tt> <i>n</i>; its limit will not have changed.
+ * <i>p</i> {@code +} <i>n</i>; its limit will not have changed.
*
* <p> A read operation might not fill the buffer, and in fact it might not
* read any bytes at all. Whether or not it does so depends upon the
@@ -81,7 +81,7 @@
* @param dst
* The buffer into which bytes are to be transferred
*
- * @return The number of bytes read, possibly zero, or <tt>-1</tt> if the
+ * @return The number of bytes read, possibly zero, or {@code -1} if the
* channel has reached end-of-stream
*
* @throws NonReadableChannelException
diff --git a/jdk/src/java.base/share/classes/java/nio/channels/ScatteringByteChannel.java b/jdk/src/java.base/share/classes/java/nio/channels/ScatteringByteChannel.java
index 7922909..d449397 100644
--- a/jdk/src/java.base/share/classes/java/nio/channels/ScatteringByteChannel.java
+++ b/jdk/src/java.base/share/classes/java/nio/channels/ScatteringByteChannel.java
@@ -66,11 +66,11 @@
* at the moment that this method is invoked.
*
* <p> Suppose that a byte sequence of length <i>n</i> is read, where
- * <tt>0</tt> <tt><=</tt> <i>n</i> <tt><=</tt> <i>r</i>.
- * Up to the first <tt>dsts[offset].remaining()</tt> bytes of this sequence
- * are transferred into buffer <tt>dsts[offset]</tt>, up to the next
- * <tt>dsts[offset+1].remaining()</tt> bytes are transferred into buffer
- * <tt>dsts[offset+1]</tt>, and so forth, until the entire byte sequence
+ * {@code 0} {@code <=} <i>n</i> {@code <=} <i>r</i>.
+ * Up to the first {@code dsts[offset].remaining()} bytes of this sequence
+ * are transferred into buffer {@code dsts[offset]}, up to the next
+ * {@code dsts[offset+1].remaining()} bytes are transferred into buffer
+ * {@code dsts[offset+1]}, and so forth, until the entire byte sequence
* is transferred into the given buffers. As many bytes as possible are
* transferred into each buffer, hence the final position of each updated
* buffer, except the last updated buffer, is guaranteed to be equal to
@@ -87,18 +87,18 @@
* @param offset
* The offset within the buffer array of the first buffer into
* which bytes are to be transferred; must be non-negative and no
- * larger than <tt>dsts.length</tt>
+ * larger than {@code dsts.length}
*
* @param length
* The maximum number of buffers to be accessed; must be
* non-negative and no larger than
- * <tt>dsts.length</tt> - <tt>offset</tt>
+ * {@code dsts.length} - {@code offset}
*
* @return The number of bytes read, possibly zero,
- * or <tt>-1</tt> if the channel has reached end-of-stream
+ * or {@code -1} if the channel has reached end-of-stream
*
* @throws IndexOutOfBoundsException
- * If the preconditions on the <tt>offset</tt> and <tt>length</tt>
+ * If the preconditions on the {@code offset} and {@code length}
* parameters do not hold
*
* @throws NonReadableChannelException
@@ -126,7 +126,7 @@
/**
* Reads a sequence of bytes from this channel into the given buffers.
*
- * <p> An invocation of this method of the form <tt>c.read(dsts)</tt>
+ * <p> An invocation of this method of the form {@code c.read(dsts)}
* behaves in exactly the same manner as the invocation
*
* <blockquote><pre>
@@ -136,7 +136,7 @@
* The buffers into which bytes are to be transferred
*
* @return The number of bytes read, possibly zero,
- * or <tt>-1</tt> if the channel has reached end-of-stream
+ * or {@code -1} if the channel has reached end-of-stream
*
* @throws NonReadableChannelException
* If this channel was not opened for reading
diff --git a/jdk/src/java.base/share/classes/java/nio/channels/SelectableChannel.java b/jdk/src/java.base/share/classes/java/nio/channels/SelectableChannel.java
index 997d5c5..8cf4dab 100644
--- a/jdk/src/java.base/share/classes/java/nio/channels/SelectableChannel.java
+++ b/jdk/src/java.base/share/classes/java/nio/channels/SelectableChannel.java
@@ -132,7 +132,7 @@
* of its keys have been cancelled. A channel may also remain registered
* for some time after it is closed. </p>
*
- * @return <tt>true</tt> if, and only if, this channel is registered
+ * @return {@code true} if, and only if, this channel is registered
*/
public abstract boolean isRegistered();
//
@@ -146,7 +146,7 @@
* The selector
*
* @return The key returned when this channel was last registered with the
- * given selector, or <tt>null</tt> if this channel is not
+ * given selector, or {@code null} if this channel is not
* currently registered with that selector
*/
public abstract SelectionKey keyFor(Selector sel);
@@ -159,16 +159,16 @@
*
* <p> If this channel is currently registered with the given selector then
* the selection key representing that registration is returned. The key's
- * interest set will have been changed to <tt>ops</tt>, as if by invoking
+ * interest set will have been changed to {@code ops}, as if by invoking
* the {@link SelectionKey#interestOps(int) interestOps(int)} method. If
- * the <tt>att</tt> argument is not <tt>null</tt> then the key's attachment
+ * the {@code att} argument is not {@code null} then the key's attachment
* will have been set to that value. A {@link CancelledKeyException} will
* be thrown if the key has already been cancelled.
*
* <p> Otherwise this channel has not yet been registered with the given
* selector, so it is registered and the resulting new key is returned.
- * The key's initial interest set will be <tt>ops</tt> and its attachment
- * will be <tt>att</tt>.
+ * The key's initial interest set will be {@code ops} and its attachment
+ * will be {@code att}.
*
* <p> This method may be invoked at any time. If this method is invoked
* while another invocation of this method or of the {@link
@@ -189,7 +189,7 @@
* The interest set for the resulting key
*
* @param att
- * The attachment for the resulting key; may be <tt>null</tt>
+ * The attachment for the resulting key; may be {@code null}
*
* @throws ClosedChannelException
* If this channel is closed
@@ -209,7 +209,7 @@
* but the corresponding key has already been cancelled
*
* @throws IllegalArgumentException
- * If a bit in the <tt>ops</tt> set does not correspond to an
+ * If a bit in the {@code ops} set does not correspond to an
* operation that is supported by this channel, that is, if
* {@code set & ~validOps() != 0}
*
@@ -235,13 +235,13 @@
*
* <p> An invocation of this convenience method of the form
*
- * <blockquote><tt>sc.register(sel, ops)</tt></blockquote>
+ * <blockquote>{@code sc.register(sel, ops)}</blockquote>
*
* behaves in exactly the same way as the invocation
*
- * <blockquote><tt>sc.{@link
+ * <blockquote>{@code sc.}{@link
* #register(java.nio.channels.Selector,int,java.lang.Object)
- * register}(sel, ops, null)</tt></blockquote>
+ * register(sel, ops, null)}</blockquote>
*
* @param sel
* The selector with which this channel is to be registered
@@ -267,7 +267,7 @@
* but the corresponding key has already been cancelled
*
* @throws IllegalArgumentException
- * If a bit in <tt>ops</tt> does not correspond to an operation
+ * If a bit in {@code ops} does not correspond to an operation
* that is supported by this channel, that is, if {@code set &
* ~validOps() != 0}
*
@@ -296,8 +296,8 @@
* of the {@link #register(Selector, int) register} method is in progress
* then it will first block until the other operation is complete. </p>
*
- * @param block If <tt>true</tt> then this channel will be placed in
- * blocking mode; if <tt>false</tt> then it will be placed
+ * @param block If {@code true} then this channel will be placed in
+ * blocking mode; if {@code false} then it will be placed
* non-blocking mode
*
* @return This selectable channel
@@ -306,7 +306,7 @@
* If this channel is closed
*
* @throws IllegalBlockingModeException
- * If <tt>block</tt> is <tt>true</tt> and this channel is
+ * If {@code block} is {@code true} and this channel is
* registered with one or more selectors
*
* @throws IOException
@@ -327,7 +327,7 @@
* <p> If this channel is closed then the value returned by this method is
* not specified. </p>
*
- * @return <tt>true</tt> if, and only if, this channel is in blocking mode
+ * @return {@code true} if, and only if, this channel is in blocking mode
*/
public abstract boolean isBlocking();
diff --git a/jdk/src/java.base/share/classes/java/nio/channels/SelectionKey.java b/jdk/src/java.base/share/classes/java/nio/channels/SelectionKey.java
index 00ea670..86c133d 100644
--- a/jdk/src/java.base/share/classes/java/nio/channels/SelectionKey.java
+++ b/jdk/src/java.base/share/classes/java/nio/channels/SelectionKey.java
@@ -139,7 +139,7 @@
* <p> A key is valid upon creation and remains so until it is cancelled,
* its channel is closed, or its selector is closed. </p>
*
- * @return <tt>true</tt> if, and only if, this key is valid
+ * @return {@code true} if, and only if, this key is valid
*/
public abstract boolean isValid();
@@ -218,11 +218,11 @@
* Operation-set bit for read operations.
*
* <p> Suppose that a selection key's interest set contains
- * <tt>OP_READ</tt> at the start of a <a
+ * {@code OP_READ} at the start of a <a
* href="Selector.html#selop">selection operation</a>. If the selector
* detects that the corresponding channel is ready for reading, has reached
* end-of-stream, has been remotely shut down for further reading, or has
- * an error pending, then it will add <tt>OP_READ</tt> to the key's
+ * an error pending, then it will add {@code OP_READ} to the key's
* ready-operation set and add the key to its selected-key set. </p>
*/
public static final int OP_READ = 1 << 0;
@@ -231,11 +231,11 @@
* Operation-set bit for write operations.
*
* <p> Suppose that a selection key's interest set contains
- * <tt>OP_WRITE</tt> at the start of a <a
+ * {@code OP_WRITE} at the start of a <a
* href="Selector.html#selop">selection operation</a>. If the selector
* detects that the corresponding channel is ready for writing, has been
* remotely shut down for further writing, or has an error pending, then it
- * will add <tt>OP_WRITE</tt> to the key's ready set and add the key to its
+ * will add {@code OP_WRITE} to the key's ready set and add the key to its
* selected-key set. </p>
*/
public static final int OP_WRITE = 1 << 2;
@@ -244,11 +244,11 @@
* Operation-set bit for socket-connect operations.
*
* <p> Suppose that a selection key's interest set contains
- * <tt>OP_CONNECT</tt> at the start of a <a
+ * {@code OP_CONNECT} at the start of a <a
* href="Selector.html#selop">selection operation</a>. If the selector
* detects that the corresponding socket channel is ready to complete its
* connection sequence, or has an error pending, then it will add
- * <tt>OP_CONNECT</tt> to the key's ready set and add the key to its
+ * {@code OP_CONNECT} to the key's ready set and add the key to its
* selected-key set. </p>
*/
public static final int OP_CONNECT = 1 << 3;
@@ -257,11 +257,11 @@
* Operation-set bit for socket-accept operations.
*
* <p> Suppose that a selection key's interest set contains
- * <tt>OP_ACCEPT</tt> at the start of a <a
+ * {@code OP_ACCEPT} at the start of a <a
* href="Selector.html#selop">selection operation</a>. If the selector
* detects that the corresponding server-socket channel is ready to accept
* another connection, or has an error pending, then it will add
- * <tt>OP_ACCEPT</tt> to the key's ready set and add the key to its
+ * {@code OP_ACCEPT} to the key's ready set and add the key to its
* selected-key set. </p>
*/
public static final int OP_ACCEPT = 1 << 4;
@@ -269,7 +269,7 @@
/**
* Tests whether this key's channel is ready for reading.
*
- * <p> An invocation of this method of the form <tt>k.isReadable()</tt>
+ * <p> An invocation of this method of the form {@code k.isReadable()}
* behaves in exactly the same way as the expression
*
* <blockquote><pre>{@code
@@ -277,9 +277,9 @@
* }</pre></blockquote>
*
* <p> If this key's channel does not support read operations then this
- * method always returns <tt>false</tt>. </p>
+ * method always returns {@code false}. </p>
*
- * @return <tt>true</tt> if, and only if,
+ * @return {@code true} if, and only if,
{@code readyOps() & OP_READ} is nonzero
*
* @throws CancelledKeyException
@@ -292,7 +292,7 @@
/**
* Tests whether this key's channel is ready for writing.
*
- * <p> An invocation of this method of the form <tt>k.isWritable()</tt>
+ * <p> An invocation of this method of the form {@code k.isWritable()}
* behaves in exactly the same way as the expression
*
* <blockquote><pre>{@code
@@ -300,9 +300,9 @@
* }</pre></blockquote>
*
* <p> If this key's channel does not support write operations then this
- * method always returns <tt>false</tt>. </p>
+ * method always returns {@code false}. </p>
*
- * @return <tt>true</tt> if, and only if,
+ * @return {@code true} if, and only if,
* {@code readyOps() & OP_WRITE} is nonzero
*
* @throws CancelledKeyException
@@ -316,7 +316,7 @@
* Tests whether this key's channel has either finished, or failed to
* finish, its socket-connection operation.
*
- * <p> An invocation of this method of the form <tt>k.isConnectable()</tt>
+ * <p> An invocation of this method of the form {@code k.isConnectable()}
* behaves in exactly the same way as the expression
*
* <blockquote><pre>{@code
@@ -324,9 +324,9 @@
* }</pre></blockquote>
*
* <p> If this key's channel does not support socket-connect operations
- * then this method always returns <tt>false</tt>. </p>
+ * then this method always returns {@code false}. </p>
*
- * @return <tt>true</tt> if, and only if,
+ * @return {@code true} if, and only if,
* {@code readyOps() & OP_CONNECT} is nonzero
*
* @throws CancelledKeyException
@@ -340,7 +340,7 @@
* Tests whether this key's channel is ready to accept a new socket
* connection.
*
- * <p> An invocation of this method of the form <tt>k.isAcceptable()</tt>
+ * <p> An invocation of this method of the form {@code k.isAcceptable()}
* behaves in exactly the same way as the expression
*
* <blockquote><pre>{@code
@@ -348,9 +348,9 @@
* }</pre></blockquote>
*
* <p> If this key's channel does not support socket-accept operations then
- * this method always returns <tt>false</tt>. </p>
+ * this method always returns {@code false}. </p>
*
- * @return <tt>true</tt> if, and only if,
+ * @return {@code true} if, and only if,
* {@code readyOps() & OP_ACCEPT} is nonzero
*
* @throws CancelledKeyException
@@ -376,13 +376,13 @@
* <p> An attached object may later be retrieved via the {@link #attachment()
* attachment} method. Only one object may be attached at a time; invoking
* this method causes any previous attachment to be discarded. The current
- * attachment may be discarded by attaching <tt>null</tt>. </p>
+ * attachment may be discarded by attaching {@code null}. </p>
*
* @param ob
- * The object to be attached; may be <tt>null</tt>
+ * The object to be attached; may be {@code null}
*
* @return The previously-attached object, if any,
- * otherwise <tt>null</tt>
+ * otherwise {@code null}
*/
public final Object attach(Object ob) {
return attachmentUpdater.getAndSet(this, ob);
@@ -392,7 +392,7 @@
* Retrieves the current attachment.
*
* @return The object currently attached to this key,
- * or <tt>null</tt> if there is no attachment
+ * or {@code null} if there is no attachment
*/
public final Object attachment() {
return attachment;
diff --git a/jdk/src/java.base/share/classes/java/nio/channels/Selector.java b/jdk/src/java.base/share/classes/java/nio/channels/Selector.java
index ea72acb..cfed526 100644
--- a/jdk/src/java.base/share/classes/java/nio/channels/Selector.java
+++ b/jdk/src/java.base/share/classes/java/nio/channels/Selector.java
@@ -230,7 +230,7 @@
/**
* Tells whether or not this selector is open.
*
- * @return <tt>true</tt> if, and only if, this selector is open
+ * @return {@code true} if, and only if, this selector is open
*/
public abstract boolean isOpen();
@@ -309,7 +309,7 @@
* <p> This method does not offer real-time guarantees: It schedules the
* timeout as if by invoking the {@link Object#wait(long)} method. </p>
*
- * @param timeout If positive, block for up to <tt>timeout</tt>
+ * @param timeout If positive, block for up to {@code timeout}
* milliseconds, more or less, while waiting for a
* channel to become ready; if zero, block indefinitely;
* must not be negative
diff --git a/jdk/src/java.base/share/classes/java/nio/channels/ServerSocketChannel.java b/jdk/src/java.base/share/classes/java/nio/channels/ServerSocketChannel.java
index 8d967b3..7c9666bb 100644
--- a/jdk/src/java.base/share/classes/java/nio/channels/ServerSocketChannel.java
+++ b/jdk/src/java.base/share/classes/java/nio/channels/ServerSocketChannel.java
@@ -223,7 +223,7 @@
* Accepts a connection made to this channel's socket.
*
* <p> If this channel is in non-blocking mode then this method will
- * immediately return <tt>null</tt> if there are no pending connections.
+ * immediately return {@code null} if there are no pending connections.
* Otherwise it will block indefinitely until a new connection is available
* or an I/O error occurs.
*
@@ -239,7 +239,7 @@
* java.lang.SecurityManager#checkAccept checkAccept} method. </p>
*
* @return The socket channel for the new connection,
- * or <tt>null</tt> if this channel is in non-blocking mode
+ * or {@code null} if this channel is in non-blocking mode
* and no connection is available to be accepted
*
* @throws ClosedChannelException
diff --git a/jdk/src/java.base/share/classes/java/nio/channels/SocketChannel.java b/jdk/src/java.base/share/classes/java/nio/channels/SocketChannel.java
index eb13b15..c25cc68 100644
--- a/jdk/src/java.base/share/classes/java/nio/channels/SocketChannel.java
+++ b/jdk/src/java.base/share/classes/java/nio/channels/SocketChannel.java
@@ -58,7 +58,7 @@
* If the input side of a socket is shut down by one thread while another
* thread is blocked in a read operation on the socket's channel, then the read
* operation in the blocked thread will complete without reading any bytes and
- * will return <tt>-1</tt>. If the output side of a socket is shut down by one
+ * will return {@code -1}. If the output side of a socket is shut down by one
* thread while another thread is blocked in a write operation on the socket's
* channel, then the blocked thread will receive an {@link
* AsynchronousCloseException}.
@@ -150,7 +150,7 @@
*
* <p> This convenience method works as if by invoking the {@link #open()}
* method, invoking the {@link #connect(SocketAddress) connect} method upon
- * the resulting socket channel, passing it <tt>remote</tt>, and then
+ * the resulting socket channel, passing it {@code remote}, and then
* returning that channel. </p>
*
* @param remote
@@ -204,9 +204,9 @@
* operations.
*
* <p> Socket channels support connecting, reading, and writing, so this
- * method returns <tt>(</tt>{@link SelectionKey#OP_CONNECT}
- * <tt>|</tt> {@link SelectionKey#OP_READ} <tt>|</tt> {@link
- * SelectionKey#OP_WRITE}<tt>)</tt>. </p>
+ * method returns {@code (}{@link SelectionKey#OP_CONNECT}
+ * {@code |} {@link SelectionKey#OP_READ} {@code |} {@link
+ * SelectionKey#OP_WRITE}{@code )}.
*
* @return The valid-operation set
*/
@@ -304,7 +304,7 @@
/**
* Tells whether or not this channel's network socket is connected.
*
- * @return <tt>true</tt> if, and only if, this channel's network socket
+ * @return {@code true} if, and only if, this channel's network socket
* is {@link #isOpen open} and connected
*/
public abstract boolean isConnected();
@@ -313,7 +313,7 @@
* Tells whether or not a connection operation is in progress on this
* channel.
*
- * @return <tt>true</tt> if, and only if, a connection operation has been
+ * @return {@code true} if, and only if, a connection operation has been
* initiated on this channel but not yet completed by invoking the
* {@link #finishConnect finishConnect} method
*/
@@ -325,8 +325,8 @@
* <p> If this channel is in non-blocking mode then an invocation of this
* method initiates a non-blocking connection operation. If the connection
* is established immediately, as can happen with a local connection, then
- * this method returns <tt>true</tt>. Otherwise this method returns
- * <tt>false</tt> and the connection operation must later be completed by
+ * this method returns {@code true}. Otherwise this method returns
+ * {@code false} and the connection operation must later be completed by
* invoking the {@link #finishConnect finishConnect} method.
*
* <p> If this channel is in blocking mode then an invocation of this
@@ -349,8 +349,8 @@
* @param remote
* The remote address to which this channel is to be connected
*
- * @return <tt>true</tt> if a connection was established,
- * <tt>false</tt> if this channel is in non-blocking mode
+ * @return {@code true} if a connection was established,
+ * {@code false} if this channel is in non-blocking mode
* and the connection operation is in progress
*
* @throws AlreadyConnectedException
@@ -400,11 +400,11 @@
* {@link java.io.IOException} to be thrown.
*
* <p> If this channel is already connected then this method will not block
- * and will immediately return <tt>true</tt>. If this channel is in
- * non-blocking mode then this method will return <tt>false</tt> if the
+ * and will immediately return {@code true}. If this channel is in
+ * non-blocking mode then this method will return {@code false} if the
* connection process is not yet complete. If this channel is in blocking
* mode then this method will block until the connection either completes
- * or fails, and will always either return <tt>true</tt> or throw a checked
+ * or fails, and will always either return {@code true} or throw a checked
* exception describing the failure.
*
* <p> This method may be invoked at any time. If a read or write
@@ -414,7 +414,7 @@
* invocation of this method throws a checked exception, then the channel
* will be closed. </p>
*
- * @return <tt>true</tt> if, and only if, this channel's socket is now
+ * @return {@code true} if, and only if, this channel's socket is now
* connected
*
* @throws NoConnectionPendingException
diff --git a/jdk/src/java.base/share/classes/java/nio/channels/WritableByteChannel.java b/jdk/src/java.base/share/classes/java/nio/channels/WritableByteChannel.java
index b2ea065..ef8efa5 100644
--- a/jdk/src/java.base/share/classes/java/nio/channels/WritableByteChannel.java
+++ b/jdk/src/java.base/share/classes/java/nio/channels/WritableByteChannel.java
@@ -54,16 +54,16 @@
*
* <p> An attempt is made to write up to <i>r</i> bytes to the channel,
* where <i>r</i> is the number of bytes remaining in the buffer, that is,
- * <tt>src.remaining()</tt>, at the moment this method is invoked.
+ * {@code src.remaining()}, at the moment this method is invoked.
*
* <p> Suppose that a byte sequence of length <i>n</i> is written, where
- * <tt>0</tt> <tt><=</tt> <i>n</i> <tt><=</tt> <i>r</i>.
+ * {@code 0} {@code <=} <i>n</i> {@code <=} <i>r</i>.
* This byte sequence will be transferred from the buffer starting at index
* <i>p</i>, where <i>p</i> is the buffer's position at the moment this
* method is invoked; the index of the last byte written will be
- * <i>p</i> <tt>+</tt> <i>n</i> <tt>-</tt> <tt>1</tt>.
+ * <i>p</i> {@code +} <i>n</i> {@code -} {@code 1}.
* Upon return the buffer's position will be equal to
- * <i>p</i> <tt>+</tt> <i>n</i>; its limit will not have changed.
+ * <i>p</i> {@code +} <i>n</i>; its limit will not have changed.
*
* <p> Unless otherwise specified, a write operation will return only after
* writing all of the <i>r</i> requested bytes. Some types of channels,
diff --git a/jdk/src/java.base/share/classes/java/nio/channels/package-info.java b/jdk/src/java.base/share/classes/java/nio/channels/package-info.java
index 8118347..b38bdea 100644
--- a/jdk/src/java.base/share/classes/java/nio/channels/package-info.java
+++ b/jdk/src/java.base/share/classes/java/nio/channels/package-info.java
@@ -32,29 +32,29 @@
*
* <blockquote><table cellspacing=1 cellpadding=0 summary="Lists channels and their descriptions">
* <tr><th align="left">Channels</th><th align="left">Description</th></tr>
- * <tr><td valign=top><tt><i>{@link java.nio.channels.Channel}</i></tt></td>
+ * <tr><td valign=top><i>{@link java.nio.channels.Channel}</i></td>
* <td>A nexus for I/O operations</td></tr>
- * <tr><td valign=top><tt> <i>{@link java.nio.channels.ReadableByteChannel}</i></tt></td>
+ * <tr><td valign=top> <i>{@link java.nio.channels.ReadableByteChannel}</i></td>
* <td>Can read into a buffer</td></tr>
- * <tr><td valign=top><tt> <i>{@link java.nio.channels.ScatteringByteChannel} </i></tt></td>
+ * <tr><td valign=top> <i>{@link java.nio.channels.ScatteringByteChannel} </i></td>
* <td>Can read into a sequence of buffers</td></tr>
- * <tr><td valign=top><tt> <i>{@link java.nio.channels.WritableByteChannel}</i></tt></td>
+ * <tr><td valign=top> <i>{@link java.nio.channels.WritableByteChannel}</i></td>
* <td>Can write from a buffer</td></tr>
- * <tr><td valign=top><tt> <i>{@link java.nio.channels.GatheringByteChannel}</i></tt></td>
+ * <tr><td valign=top> <i>{@link java.nio.channels.GatheringByteChannel}</i></td>
* <td>Can write from a sequence of buffers</td></tr>
- * <tr><td valign=top><tt> <i>{@link java.nio.channels.ByteChannel}</i></tt></td>
+ * <tr><td valign=top> <i>{@link java.nio.channels.ByteChannel}</i></td>
* <td>Can read/write to/from a buffer</td></tr>
- * <tr><td valign=top><tt> <i>{@link java.nio.channels.SeekableByteChannel}</i></tt></td>
+ * <tr><td valign=top> <i>{@link java.nio.channels.SeekableByteChannel}</i></td>
* <td>A {@code ByteChannel} connected to an entity that contains a variable-length sequence of bytes</td></tr>
- * <tr><td valign=top><tt> <i>{@link java.nio.channels.AsynchronousChannel}</i></tt></td>
+ * <tr><td valign=top> <i>{@link java.nio.channels.AsynchronousChannel}</i></td>
* <td>Supports asynchronous I/O operations.</td></tr>
- * <tr><td valign=top><tt> <i>{@link java.nio.channels.AsynchronousByteChannel}</i></tt></td>
+ * <tr><td valign=top> <i>{@link java.nio.channels.AsynchronousByteChannel}</i></td>
* <td>Can read and write bytes asynchronously</td></tr>
- * <tr><td valign=top><tt> <i>{@link java.nio.channels.NetworkChannel}</i></tt></td>
+ * <tr><td valign=top> <i>{@link java.nio.channels.NetworkChannel}</i></td>
* <td>A channel to a network socket</td></tr>
- * <tr><td valign=top><tt> <i>{@link java.nio.channels.MulticastChannel}</i></tt></td>
+ * <tr><td valign=top> <i>{@link java.nio.channels.MulticastChannel}</i></td>
* <td>Can join Internet Protocol (IP) multicast groups</td></tr>
- * <tr><td valign=top><tt>{@link java.nio.channels.Channels}</tt></td>
+ * <tr><td valign=top>{@link java.nio.channels.Channels}</td>
* <td>Utility methods for channel/stream interoperation</td></tr>
* </table></blockquote>
*
@@ -99,8 +99,8 @@
* Internet Protocol (IP) multicast groups.
*
* <p> The {@link java.nio.channels.Channels} utility class defines static methods
- * that support the interoperation of the stream classes of the <tt>{@link
- * java.io}</tt> package with the channel classes of this package. An appropriate
+ * that support the interoperation of the stream classes of the {@link
+ * java.io} package with the channel classes of this package. An appropriate
* channel can be constructed from an {@link java.io.InputStream} or an {@link
* java.io.OutputStream}, and conversely an {@link java.io.InputStream} or an
* {@link java.io.OutputStream} can be constructed from a channel. A {@link
@@ -111,11 +111,11 @@
*
* <blockquote><table cellspacing=1 cellpadding=0 summary="Lists file channels and their descriptions">
* <tr><th align="left">File channels</th><th align="left">Description</th></tr>
- * <tr><td valign=top><tt>{@link java.nio.channels.FileChannel}</tt></td>
+ * <tr><td valign=top>{@link java.nio.channels.FileChannel}</td>
* <td>Reads, writes, maps, and manipulates files</td></tr>
- * <tr><td valign=top><tt>{@link java.nio.channels.FileLock}</tt></td>
+ * <tr><td valign=top>{@link java.nio.channels.FileLock}</td>
* <td>A lock on a (region of a) file</td></tr>
- * <tr><td valign=top><tt>{@link java.nio.MappedByteBuffer} </tt></td>
+ * <tr><td valign=top>{@link java.nio.MappedByteBuffer} </td>
* <td>A direct byte buffer mapped to a region of a file</td></tr>
* </table></blockquote>
*
@@ -133,30 +133,30 @@
* java.nio.channels.FileChannel#open open} methods, or by invoking the {@code
* getChannel} method of a {@link java.io.FileInputStream}, {@link
* java.io.FileOutputStream}, or {@link java.io.RandomAccessFile} to return a
- * file channel connected to the same underlying file as the <tt>{@link java.io}</tt>
+ * file channel connected to the same underlying file as the {@link java.io}
* class.
*
* <a name="multiplex"></a>
* <blockquote><table cellspacing=1 cellpadding=0 summary="Lists multiplexed, non-blocking channels and their descriptions">
* <tr><th align="left">Multiplexed, non-blocking I/O</th><th align="left"><p>Description</th></tr>
- * <tr><td valign=top><tt>{@link java.nio.channels.SelectableChannel}</tt></td>
+ * <tr><td valign=top>{@link java.nio.channels.SelectableChannel}</td>
* <td>A channel that can be multiplexed</td></tr>
- * <tr><td valign=top><tt> {@link java.nio.channels.DatagramChannel}</tt></td>
+ * <tr><td valign=top> {@link java.nio.channels.DatagramChannel}</td>
* <td>A channel to a datagram-oriented socket</td></tr>
- * <tr><td valign=top><tt> {@link java.nio.channels.Pipe.SinkChannel}</tt></td>
+ * <tr><td valign=top> {@link java.nio.channels.Pipe.SinkChannel}</td>
* <td>The write end of a pipe</td></tr>
- * <tr><td valign=top><tt> {@link java.nio.channels.Pipe.SourceChannel}</tt></td>
+ * <tr><td valign=top> {@link java.nio.channels.Pipe.SourceChannel}</td>
* <td>The read end of a pipe</td></tr>
- * <tr><td valign=top><tt> {@link java.nio.channels.ServerSocketChannel} </tt></td>
+ * <tr><td valign=top> {@link java.nio.channels.ServerSocketChannel} </td>
* <td>A channel to a stream-oriented listening socket</td></tr>
- * <tr><td valign=top><tt> {@link java.nio.channels.SocketChannel}</tt></td>
+ * <tr><td valign=top> {@link java.nio.channels.SocketChannel}</td>
* <td>A channel for a stream-oriented connecting socket</td></tr>
- * <tr><td valign=top><tt>{@link java.nio.channels.Selector}</tt></td>
+ * <tr><td valign=top>{@link java.nio.channels.Selector}</td>
* <td>A multiplexor of selectable channels</td></tr>
- * <tr><td valign=top><tt>{@link java.nio.channels.SelectionKey}</tt></td>
+ * <tr><td valign=top>{@link java.nio.channels.SelectionKey}</td>
* <td>A token representing the registration <br> of a channel
* with a selector</td></tr>
- * <tr><td valign=top><tt>{@link java.nio.channels.Pipe}</tt></td>
+ * <tr><td valign=top>{@link java.nio.channels.Pipe}</td>
* <td>Two channels that form a unidirectional pipe</td></tr>
* </table></blockquote>
*
@@ -194,18 +194,18 @@
*
* <p> This package defines selectable-channel classes corresponding to the {@link
* java.net.DatagramSocket}, {@link java.net.ServerSocket}, and {@link
- * java.net.Socket} classes defined in the <tt>{@link java.net}</tt> package.
+ * java.net.Socket} classes defined in the {@link java.net} package.
* Minor changes to these classes have been made in order to support sockets that
* are associated with channels. This package also defines a simple class that
* implements unidirectional pipes. In all cases, a new selectable channel is
- * created by invoking the static <tt>open</tt> method of the corresponding class.
+ * created by invoking the static {@code open} method of the corresponding class.
* If a channel needs an associated socket then a socket will be created as a side
* effect of this operation.
*
* <p> The implementation of selectors, selectable channels, and selection keys
* can be replaced by "plugging in" an alternative definition or instance of the
- * {@link java.nio.channels.spi.SelectorProvider} class defined in the <tt>{@link
- * java.nio.channels.spi}</tt> package. It is not expected that many developers
+ * {@link java.nio.channels.spi.SelectorProvider} class defined in the {@link
+ * java.nio.channels.spi} package. It is not expected that many developers
* will actually make use of this facility; it is provided primarily so that
* sophisticated users can take advantage of operating-system-specific
* I/O-multiplexing mechanisms when very high performance is required.
@@ -215,8 +215,8 @@
* java.nio.channels.spi.AbstractInterruptibleChannel}, {@link
* java.nio.channels.spi.AbstractSelectableChannel}, {@link
* java.nio.channels.spi.AbstractSelectionKey}, and {@link
- * java.nio.channels.spi.AbstractSelector} classes in the <tt>{@link
- * java.nio.channels.spi}</tt> package. When defining a custom selector provider,
+ * java.nio.channels.spi.AbstractSelector} classes in the {@link
+ * java.nio.channels.spi} package. When defining a custom selector provider,
* only the {@link java.nio.channels.spi.AbstractSelector} and {@link
* java.nio.channels.spi.AbstractSelectionKey} classes should be subclassed
* directly; custom channel classes should extend the appropriate {@link
@@ -226,15 +226,15 @@
*
* <blockquote><table cellspacing=1 cellpadding=0 summary="Lists asynchronous channels and their descriptions">
* <tr><th align="left">Asynchronous I/O</th><th align="left">Description</th></tr>
- * <tr><td valign=top><tt>{@link java.nio.channels.AsynchronousFileChannel}</tt></td>
+ * <tr><td valign=top>{@link java.nio.channels.AsynchronousFileChannel}</td>
* <td>An asynchronous channel for reading, writing, and manipulating a file</td></tr>
- * <tr><td valign=top><tt>{@link java.nio.channels.AsynchronousSocketChannel}</tt></td>
+ * <tr><td valign=top>{@link java.nio.channels.AsynchronousSocketChannel}</td>
* <td>An asynchronous channel to a stream-oriented connecting socket</td></tr>
- * <tr><td valign=top><tt>{@link java.nio.channels.AsynchronousServerSocketChannel} </tt></td>
+ * <tr><td valign=top>{@link java.nio.channels.AsynchronousServerSocketChannel} </td>
* <td>An asynchronous channel to a stream-oriented listening socket</td></tr>
- * <tr><td valign=top><tt>{@link java.nio.channels.CompletionHandler}</tt></td>
+ * <tr><td valign=top>{@link java.nio.channels.CompletionHandler}</td>
* <td>A handler for consuming the result of an asynchronous operation</td></tr>
- * <tr><td valign=top><tt>{@link java.nio.channels.AsynchronousChannelGroup}</tt></td>
+ * <tr><td valign=top>{@link java.nio.channels.AsynchronousChannelGroup}</td>
* <td>A grouping of asynchronous channels for the purpose of resource sharing</td></tr>
* </table></blockquote>
*
@@ -272,13 +272,13 @@
* <p> As with selectors, the implementation of asynchronous channels can be
* replaced by "plugging in" an alternative definition or instance of the {@link
* java.nio.channels.spi.AsynchronousChannelProvider} class defined in the
- * <tt>{@link java.nio.channels.spi}</tt> package. It is not expected that many
+ * {@link java.nio.channels.spi} package. It is not expected that many
* developers will actually make use of this facility; it is provided primarily
* so that sophisticated users can take advantage of operating-system-specific
* asynchronous I/O mechanisms when very high performance is required.
*
* <hr width="80%">
- * <p> Unless otherwise noted, passing a <tt>null</tt> argument to a constructor
+ * <p> Unless otherwise noted, passing a {@code null} argument to a constructor
* or method in any class or interface in this package will cause a {@link
* java.lang.NullPointerException NullPointerException} to be thrown.
*
diff --git a/jdk/src/java.base/share/classes/java/nio/channels/spi/AbstractInterruptibleChannel.java b/jdk/src/java.base/share/classes/java/nio/channels/spi/AbstractInterruptibleChannel.java
index fccc290..e45be24 100644
--- a/jdk/src/java.base/share/classes/java/nio/channels/spi/AbstractInterruptibleChannel.java
+++ b/jdk/src/java.base/share/classes/java/nio/channels/spi/AbstractInterruptibleChannel.java
@@ -46,7 +46,7 @@
* before and after, respectively, invoking an I/O operation that might block
* indefinitely. In order to ensure that the {@link #end end} method is always
* invoked, these methods should be used within a
- * <tt>try</tt> ... <tt>finally</tt> block:
+ * {@code try} ... {@code finally} block:
*
* <blockquote><pre>
* boolean completed = false;
@@ -58,11 +58,11 @@
* end(completed);
* }</pre></blockquote>
*
- * <p> The <tt>completed</tt> argument to the {@link #end end} method tells
+ * <p> The {@code completed} argument to the {@link #end end} method tells
* whether or not the I/O operation actually completed, that is, whether it had
* any effect that would be visible to the invoker. In the case of an
* operation that reads bytes, for example, this argument should be
- * <tt>true</tt> if, and only if, some bytes were actually transferred into the
+ * {@code true} if, and only if, some bytes were actually transferred into the
* invoker's target buffer.
*
* <p> A concrete channel class must also implement the {@link
@@ -148,7 +148,7 @@
* Marks the beginning of an I/O operation that might block indefinitely.
*
* <p> This method should be invoked in tandem with the {@link #end end}
- * method, using a <tt>try</tt> ... <tt>finally</tt> block as
+ * method, using a {@code try} ... {@code finally} block as
* shown <a href="#be">above</a>, in order to implement asynchronous
* closing and interruption for this channel. </p>
*/
@@ -177,12 +177,12 @@
* Marks the end of an I/O operation that might block indefinitely.
*
* <p> This method should be invoked in tandem with the {@link #begin
- * begin} method, using a <tt>try</tt> ... <tt>finally</tt> block
+ * begin} method, using a {@code try} ... {@code finally} block
* as shown <a href="#be">above</a>, in order to implement asynchronous
* closing and interruption for this channel. </p>
*
* @param completed
- * <tt>true</tt> if, and only if, the I/O operation completed
+ * {@code true} if, and only if, the I/O operation completed
* successfully, that is, had some effect that would be visible to
* the operation's invoker
*
diff --git a/jdk/src/java.base/share/classes/java/nio/channels/spi/AbstractSelectableChannel.java b/jdk/src/java.base/share/classes/java/nio/channels/spi/AbstractSelectableChannel.java
index 0de212d..cb3ced9 100644
--- a/jdk/src/java.base/share/classes/java/nio/channels/spi/AbstractSelectableChannel.java
+++ b/jdk/src/java.base/share/classes/java/nio/channels/spi/AbstractSelectableChannel.java
@@ -305,8 +305,8 @@
* changing the blocking mode. This method is only invoked if the new mode
* is different from the current mode. </p>
*
- * @param block If <tt>true</tt> then this channel will be placed in
- * blocking mode; if <tt>false</tt> then it will be placed
+ * @param block If {@code true} then this channel will be placed in
+ * blocking mode; if {@code false} then it will be placed
* non-blocking mode
*
* @throws IOException
diff --git a/jdk/src/java.base/share/classes/java/nio/channels/spi/AbstractSelector.java b/jdk/src/java.base/share/classes/java/nio/channels/spi/AbstractSelector.java
index 09e3b61..3c4eda9 100644
--- a/jdk/src/java.base/share/classes/java/nio/channels/spi/AbstractSelector.java
+++ b/jdk/src/java.base/share/classes/java/nio/channels/spi/AbstractSelector.java
@@ -43,7 +43,7 @@
* after, respectively, invoking an I/O operation that might block
* indefinitely. In order to ensure that the {@link #end end} method is always
* invoked, these methods should be used within a
- * <tt>try</tt> ... <tt>finally</tt> block:
+ * {@code try} ... {@code finally} block:
*
* <blockquote><pre>
* try {
@@ -197,7 +197,7 @@
* Marks the beginning of an I/O operation that might block indefinitely.
*
* <p> This method should be invoked in tandem with the {@link #end end}
- * method, using a <tt>try</tt> ... <tt>finally</tt> block as
+ * method, using a {@code try} ... {@code finally} block as
* shown <a href="#be">above</a>, in order to implement interruption for
* this selector.
*
@@ -223,7 +223,7 @@
* Marks the end of an I/O operation that might block indefinitely.
*
* <p> This method should be invoked in tandem with the {@link #begin begin}
- * method, using a <tt>try</tt> ... <tt>finally</tt> block as
+ * method, using a {@code try} ... {@code finally} block as
* shown <a href="#be">above</a>, in order to implement interruption for
* this selector. </p>
*/
diff --git a/jdk/src/java.base/share/classes/java/nio/channels/spi/AsynchronousChannelProvider.java b/jdk/src/java.base/share/classes/java/nio/channels/spi/AsynchronousChannelProvider.java
index d14c853..f720261 100644
--- a/jdk/src/java.base/share/classes/java/nio/channels/spi/AsynchronousChannelProvider.java
+++ b/jdk/src/java.base/share/classes/java/nio/channels/spi/AsynchronousChannelProvider.java
@@ -64,7 +64,7 @@
*
* @throws SecurityException
* If a security manager has been installed and it denies
- * {@link RuntimePermission}<tt>("asynchronousChannelProvider")</tt>
+ * {@link RuntimePermission}{@code ("asynchronousChannelProvider")}
*/
protected AsynchronousChannelProvider() {
this(checkPermission());
@@ -137,7 +137,7 @@
* <ol>
*
* <li><p> If the system property
- * <tt>java.nio.channels.spi.AsynchronousChannelProvider</tt> is defined
+ * {@code java.nio.channels.spi.AsynchronousChannelProvider} is defined
* then it is taken to be the fully-qualified name of a concrete provider class.
* The class is loaded and instantiated; if this process fails then an
* unspecified error is thrown. </p></li>
@@ -145,8 +145,8 @@
* <li><p> If a provider class has been installed in a jar file that is
* visible to the system class loader, and that jar file contains a
* provider-configuration file named
- * <tt>java.nio.channels.spi.AsynchronousChannelProvider</tt> in the resource
- * directory <tt>META-INF/services</tt>, then the first class name
+ * {@code java.nio.channels.spi.AsynchronousChannelProvider} in the resource
+ * directory {@code META-INF/services}, then the first class name
* specified in that file is taken. The class is loaded and
* instantiated; if this process fails then an unspecified error is
* thrown. </p></li>
diff --git a/jdk/src/java.base/share/classes/java/nio/channels/spi/SelectorProvider.java b/jdk/src/java.base/share/classes/java/nio/channels/spi/SelectorProvider.java
index ca704a8..cfe444a 100644
--- a/jdk/src/java.base/share/classes/java/nio/channels/spi/SelectorProvider.java
+++ b/jdk/src/java.base/share/classes/java/nio/channels/spi/SelectorProvider.java
@@ -46,7 +46,7 @@
* #provider() provider} method. The first invocation of that method will locate
* the default provider as specified below.
*
- * <p> The system-wide default provider is used by the static <tt>open</tt>
+ * <p> The system-wide default provider is used by the static {@code open}
* methods of the {@link java.nio.channels.DatagramChannel#open
* DatagramChannel}, {@link java.nio.channels.Pipe#open Pipe}, {@link
* java.nio.channels.Selector#open Selector}, {@link
@@ -54,7 +54,7 @@
* java.nio.channels.SocketChannel#open SocketChannel} classes. It is also
* used by the {@link java.lang.System#inheritedChannel System.inheritedChannel()}
* method. A program may make use of a provider other than the default provider
- * by instantiating that provider and then directly invoking the <tt>open</tt>
+ * by instantiating that provider and then directly invoking the {@code open}
* methods defined in this class.
*
* <p> All of the methods in this class are safe for use by multiple concurrent
@@ -84,7 +84,7 @@
*
* @throws SecurityException
* If a security manager has been installed and it denies
- * {@link RuntimePermission}<tt>("selectorProvider")</tt>
+ * {@link RuntimePermission}{@code ("selectorProvider")}
*/
protected SelectorProvider() {
this(checkPermission());
@@ -142,7 +142,7 @@
* <ol>
*
* <li><p> If the system property
- * <tt>java.nio.channels.spi.SelectorProvider</tt> is defined then it is
+ * {@code java.nio.channels.spi.SelectorProvider} is defined then it is
* taken to be the fully-qualified name of a concrete provider class.
* The class is loaded and instantiated; if this process fails then an
* unspecified error is thrown. </p></li>
@@ -150,8 +150,8 @@
* <li><p> If a provider class has been installed in a jar file that is
* visible to the system class loader, and that jar file contains a
* provider-configuration file named
- * <tt>java.nio.channels.spi.SelectorProvider</tt> in the resource
- * directory <tt>META-INF/services</tt>, then the first class name
+ * {@code java.nio.channels.spi.SelectorProvider} in the resource
+ * directory {@code META-INF/services}, then the first class name
* specified in that file is taken. The class is loaded and
* instantiated; if this process fails then an unspecified error is
* thrown. </p></li>
@@ -305,14 +305,14 @@
* returned. Subsequent invocations of this method return the same
* channel. </p>
*
- * @return The inherited channel, if any, otherwise <tt>null</tt>.
+ * @return The inherited channel, if any, otherwise {@code null}.
*
* @throws IOException
* If an I/O error occurs
*
* @throws SecurityException
* If a security manager has been installed and it denies
- * {@link RuntimePermission}<tt>("inheritedChannel")</tt>
+ * {@link RuntimePermission}{@code ("inheritedChannel")}
*
* @since 1.5
*/
diff --git a/jdk/src/java.base/share/classes/java/nio/charset/Charset-X-Coder.java.template b/jdk/src/java.base/share/classes/java/nio/charset/Charset-X-Coder.java.template
index faa51bb..74b6f92 100644
--- a/jdk/src/java.base/share/classes/java/nio/charset/Charset-X-Coder.java.template
+++ b/jdk/src/java.base/share/classes/java/nio/charset/Charset-X-Coder.java.template
@@ -55,12 +55,12 @@
* has not been used before; </p></li>
*
* <li><p> Invoke the {@link #$code$ $code$} method zero or more times, as
- * long as additional input may be available, passing <tt>false</tt> for the
- * <tt>endOfInput</tt> argument and filling the input buffer and flushing the
+ * long as additional input may be available, passing {@code false} for the
+ * {@code endOfInput} argument and filling the input buffer and flushing the
* output buffer between invocations; </p></li>
*
* <li><p> Invoke the {@link #$code$ $code$} method one final time, passing
- * <tt>true</tt> for the <tt>endOfInput</tt> argument; and then </p></li>
+ * {@code true} for the {@code endOfInput} argument; and then </p></li>
*
* <li><p> Invoke the {@link #flush flush} method so that the $coder$ can
* flush any internal state to the output buffer. </p></li>
@@ -175,7 +175,7 @@
* $otype$s that will be produced for each input $itype$
*
* @param replacement
- * The initial replacement; must not be <tt>null</tt>, must have
+ * The initial replacement; must not be {@code null}, must have
* non-zero length, must not be longer than max$ItypesPerOtype$,
* and must be {@linkplain #isLegalReplacement legal}
*
@@ -248,7 +248,7 @@
* Returns this $coder$'s replacement value.
*
* @return This $coder$'s current replacement,
- * which is never <tt>null</tt> and is never empty
+ * which is never {@code null} and is never empty
*/
public final $replType$ replacement() {
#if[decoder]
@@ -267,7 +267,7 @@
* replacement is acceptable. </p>
*
* @param newReplacement The new replacement; must not be
- * <tt>null</tt>, must have non-zero length,
+ * {@code null}, must have non-zero length,
#if[decoder]
* and must not be longer than the value returned by the
* {@link #max$ItypesPerOtype$() max$ItypesPerOtype$} method
@@ -332,7 +332,7 @@
*
* @param repl The byte array to be tested
*
- * @return <tt>true</tt> if, and only if, the given byte array
+ * @return {@code true} if, and only if, the given byte array
* is a legal replacement value for this encoder
*/
public boolean isLegalReplacement(byte[] repl) {
@@ -358,7 +358,7 @@
/**
* Returns this $coder$'s current action for malformed-input errors.
*
- * @return The current malformed-input action, which is never <tt>null</tt>
+ * @return The current malformed-input action, which is never {@code null}
*/
public CodingErrorAction malformedInputAction() {
return malformedInputAction;
@@ -370,7 +370,7 @@
* <p> This method invokes the {@link #implOnMalformedInput
* implOnMalformedInput} method, passing the new action. </p>
*
- * @param newAction The new action; must not be <tt>null</tt>
+ * @param newAction The new action; must not be {@code null}
*
* @return This $coder$
*
@@ -400,7 +400,7 @@
* Returns this $coder$'s current action for unmappable-character errors.
*
* @return The current unmappable-character action, which is never
- * <tt>null</tt>
+ * {@code null}
*/
public CodingErrorAction unmappableCharacterAction() {
return unmappableCharacterAction;
@@ -412,7 +412,7 @@
* <p> This method invokes the {@link #implOnUnmappableCharacter
* implOnUnmappableCharacter} method, passing the new action. </p>
*
- * @param newAction The new action; must not be <tt>null</tt>
+ * @param newAction The new action; must not be {@code null}
*
* @return This $coder$
*
@@ -521,16 +521,16 @@
* operation then care should be taken to preserve any $itype$s remaining
* in the input buffer so that they are available to the next invocation.
*
- * <p> The <tt>endOfInput</tt> parameter advises this method as to whether
+ * <p> The {@code endOfInput} parameter advises this method as to whether
* the invoker can provide further input beyond that contained in the given
* input buffer. If there is a possibility of providing additional input
- * then the invoker should pass <tt>false</tt> for this parameter; if there
+ * then the invoker should pass {@code false} for this parameter; if there
* is no possibility of providing further input then the invoker should
- * pass <tt>true</tt>. It is not erroneous, and in fact it is quite
- * common, to pass <tt>false</tt> in one invocation and later discover that
+ * pass {@code true}. It is not erroneous, and in fact it is quite
+ * common, to pass {@code false} in one invocation and later discover that
* no further input was actually available. It is critical, however, that
* the final invocation of this method in a sequence of invocations always
- * pass <tt>true</tt> so that any remaining un$code$d input will be treated
+ * pass {@code true} so that any remaining un$code$d input will be treated
* as being malformed.
*
* <p> This method works by invoking the {@link #$code$Loop $code$Loop}
@@ -545,7 +545,7 @@
* The output $otype$ buffer
*
* @param endOfInput
- * <tt>true</tt> if, and only if, the invoker can provide no
+ * {@code true} if, and only if, the invoker can provide no
* additional input $itype$s beyond those in the given buffer
*
* @return A coder-result object describing the reason for termination
@@ -553,9 +553,9 @@
* @throws IllegalStateException
* If $a$ $coding$ operation is already in progress and the previous
* step was an invocation neither of the {@link #reset reset}
- * method, nor of this method with a value of <tt>false</tt> for
- * the <tt>endOfInput</tt> parameter, nor of this method with a
- * value of <tt>true</tt> for the <tt>endOfInput</tt> parameter
+ * method, nor of this method with a value of {@code false} for
+ * the {@code endOfInput} parameter, nor of this method with a
+ * value of {@code true} for the {@code endOfInput} parameter
* but a return value indicating an incomplete $coding$ operation
*
* @throws CoderMalfunctionError
@@ -659,7 +659,7 @@
* invocation neither of the {@link #flush flush} method nor of
* the three-argument {@link
* #$code$($Itype$Buffer,$Otype$Buffer,boolean) $code$} method
- * with a value of <tt>true</tt> for the <tt>endOfInput</tt>
+ * with a value of {@code true} for the {@code endOfInput}
* parameter
*/
public final CoderResult flush($Otype$Buffer out) {
@@ -824,10 +824,10 @@
* Tells whether or not this decoder implements an auto-detecting charset.
*
* <p> The default implementation of this method always returns
- * <tt>false</tt>; it should be overridden by auto-detecting decoders to
- * return <tt>true</tt>. </p>
+ * {@code false}; it should be overridden by auto-detecting decoders to
+ * return {@code true}. </p>
*
- * @return <tt>true</tt> if, and only if, this decoder implements an
+ * @return {@code true} if, and only if, this decoder implements an
* auto-detecting charset
*/
public boolean isAutoDetecting() {
@@ -840,21 +840,21 @@
*
* <p> If this decoder implements an auto-detecting charset then at a
* single point during a decoding operation this method may start returning
- * <tt>true</tt> to indicate that a specific charset has been detected in
+ * {@code true} to indicate that a specific charset has been detected in
* the input byte sequence. Once this occurs, the {@link #detectedCharset
* detectedCharset} method may be invoked to retrieve the detected charset.
*
- * <p> That this method returns <tt>false</tt> does not imply that no bytes
+ * <p> That this method returns {@code false} does not imply that no bytes
* have yet been decoded. Some auto-detecting decoders are capable of
* decoding some, or even all, of an input byte sequence without fixing on
* a particular charset.
*
* <p> The default implementation of this method always throws an {@link
* UnsupportedOperationException}; it should be overridden by
- * auto-detecting decoders to return <tt>true</tt> once the input charset
+ * auto-detecting decoders to return {@code true} once the input charset
* has been determined. </p>
*
- * @return <tt>true</tt> if, and only if, this decoder has detected a
+ * @return {@code true} if, and only if, this decoder has detected a
* specific charset
*
* @throws UnsupportedOperationException
@@ -880,7 +880,7 @@
* auto-detecting decoders to return the appropriate value. </p>
*
* @return The charset detected by this auto-detecting decoder,
- * or <tt>null</tt> if the charset has not yet been determined
+ * or {@code null} if the charset has not yet been determined
*
* @throws IllegalStateException
* If insufficient bytes have been read to determine a charset
@@ -920,7 +920,7 @@
/**
* Tells whether or not this encoder can encode the given character.
*
- * <p> This method returns <tt>false</tt> if the given character is a
+ * <p> This method returns {@code false} if the given character is a
* surrogate character; such characters can be interpreted only when they
* are members of a pair consisting of a high surrogate followed by a low
* surrogate. The {@link #canEncode(java.lang.CharSequence)
@@ -937,7 +937,7 @@
* @param c
* The given character
*
- * @return <tt>true</tt> if, and only if, this encoder can encode
+ * @return {@code true} if, and only if, this encoder can encode
* the given character
*
* @throws IllegalStateException
@@ -954,7 +954,7 @@
* Tells whether or not this encoder can encode the given character
* sequence.
*
- * <p> If this method returns <tt>false</tt> for a particular character
+ * <p> If this method returns {@code false} for a particular character
* sequence then more information about why the sequence cannot be encoded
* may be obtained by performing a full <a href="#steps">encoding
* operation</a>.
@@ -968,7 +968,7 @@
* @param cs
* The given character sequence
*
- * @return <tt>true</tt> if, and only if, this encoder can encode
+ * @return {@code true} if, and only if, this encoder can encode
* the given character without throwing any exceptions and without
* performing any replacements
*
diff --git a/jdk/src/java.base/share/classes/java/nio/charset/Charset.java b/jdk/src/java.base/share/classes/java/nio/charset/Charset.java
index a242b9c..6766cb5 100644
--- a/jdk/src/java.base/share/classes/java/nio/charset/Charset.java
+++ b/jdk/src/java.base/share/classes/java/nio/charset/Charset.java
@@ -73,29 +73,29 @@
*
* <ul>
*
- * <li> The uppercase letters <tt>'A'</tt> through <tt>'Z'</tt>
- * (<tt>'\u0041'</tt> through <tt>'\u005a'</tt>),
+ * <li> The uppercase letters {@code 'A'} through {@code 'Z'}
+ * (<code>'\u0041'</code> through <code>'\u005a'</code>),
*
- * <li> The lowercase letters <tt>'a'</tt> through <tt>'z'</tt>
- * (<tt>'\u0061'</tt> through <tt>'\u007a'</tt>),
+ * <li> The lowercase letters {@code 'a'} through {@code 'z'}
+ * (<code>'\u0061'</code> through <code>'\u007a'</code>),
*
- * <li> The digits <tt>'0'</tt> through <tt>'9'</tt>
- * (<tt>'\u0030'</tt> through <tt>'\u0039'</tt>),
+ * <li> The digits {@code '0'} through {@code '9'}
+ * (<code>'\u0030'</code> through <code>'\u0039'</code>),
*
- * <li> The dash character <tt>'-'</tt>
- * (<tt>'\u002d'</tt>, <small>HYPHEN-MINUS</small>),
+ * <li> The dash character {@code '-'}
+ * (<code>'\u002d'</code>, <small>HYPHEN-MINUS</small>),
*
- * <li> The plus character <tt>'+'</tt>
- * (<tt>'\u002b'</tt>, <small>PLUS SIGN</small>),
+ * <li> The plus character {@code '+'}
+ * (<code>'\u002b'</code>, <small>PLUS SIGN</small>),
*
- * <li> The period character <tt>'.'</tt>
- * (<tt>'\u002e'</tt>, <small>FULL STOP</small>),
+ * <li> The period character {@code '.'}
+ * (<code>'\u002e'</code>, <small>FULL STOP</small>),
*
- * <li> The colon character <tt>':'</tt>
- * (<tt>'\u003a'</tt>, <small>COLON</small>), and
+ * <li> The colon character {@code ':'}
+ * (<code>'\u003a'</code>, <small>COLON</small>), and
*
- * <li> The underscore character <tt>'_'</tt>
- * (<tt>'\u005f'</tt>, <small>LOW LINE</small>).
+ * <li> The underscore character {@code '_'}
+ * (<code>'\u005f'</code>, <small>LOW LINE</small>).
*
* </ul>
*
@@ -115,7 +115,7 @@
* <p><a name="hn">Some charsets have an <i>historical name</i> that is defined for
* compatibility with previous versions of the Java platform.</a> A charset's
* historical name is either its canonical name or one of its aliases. The
- * historical name is returned by the <tt>getEncoding()</tt> methods of the
+ * historical name is returned by the {@code getEncoding()} methods of the
* {@link java.io.InputStreamReader#getEncoding InputStreamReader} and {@link
* java.io.OutputStreamWriter#getEncoding OutputStreamWriter} classes.
*
@@ -128,7 +128,7 @@
* than one registry name then its canonical name must be the MIME-preferred
* name and the other names in the registry must be valid aliases. If a
* supported charset is not listed in the IANA registry then its canonical name
- * must begin with one of the strings <tt>"X-"</tt> or <tt>"x-"</tt>.
+ * must begin with one of the strings {@code "X-"} or {@code "x-"}.
*
* <p> The IANA charset registry does change over time, and so the canonical
* name and the aliases of a particular charset may also change over time. To
@@ -148,53 +148,53 @@
*
* <blockquote><table width="80%" summary="Description of standard charsets">
* <tr><th align="left">Charset</th><th align="left">Description</th></tr>
- * <tr><td valign=top><tt>US-ASCII</tt></td>
- * <td>Seven-bit ASCII, a.k.a. <tt>ISO646-US</tt>,
+ * <tr><td valign=top>{@code US-ASCII}</td>
+ * <td>Seven-bit ASCII, a.k.a. {@code ISO646-US},
* a.k.a. the Basic Latin block of the Unicode character set</td></tr>
- * <tr><td valign=top><tt>ISO-8859-1 </tt></td>
- * <td>ISO Latin Alphabet No. 1, a.k.a. <tt>ISO-LATIN-1</tt></td></tr>
- * <tr><td valign=top><tt>UTF-8</tt></td>
+ * <tr><td valign=top><code>ISO-8859-1 </code></td>
+ * <td>ISO Latin Alphabet No. 1, a.k.a. {@code ISO-LATIN-1}</td></tr>
+ * <tr><td valign=top>{@code UTF-8}</td>
* <td>Eight-bit UCS Transformation Format</td></tr>
- * <tr><td valign=top><tt>UTF-16BE</tt></td>
+ * <tr><td valign=top>{@code UTF-16BE}</td>
* <td>Sixteen-bit UCS Transformation Format,
* big-endian byte order</td></tr>
- * <tr><td valign=top><tt>UTF-16LE</tt></td>
+ * <tr><td valign=top>{@code UTF-16LE}</td>
* <td>Sixteen-bit UCS Transformation Format,
* little-endian byte order</td></tr>
- * <tr><td valign=top><tt>UTF-16</tt></td>
+ * <tr><td valign=top>{@code UTF-16}</td>
* <td>Sixteen-bit UCS Transformation Format,
* byte order identified by an optional byte-order mark</td></tr>
* </table></blockquote>
*
- * <p> The <tt>UTF-8</tt> charset is specified by <a
+ * <p> The {@code UTF-8} charset is specified by <a
* href="http://www.ietf.org/rfc/rfc2279.txt"><i>RFC 2279</i></a>; the
* transformation format upon which it is based is specified in
* Amendment 2 of ISO 10646-1 and is also described in the <a
* href="http://www.unicode.org/unicode/standard/standard.html"><i>Unicode
* Standard</i></a>.
*
- * <p> The <tt>UTF-16</tt> charsets are specified by <a
+ * <p> The {@code UTF-16} charsets are specified by <a
* href="http://www.ietf.org/rfc/rfc2781.txt"><i>RFC 2781</i></a>; the
* transformation formats upon which they are based are specified in
* Amendment 1 of ISO 10646-1 and are also described in the <a
* href="http://www.unicode.org/unicode/standard/standard.html"><i>Unicode
* Standard</i></a>.
*
- * <p> The <tt>UTF-16</tt> charsets use sixteen-bit quantities and are
+ * <p> The {@code UTF-16} charsets use sixteen-bit quantities and are
* therefore sensitive to byte order. In these encodings the byte order of a
* stream may be indicated by an initial <i>byte-order mark</i> represented by
- * the Unicode character <tt>'\uFEFF'</tt>. Byte-order marks are handled
+ * the Unicode character <code>'\uFEFF'</code>. Byte-order marks are handled
* as follows:
*
* <ul>
*
- * <li><p> When decoding, the <tt>UTF-16BE</tt> and <tt>UTF-16LE</tt>
+ * <li><p> When decoding, the {@code UTF-16BE} and {@code UTF-16LE}
* charsets interpret the initial byte-order marks as a <small>ZERO-WIDTH
* NON-BREAKING SPACE</small>; when encoding, they do not write
* byte-order marks. </p></li>
*
- * <li><p> When decoding, the <tt>UTF-16</tt> charset interprets the
+ * <li><p> When decoding, the {@code UTF-16} charset interprets the
* byte-order mark at the beginning of the input stream to indicate the
* byte-order of the stream but defaults to big-endian if there is no
* byte-order mark; when encoding, it uses big-endian byte order and writes
@@ -247,9 +247,9 @@
* character-encoding scheme then the corresponding charset is usually
* named for the coded character set; otherwise a charset is usually named
* for the encoding scheme and, possibly, the locale of the coded
- * character sets that it supports. Hence <tt>US-ASCII</tt> is both the
+ * character sets that it supports. Hence {@code US-ASCII} is both the
* name of a coded character set and of the charset that encodes it, while
- * <tt>EUC-JP</tt> is the name of the charset that encodes the
+ * {@code EUC-JP} is the name of the charset that encodes the
* JIS X 0201, JIS X 0208, and JIS X 0212
* coded character sets for the Japanese language.
*
@@ -495,14 +495,14 @@
* The name of the requested charset; may be either
* a canonical name or an alias
*
- * @return <tt>true</tt> if, and only if, support for the named charset
+ * @return {@code true} if, and only if, support for the named charset
* is available in the current Java virtual machine
*
* @throws IllegalCharsetNameException
* If the given charset name is illegal
*
* @throws IllegalArgumentException
- * If the given <tt>charsetName</tt> is null
+ * If the given {@code charsetName} is null
*/
public static boolean isSupported(String charsetName) {
return (lookup(charsetName) != null);
@@ -521,7 +521,7 @@
* If the given charset name is illegal
*
* @throws IllegalArgumentException
- * If the given <tt>charsetName</tt> is null
+ * If the given {@code charsetName} is null
*
* @throws UnsupportedCharsetException
* If no support for the named charset is available
@@ -692,7 +692,7 @@
* href="http://www.iana.org/assignments/character-sets">IANA Charset
* Registry</a>.
*
- * @return <tt>true</tt> if, and only if, this charset is known by its
+ * @return {@code true} if, and only if, this charset is known by its
* implementor to be registered with the IANA
*/
public final boolean isRegistered() {
@@ -732,15 +732,15 @@
* <p> Every charset contains itself.
*
* <p> This method computes an approximation of the containment relation:
- * If it returns <tt>true</tt> then the given charset is known to be
- * contained by this charset; if it returns <tt>false</tt>, however, then
+ * If it returns {@code true} then the given charset is known to be
+ * contained by this charset; if it returns {@code false}, however, then
* it is not necessarily the case that the given charset is not contained
* in this charset.
*
* @param cs
* The given charset
*
- * @return <tt>true</tt> if the given charset is contained in this charset
+ * @return {@code true} if the given charset is contained in this charset
*/
public abstract boolean contains(Charset cs);
@@ -770,9 +770,9 @@
* input byte sequence. Such charsets do not support encoding because
* there is no way to determine which encoding should be used on output.
* Implementations of such charsets should override this method to return
- * <tt>false</tt>. </p>
+ * {@code false}. </p>
*
- * @return <tt>true</tt> if, and only if, this charset supports encoding
+ * @return {@code true} if, and only if, this charset supports encoding
*/
public boolean canEncode() {
return true;
@@ -782,7 +782,7 @@
* Convenience method that decodes bytes in this charset into Unicode
* characters.
*
- * <p> An invocation of this method upon a charset <tt>cs</tt> returns the
+ * <p> An invocation of this method upon a charset {@code cs} returns the
* same result as the expression
*
* <pre>
@@ -818,7 +818,7 @@
* Convenience method that encodes Unicode characters into bytes in this
* charset.
*
- * <p> An invocation of this method upon a charset <tt>cs</tt> returns the
+ * <p> An invocation of this method upon a charset {@code cs} returns the
* same result as the expression
*
* <pre>
@@ -853,7 +853,7 @@
/**
* Convenience method that encodes a string into bytes in this charset.
*
- * <p> An invocation of this method upon a charset <tt>cs</tt> returns the
+ * <p> An invocation of this method upon a charset {@code cs} returns the
* same result as the expression
*
* <pre>
@@ -898,7 +898,7 @@
* <p> Two charsets are equal if, and only if, they have the same canonical
* names. A charset is never equal to any other type of object. </p>
*
- * @return <tt>true</tt> if, and only if, this charset is equal to the
+ * @return {@code true} if, and only if, this charset is equal to the
* given object
*/
public final boolean equals(Object ob) {
diff --git a/jdk/src/java.base/share/classes/java/nio/charset/CoderResult.java b/jdk/src/java.base/share/classes/java/nio/charset/CoderResult.java
index 79d4843..3d5e1c4 100644
--- a/jdk/src/java.base/share/classes/java/nio/charset/CoderResult.java
+++ b/jdk/src/java.base/share/classes/java/nio/charset/CoderResult.java
@@ -46,24 +46,24 @@
* processed, or there is insufficient input and additional input is
* required. This condition is represented by the unique result object
* {@link #UNDERFLOW}, whose {@link #isUnderflow() isUnderflow} method
- * returns <tt>true</tt>. </p></li>
+ * returns {@code true}. </p></li>
*
* <li><p> <i>Overflow</i> is reported when there is insufficient room
* remaining in the output buffer. This condition is represented by the
* unique result object {@link #OVERFLOW}, whose {@link #isOverflow()
- * isOverflow} method returns <tt>true</tt>. </p></li>
+ * isOverflow} method returns {@code true}. </p></li>
*
* <li><p> A <i>malformed-input error</i> is reported when a sequence of
* input units is not well-formed. Such errors are described by instances of
* this class whose {@link #isMalformed() isMalformed} method returns
- * <tt>true</tt> and whose {@link #length() length} method returns the length
+ * {@code true} and whose {@link #length() length} method returns the length
* of the malformed sequence. There is one unique instance of this class for
* all malformed-input errors of a given length. </p></li>
*
* <li><p> An <i>unmappable-character error</i> is reported when a sequence
* of input units denotes a character that cannot be represented in the
* output charset. Such errors are described by instances of this class
- * whose {@link #isUnmappable() isUnmappable} method returns <tt>true</tt> and
+ * whose {@link #isUnmappable() isUnmappable} method returns {@code true} and
* whose {@link #length() length} method returns the length of the input
* sequence denoting the unmappable character. There is one unique instance
* of this class for all unmappable-character errors of a given length.
@@ -71,9 +71,9 @@
*
* </ul>
*
- * <p> For convenience, the {@link #isError() isError} method returns <tt>true</tt>
+ * <p> For convenience, the {@link #isError() isError} method returns {@code true}
* for result objects that describe malformed-input and unmappable-character
- * errors but <tt>false</tt> for those that describe underflow or overflow
+ * errors but {@code false} for those that describe underflow or overflow
* conditions. </p>
*
*
@@ -114,7 +114,7 @@
/**
* Tells whether or not this object describes an underflow condition.
*
- * @return <tt>true</tt> if, and only if, this object denotes underflow
+ * @return {@code true} if, and only if, this object denotes underflow
*/
public boolean isUnderflow() {
return (type == CR_UNDERFLOW);
@@ -123,7 +123,7 @@
/**
* Tells whether or not this object describes an overflow condition.
*
- * @return <tt>true</tt> if, and only if, this object denotes overflow
+ * @return {@code true} if, and only if, this object denotes overflow
*/
public boolean isOverflow() {
return (type == CR_OVERFLOW);
@@ -132,7 +132,7 @@
/**
* Tells whether or not this object describes an error condition.
*
- * @return <tt>true</tt> if, and only if, this object denotes either a
+ * @return {@code true} if, and only if, this object denotes either a
* malformed-input error or an unmappable-character error
*/
public boolean isError() {
@@ -142,7 +142,7 @@
/**
* Tells whether or not this object describes a malformed-input error.
*
- * @return <tt>true</tt> if, and only if, this object denotes a
+ * @return {@code true} if, and only if, this object denotes a
* malformed-input error
*/
public boolean isMalformed() {
@@ -153,7 +153,7 @@
* Tells whether or not this object describes an unmappable-character
* error.
*
- * @return <tt>true</tt> if, and only if, this object denotes an
+ * @return {@code true} if, and only if, this object denotes an
* unmappable-character error
*/
public boolean isUnmappable() {
@@ -168,7 +168,7 @@
*
* @throws UnsupportedOperationException
* If this object does not describe an error condition, that is,
- * if the {@link #isError() isError} does not return <tt>true</tt>
+ * if the {@link #isError() isError} does not return {@code true}
*/
public int length() {
if (!isError())
diff --git a/jdk/src/java.base/share/classes/java/nio/charset/package-info.java b/jdk/src/java.base/share/classes/java/nio/charset/package-info.java
index e18f568..9d93a71 100644
--- a/jdk/src/java.base/share/classes/java/nio/charset/package-info.java
+++ b/jdk/src/java.base/share/classes/java/nio/charset/package-info.java
@@ -74,10 +74,10 @@
*
* <p> Support for new charsets can be made available via the
* interface defined in the {@link
- * java.nio.charset.spi.CharsetProvider} class in the <tt>{@link
- * java.nio.charset.spi}</tt> package.
+ * java.nio.charset.spi.CharsetProvider} class in the {@link
+ * java.nio.charset.spi} package.
*
- * <p> Unless otherwise noted, passing a <tt>null</tt> argument to a
+ * <p> Unless otherwise noted, passing a {@code null} argument to a
* constructor or method in any class or interface in this package
* will cause a {@link java.lang.NullPointerException
* NullPointerException} to be thrown.
diff --git a/jdk/src/java.base/share/classes/java/nio/charset/spi/CharsetProvider.java b/jdk/src/java.base/share/classes/java/nio/charset/spi/CharsetProvider.java
index f859245..63f01bf 100644
--- a/jdk/src/java.base/share/classes/java/nio/charset/spi/CharsetProvider.java
+++ b/jdk/src/java.base/share/classes/java/nio/charset/spi/CharsetProvider.java
@@ -42,13 +42,13 @@
* loader}.
*
* <p> A charset provider identifies itself with a provider-configuration file
- * named <tt>java.nio.charset.spi.CharsetProvider</tt> in the resource
- * directory <tt>META-INF/services</tt>. The file should contain a list of
+ * named {@code java.nio.charset.spi.CharsetProvider} in the resource
+ * directory {@code META-INF/services}. The file should contain a list of
* fully-qualified concrete charset-provider class names, one per line. A line
- * is terminated by any one of a line feed (<tt>'\n'</tt>), a carriage return
- * (<tt>'\r'</tt>), or a carriage return followed immediately by a line feed.
+ * is terminated by any one of a line feed ({@code '\n'}), a carriage return
+ * ({@code '\r'}), or a carriage return followed immediately by a line feed.
* Space and tab characters surrounding each name, as well as blank lines, are
- * ignored. The comment character is <tt>'#'</tt> (<tt>'\u0023'</tt>); on
+ * ignored. The comment character is {@code '#'} (<code>'\u0023'</code>); on
* each line all characters following the first comment character are ignored.
* The file must be encoded in UTF-8.
*
@@ -83,7 +83,7 @@
*
* @throws SecurityException
* If a security manager has been installed and it denies
- * {@link RuntimePermission}<tt>("charsetProvider")</tt>
+ * {@link RuntimePermission}{@code ("charsetProvider")}
*/
protected CharsetProvider() {
this(checkPermission());
@@ -107,7 +107,7 @@
* a canonical name or an alias
*
* @return A charset object for the named charset,
- * or <tt>null</tt> if the named charset
+ * or {@code null} if the named charset
* is not supported by this provider
*/
public abstract Charset charsetForName(String charsetName);
diff --git a/jdk/src/java.base/share/classes/java/nio/exceptions b/jdk/src/java.base/share/classes/java/nio/exceptions
index 062ccc4..d8cba29 100644
--- a/jdk/src/java.base/share/classes/java/nio/exceptions
+++ b/jdk/src/java.base/share/classes/java/nio/exceptions
@@ -56,5 +56,5 @@
gen ReadOnlyBufferException "
* Unchecked exception thrown when a content-mutation method such as
- * <tt>put</tt> or <tt>compact</tt> is invoked upon a read-only buffer." \
+ * <code>put</code> or <code>compact</code> is invoked upon a read-only buffer." \
-1210063976496234090L
diff --git a/jdk/src/java.base/share/classes/java/nio/file/FileSystem.java b/jdk/src/java.base/share/classes/java/nio/file/FileSystem.java
index 03ace89..1c60862 100644
--- a/jdk/src/java.base/share/classes/java/nio/file/FileSystem.java
+++ b/jdk/src/java.base/share/classes/java/nio/file/FileSystem.java
@@ -202,7 +202,7 @@
*
* <p> In the case of the default provider, and a security manager is
* installed, the security manager is invoked to check {@link
- * RuntimePermission}<tt>("getFileStoreAttributes")</tt>. If denied, then
+ * RuntimePermission}{@code ("getFileStoreAttributes")}. If denied, then
* no file stores are returned by the iterator. In addition, the security
* manager's {@link SecurityManager#checkRead(String)} method is invoked to
* check read access to the file store's <em>top-most</em> directory. If
@@ -334,19 +334,19 @@
* character extension</td>
* </tr>
* <tr>
- * <td><tt>/home/*/*</tt>
- * <td>Matches <tt>/home/gus/data</tt> on UNIX platforms</td>
+ * <td><code>/home/*/*</code>
+ * <td>Matches <code>/home/gus/data</code> on UNIX platforms</td>
* </tr>
* <tr>
- * <td><tt>/home/**</tt>
- * <td>Matches <tt>/home/gus</tt> and
- * <tt>/home/gus/data</tt> on UNIX platforms</td>
+ * <td><code>/home/**</code>
+ * <td>Matches <code>/home/gus</code> and
+ * <code>/home/gus/data</code> on UNIX platforms</td>
* </tr>
* <tr>
- * <td><tt>C:\\*</tt>
- * <td>Matches <tt>C:\foo</tt> and <tt>C:\bar</tt> on the Windows
+ * <td><code>C:\\*</code>
+ * <td>Matches <code>C:\foo</code> and <code>C:\bar</code> on the Windows
* platform (note that the backslash is escaped; as a string literal in the
- * Java Language the pattern would be <tt>"C:\\\\*"</tt>) </td>
+ * Java Language the pattern would be <code>"C:\\\\*"</code>) </td>
* </tr>
*
* </table>
@@ -390,7 +390,7 @@
* character is used to separate the subpatterns. Groups cannot be nested.
* </p></li>
*
- * <li><p> Leading period<tt>/</tt>dot characters in file name are
+ * <li><p> Leading period<code>/</code>dot characters in file name are
* treated as regular characters in match operations. For example,
* the {@code "*"} glob pattern matches file name {@code ".login"}.
* The {@link Files#isHidden} method may be used to test whether a file
diff --git a/jdk/src/java.base/share/classes/java/nio/file/FileSystems.java b/jdk/src/java.base/share/classes/java/nio/file/FileSystems.java
index 8524518..a5216b9 100644
--- a/jdk/src/java.base/share/classes/java/nio/file/FileSystems.java
+++ b/jdk/src/java.base/share/classes/java/nio/file/FileSystems.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, 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
@@ -321,9 +321,12 @@
String scheme = uri.getScheme();
// check installed providers
- for (FileSystemProvider provider: FileSystemProvider.installedProviders()) {
+ for (FileSystemProvider provider : FileSystemProvider.installedProviders()) {
if (scheme.equalsIgnoreCase(provider.getScheme())) {
- return provider.newFileSystem(uri, env);
+ try {
+ return provider.newFileSystem(uri, env);
+ } catch (UnsupportedOperationException uoe) {
+ }
}
}
@@ -331,9 +334,12 @@
if (loader != null) {
ServiceLoader<FileSystemProvider> sl = ServiceLoader
.load(FileSystemProvider.class, loader);
- for (FileSystemProvider provider: sl) {
+ for (FileSystemProvider provider : sl) {
if (scheme.equalsIgnoreCase(provider.getScheme())) {
- return provider.newFileSystem(uri, env);
+ try {
+ return provider.newFileSystem(uri, env);
+ } catch (UnsupportedOperationException uoe) {
+ }
}
}
}
diff --git a/jdk/src/java.base/share/classes/java/nio/file/Files.java b/jdk/src/java.base/share/classes/java/nio/file/Files.java
index 079361e..3fb7fe2 100644
--- a/jdk/src/java.base/share/classes/java/nio/file/Files.java
+++ b/jdk/src/java.base/share/classes/java/nio/file/Files.java
@@ -1033,7 +1033,7 @@
* if an I/O error occurs
* @throws SecurityException
* In the case of the default provider, and a security manager
- * is installed, it denies {@link LinkPermission}<tt>("symbolic")</tt>
+ * is installed, it denies {@link LinkPermission}{@code ("symbolic")}
* or its {@link SecurityManager#checkWrite(String) checkWrite}
* method denies write access to the path of the symbolic link.
*/
@@ -1078,7 +1078,7 @@
* if an I/O error occurs
* @throws SecurityException
* In the case of the default provider, and a security manager
- * is installed, it denies {@link LinkPermission}<tt>("hard")</tt>
+ * is installed, it denies {@link LinkPermission}{@code ("hard")}
* or its {@link SecurityManager#checkWrite(String) checkWrite}
* method denies write access to either the link or the
* existing file.
@@ -1455,8 +1455,8 @@
* In the case of the default provider, and a security manager is
* installed, the {@link SecurityManager#checkRead(String) checkRead}
* method is invoked to check read access to the file, and in
- * addition it checks {@link RuntimePermission}<tt>
- * ("getFileStoreAttributes")</tt>
+ * addition it checks
+ * {@link RuntimePermission}{@code ("getFileStoreAttributes")}
*/
public static FileStore getFileStore(Path path) throws IOException {
return provider(path).getFileStore(path);
@@ -1995,7 +1995,8 @@
* if an I/O error occurs
* @throws SecurityException
* In the case of the default provider, a security manager is
- * installed, and it denies {@link RuntimePermission}<tt>("accessUserInformation")</tt>
+ * installed, and it denies
+ * {@link RuntimePermission}{@code ("accessUserInformation")}
* or its {@link SecurityManager#checkRead(String) checkRead} method
* denies read access to the file.
*/
@@ -2032,7 +2033,8 @@
* if an I/O error occurs
* @throws SecurityException
* In the case of the default provider, and a security manager is
- * installed, it denies {@link RuntimePermission}<tt>("accessUserInformation")</tt>
+ * installed, it denies
+ * {@link RuntimePermission}{@code ("accessUserInformation")}
* or its {@link SecurityManager#checkWrite(String) checkWrite}
* method denies write access to the file.
*/
@@ -2069,7 +2071,8 @@
* if an I/O error occurs
* @throws SecurityException
* In the case of the default provider, and a security manager is
- * installed, it denies {@link RuntimePermission}<tt>("accessUserInformation")</tt>
+ * installed, it denies
+ * {@link RuntimePermission}{@code ("accessUserInformation")}
* or its {@link SecurityManager#checkRead(String) checkRead} method
* denies read access to the file.
*/
@@ -2112,7 +2115,8 @@
* if an I/O error occurs
* @throws SecurityException
* In the case of the default provider, and a security manager is
- * installed, it denies {@link RuntimePermission}<tt>("accessUserInformation")</tt>
+ * installed, it denies
+ * {@link RuntimePermission}{@code ("accessUserInformation")}
* or its {@link SecurityManager#checkWrite(String) checkWrite}
* method denies write access to the file.
*
@@ -3835,7 +3839,9 @@
// Obtaining the size from the FileChannel is much faster
// than obtaining using path.toFile().length()
long length = fc.size();
- if (length <= Integer.MAX_VALUE) {
+ // FileChannel.size() may in certain circumstances return zero
+ // for a non-zero length file so disallow this case.
+ if (length > 0 && length <= Integer.MAX_VALUE) {
Spliterator<String> s = new FileChannelLinesSpliterator(fc, cs, 0, (int) length);
return StreamSupport.stream(s, false)
.onClose(Files.asUncheckedRunnable(fc));
diff --git a/jdk/src/java.base/share/classes/java/nio/file/InvalidPathException.java b/jdk/src/java.base/share/classes/java/nio/file/InvalidPathException.java
index c3d617b..0502d7b 100644
--- a/jdk/src/java.base/share/classes/java/nio/file/InvalidPathException.java
+++ b/jdk/src/java.base/share/classes/java/nio/file/InvalidPathException.java
@@ -46,13 +46,13 @@
* @param input the input string
* @param reason a string explaining why the input was rejected
* @param index the index at which the error occurred,
- * or <tt>-1</tt> if the index is not known
+ * or {@code -1} if the index is not known
*
* @throws NullPointerException
- * if either the input or reason strings are <tt>null</tt>
+ * if either the input or reason strings are {@code null}
*
* @throws IllegalArgumentException
- * if the error index is less than <tt>-1</tt>
+ * if the error index is less than {@code -1}
*/
public InvalidPathException(String input, String reason, int index) {
super(reason);
@@ -66,13 +66,13 @@
/**
* Constructs an instance from the given input string and reason. The
- * resulting object will have an error index of <tt>-1</tt>.
+ * resulting object will have an error index of {@code -1}.
*
* @param input the input string
* @param reason a string explaining why the input was rejected
*
* @throws NullPointerException
- * if either the input or reason strings are <tt>null</tt>
+ * if either the input or reason strings are {@code null}
*/
public InvalidPathException(String input, String reason) {
this(input, reason, -1);
@@ -98,7 +98,7 @@
/**
* Returns an index into the input string of the position at which the
- * error occurred, or <tt>-1</tt> if this position is not known.
+ * error occurred, or {@code -1} if this position is not known.
*
* @return the error index
*/
@@ -109,8 +109,8 @@
/**
* Returns a string describing the error. The resulting string
* consists of the reason string followed by a colon character
- * (<tt>':'</tt>), a space, and the input string. If the error index is
- * defined then the string <tt>" at index "</tt> followed by the index, in
+ * ({@code ':'}), a space, and the input string. If the error index is
+ * defined then the string {@code " at index "} followed by the index, in
* decimal, is inserted after the reason string and before the colon
* character.
*
diff --git a/jdk/src/java.base/share/classes/java/nio/file/Path.java b/jdk/src/java.base/share/classes/java/nio/file/Path.java
index 8387a8e..ac497c3 100644
--- a/jdk/src/java.base/share/classes/java/nio/file/Path.java
+++ b/jdk/src/java.base/share/classes/java/nio/file/Path.java
@@ -480,7 +480,8 @@
* <p> For any two {@link #normalize normalized} paths <i>p</i> and
* <i>q</i>, where <i>q</i> does not have a root component,
* <blockquote>
- * <i>p</i><tt>.relativize(</tt><i>p</i><tt>.resolve(</tt><i>q</i><tt>)).equals(</tt><i>q</i><tt>)</tt>
+ * <i>p</i>{@code .relativize(}<i>p</i>
+ * {@code .resolve(}<i>q</i>{@code )).equals(}<i>q</i>{@code )}
* </blockquote>
*
* <p> When symbolic links are supported, then whether the resulting path,
@@ -525,9 +526,9 @@
* <p> The default provider provides a similar <em>round-trip</em> guarantee
* to the {@link java.io.File} class. For a given {@code Path} <i>p</i> it
* is guaranteed that
- * <blockquote><tt>
- * {@link Paths#get(URI) Paths.get}(</tt><i>p</i><tt>.toUri()).equals(</tt><i>p</i>
- * <tt>.{@link #toAbsolutePath() toAbsolutePath}())</tt>
+ * <blockquote>
+ * {@link Paths#get(URI) Paths.get}{@code (}<i>p</i>{@code .toUri()).equals(}<i>p</i>
+ * {@code .}{@link #toAbsolutePath() toAbsolutePath}{@code ())}
* </blockquote>
* so long as the original {@code Path}, the {@code URI}, and the new {@code
* Path} are all created in (possibly different invocations of) the same
diff --git a/jdk/src/java.base/share/classes/java/nio/file/Paths.java b/jdk/src/java.base/share/classes/java/nio/file/Paths.java
index bb49f99..3f57aaf7 100644
--- a/jdk/src/java.base/share/classes/java/nio/file/Paths.java
+++ b/jdk/src/java.base/share/classes/java/nio/file/Paths.java
@@ -103,9 +103,9 @@
* <p> The default provider provides a similar <em>round-trip</em> guarantee
* to the {@link java.io.File} class. For a given {@code Path} <i>p</i> it
* is guaranteed that
- * <blockquote><tt>
- * Paths.get(</tt><i>p</i><tt>.{@link Path#toUri() toUri}()).equals(</tt>
- * <i>p</i><tt>.{@link Path#toAbsolutePath() toAbsolutePath}())</tt>
+ * <blockquote>{@code
+ * Paths.get(}<i>p</i>{@code .}{@link Path#toUri() toUri}{@code ()).equals(}
+ * <i>p</i>{@code .}{@link Path#toAbsolutePath() toAbsolutePath}{@code ())}
* </blockquote>
* so long as the original {@code Path}, the {@code URI}, and the new {@code
* Path} are all created in (possibly different invocations of) the same
diff --git a/jdk/src/java.base/share/classes/java/nio/file/attribute/AclFileAttributeView.java b/jdk/src/java.base/share/classes/java/nio/file/attribute/AclFileAttributeView.java
index 129d0ee..429bfde 100644
--- a/jdk/src/java.base/share/classes/java/nio/file/attribute/AclFileAttributeView.java
+++ b/jdk/src/java.base/share/classes/java/nio/file/attribute/AclFileAttributeView.java
@@ -165,7 +165,7 @@
* if an I/O error occurs
* @throws SecurityException
* In the case of the default provider, a security manager is
- * installed, and it denies {@link RuntimePermission}<tt>("accessUserInformation")</tt>
+ * installed, and it denies {@link RuntimePermission}{@code ("accessUserInformation")}
* or its {@link SecurityManager#checkRead(String) checkRead} method
* denies read access to the file.
*/
@@ -201,7 +201,7 @@
* if an I/O error occurs or the ACL is invalid
* @throws SecurityException
* In the case of the default provider, a security manager is
- * installed, it denies {@link RuntimePermission}<tt>("accessUserInformation")</tt>
+ * installed, it denies {@link RuntimePermission}{@code ("accessUserInformation")}
* or its {@link SecurityManager#checkWrite(String) checkWrite}
* method denies write access to the file.
*/
diff --git a/jdk/src/java.base/share/classes/java/nio/file/attribute/FileOwnerAttributeView.java b/jdk/src/java.base/share/classes/java/nio/file/attribute/FileOwnerAttributeView.java
index f18caaf..9acde22 100644
--- a/jdk/src/java.base/share/classes/java/nio/file/attribute/FileOwnerAttributeView.java
+++ b/jdk/src/java.base/share/classes/java/nio/file/attribute/FileOwnerAttributeView.java
@@ -69,7 +69,7 @@
* @throws SecurityException
* In the case of the default provider, a security manager is
* installed, and it denies {@link
- * RuntimePermission}<tt>("accessUserInformation")</tt> or its
+ * RuntimePermission}{@code ("accessUserInformation")} or its
* {@link SecurityManager#checkRead(String) checkRead} method
* denies read access to the file.
*/
@@ -93,7 +93,7 @@
* @throws SecurityException
* In the case of the default provider, a security manager is
* installed, and it denies {@link
- * RuntimePermission}<tt>("accessUserInformation")</tt> or its
+ * RuntimePermission}{@code ("accessUserInformation")} or its
* {@link SecurityManager#checkWrite(String) checkWrite} method
* denies write access to the file.
*/
diff --git a/jdk/src/java.base/share/classes/java/nio/file/attribute/PosixFileAttributeView.java b/jdk/src/java.base/share/classes/java/nio/file/attribute/PosixFileAttributeView.java
index 25466f2..f8c3652 100644
--- a/jdk/src/java.base/share/classes/java/nio/file/attribute/PosixFileAttributeView.java
+++ b/jdk/src/java.base/share/classes/java/nio/file/attribute/PosixFileAttributeView.java
@@ -149,7 +149,8 @@
* @throws IOException {@inheritDoc}
* @throws SecurityException
* In the case of the default provider, a security manager is
- * installed, and it denies {@link RuntimePermission}<tt>("accessUserInformation")</tt>
+ * installed, and it denies
+ * {@link RuntimePermission}{@code ("accessUserInformation")}
* or its {@link SecurityManager#checkRead(String) checkRead} method
* denies read access to the file.
*/
@@ -169,7 +170,8 @@
* if an I/O error occurs
* @throws SecurityException
* In the case of the default provider, a security manager is
- * installed, and it denies {@link RuntimePermission}<tt>("accessUserInformation")</tt>
+ * installed, and it denies
+ * {@link RuntimePermission}{@code ("accessUserInformation")}
* or its {@link SecurityManager#checkWrite(String) checkWrite}
* method denies write access to the file.
*/
@@ -185,7 +187,8 @@
* if an I/O error occurs
* @throws SecurityException
* In the case of the default provider, and a security manager is
- * installed, it denies {@link RuntimePermission}<tt>("accessUserInformation")</tt>
+ * installed, it denies
+ * {@link RuntimePermission}{@code ("accessUserInformation")}
* or its {@link SecurityManager#checkWrite(String) checkWrite}
* method denies write access to the file.
*/
diff --git a/jdk/src/java.base/share/classes/java/nio/file/attribute/UserDefinedFileAttributeView.java b/jdk/src/java.base/share/classes/java/nio/file/attribute/UserDefinedFileAttributeView.java
index 56e7135..ffd89b9 100644
--- a/jdk/src/java.base/share/classes/java/nio/file/attribute/UserDefinedFileAttributeView.java
+++ b/jdk/src/java.base/share/classes/java/nio/file/attribute/UserDefinedFileAttributeView.java
@@ -89,7 +89,7 @@
* @throws SecurityException
* In the case of the default provider, a security manager is
* installed, and it denies {@link
- * RuntimePermission}<tt>("accessUserDefinedAttributes")</tt>
+ * RuntimePermission}{@code ("accessUserDefinedAttributes")}
* or its {@link SecurityManager#checkRead(String) checkRead} method
* denies read access to the file.
*/
@@ -110,7 +110,7 @@
* @throws SecurityException
* In the case of the default provider, a security manager is
* installed, and it denies {@link
- * RuntimePermission}<tt>("accessUserDefinedAttributes")</tt>
+ * RuntimePermission}{@code ("accessUserDefinedAttributes")}
* or its {@link SecurityManager#checkRead(String) checkRead} method
* denies read access to the file.
*/
@@ -156,7 +156,7 @@
* @throws SecurityException
* In the case of the default provider, a security manager is
* installed, and it denies {@link
- * RuntimePermission}<tt>("accessUserDefinedAttributes")</tt>
+ * RuntimePermission}{@code ("accessUserDefinedAttributes")}
* or its {@link SecurityManager#checkRead(String) checkRead} method
* denies read access to the file.
*
@@ -206,7 +206,7 @@
* @throws SecurityException
* In the case of the default provider, a security manager is
* installed, and it denies {@link
- * RuntimePermission}<tt>("accessUserDefinedAttributes")</tt>
+ * RuntimePermission}{@code ("accessUserDefinedAttributes")}
* or its {@link SecurityManager#checkWrite(String) checkWrite}
* method denies write access to the file.
*/
@@ -223,7 +223,7 @@
* @throws SecurityException
* In the case of the default provider, a security manager is
* installed, and it denies {@link
- * RuntimePermission}<tt>("accessUserDefinedAttributes")</tt>
+ * RuntimePermission}{@code ("accessUserDefinedAttributes")}
* or its {@link SecurityManager#checkWrite(String) checkWrite}
* method denies write access to the file.
*/
diff --git a/jdk/src/java.base/share/classes/java/nio/file/attribute/UserPrincipalLookupService.java b/jdk/src/java.base/share/classes/java/nio/file/attribute/UserPrincipalLookupService.java
index c3f3bef..64e2660 100644
--- a/jdk/src/java.base/share/classes/java/nio/file/attribute/UserPrincipalLookupService.java
+++ b/jdk/src/java.base/share/classes/java/nio/file/attribute/UserPrincipalLookupService.java
@@ -72,7 +72,8 @@
* if an I/O error occurs
* @throws SecurityException
* In the case of the default provider, and a security manager is
- * installed, it checks {@link RuntimePermission}<tt>("lookupUserInformation")</tt>
+ * installed, it checks
+ * {@link RuntimePermission}{@code ("lookupUserInformation")}
*/
public abstract UserPrincipal lookupPrincipalByName(String name)
throws IOException;
@@ -97,7 +98,8 @@
* if an I/O error occurs
* @throws SecurityException
* In the case of the default provider, and a security manager is
- * installed, it checks {@link RuntimePermission}<tt>("lookupUserInformation")</tt>
+ * installed, it checks
+ * {@link RuntimePermission}{@code ("lookupUserInformation")}
*/
public abstract GroupPrincipal lookupPrincipalByGroupName(String group)
throws IOException;
diff --git a/jdk/src/java.base/share/classes/java/nio/file/attribute/UserPrincipalNotFoundException.java b/jdk/src/java.base/share/classes/java/nio/file/attribute/UserPrincipalNotFoundException.java
index 5cf0ab0..563b339 100644
--- a/jdk/src/java.base/share/classes/java/nio/file/attribute/UserPrincipalNotFoundException.java
+++ b/jdk/src/java.base/share/classes/java/nio/file/attribute/UserPrincipalNotFoundException.java
@@ -54,7 +54,7 @@
/**
* Returns the user principal name if this exception was created with the
- * user principal name that was not found, otherwise <tt>null</tt>.
+ * user principal name that was not found, otherwise {@code null}.
*
* @return the user principal name or {@code null}
*/
diff --git a/jdk/src/java.base/share/classes/java/nio/file/attribute/package-info.java b/jdk/src/java.base/share/classes/java/nio/file/attribute/package-info.java
index be46551..1dd20f6 100644
--- a/jdk/src/java.base/share/classes/java/nio/file/attribute/package-info.java
+++ b/jdk/src/java.base/share/classes/java/nio/file/attribute/package-info.java
@@ -28,23 +28,23 @@
*
* <blockquote><table cellspacing=1 cellpadding=0 summary="Attribute views">
* <tr><th align="left">Attribute views</th><th align="left">Description</th></tr>
- * <tr><td valign=top><tt><i>{@link java.nio.file.attribute.AttributeView}</i></tt></td>
+ * <tr><td valign=top><i>{@link java.nio.file.attribute.AttributeView}</i></td>
* <td>Can read or update non-opaque values associated with objects in a file system</td></tr>
- * <tr><td valign=top><tt> <i>{@link java.nio.file.attribute.FileAttributeView}</i></tt></td>
+ * <tr><td valign=top> <i>{@link java.nio.file.attribute.FileAttributeView}</i></td>
* <td>Can read or update file attributes</td></tr>
- * <tr><td valign=top><tt> <i>{@link java.nio.file.attribute.BasicFileAttributeView} </i></tt></td>
+ * <tr><td valign=top> <i>{@link java.nio.file.attribute.BasicFileAttributeView} </i></td>
* <td>Can read or update a basic set of file attributes</td></tr>
- * <tr><td valign=top><tt> <i>{@link java.nio.file.attribute.PosixFileAttributeView} </i></tt></td>
+ * <tr><td valign=top> <i>{@link java.nio.file.attribute.PosixFileAttributeView} </i></td>
* <td>Can read or update POSIX defined file attributes</td></tr>
- * <tr><td valign=top><tt> <i>{@link java.nio.file.attribute.DosFileAttributeView} </i></tt></td>
+ * <tr><td valign=top> <i>{@link java.nio.file.attribute.DosFileAttributeView} </i></td>
* <td>Can read or update FAT file attributes</td></tr>
- * <tr><td valign=top><tt> <i>{@link java.nio.file.attribute.FileOwnerAttributeView} </i></tt></td>
+ * <tr><td valign=top> <i>{@link java.nio.file.attribute.FileOwnerAttributeView} </i></td>
* <td>Can read or update the owner of a file</td></tr>
- * <tr><td valign=top><tt> <i>{@link java.nio.file.attribute.AclFileAttributeView} </i></tt></td>
+ * <tr><td valign=top> <i>{@link java.nio.file.attribute.AclFileAttributeView} </i></td>
* <td>Can read or update Access Control Lists</td></tr>
- * <tr><td valign=top><tt> <i>{@link java.nio.file.attribute.UserDefinedFileAttributeView} </i></tt></td>
+ * <tr><td valign=top> <i>{@link java.nio.file.attribute.UserDefinedFileAttributeView} </i></td>
* <td>Can read or update user-defined file attributes</td></tr>
- * <tr><td valign=top><tt> <i>{@link java.nio.file.attribute.FileStoreAttributeView}</i></tt></td>
+ * <tr><td valign=top> <i>{@link java.nio.file.attribute.FileStoreAttributeView}</i></td>
* <td>Can read or update file system attributes</td></tr>
* </table></blockquote>
*
@@ -100,7 +100,7 @@
* </ul>
*
*
- * <p> Unless otherwise noted, passing a <tt>null</tt> argument to a constructor
+ * <p> Unless otherwise noted, passing a {@code null} argument to a constructor
* or method in any class or interface in this package will cause a {@link
* java.lang.NullPointerException NullPointerException} to be thrown.
*
diff --git a/jdk/src/java.base/share/classes/java/nio/file/spi/FileSystemProvider.java b/jdk/src/java.base/share/classes/java/nio/file/spi/FileSystemProvider.java
index dad5108..b92cf52 100644
--- a/jdk/src/java.base/share/classes/java/nio/file/spi/FileSystemProvider.java
+++ b/jdk/src/java.base/share/classes/java/nio/file/spi/FileSystemProvider.java
@@ -102,7 +102,7 @@
*
* @throws SecurityException
* If a security manager has been installed and it denies
- * {@link RuntimePermission}<tt>("fileSystemProvider")</tt>
+ * {@link RuntimePermission}{@code ("fileSystemProvider")}
*/
protected FileSystemProvider() {
this(checkPermission());
@@ -644,7 +644,7 @@
* if an I/O error occurs
* @throws SecurityException
* In the case of the default provider, and a security manager
- * is installed, it denies {@link LinkPermission}<tt>("symbolic")</tt>
+ * is installed, it denies {@link LinkPermission}{@code ("symbolic")}
* or its {@link SecurityManager#checkWrite(String) checkWrite}
* method denies write access to the path of the symbolic link.
*/
@@ -677,7 +677,7 @@
* if an I/O error occurs
* @throws SecurityException
* In the case of the default provider, and a security manager
- * is installed, it denies {@link LinkPermission}<tt>("hard")</tt>
+ * is installed, it denies {@link LinkPermission}{@code ("hard")}
* or its {@link SecurityManager#checkWrite(String) checkWrite}
* method denies write access to either the link or the
* existing file.
@@ -902,8 +902,8 @@
* In the case of the default provider, and a security manager is
* installed, the {@link SecurityManager#checkRead(String) checkRead}
* method is invoked to check read access to the file, and in
- * addition it checks {@link RuntimePermission}<tt>
- * ("getFileStoreAttributes")</tt>
+ * addition it checks
+ * {@link RuntimePermission}{@code ("getFileStoreAttributes")}
*/
public abstract FileStore getFileStore(Path path) throws IOException;
diff --git a/jdk/src/java.base/share/classes/java/nio/file/spi/FileTypeDetector.java b/jdk/src/java.base/share/classes/java/nio/file/spi/FileTypeDetector.java
index ee118d6..1e06a11 100644
--- a/jdk/src/java.base/share/classes/java/nio/file/spi/FileTypeDetector.java
+++ b/jdk/src/java.base/share/classes/java/nio/file/spi/FileTypeDetector.java
@@ -62,7 +62,7 @@
*
* @throws SecurityException
* If a security manager has been installed and it denies
- * {@link RuntimePermission}<tt>("fileTypeDetector")</tt>
+ * {@link RuntimePermission}{@code ("fileTypeDetector")}
*/
protected FileTypeDetector() {
this(checkPermission());
diff --git a/jdk/src/java.base/share/classes/java/nio/file/spi/package-info.java b/jdk/src/java.base/share/classes/java/nio/file/spi/package-info.java
index b86affe..d263ef7 100644
--- a/jdk/src/java.base/share/classes/java/nio/file/spi/package-info.java
+++ b/jdk/src/java.base/share/classes/java/nio/file/spi/package-info.java
@@ -24,12 +24,12 @@
*/
/**
- * Service-provider classes for the <tt>{@link java.nio.file}</tt> package.
+ * Service-provider classes for the {@link java.nio.file} package.
*
* <p> Only developers who are defining new file system providers or file type
* detectors should need to make direct use of this package. </p>
*
- * <p> Unless otherwise noted, passing a <tt>null</tt> argument to a constructor
+ * <p> Unless otherwise noted, passing a {@code null} argument to a constructor
* or method in any class or interface in this package will cause a {@link
* java.lang.NullPointerException NullPointerException} to be thrown.
*
diff --git a/jdk/src/java.base/share/classes/java/nio/package-info.java b/jdk/src/java.base/share/classes/java/nio/package-info.java
index 374e0bb..b36faea 100644
--- a/jdk/src/java.base/share/classes/java/nio/package-info.java
+++ b/jdk/src/java.base/share/classes/java/nio/package-info.java
@@ -52,7 +52,7 @@
*
* </ul>
*
- * <p> The <tt>java.nio</tt> package defines the buffer classes, which
+ * <p> The {@code java.nio} package defines the buffer classes, which
* are used throughout the NIO APIs. The charset API is defined in
* the {@link java.nio.charset} package, and the channel and selector
* APIs are defined in the {@link java.nio.channels} package. Each of
@@ -64,26 +64,26 @@
*
* <blockquote><table cellspacing=1 cellpadding=0 summary="Description of the various buffers">
* <tr><th align="left">Buffers</th><th align="left">Description</th></tr>
- * <tr><td valign=top><tt>{@link java.nio.Buffer}</tt></td>
+ * <tr><td valign=top>{@link java.nio.Buffer}</td>
* <td>Position, limit, and capacity;
* <br>clear, flip, rewind, and mark/reset</td></tr>
- * <tr><td valign=top><tt> {@link java.nio.ByteBuffer}</tt></td>
+ * <tr><td valign=top> {@link java.nio.ByteBuffer}</td>
* <td>Get/put, compact, views; allocate, wrap</td></tr>
- * <tr><td valign=top><tt> {@link java.nio.MappedByteBuffer} </tt></td>
+ * <tr><td valign=top> {@link java.nio.MappedByteBuffer} </td>
* <td>A byte buffer mapped to a file</td></tr>
- * <tr><td valign=top><tt> {@link java.nio.CharBuffer}</tt></td>
+ * <tr><td valign=top> {@link java.nio.CharBuffer}</td>
* <td>Get/put, compact; allocate, wrap</td></tr>
- * <tr><td valign=top><tt> {@link java.nio.DoubleBuffer}</tt></td>
+ * <tr><td valign=top> {@link java.nio.DoubleBuffer}</td>
* <td> ' '</td></tr>
- * <tr><td valign=top><tt> {@link java.nio.FloatBuffer}</tt></td>
+ * <tr><td valign=top> {@link java.nio.FloatBuffer}</td>
* <td> ' '</td></tr>
- * <tr><td valign=top><tt> {@link java.nio.IntBuffer}</tt></td>
+ * <tr><td valign=top> {@link java.nio.IntBuffer}</td>
* <td> ' '</td></tr>
- * <tr><td valign=top><tt> {@link java.nio.LongBuffer}</tt></td>
+ * <tr><td valign=top> {@link java.nio.LongBuffer}</td>
* <td> ' '</td></tr>
- * <tr><td valign=top><tt> {@link java.nio.ShortBuffer}</tt></td>
+ * <tr><td valign=top> {@link java.nio.ShortBuffer}</td>
* <td> ' '</td></tr>
- * <tr><td valign=top><tt>{@link java.nio.ByteOrder}</tt></td>
+ * <tr><td valign=top>{@link java.nio.ByteOrder}</td>
* <td>Typesafe enumeration for byte orders</td></tr>
* </table></blockquote>
*
@@ -129,7 +129,7 @@
*
* </ul>
*
- * <p> Unless otherwise noted, passing a <tt>null</tt> argument to a
+ * <p> Unless otherwise noted, passing a {@code null} argument to a
* constructor or method in any class or interface in this package
* will cause a {@link java.lang.NullPointerException
* NullPointerException} to be thrown.
diff --git a/jdk/src/java.base/share/classes/java/security/SecurityPermission.java b/jdk/src/java.base/share/classes/java/security/SecurityPermission.java
index 5bb7456..60d1d78 100644
--- a/jdk/src/java.base/share/classes/java/security/SecurityPermission.java
+++ b/jdk/src/java.base/share/classes/java/security/SecurityPermission.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, 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
@@ -31,19 +31,19 @@
import java.util.StringTokenizer;
/**
- * This class is for security permissions.
- * A SecurityPermission contains a name (also referred to as a "target name")
- * but no actions list; you either have the named permission
- * or you don't.
- * <P>
- * The target name is the name of a security configuration parameter (see below).
- * Currently the SecurityPermission object is used to guard access
- * to the Policy, Security, Provider, Signer, and Identity
+ * This class is for security permissions. A {@code SecurityPermission}
+ * contains a name (also referred to as a "target name") but no actions list;
+ * you either have the named permission or you don't.
+ * <p>
+ * The target name is the name of a security configuration parameter
+ * (see below). Currently the {@code SecurityPermission} object is used to
+ * guard access to the {@link AccessControlContext}, {@link Policy},
+ * {@link Provider}, {@link Security}, {@link Signer}, and {@link Identity}
* objects.
- * <P>
- * The following table lists all the possible SecurityPermission target names,
- * and for each provides a description of what the permission allows
- * and a discussion of the risks of granting code the permission.
+ * <p>
+ * The following table lists the standard {@code SecurityPermission}
+ * target names, and for each provides a description of what the permission
+ * allows and a discussion of the risks of granting code the permission.
*
* <table border=1 cellpadding=5 summary="target name,what the permission allows, and associated risks">
* <tr>
@@ -299,6 +299,10 @@
*
* </table>
*
+ * @implNote
+ * Implementations may define additional target names, but should use naming
+ * conventions such as reverse domain name notation to avoid name clashes.
+ *
* @see java.security.BasicPermission
* @see java.security.Permission
* @see java.security.Permissions
diff --git a/jdk/src/java.base/share/classes/java/util/AbstractCollection.java b/jdk/src/java.base/share/classes/java/util/AbstractCollection.java
index 4e53015..6f344f8 100644
--- a/jdk/src/java.base/share/classes/java/util/AbstractCollection.java
+++ b/jdk/src/java.base/share/classes/java/util/AbstractCollection.java
@@ -26,23 +26,23 @@
package java.util;
/**
- * This class provides a skeletal implementation of the <tt>Collection</tt>
+ * This class provides a skeletal implementation of the {@code Collection}
* interface, to minimize the effort required to implement this interface. <p>
*
* To implement an unmodifiable collection, the programmer needs only to
- * extend this class and provide implementations for the <tt>iterator</tt> and
- * <tt>size</tt> methods. (The iterator returned by the <tt>iterator</tt>
- * method must implement <tt>hasNext</tt> and <tt>next</tt>.)<p>
+ * extend this class and provide implementations for the {@code iterator} and
+ * {@code size} methods. (The iterator returned by the {@code iterator}
+ * method must implement {@code hasNext} and {@code next}.)<p>
*
* To implement a modifiable collection, the programmer must additionally
- * override this class's <tt>add</tt> method (which otherwise throws an
- * <tt>UnsupportedOperationException</tt>), and the iterator returned by the
- * <tt>iterator</tt> method must additionally implement its <tt>remove</tt>
+ * override this class's {@code add} method (which otherwise throws an
+ * {@code UnsupportedOperationException}), and the iterator returned by the
+ * {@code iterator} method must additionally implement its {@code remove}
* method.<p>
*
* The programmer should generally provide a void (no argument) and
- * <tt>Collection</tt> constructor, as per the recommendation in the
- * <tt>Collection</tt> interface specification.<p>
+ * {@code Collection} constructor, as per the recommendation in the
+ * {@code Collection} interface specification.<p>
*
* The documentation for each non-abstract method in this class describes its
* implementation in detail. Each of these methods may be overridden if
@@ -81,7 +81,7 @@
* {@inheritDoc}
*
* @implSpec
- * This implementation returns <tt>size() == 0</tt>.
+ * This implementation returns {@code size() == 0}.
*/
public boolean isEmpty() {
return size() == 0;
@@ -255,7 +255,7 @@
*
* @implSpec
* This implementation always throws an
- * <tt>UnsupportedOperationException</tt>.
+ * {@code UnsupportedOperationException}.
*
* @throws UnsupportedOperationException {@inheritDoc}
* @throws ClassCastException {@inheritDoc}
@@ -276,8 +276,8 @@
* from the collection using the iterator's remove method.
*
* <p>Note that this implementation throws an
- * <tt>UnsupportedOperationException</tt> if the iterator returned by this
- * collection's iterator method does not implement the <tt>remove</tt>
+ * {@code UnsupportedOperationException} if the iterator returned by this
+ * collection's iterator method does not implement the {@code remove}
* method and this collection contains the specified object.
*
* @throws UnsupportedOperationException {@inheritDoc}
@@ -314,7 +314,7 @@
* This implementation iterates over the specified collection,
* checking each element returned by the iterator in turn to see
* if it's contained in this collection. If all elements are so
- * contained <tt>true</tt> is returned, otherwise <tt>false</tt>.
+ * contained {@code true} is returned, otherwise {@code false}.
*
* @throws ClassCastException {@inheritDoc}
* @throws NullPointerException {@inheritDoc}
@@ -335,7 +335,7 @@
* each object returned by the iterator to this collection, in turn.
*
* <p>Note that this implementation will throw an
- * <tt>UnsupportedOperationException</tt> unless <tt>add</tt> is
+ * {@code UnsupportedOperationException} unless {@code add} is
* overridden (assuming the specified collection is non-empty).
*
* @throws UnsupportedOperationException {@inheritDoc}
@@ -361,11 +361,11 @@
* This implementation iterates over this collection, checking each
* element returned by the iterator in turn to see if it's contained
* in the specified collection. If it's so contained, it's removed from
- * this collection with the iterator's <tt>remove</tt> method.
+ * this collection with the iterator's {@code remove} method.
*
* <p>Note that this implementation will throw an
- * <tt>UnsupportedOperationException</tt> if the iterator returned by the
- * <tt>iterator</tt> method does not implement the <tt>remove</tt> method
+ * {@code UnsupportedOperationException} if the iterator returned by the
+ * {@code iterator} method does not implement the {@code remove} method
* and this collection contains one or more elements in common with the
* specified collection.
*
@@ -396,11 +396,11 @@
* This implementation iterates over this collection, checking each
* element returned by the iterator in turn to see if it's contained
* in the specified collection. If it's not so contained, it's removed
- * from this collection with the iterator's <tt>remove</tt> method.
+ * from this collection with the iterator's {@code remove} method.
*
* <p>Note that this implementation will throw an
- * <tt>UnsupportedOperationException</tt> if the iterator returned by the
- * <tt>iterator</tt> method does not implement the <tt>remove</tt> method
+ * {@code UnsupportedOperationException} if the iterator returned by the
+ * {@code iterator} method does not implement the {@code remove} method
* and this collection contains one or more elements not present in the
* specified collection.
*
@@ -429,14 +429,14 @@
*
* @implSpec
* This implementation iterates over this collection, removing each
- * element using the <tt>Iterator.remove</tt> operation. Most
+ * element using the {@code Iterator.remove} operation. Most
* implementations will probably choose to override this method for
* efficiency.
*
* <p>Note that this implementation will throw an
- * <tt>UnsupportedOperationException</tt> if the iterator returned by this
- * collection's <tt>iterator</tt> method does not implement the
- * <tt>remove</tt> method and this collection is non-empty.
+ * {@code UnsupportedOperationException} if the iterator returned by this
+ * collection's {@code iterator} method does not implement the
+ * {@code remove} method and this collection is non-empty.
*
* @throws UnsupportedOperationException {@inheritDoc}
*/
@@ -455,8 +455,8 @@
* Returns a string representation of this collection. The string
* representation consists of a list of the collection's elements in the
* order they are returned by its iterator, enclosed in square brackets
- * (<tt>"[]"</tt>). Adjacent elements are separated by the characters
- * <tt>", "</tt> (comma and space). Elements are converted to strings as
+ * ({@code "[]"}). Adjacent elements are separated by the characters
+ * {@code ", "} (comma and space). Elements are converted to strings as
* by {@link String#valueOf(Object)}.
*
* @return a string representation of this collection
diff --git a/jdk/src/java.base/share/classes/java/util/AbstractMap.java b/jdk/src/java.base/share/classes/java/util/AbstractMap.java
index 143f228..20d0cac 100644
--- a/jdk/src/java.base/share/classes/java/util/AbstractMap.java
+++ b/jdk/src/java.base/share/classes/java/util/AbstractMap.java
@@ -27,24 +27,24 @@
import java.util.Map.Entry;
/**
- * This class provides a skeletal implementation of the <tt>Map</tt>
+ * This class provides a skeletal implementation of the {@code Map}
* interface, to minimize the effort required to implement this interface.
*
* <p>To implement an unmodifiable map, the programmer needs only to extend this
- * class and provide an implementation for the <tt>entrySet</tt> method, which
+ * class and provide an implementation for the {@code entrySet} method, which
* returns a set-view of the map's mappings. Typically, the returned set
- * will, in turn, be implemented atop <tt>AbstractSet</tt>. This set should
- * not support the <tt>add</tt> or <tt>remove</tt> methods, and its iterator
- * should not support the <tt>remove</tt> method.
+ * will, in turn, be implemented atop {@code AbstractSet}. This set should
+ * not support the {@code add} or {@code remove} methods, and its iterator
+ * should not support the {@code remove} method.
*
* <p>To implement a modifiable map, the programmer must additionally override
- * this class's <tt>put</tt> method (which otherwise throws an
- * <tt>UnsupportedOperationException</tt>), and the iterator returned by
- * <tt>entrySet().iterator()</tt> must additionally implement its
- * <tt>remove</tt> method.
+ * this class's {@code put} method (which otherwise throws an
+ * {@code UnsupportedOperationException}), and the iterator returned by
+ * {@code entrySet().iterator()} must additionally implement its
+ * {@code remove} method.
*
* <p>The programmer should generally provide a void (no argument) and map
- * constructor, as per the recommendation in the <tt>Map</tt> interface
+ * constructor, as per the recommendation in the {@code Map} interface
* specification.
*
* <p>The documentation for each non-abstract method in this class describes its
@@ -79,7 +79,7 @@
* {@inheritDoc}
*
* @implSpec
- * This implementation returns <tt>entrySet().size()</tt>.
+ * This implementation returns {@code entrySet().size()}.
*/
public int size() {
return entrySet().size();
@@ -89,7 +89,7 @@
* {@inheritDoc}
*
* @implSpec
- * This implementation returns <tt>size() == 0</tt>.
+ * This implementation returns {@code size() == 0}.
*/
public boolean isEmpty() {
return size() == 0;
@@ -99,10 +99,10 @@
* {@inheritDoc}
*
* @implSpec
- * This implementation iterates over <tt>entrySet()</tt> searching
+ * This implementation iterates over {@code entrySet()} searching
* for an entry with the specified value. If such an entry is found,
- * <tt>true</tt> is returned. If the iteration terminates without
- * finding such an entry, <tt>false</tt> is returned. Note that this
+ * {@code true} is returned. If the iteration terminates without
+ * finding such an entry, {@code false} is returned. Note that this
* implementation requires linear time in the size of the map.
*
* @throws ClassCastException {@inheritDoc}
@@ -130,10 +130,10 @@
* {@inheritDoc}
*
* @implSpec
- * This implementation iterates over <tt>entrySet()</tt> searching
+ * This implementation iterates over {@code entrySet()} searching
* for an entry with the specified key. If such an entry is found,
- * <tt>true</tt> is returned. If the iteration terminates without
- * finding such an entry, <tt>false</tt> is returned. Note that this
+ * {@code true} is returned. If the iteration terminates without
+ * finding such an entry, {@code false} is returned. Note that this
* implementation requires linear time in the size of the map; many
* implementations will override this method.
*
@@ -162,10 +162,10 @@
* {@inheritDoc}
*
* @implSpec
- * This implementation iterates over <tt>entrySet()</tt> searching
+ * This implementation iterates over {@code entrySet()} searching
* for an entry with the specified key. If such an entry is found,
* the entry's value is returned. If the iteration terminates without
- * finding such an entry, <tt>null</tt> is returned. Note that this
+ * finding such an entry, {@code null} is returned. Note that this
* implementation requires linear time in the size of the map; many
* implementations will override this method.
*
@@ -198,7 +198,7 @@
*
* @implSpec
* This implementation always throws an
- * <tt>UnsupportedOperationException</tt>.
+ * {@code UnsupportedOperationException}.
*
* @throws UnsupportedOperationException {@inheritDoc}
* @throws ClassCastException {@inheritDoc}
@@ -213,18 +213,18 @@
* {@inheritDoc}
*
* @implSpec
- * This implementation iterates over <tt>entrySet()</tt> searching for an
+ * This implementation iterates over {@code entrySet()} searching for an
* entry with the specified key. If such an entry is found, its value is
- * obtained with its <tt>getValue</tt> operation, the entry is removed
+ * obtained with its {@code getValue} operation, the entry is removed
* from the collection (and the backing map) with the iterator's
- * <tt>remove</tt> operation, and the saved value is returned. If the
- * iteration terminates without finding such an entry, <tt>null</tt> is
+ * {@code remove} operation, and the saved value is returned. If the
+ * iteration terminates without finding such an entry, {@code null} is
* returned. Note that this implementation requires linear time in the
* size of the map; many implementations will override this method.
*
* <p>Note that this implementation throws an
- * <tt>UnsupportedOperationException</tt> if the <tt>entrySet</tt>
- * iterator does not support the <tt>remove</tt> method and this map
+ * {@code UnsupportedOperationException} if the {@code entrySet}
+ * iterator does not support the {@code remove} method and this map
* contains a mapping for the specified key.
*
* @throws UnsupportedOperationException {@inheritDoc}
@@ -264,12 +264,12 @@
*
* @implSpec
* This implementation iterates over the specified map's
- * <tt>entrySet()</tt> collection, and calls this map's <tt>put</tt>
+ * {@code entrySet()} collection, and calls this map's {@code put}
* operation once for each entry returned by the iteration.
*
* <p>Note that this implementation throws an
- * <tt>UnsupportedOperationException</tt> if this map does not support
- * the <tt>put</tt> operation and the specified map is nonempty.
+ * {@code UnsupportedOperationException} if this map does not support
+ * the {@code put} operation and the specified map is nonempty.
*
* @throws UnsupportedOperationException {@inheritDoc}
* @throws ClassCastException {@inheritDoc}
@@ -285,11 +285,11 @@
* {@inheritDoc}
*
* @implSpec
- * This implementation calls <tt>entrySet().clear()</tt>.
+ * This implementation calls {@code entrySet().clear()}.
*
* <p>Note that this implementation throws an
- * <tt>UnsupportedOperationException</tt> if the <tt>entrySet</tt>
- * does not support the <tt>clear</tt> operation.
+ * {@code UnsupportedOperationException} if the {@code entrySet}
+ * does not support the {@code clear} operation.
*
* @throws UnsupportedOperationException {@inheritDoc}
*/
@@ -314,10 +314,10 @@
* @implSpec
* This implementation returns a set that subclasses {@link AbstractSet}.
* The subclass's iterator method returns a "wrapper object" over this
- * map's <tt>entrySet()</tt> iterator. The <tt>size</tt> method
- * delegates to this map's <tt>size</tt> method and the
- * <tt>contains</tt> method delegates to this map's
- * <tt>containsKey</tt> method.
+ * map's {@code entrySet()} iterator. The {@code size} method
+ * delegates to this map's {@code size} method and the
+ * {@code contains} method delegates to this map's
+ * {@code containsKey} method.
*
* <p>The set is created the first time this method is called,
* and returned in response to all subsequent calls. No synchronization
@@ -371,10 +371,10 @@
* @implSpec
* This implementation returns a collection that subclasses {@link
* AbstractCollection}. The subclass's iterator method returns a
- * "wrapper object" over this map's <tt>entrySet()</tt> iterator.
- * The <tt>size</tt> method delegates to this map's <tt>size</tt>
- * method and the <tt>contains</tt> method delegates to this map's
- * <tt>containsValue</tt> method.
+ * "wrapper object" over this map's {@code entrySet()} iterator.
+ * The {@code size} method delegates to this map's {@code size}
+ * method and the {@code contains} method delegates to this map's
+ * {@code containsValue} method.
*
* <p>The collection is created the first time this method is called, and
* returned in response to all subsequent calls. No synchronization is
@@ -429,25 +429,25 @@
/**
* Compares the specified object with this map for equality. Returns
- * <tt>true</tt> if the given object is also a map and the two maps
- * represent the same mappings. More formally, two maps <tt>m1</tt> and
- * <tt>m2</tt> represent the same mappings if
- * <tt>m1.entrySet().equals(m2.entrySet())</tt>. This ensures that the
- * <tt>equals</tt> method works properly across different implementations
- * of the <tt>Map</tt> interface.
+ * {@code true} if the given object is also a map and the two maps
+ * represent the same mappings. More formally, two maps {@code m1} and
+ * {@code m2} represent the same mappings if
+ * {@code m1.entrySet().equals(m2.entrySet())}. This ensures that the
+ * {@code equals} method works properly across different implementations
+ * of the {@code Map} interface.
*
* @implSpec
* This implementation first checks if the specified object is this map;
- * if so it returns <tt>true</tt>. Then, it checks if the specified
+ * if so it returns {@code true}. Then, it checks if the specified
* object is a map whose size is identical to the size of this map; if
- * not, it returns <tt>false</tt>. If so, it iterates over this map's
- * <tt>entrySet</tt> collection, and checks that the specified map
+ * not, it returns {@code false}. If so, it iterates over this map's
+ * {@code entrySet} collection, and checks that the specified map
* contains each mapping that this map contains. If the specified map
- * fails to contain such a mapping, <tt>false</tt> is returned. If the
- * iteration completes, <tt>true</tt> is returned.
+ * fails to contain such a mapping, {@code false} is returned. If the
+ * iteration completes, {@code true} is returned.
*
* @param o object to be compared for equality with this map
- * @return <tt>true</tt> if the specified object is equal to this map
+ * @return {@code true} if the specified object is equal to this map
*/
public boolean equals(Object o) {
if (o == this)
@@ -483,13 +483,13 @@
/**
* Returns the hash code value for this map. The hash code of a map is
* defined to be the sum of the hash codes of each entry in the map's
- * <tt>entrySet()</tt> view. This ensures that <tt>m1.equals(m2)</tt>
- * implies that <tt>m1.hashCode()==m2.hashCode()</tt> for any two maps
- * <tt>m1</tt> and <tt>m2</tt>, as required by the general contract of
+ * {@code entrySet()} view. This ensures that {@code m1.equals(m2)}
+ * implies that {@code m1.hashCode()==m2.hashCode()} for any two maps
+ * {@code m1} and {@code m2}, as required by the general contract of
* {@link Object#hashCode}.
*
* @implSpec
- * This implementation iterates over <tt>entrySet()</tt>, calling
+ * This implementation iterates over {@code entrySet()}, calling
* {@link Map.Entry#hashCode hashCode()} on each element (entry) in the
* set, and adding up the results.
*
@@ -508,10 +508,10 @@
/**
* Returns a string representation of this map. The string representation
* consists of a list of key-value mappings in the order returned by the
- * map's <tt>entrySet</tt> view's iterator, enclosed in braces
- * (<tt>"{}"</tt>). Adjacent mappings are separated by the characters
- * <tt>", "</tt> (comma and space). Each key-value mapping is rendered as
- * the key followed by an equals sign (<tt>"="</tt>) followed by the
+ * map's {@code entrySet} view's iterator, enclosed in braces
+ * ({@code "{}"}). Adjacent mappings are separated by the characters
+ * {@code ", "} (comma and space). Each key-value mapping is rendered as
+ * the key followed by an equals sign ({@code "="}) followed by the
* associated value. Keys and values are converted to strings as by
* {@link String#valueOf(Object)}.
*
@@ -538,7 +538,7 @@
}
/**
- * Returns a shallow copy of this <tt>AbstractMap</tt> instance: the keys
+ * Returns a shallow copy of this {@code AbstractMap} instance: the keys
* and values themselves are not cloned.
*
* @return a shallow copy of this map
@@ -570,11 +570,11 @@
/**
* An Entry maintaining a key and a value. The value may be
- * changed using the <tt>setValue</tt> method. This class
+ * changed using the {@code setValue} method. This class
* facilitates the process of building custom map
* implementations. For example, it may be convenient to return
- * arrays of <tt>SimpleEntry</tt> instances in method
- * <tt>Map.entrySet().toArray</tt>.
+ * arrays of {@code SimpleEntry} instances in method
+ * {@code Map.entrySet().toArray}.
*
* @since 1.6
*/
@@ -689,7 +689,7 @@
/**
* Returns a String representation of this map entry. This
* implementation returns the string representation of this
- * entry's key followed by the equals character ("<tt>=</tt>")
+ * entry's key followed by the equals character ("{@code =}")
* followed by the string representation of this entry's value.
*
* @return a String representation of this map entry
@@ -702,7 +702,7 @@
/**
* An Entry maintaining an immutable key and value. This class
- * does not support method <tt>setValue</tt>. This class may be
+ * does not support method {@code setValue}. This class may be
* convenient in methods that return thread-safe snapshots of
* key-value mappings.
*
@@ -760,7 +760,7 @@
/**
* Replaces the value corresponding to this entry with the specified
* value (optional operation). This implementation simply throws
- * <tt>UnsupportedOperationException</tt>, as this class implements
+ * {@code UnsupportedOperationException}, as this class implements
* an <i>immutable</i> map entry.
*
* @param value new value to be stored in this entry
@@ -820,7 +820,7 @@
/**
* Returns a String representation of this map entry. This
* implementation returns the string representation of this
- * entry's key followed by the equals character ("<tt>=</tt>")
+ * entry's key followed by the equals character ("{@code =}")
* followed by the string representation of this entry's value.
*
* @return a String representation of this map entry
diff --git a/jdk/src/java.base/share/classes/java/util/AbstractSequentialList.java b/jdk/src/java.base/share/classes/java/util/AbstractSequentialList.java
index 85f77c6..bd6736b 100644
--- a/jdk/src/java.base/share/classes/java/util/AbstractSequentialList.java
+++ b/jdk/src/java.base/share/classes/java/util/AbstractSequentialList.java
@@ -26,31 +26,31 @@
package java.util;
/**
- * This class provides a skeletal implementation of the <tt>List</tt>
+ * This class provides a skeletal implementation of the {@code List}
* interface to minimize the effort required to implement this interface
* backed by a "sequential access" data store (such as a linked list). For
- * random access data (such as an array), <tt>AbstractList</tt> should be used
+ * random access data (such as an array), {@code AbstractList} should be used
* in preference to this class.<p>
*
- * This class is the opposite of the <tt>AbstractList</tt> class in the sense
- * that it implements the "random access" methods (<tt>get(int index)</tt>,
- * <tt>set(int index, E element)</tt>, <tt>add(int index, E element)</tt> and
- * <tt>remove(int index)</tt>) on top of the list's list iterator, instead of
+ * This class is the opposite of the {@code AbstractList} class in the sense
+ * that it implements the "random access" methods ({@code get(int index)},
+ * {@code set(int index, E element)}, {@code add(int index, E element)} and
+ * {@code remove(int index)}) on top of the list's list iterator, instead of
* the other way around.<p>
*
* To implement a list the programmer needs only to extend this class and
- * provide implementations for the <tt>listIterator</tt> and <tt>size</tt>
+ * provide implementations for the {@code listIterator} and {@code size}
* methods. For an unmodifiable list, the programmer need only implement the
- * list iterator's <tt>hasNext</tt>, <tt>next</tt>, <tt>hasPrevious</tt>,
- * <tt>previous</tt> and <tt>index</tt> methods.<p>
+ * list iterator's {@code hasNext}, {@code next}, {@code hasPrevious},
+ * {@code previous} and {@code index} methods.<p>
*
* For a modifiable list the programmer should additionally implement the list
- * iterator's <tt>set</tt> method. For a variable-size list the programmer
- * should additionally implement the list iterator's <tt>remove</tt> and
- * <tt>add</tt> methods.<p>
+ * iterator's {@code set} method. For a variable-size list the programmer
+ * should additionally implement the list iterator's {@code remove} and
+ * {@code add} methods.<p>
*
* The programmer should generally provide a void (no argument) and collection
- * constructor, as per the recommendation in the <tt>Collection</tt> interface
+ * constructor, as per the recommendation in the {@code Collection} interface
* specification.<p>
*
* This class is a member of the
@@ -78,8 +78,8 @@
* Returns the element at the specified position in this list.
*
* <p>This implementation first gets a list iterator pointing to the
- * indexed element (with <tt>listIterator(index)</tt>). Then, it gets
- * the element using <tt>ListIterator.next</tt> and returns it.
+ * indexed element (with {@code listIterator(index)}). Then, it gets
+ * the element using {@code ListIterator.next} and returns it.
*
* @throws IndexOutOfBoundsException {@inheritDoc}
*/
@@ -96,13 +96,13 @@
* specified element (optional operation).
*
* <p>This implementation first gets a list iterator pointing to the
- * indexed element (with <tt>listIterator(index)</tt>). Then, it gets
- * the current element using <tt>ListIterator.next</tt> and replaces it
- * with <tt>ListIterator.set</tt>.
+ * indexed element (with {@code listIterator(index)}). Then, it gets
+ * the current element using {@code ListIterator.next} and replaces it
+ * with {@code ListIterator.set}.
*
* <p>Note that this implementation will throw an
- * <tt>UnsupportedOperationException</tt> if the list iterator does not
- * implement the <tt>set</tt> operation.
+ * {@code UnsupportedOperationException} if the list iterator does not
+ * implement the {@code set} operation.
*
* @throws UnsupportedOperationException {@inheritDoc}
* @throws ClassCastException {@inheritDoc}
@@ -128,12 +128,12 @@
* indices).
*
* <p>This implementation first gets a list iterator pointing to the
- * indexed element (with <tt>listIterator(index)</tt>). Then, it
- * inserts the specified element with <tt>ListIterator.add</tt>.
+ * indexed element (with {@code listIterator(index)}). Then, it
+ * inserts the specified element with {@code ListIterator.add}.
*
* <p>Note that this implementation will throw an
- * <tt>UnsupportedOperationException</tt> if the list iterator does not
- * implement the <tt>add</tt> operation.
+ * {@code UnsupportedOperationException} if the list iterator does not
+ * implement the {@code add} operation.
*
* @throws UnsupportedOperationException {@inheritDoc}
* @throws ClassCastException {@inheritDoc}
@@ -156,12 +156,12 @@
* list.
*
* <p>This implementation first gets a list iterator pointing to the
- * indexed element (with <tt>listIterator(index)</tt>). Then, it removes
- * the element with <tt>ListIterator.remove</tt>.
+ * indexed element (with {@code listIterator(index)}). Then, it removes
+ * the element with {@code ListIterator.remove}.
*
* <p>Note that this implementation will throw an
- * <tt>UnsupportedOperationException</tt> if the list iterator does not
- * implement the <tt>remove</tt> operation.
+ * {@code UnsupportedOperationException} if the list iterator does not
+ * implement the {@code remove} operation.
*
* @throws UnsupportedOperationException {@inheritDoc}
* @throws IndexOutOfBoundsException {@inheritDoc}
@@ -193,14 +193,14 @@
*
* <p>This implementation gets an iterator over the specified collection and
* a list iterator over this list pointing to the indexed element (with
- * <tt>listIterator(index)</tt>). Then, it iterates over the specified
+ * {@code listIterator(index)}). Then, it iterates over the specified
* collection, inserting the elements obtained from the iterator into this
- * list, one at a time, using <tt>ListIterator.add</tt> followed by
- * <tt>ListIterator.next</tt> (to skip over the added element).
+ * list, one at a time, using {@code ListIterator.add} followed by
+ * {@code ListIterator.next} (to skip over the added element).
*
* <p>Note that this implementation will throw an
- * <tt>UnsupportedOperationException</tt> if the list iterator returned by
- * the <tt>listIterator</tt> method does not implement the <tt>add</tt>
+ * {@code UnsupportedOperationException} if the list iterator returned by
+ * the {@code listIterator} method does not implement the {@code add}
* operation.
*
* @throws UnsupportedOperationException {@inheritDoc}
@@ -243,7 +243,7 @@
* sequence).
*
* @param index index of first element to be returned from the list
- * iterator (by a call to the <code>next</code> method)
+ * iterator (by a call to the {@code next} method)
* @return a list iterator over the elements in this list (in proper
* sequence)
* @throws IndexOutOfBoundsException {@inheritDoc}
diff --git a/jdk/src/java.base/share/classes/java/util/AbstractSet.java b/jdk/src/java.base/share/classes/java/util/AbstractSet.java
index e999188..35e2ba4 100644
--- a/jdk/src/java.base/share/classes/java/util/AbstractSet.java
+++ b/jdk/src/java.base/share/classes/java/util/AbstractSet.java
@@ -26,20 +26,20 @@
package java.util;
/**
- * This class provides a skeletal implementation of the <tt>Set</tt>
+ * This class provides a skeletal implementation of the {@code Set}
* interface to minimize the effort required to implement this
* interface. <p>
*
* The process of implementing a set by extending this class is identical
* to that of implementing a Collection by extending AbstractCollection,
* except that all of the methods and constructors in subclasses of this
- * class must obey the additional constraints imposed by the <tt>Set</tt>
+ * class must obey the additional constraints imposed by the {@code Set}
* interface (for instance, the add method must not permit addition of
* multiple instances of an object to a set).<p>
*
* Note that this class does not override any of the implementations from
- * the <tt>AbstractCollection</tt> class. It merely adds implementations
- * for <tt>equals</tt> and <tt>hashCode</tt>.<p>
+ * the {@code AbstractCollection} class. It merely adds implementations
+ * for {@code equals} and {@code hashCode}.<p>
*
* This class is a member of the
* <a href="{@docRoot}/../technotes/guides/collections/index.html">
@@ -67,20 +67,20 @@
/**
* Compares the specified object with this set for equality. Returns
- * <tt>true</tt> if the given object is also a set, the two sets have
+ * {@code true} if the given object is also a set, the two sets have
* the same size, and every member of the given set is contained in
- * this set. This ensures that the <tt>equals</tt> method works
- * properly across different implementations of the <tt>Set</tt>
+ * this set. This ensures that the {@code equals} method works
+ * properly across different implementations of the {@code Set}
* interface.<p>
*
* This implementation first checks if the specified object is this
- * set; if so it returns <tt>true</tt>. Then, it checks if the
+ * set; if so it returns {@code true}. Then, it checks if the
* specified object is a set whose size is identical to the size of
* this set; if not, it returns false. If so, it returns
- * <tt>containsAll((Collection) o)</tt>.
+ * {@code containsAll((Collection) o)}.
*
* @param o object to be compared for equality with this set
- * @return <tt>true</tt> if the specified object is equal to this set
+ * @return {@code true} if the specified object is equal to this set
*/
public boolean equals(Object o) {
if (o == this)
@@ -103,14 +103,14 @@
/**
* Returns the hash code value for this set. The hash code of a set is
* defined to be the sum of the hash codes of the elements in the set,
- * where the hash code of a <tt>null</tt> element is defined to be zero.
- * This ensures that <tt>s1.equals(s2)</tt> implies that
- * <tt>s1.hashCode()==s2.hashCode()</tt> for any two sets <tt>s1</tt>
- * and <tt>s2</tt>, as required by the general contract of
+ * where the hash code of a {@code null} element is defined to be zero.
+ * This ensures that {@code s1.equals(s2)} implies that
+ * {@code s1.hashCode()==s2.hashCode()} for any two sets {@code s1}
+ * and {@code s2}, as required by the general contract of
* {@link Object#hashCode}.
*
* <p>This implementation iterates over the set, calling the
- * <tt>hashCode</tt> method on each element in the set, and adding up
+ * {@code hashCode} method on each element in the set, and adding up
* the results.
*
* @return the hash code value for this set
@@ -136,24 +136,24 @@
* the two sets.
*
* <p>This implementation determines which is the smaller of this set
- * and the specified collection, by invoking the <tt>size</tt>
+ * and the specified collection, by invoking the {@code size}
* method on each. If this set has fewer elements, then the
* implementation iterates over this set, checking each element
* returned by the iterator in turn to see if it is contained in
* the specified collection. If it is so contained, it is removed
- * from this set with the iterator's <tt>remove</tt> method. If
+ * from this set with the iterator's {@code remove} method. If
* the specified collection has fewer elements, then the
* implementation iterates over the specified collection, removing
* from this set each element returned by the iterator, using this
- * set's <tt>remove</tt> method.
+ * set's {@code remove} method.
*
* <p>Note that this implementation will throw an
- * <tt>UnsupportedOperationException</tt> if the iterator returned by the
- * <tt>iterator</tt> method does not implement the <tt>remove</tt> method.
+ * {@code UnsupportedOperationException} if the iterator returned by the
+ * {@code iterator} method does not implement the {@code remove} method.
*
* @param c collection containing elements to be removed from this set
- * @return <tt>true</tt> if this set changed as a result of the call
- * @throws UnsupportedOperationException if the <tt>removeAll</tt> operation
+ * @return {@code true} if this set changed as a result of the call
+ * @throws UnsupportedOperationException if the {@code removeAll} operation
* is not supported by this set
* @throws ClassCastException if the class of an element of this set
* is incompatible with the specified collection
diff --git a/jdk/src/java.base/share/classes/java/util/ArrayList.java b/jdk/src/java.base/share/classes/java/util/ArrayList.java
index 7a3ad72..6afb433 100644
--- a/jdk/src/java.base/share/classes/java/util/ArrayList.java
+++ b/jdk/src/java.base/share/classes/java/util/ArrayList.java
@@ -294,7 +294,7 @@
* Returns {@code true} if this list contains the specified element.
* More formally, returns {@code true} if and only if this list contains
* at least one element {@code e} such that
- * <tt>(o==null ? e==null : o.equals(e))</tt>.
+ * {@code Objects.equals(o, e)}.
*
* @param o element whose presence in this list is to be tested
* @return {@code true} if this list contains the specified element
@@ -307,7 +307,7 @@
* Returns the index of the first occurrence of the specified element
* in this list, or -1 if this list does not contain the element.
* More formally, returns the lowest index {@code i} such that
- * <tt>(o==null ? get(i)==null : o.equals(get(i)))</tt>,
+ * {@code Objects.equals(o, get(i))},
* or -1 if there is no such index.
*/
public int indexOf(Object o) {
@@ -327,7 +327,7 @@
* Returns the index of the last occurrence of the specified element
* in this list, or -1 if this list does not contain the element.
* More formally, returns the highest index {@code i} such that
- * <tt>(o==null ? get(i)==null : o.equals(get(i)))</tt>,
+ * {@code Objects.equals(o, get(i))},
* or -1 if there is no such index.
*/
public int lastIndexOf(Object o) {
@@ -511,7 +511,7 @@
* if it is present. If the list does not contain the element, it is
* unchanged. More formally, removes the element with the lowest index
* {@code i} such that
- * <tt>(o==null ? get(i)==null : o.equals(get(i)))</tt>
+ * {@code Objects.equals(o, get(i))}
* (if such an element exists). Returns {@code true} if this list
* contained the specified element (or equivalently, if this list
* changed as a result of the call).
diff --git a/jdk/src/java.base/share/classes/java/util/Arrays.java b/jdk/src/java.base/share/classes/java/util/Arrays.java
index 70049da..3596298 100644
--- a/jdk/src/java.base/share/classes/java/util/Arrays.java
+++ b/jdk/src/java.base/share/classes/java/util/Arrays.java
@@ -1772,10 +1772,10 @@
* @param a the array to be searched
* @param key the value to be searched for
* @return index of the search key, if it is contained in the array;
- * otherwise, <tt>(-(<i>insertion point</i>) - 1)</tt>. The
+ * otherwise, <code>(-(<i>insertion point</i>) - 1)</code>. The
* <i>insertion point</i> is defined as the point at which the
* key would be inserted into the array: the index of the first
- * element greater than the key, or <tt>a.length</tt> if all
+ * element greater than the key, or {@code a.length} if all
* elements in the array are less than the specified key. Note
* that this guarantees that the return value will be >= 0 if
* and only if the key is found.
@@ -1802,11 +1802,11 @@
* @param key the value to be searched for
* @return index of the search key, if it is contained in the array
* within the specified range;
- * otherwise, <tt>(-(<i>insertion point</i>) - 1)</tt>. The
+ * otherwise, <code>(-(<i>insertion point</i>) - 1)</code>. The
* <i>insertion point</i> is defined as the point at which the
* key would be inserted into the array: the index of the first
* element in the range greater than the key,
- * or <tt>toIndex</tt> if all
+ * or {@code toIndex} if all
* elements in the range are less than the specified key. Note
* that this guarantees that the return value will be >= 0 if
* and only if the key is found.
@@ -1853,10 +1853,10 @@
* @param a the array to be searched
* @param key the value to be searched for
* @return index of the search key, if it is contained in the array;
- * otherwise, <tt>(-(<i>insertion point</i>) - 1)</tt>. The
+ * otherwise, <code>(-(<i>insertion point</i>) - 1)</code>. The
* <i>insertion point</i> is defined as the point at which the
* key would be inserted into the array: the index of the first
- * element greater than the key, or <tt>a.length</tt> if all
+ * element greater than the key, or {@code a.length} if all
* elements in the array are less than the specified key. Note
* that this guarantees that the return value will be >= 0 if
* and only if the key is found.
@@ -1883,11 +1883,11 @@
* @param key the value to be searched for
* @return index of the search key, if it is contained in the array
* within the specified range;
- * otherwise, <tt>(-(<i>insertion point</i>) - 1)</tt>. The
+ * otherwise, <code>(-(<i>insertion point</i>) - 1)</code>. The
* <i>insertion point</i> is defined as the point at which the
* key would be inserted into the array: the index of the first
* element in the range greater than the key,
- * or <tt>toIndex</tt> if all
+ * or {@code toIndex} if all
* elements in the range are less than the specified key. Note
* that this guarantees that the return value will be >= 0 if
* and only if the key is found.
@@ -1934,10 +1934,10 @@
* @param a the array to be searched
* @param key the value to be searched for
* @return index of the search key, if it is contained in the array;
- * otherwise, <tt>(-(<i>insertion point</i>) - 1)</tt>. The
+ * otherwise, <code>(-(<i>insertion point</i>) - 1)</code>. The
* <i>insertion point</i> is defined as the point at which the
* key would be inserted into the array: the index of the first
- * element greater than the key, or <tt>a.length</tt> if all
+ * element greater than the key, or {@code a.length} if all
* elements in the array are less than the specified key. Note
* that this guarantees that the return value will be >= 0 if
* and only if the key is found.
@@ -1964,11 +1964,11 @@
* @param key the value to be searched for
* @return index of the search key, if it is contained in the array
* within the specified range;
- * otherwise, <tt>(-(<i>insertion point</i>) - 1)</tt>. The
+ * otherwise, <code>(-(<i>insertion point</i>) - 1)</code>. The
* <i>insertion point</i> is defined as the point at which the
* key would be inserted into the array: the index of the first
* element in the range greater than the key,
- * or <tt>toIndex</tt> if all
+ * or {@code toIndex} if all
* elements in the range are less than the specified key. Note
* that this guarantees that the return value will be >= 0 if
* and only if the key is found.
@@ -2015,10 +2015,10 @@
* @param a the array to be searched
* @param key the value to be searched for
* @return index of the search key, if it is contained in the array;
- * otherwise, <tt>(-(<i>insertion point</i>) - 1)</tt>. The
+ * otherwise, <code>(-(<i>insertion point</i>) - 1)</code>. The
* <i>insertion point</i> is defined as the point at which the
* key would be inserted into the array: the index of the first
- * element greater than the key, or <tt>a.length</tt> if all
+ * element greater than the key, or {@code a.length} if all
* elements in the array are less than the specified key. Note
* that this guarantees that the return value will be >= 0 if
* and only if the key is found.
@@ -2045,11 +2045,11 @@
* @param key the value to be searched for
* @return index of the search key, if it is contained in the array
* within the specified range;
- * otherwise, <tt>(-(<i>insertion point</i>) - 1)</tt>. The
+ * otherwise, <code>(-(<i>insertion point</i>) - 1)</code>. The
* <i>insertion point</i> is defined as the point at which the
* key would be inserted into the array: the index of the first
* element in the range greater than the key,
- * or <tt>toIndex</tt> if all
+ * or {@code toIndex} if all
* elements in the range are less than the specified key. Note
* that this guarantees that the return value will be >= 0 if
* and only if the key is found.
@@ -2096,10 +2096,10 @@
* @param a the array to be searched
* @param key the value to be searched for
* @return index of the search key, if it is contained in the array;
- * otherwise, <tt>(-(<i>insertion point</i>) - 1)</tt>. The
+ * otherwise, <code>(-(<i>insertion point</i>) - 1)</code>. The
* <i>insertion point</i> is defined as the point at which the
* key would be inserted into the array: the index of the first
- * element greater than the key, or <tt>a.length</tt> if all
+ * element greater than the key, or {@code a.length} if all
* elements in the array are less than the specified key. Note
* that this guarantees that the return value will be >= 0 if
* and only if the key is found.
@@ -2126,11 +2126,11 @@
* @param key the value to be searched for
* @return index of the search key, if it is contained in the array
* within the specified range;
- * otherwise, <tt>(-(<i>insertion point</i>) - 1)</tt>. The
+ * otherwise, <code>(-(<i>insertion point</i>) - 1)</code>. The
* <i>insertion point</i> is defined as the point at which the
* key would be inserted into the array: the index of the first
* element in the range greater than the key,
- * or <tt>toIndex</tt> if all
+ * or {@code toIndex} if all
* elements in the range are less than the specified key. Note
* that this guarantees that the return value will be >= 0 if
* and only if the key is found.
@@ -2178,10 +2178,10 @@
* @param a the array to be searched
* @param key the value to be searched for
* @return index of the search key, if it is contained in the array;
- * otherwise, <tt>(-(<i>insertion point</i>) - 1)</tt>. The
+ * otherwise, <code>(-(<i>insertion point</i>) - 1)</code>. The
* <i>insertion point</i> is defined as the point at which the
* key would be inserted into the array: the index of the first
- * element greater than the key, or <tt>a.length</tt> if all
+ * element greater than the key, or {@code a.length} if all
* elements in the array are less than the specified key. Note
* that this guarantees that the return value will be >= 0 if
* and only if the key is found.
@@ -2209,11 +2209,11 @@
* @param key the value to be searched for
* @return index of the search key, if it is contained in the array
* within the specified range;
- * otherwise, <tt>(-(<i>insertion point</i>) - 1)</tt>. The
+ * otherwise, <code>(-(<i>insertion point</i>) - 1)</code>. The
* <i>insertion point</i> is defined as the point at which the
* key would be inserted into the array: the index of the first
* element in the range greater than the key,
- * or <tt>toIndex</tt> if all
+ * or {@code toIndex} if all
* elements in the range are less than the specified key. Note
* that this guarantees that the return value will be >= 0 if
* and only if the key is found.
@@ -2269,10 +2269,10 @@
* @param a the array to be searched
* @param key the value to be searched for
* @return index of the search key, if it is contained in the array;
- * otherwise, <tt>(-(<i>insertion point</i>) - 1)</tt>. The
+ * otherwise, <code>(-(<i>insertion point</i>) - 1)</code>. The
* <i>insertion point</i> is defined as the point at which the
* key would be inserted into the array: the index of the first
- * element greater than the key, or <tt>a.length</tt> if all
+ * element greater than the key, or {@code a.length} if all
* elements in the array are less than the specified key. Note
* that this guarantees that the return value will be >= 0 if
* and only if the key is found.
@@ -2300,11 +2300,11 @@
* @param key the value to be searched for
* @return index of the search key, if it is contained in the array
* within the specified range;
- * otherwise, <tt>(-(<i>insertion point</i>) - 1)</tt>. The
+ * otherwise, <code>(-(<i>insertion point</i>) - 1)</code>. The
* <i>insertion point</i> is defined as the point at which the
* key would be inserted into the array: the index of the first
* element in the range greater than the key,
- * or <tt>toIndex</tt> if all
+ * or {@code toIndex} if all
* elements in the range are less than the specified key. Note
* that this guarantees that the return value will be >= 0 if
* and only if the key is found.
@@ -2366,10 +2366,10 @@
* @param a the array to be searched
* @param key the value to be searched for
* @return index of the search key, if it is contained in the array;
- * otherwise, <tt>(-(<i>insertion point</i>) - 1)</tt>. The
+ * otherwise, <code>(-(<i>insertion point</i>) - 1)</code>. The
* <i>insertion point</i> is defined as the point at which the
* key would be inserted into the array: the index of the first
- * element greater than the key, or <tt>a.length</tt> if all
+ * element greater than the key, or {@code a.length} if all
* elements in the array are less than the specified key. Note
* that this guarantees that the return value will be >= 0 if
* and only if the key is found.
@@ -2404,11 +2404,11 @@
* @param key the value to be searched for
* @return index of the search key, if it is contained in the array
* within the specified range;
- * otherwise, <tt>(-(<i>insertion point</i>) - 1)</tt>. The
+ * otherwise, <code>(-(<i>insertion point</i>) - 1)</code>. The
* <i>insertion point</i> is defined as the point at which the
* key would be inserted into the array: the index of the first
* element in the range greater than the key,
- * or <tt>toIndex</tt> if all
+ * or {@code toIndex} if all
* elements in the range are less than the specified key. Note
* that this guarantees that the return value will be >= 0 if
* and only if the key is found.
@@ -2464,13 +2464,13 @@
* @param a the array to be searched
* @param key the value to be searched for
* @param c the comparator by which the array is ordered. A
- * <tt>null</tt> value indicates that the elements'
+ * {@code null} value indicates that the elements'
* {@linkplain Comparable natural ordering} should be used.
* @return index of the search key, if it is contained in the array;
- * otherwise, <tt>(-(<i>insertion point</i>) - 1)</tt>. The
+ * otherwise, <code>(-(<i>insertion point</i>) - 1)</code>. The
* <i>insertion point</i> is defined as the point at which the
* key would be inserted into the array: the index of the first
- * element greater than the key, or <tt>a.length</tt> if all
+ * element greater than the key, or {@code a.length} if all
* elements in the array are less than the specified key. Note
* that this guarantees that the return value will be >= 0 if
* and only if the key is found.
@@ -2503,15 +2503,15 @@
* @param toIndex the index of the last element (exclusive) to be searched
* @param key the value to be searched for
* @param c the comparator by which the array is ordered. A
- * <tt>null</tt> value indicates that the elements'
+ * {@code null} value indicates that the elements'
* {@linkplain Comparable natural ordering} should be used.
* @return index of the search key, if it is contained in the array
* within the specified range;
- * otherwise, <tt>(-(<i>insertion point</i>) - 1)</tt>. The
+ * otherwise, <code>(-(<i>insertion point</i>) - 1)</code>. The
* <i>insertion point</i> is defined as the point at which the
* key would be inserted into the array: the index of the first
* element in the range greater than the key,
- * or <tt>toIndex</tt> if all
+ * or {@code toIndex} if all
* elements in the range are less than the specified key. Note
* that this guarantees that the return value will be >= 0 if
* and only if the key is found.
@@ -2557,16 +2557,16 @@
// Equality Testing
/**
- * Returns <tt>true</tt> if the two specified arrays of longs are
+ * Returns {@code true} if the two specified arrays of longs are
* <i>equal</i> to one another. Two arrays are considered equal if both
* arrays contain the same number of elements, and all corresponding pairs
* of elements in the two arrays are equal. In other words, two arrays
* are equal if they contain the same elements in the same order. Also,
- * two array references are considered equal if both are <tt>null</tt>.
+ * two array references are considered equal if both are {@code null}.
*
* @param a one array to be tested for equality
* @param a2 the other array to be tested for equality
- * @return <tt>true</tt> if the two arrays are equal
+ * @return {@code true} if the two arrays are equal
*/
public static boolean equals(long[] a, long[] a2) {
if (a==a2)
@@ -2586,16 +2586,16 @@
}
/**
- * Returns <tt>true</tt> if the two specified arrays of ints are
+ * Returns {@code true} if the two specified arrays of ints are
* <i>equal</i> to one another. Two arrays are considered equal if both
* arrays contain the same number of elements, and all corresponding pairs
* of elements in the two arrays are equal. In other words, two arrays
* are equal if they contain the same elements in the same order. Also,
- * two array references are considered equal if both are <tt>null</tt>.
+ * two array references are considered equal if both are {@code null}.
*
* @param a one array to be tested for equality
* @param a2 the other array to be tested for equality
- * @return <tt>true</tt> if the two arrays are equal
+ * @return {@code true} if the two arrays are equal
*/
public static boolean equals(int[] a, int[] a2) {
if (a==a2)
@@ -2615,16 +2615,16 @@
}
/**
- * Returns <tt>true</tt> if the two specified arrays of shorts are
+ * Returns {@code true} if the two specified arrays of shorts are
* <i>equal</i> to one another. Two arrays are considered equal if both
* arrays contain the same number of elements, and all corresponding pairs
* of elements in the two arrays are equal. In other words, two arrays
* are equal if they contain the same elements in the same order. Also,
- * two array references are considered equal if both are <tt>null</tt>.
+ * two array references are considered equal if both are {@code null}.
*
* @param a one array to be tested for equality
* @param a2 the other array to be tested for equality
- * @return <tt>true</tt> if the two arrays are equal
+ * @return {@code true} if the two arrays are equal
*/
public static boolean equals(short[] a, short a2[]) {
if (a==a2)
@@ -2644,16 +2644,16 @@
}
/**
- * Returns <tt>true</tt> if the two specified arrays of chars are
+ * Returns {@code true} if the two specified arrays of chars are
* <i>equal</i> to one another. Two arrays are considered equal if both
* arrays contain the same number of elements, and all corresponding pairs
* of elements in the two arrays are equal. In other words, two arrays
* are equal if they contain the same elements in the same order. Also,
- * two array references are considered equal if both are <tt>null</tt>.
+ * two array references are considered equal if both are {@code null}.
*
* @param a one array to be tested for equality
* @param a2 the other array to be tested for equality
- * @return <tt>true</tt> if the two arrays are equal
+ * @return {@code true} if the two arrays are equal
*/
@HotSpotIntrinsicCandidate
public static boolean equals(char[] a, char[] a2) {
@@ -2674,16 +2674,16 @@
}
/**
- * Returns <tt>true</tt> if the two specified arrays of bytes are
+ * Returns {@code true} if the two specified arrays of bytes are
* <i>equal</i> to one another. Two arrays are considered equal if both
* arrays contain the same number of elements, and all corresponding pairs
* of elements in the two arrays are equal. In other words, two arrays
* are equal if they contain the same elements in the same order. Also,
- * two array references are considered equal if both are <tt>null</tt>.
+ * two array references are considered equal if both are {@code null}.
*
* @param a one array to be tested for equality
* @param a2 the other array to be tested for equality
- * @return <tt>true</tt> if the two arrays are equal
+ * @return {@code true} if the two arrays are equal
*/
public static boolean equals(byte[] a, byte[] a2) {
if (a==a2)
@@ -2703,16 +2703,16 @@
}
/**
- * Returns <tt>true</tt> if the two specified arrays of booleans are
+ * Returns {@code true} if the two specified arrays of booleans are
* <i>equal</i> to one another. Two arrays are considered equal if both
* arrays contain the same number of elements, and all corresponding pairs
* of elements in the two arrays are equal. In other words, two arrays
* are equal if they contain the same elements in the same order. Also,
- * two array references are considered equal if both are <tt>null</tt>.
+ * two array references are considered equal if both are {@code null}.
*
* @param a one array to be tested for equality
* @param a2 the other array to be tested for equality
- * @return <tt>true</tt> if the two arrays are equal
+ * @return {@code true} if the two arrays are equal
*/
public static boolean equals(boolean[] a, boolean[] a2) {
if (a==a2)
@@ -2732,21 +2732,21 @@
}
/**
- * Returns <tt>true</tt> if the two specified arrays of doubles are
+ * Returns {@code true} if the two specified arrays of doubles are
* <i>equal</i> to one another. Two arrays are considered equal if both
* arrays contain the same number of elements, and all corresponding pairs
* of elements in the two arrays are equal. In other words, two arrays
* are equal if they contain the same elements in the same order. Also,
- * two array references are considered equal if both are <tt>null</tt>.
+ * two array references are considered equal if both are {@code null}.
*
- * Two doubles <tt>d1</tt> and <tt>d2</tt> are considered equal if:
- * <pre> <tt>new Double(d1).equals(new Double(d2))</tt></pre>
- * (Unlike the <tt>==</tt> operator, this method considers
- * <tt>NaN</tt> equals to itself, and 0.0d unequal to -0.0d.)
+ * Two doubles {@code d1} and {@code d2} are considered equal if:
+ * <pre> {@code new Double(d1).equals(new Double(d2))}</pre>
+ * (Unlike the {@code ==} operator, this method considers
+ * {@code NaN} equals to itself, and 0.0d unequal to -0.0d.)
*
* @param a one array to be tested for equality
* @param a2 the other array to be tested for equality
- * @return <tt>true</tt> if the two arrays are equal
+ * @return {@code true} if the two arrays are equal
* @see Double#equals(Object)
*/
public static boolean equals(double[] a, double[] a2) {
@@ -2767,21 +2767,21 @@
}
/**
- * Returns <tt>true</tt> if the two specified arrays of floats are
+ * Returns {@code true} if the two specified arrays of floats are
* <i>equal</i> to one another. Two arrays are considered equal if both
* arrays contain the same number of elements, and all corresponding pairs
* of elements in the two arrays are equal. In other words, two arrays
* are equal if they contain the same elements in the same order. Also,
- * two array references are considered equal if both are <tt>null</tt>.
+ * two array references are considered equal if both are {@code null}.
*
- * Two floats <tt>f1</tt> and <tt>f2</tt> are considered equal if:
- * <pre> <tt>new Float(f1).equals(new Float(f2))</tt></pre>
- * (Unlike the <tt>==</tt> operator, this method considers
- * <tt>NaN</tt> equals to itself, and 0.0f unequal to -0.0f.)
+ * Two floats {@code f1} and {@code f2} are considered equal if:
+ * <pre> {@code new Float(f1).equals(new Float(f2))}</pre>
+ * (Unlike the {@code ==} operator, this method considers
+ * {@code NaN} equals to itself, and 0.0f unequal to -0.0f.)
*
* @param a one array to be tested for equality
* @param a2 the other array to be tested for equality
- * @return <tt>true</tt> if the two arrays are equal
+ * @return {@code true} if the two arrays are equal
* @see Float#equals(Object)
*/
public static boolean equals(float[] a, float[] a2) {
@@ -2802,18 +2802,19 @@
}
/**
- * Returns <tt>true</tt> if the two specified arrays of Objects are
+ * Returns {@code true} if the two specified arrays of Objects are
* <i>equal</i> to one another. The two arrays are considered equal if
* both arrays contain the same number of elements, and all corresponding
- * pairs of elements in the two arrays are equal. Two objects <tt>e1</tt>
- * and <tt>e2</tt> are considered <i>equal</i> if <tt>(e1==null ? e2==null
- * : e1.equals(e2))</tt>. In other words, the two arrays are equal if
+ * pairs of elements in the two arrays are equal. Two objects {@code e1}
+ * and {@code e2} are considered <i>equal</i> if
+ * {@code Objects.equals(e1, e2)}.
+ * In other words, the two arrays are equal if
* they contain the same elements in the same order. Also, two array
- * references are considered equal if both are <tt>null</tt>.
+ * references are considered equal if both are {@code null}.
*
* @param a one array to be tested for equality
* @param a2 the other array to be tested for equality
- * @return <tt>true</tt> if the two arrays are equal
+ * @return {@code true} if the two arrays are equal
*/
public static boolean equals(Object[] a, Object[] a2) {
if (a==a2)
@@ -2852,8 +2853,8 @@
/**
* Assigns the specified long value to each element of the specified
* range of the specified array of longs. The range to be filled
- * extends from index <tt>fromIndex</tt>, inclusive, to index
- * <tt>toIndex</tt>, exclusive. (If <tt>fromIndex==toIndex</tt>, the
+ * extends from index {@code fromIndex}, inclusive, to index
+ * {@code toIndex}, exclusive. (If {@code fromIndex==toIndex}, the
* range to be filled is empty.)
*
* @param a the array to be filled
@@ -2862,9 +2863,9 @@
* @param toIndex the index of the last element (exclusive) to be
* filled with the specified value
* @param val the value to be stored in all elements of the array
- * @throws IllegalArgumentException if <tt>fromIndex > toIndex</tt>
- * @throws ArrayIndexOutOfBoundsException if <tt>fromIndex < 0</tt> or
- * <tt>toIndex > a.length</tt>
+ * @throws IllegalArgumentException if {@code fromIndex > toIndex}
+ * @throws ArrayIndexOutOfBoundsException if {@code fromIndex < 0} or
+ * {@code toIndex > a.length}
*/
public static void fill(long[] a, int fromIndex, int toIndex, long val) {
rangeCheck(a.length, fromIndex, toIndex);
@@ -2887,8 +2888,8 @@
/**
* Assigns the specified int value to each element of the specified
* range of the specified array of ints. The range to be filled
- * extends from index <tt>fromIndex</tt>, inclusive, to index
- * <tt>toIndex</tt>, exclusive. (If <tt>fromIndex==toIndex</tt>, the
+ * extends from index {@code fromIndex}, inclusive, to index
+ * {@code toIndex}, exclusive. (If {@code fromIndex==toIndex}, the
* range to be filled is empty.)
*
* @param a the array to be filled
@@ -2897,9 +2898,9 @@
* @param toIndex the index of the last element (exclusive) to be
* filled with the specified value
* @param val the value to be stored in all elements of the array
- * @throws IllegalArgumentException if <tt>fromIndex > toIndex</tt>
- * @throws ArrayIndexOutOfBoundsException if <tt>fromIndex < 0</tt> or
- * <tt>toIndex > a.length</tt>
+ * @throws IllegalArgumentException if {@code fromIndex > toIndex}
+ * @throws ArrayIndexOutOfBoundsException if {@code fromIndex < 0} or
+ * {@code toIndex > a.length}
*/
public static void fill(int[] a, int fromIndex, int toIndex, int val) {
rangeCheck(a.length, fromIndex, toIndex);
@@ -2922,8 +2923,8 @@
/**
* Assigns the specified short value to each element of the specified
* range of the specified array of shorts. The range to be filled
- * extends from index <tt>fromIndex</tt>, inclusive, to index
- * <tt>toIndex</tt>, exclusive. (If <tt>fromIndex==toIndex</tt>, the
+ * extends from index {@code fromIndex}, inclusive, to index
+ * {@code toIndex}, exclusive. (If {@code fromIndex==toIndex}, the
* range to be filled is empty.)
*
* @param a the array to be filled
@@ -2932,9 +2933,9 @@
* @param toIndex the index of the last element (exclusive) to be
* filled with the specified value
* @param val the value to be stored in all elements of the array
- * @throws IllegalArgumentException if <tt>fromIndex > toIndex</tt>
- * @throws ArrayIndexOutOfBoundsException if <tt>fromIndex < 0</tt> or
- * <tt>toIndex > a.length</tt>
+ * @throws IllegalArgumentException if {@code fromIndex > toIndex}
+ * @throws ArrayIndexOutOfBoundsException if {@code fromIndex < 0} or
+ * {@code toIndex > a.length}
*/
public static void fill(short[] a, int fromIndex, int toIndex, short val) {
rangeCheck(a.length, fromIndex, toIndex);
@@ -2957,8 +2958,8 @@
/**
* Assigns the specified char value to each element of the specified
* range of the specified array of chars. The range to be filled
- * extends from index <tt>fromIndex</tt>, inclusive, to index
- * <tt>toIndex</tt>, exclusive. (If <tt>fromIndex==toIndex</tt>, the
+ * extends from index {@code fromIndex}, inclusive, to index
+ * {@code toIndex}, exclusive. (If {@code fromIndex==toIndex}, the
* range to be filled is empty.)
*
* @param a the array to be filled
@@ -2967,9 +2968,9 @@
* @param toIndex the index of the last element (exclusive) to be
* filled with the specified value
* @param val the value to be stored in all elements of the array
- * @throws IllegalArgumentException if <tt>fromIndex > toIndex</tt>
- * @throws ArrayIndexOutOfBoundsException if <tt>fromIndex < 0</tt> or
- * <tt>toIndex > a.length</tt>
+ * @throws IllegalArgumentException if {@code fromIndex > toIndex}
+ * @throws ArrayIndexOutOfBoundsException if {@code fromIndex < 0} or
+ * {@code toIndex > a.length}
*/
public static void fill(char[] a, int fromIndex, int toIndex, char val) {
rangeCheck(a.length, fromIndex, toIndex);
@@ -2992,8 +2993,8 @@
/**
* Assigns the specified byte value to each element of the specified
* range of the specified array of bytes. The range to be filled
- * extends from index <tt>fromIndex</tt>, inclusive, to index
- * <tt>toIndex</tt>, exclusive. (If <tt>fromIndex==toIndex</tt>, the
+ * extends from index {@code fromIndex}, inclusive, to index
+ * {@code toIndex}, exclusive. (If {@code fromIndex==toIndex}, the
* range to be filled is empty.)
*
* @param a the array to be filled
@@ -3002,9 +3003,9 @@
* @param toIndex the index of the last element (exclusive) to be
* filled with the specified value
* @param val the value to be stored in all elements of the array
- * @throws IllegalArgumentException if <tt>fromIndex > toIndex</tt>
- * @throws ArrayIndexOutOfBoundsException if <tt>fromIndex < 0</tt> or
- * <tt>toIndex > a.length</tt>
+ * @throws IllegalArgumentException if {@code fromIndex > toIndex}
+ * @throws ArrayIndexOutOfBoundsException if {@code fromIndex < 0} or
+ * {@code toIndex > a.length}
*/
public static void fill(byte[] a, int fromIndex, int toIndex, byte val) {
rangeCheck(a.length, fromIndex, toIndex);
@@ -3027,8 +3028,8 @@
/**
* Assigns the specified boolean value to each element of the specified
* range of the specified array of booleans. The range to be filled
- * extends from index <tt>fromIndex</tt>, inclusive, to index
- * <tt>toIndex</tt>, exclusive. (If <tt>fromIndex==toIndex</tt>, the
+ * extends from index {@code fromIndex}, inclusive, to index
+ * {@code toIndex}, exclusive. (If {@code fromIndex==toIndex}, the
* range to be filled is empty.)
*
* @param a the array to be filled
@@ -3037,9 +3038,9 @@
* @param toIndex the index of the last element (exclusive) to be
* filled with the specified value
* @param val the value to be stored in all elements of the array
- * @throws IllegalArgumentException if <tt>fromIndex > toIndex</tt>
- * @throws ArrayIndexOutOfBoundsException if <tt>fromIndex < 0</tt> or
- * <tt>toIndex > a.length</tt>
+ * @throws IllegalArgumentException if {@code fromIndex > toIndex}
+ * @throws ArrayIndexOutOfBoundsException if {@code fromIndex < 0} or
+ * {@code toIndex > a.length}
*/
public static void fill(boolean[] a, int fromIndex, int toIndex,
boolean val) {
@@ -3063,8 +3064,8 @@
/**
* Assigns the specified double value to each element of the specified
* range of the specified array of doubles. The range to be filled
- * extends from index <tt>fromIndex</tt>, inclusive, to index
- * <tt>toIndex</tt>, exclusive. (If <tt>fromIndex==toIndex</tt>, the
+ * extends from index {@code fromIndex}, inclusive, to index
+ * {@code toIndex}, exclusive. (If {@code fromIndex==toIndex}, the
* range to be filled is empty.)
*
* @param a the array to be filled
@@ -3073,9 +3074,9 @@
* @param toIndex the index of the last element (exclusive) to be
* filled with the specified value
* @param val the value to be stored in all elements of the array
- * @throws IllegalArgumentException if <tt>fromIndex > toIndex</tt>
- * @throws ArrayIndexOutOfBoundsException if <tt>fromIndex < 0</tt> or
- * <tt>toIndex > a.length</tt>
+ * @throws IllegalArgumentException if {@code fromIndex > toIndex}
+ * @throws ArrayIndexOutOfBoundsException if {@code fromIndex < 0} or
+ * {@code toIndex > a.length}
*/
public static void fill(double[] a, int fromIndex, int toIndex,double val){
rangeCheck(a.length, fromIndex, toIndex);
@@ -3098,8 +3099,8 @@
/**
* Assigns the specified float value to each element of the specified
* range of the specified array of floats. The range to be filled
- * extends from index <tt>fromIndex</tt>, inclusive, to index
- * <tt>toIndex</tt>, exclusive. (If <tt>fromIndex==toIndex</tt>, the
+ * extends from index {@code fromIndex}, inclusive, to index
+ * {@code toIndex}, exclusive. (If {@code fromIndex==toIndex}, the
* range to be filled is empty.)
*
* @param a the array to be filled
@@ -3108,9 +3109,9 @@
* @param toIndex the index of the last element (exclusive) to be
* filled with the specified value
* @param val the value to be stored in all elements of the array
- * @throws IllegalArgumentException if <tt>fromIndex > toIndex</tt>
- * @throws ArrayIndexOutOfBoundsException if <tt>fromIndex < 0</tt> or
- * <tt>toIndex > a.length</tt>
+ * @throws IllegalArgumentException if {@code fromIndex > toIndex}
+ * @throws ArrayIndexOutOfBoundsException if {@code fromIndex < 0} or
+ * {@code toIndex > a.length}
*/
public static void fill(float[] a, int fromIndex, int toIndex, float val) {
rangeCheck(a.length, fromIndex, toIndex);
@@ -3135,8 +3136,8 @@
/**
* Assigns the specified Object reference to each element of the specified
* range of the specified array of Objects. The range to be filled
- * extends from index <tt>fromIndex</tt>, inclusive, to index
- * <tt>toIndex</tt>, exclusive. (If <tt>fromIndex==toIndex</tt>, the
+ * extends from index {@code fromIndex}, inclusive, to index
+ * {@code toIndex}, exclusive. (If {@code fromIndex==toIndex}, the
* range to be filled is empty.)
*
* @param a the array to be filled
@@ -3145,9 +3146,9 @@
* @param toIndex the index of the last element (exclusive) to be
* filled with the specified value
* @param val the value to be stored in all elements of the array
- * @throws IllegalArgumentException if <tt>fromIndex > toIndex</tt>
- * @throws ArrayIndexOutOfBoundsException if <tt>fromIndex < 0</tt> or
- * <tt>toIndex > a.length</tt>
+ * @throws IllegalArgumentException if {@code fromIndex > toIndex}
+ * @throws ArrayIndexOutOfBoundsException if {@code fromIndex < 0} or
+ * {@code toIndex > a.length}
* @throws ArrayStoreException if the specified value is not of a
* runtime type that can be stored in the specified array
*/
@@ -3164,7 +3165,7 @@
* so the copy has the specified length. For all indices that are
* valid in both the original array and the copy, the two arrays will
* contain identical values. For any indices that are valid in the
- * copy but not the original, the copy will contain <tt>null</tt>.
+ * copy but not the original, the copy will contain {@code null}.
* Such indices will exist if and only if the specified length
* is greater than that of the original array.
* The resulting array is of exactly the same class as the original array.
@@ -3174,8 +3175,8 @@
* @param newLength the length of the copy to be returned
* @return a copy of the original array, truncated or padded with nulls
* to obtain the specified length
- * @throws NegativeArraySizeException if <tt>newLength</tt> is negative
- * @throws NullPointerException if <tt>original</tt> is null
+ * @throws NegativeArraySizeException if {@code newLength} is negative
+ * @throws NullPointerException if {@code original} is null
* @since 1.6
*/
@SuppressWarnings("unchecked")
@@ -3188,10 +3189,10 @@
* so the copy has the specified length. For all indices that are
* valid in both the original array and the copy, the two arrays will
* contain identical values. For any indices that are valid in the
- * copy but not the original, the copy will contain <tt>null</tt>.
+ * copy but not the original, the copy will contain {@code null}.
* Such indices will exist if and only if the specified length
* is greater than that of the original array.
- * The resulting array is of the class <tt>newType</tt>.
+ * The resulting array is of the class {@code newType}.
*
* @param <U> the class of the objects in the original array
* @param <T> the class of the objects in the returned array
@@ -3200,11 +3201,11 @@
* @param newType the class of the copy to be returned
* @return a copy of the original array, truncated or padded with nulls
* to obtain the specified length
- * @throws NegativeArraySizeException if <tt>newLength</tt> is negative
- * @throws NullPointerException if <tt>original</tt> is null
+ * @throws NegativeArraySizeException if {@code newLength} is negative
+ * @throws NullPointerException if {@code original} is null
* @throws ArrayStoreException if an element copied from
- * <tt>original</tt> is not of a runtime type that can be stored in
- * an array of class <tt>newType</tt>
+ * {@code original} is not of a runtime type that can be stored in
+ * an array of class {@code newType}
* @since 1.6
*/
@HotSpotIntrinsicCandidate
@@ -3223,7 +3224,7 @@
* so the copy has the specified length. For all indices that are
* valid in both the original array and the copy, the two arrays will
* contain identical values. For any indices that are valid in the
- * copy but not the original, the copy will contain <tt>(byte)0</tt>.
+ * copy but not the original, the copy will contain {@code (byte)0}.
* Such indices will exist if and only if the specified length
* is greater than that of the original array.
*
@@ -3231,8 +3232,8 @@
* @param newLength the length of the copy to be returned
* @return a copy of the original array, truncated or padded with zeros
* to obtain the specified length
- * @throws NegativeArraySizeException if <tt>newLength</tt> is negative
- * @throws NullPointerException if <tt>original</tt> is null
+ * @throws NegativeArraySizeException if {@code newLength} is negative
+ * @throws NullPointerException if {@code original} is null
* @since 1.6
*/
public static byte[] copyOf(byte[] original, int newLength) {
@@ -3247,7 +3248,7 @@
* so the copy has the specified length. For all indices that are
* valid in both the original array and the copy, the two arrays will
* contain identical values. For any indices that are valid in the
- * copy but not the original, the copy will contain <tt>(short)0</tt>.
+ * copy but not the original, the copy will contain {@code (short)0}.
* Such indices will exist if and only if the specified length
* is greater than that of the original array.
*
@@ -3255,8 +3256,8 @@
* @param newLength the length of the copy to be returned
* @return a copy of the original array, truncated or padded with zeros
* to obtain the specified length
- * @throws NegativeArraySizeException if <tt>newLength</tt> is negative
- * @throws NullPointerException if <tt>original</tt> is null
+ * @throws NegativeArraySizeException if {@code newLength} is negative
+ * @throws NullPointerException if {@code original} is null
* @since 1.6
*/
public static short[] copyOf(short[] original, int newLength) {
@@ -3271,7 +3272,7 @@
* so the copy has the specified length. For all indices that are
* valid in both the original array and the copy, the two arrays will
* contain identical values. For any indices that are valid in the
- * copy but not the original, the copy will contain <tt>0</tt>.
+ * copy but not the original, the copy will contain {@code 0}.
* Such indices will exist if and only if the specified length
* is greater than that of the original array.
*
@@ -3279,8 +3280,8 @@
* @param newLength the length of the copy to be returned
* @return a copy of the original array, truncated or padded with zeros
* to obtain the specified length
- * @throws NegativeArraySizeException if <tt>newLength</tt> is negative
- * @throws NullPointerException if <tt>original</tt> is null
+ * @throws NegativeArraySizeException if {@code newLength} is negative
+ * @throws NullPointerException if {@code original} is null
* @since 1.6
*/
public static int[] copyOf(int[] original, int newLength) {
@@ -3295,7 +3296,7 @@
* so the copy has the specified length. For all indices that are
* valid in both the original array and the copy, the two arrays will
* contain identical values. For any indices that are valid in the
- * copy but not the original, the copy will contain <tt>0L</tt>.
+ * copy but not the original, the copy will contain {@code 0L}.
* Such indices will exist if and only if the specified length
* is greater than that of the original array.
*
@@ -3303,8 +3304,8 @@
* @param newLength the length of the copy to be returned
* @return a copy of the original array, truncated or padded with zeros
* to obtain the specified length
- * @throws NegativeArraySizeException if <tt>newLength</tt> is negative
- * @throws NullPointerException if <tt>original</tt> is null
+ * @throws NegativeArraySizeException if {@code newLength} is negative
+ * @throws NullPointerException if {@code original} is null
* @since 1.6
*/
public static long[] copyOf(long[] original, int newLength) {
@@ -3319,7 +3320,7 @@
* so the copy has the specified length. For all indices that are valid
* in both the original array and the copy, the two arrays will contain
* identical values. For any indices that are valid in the copy but not
- * the original, the copy will contain <tt>'\\u000'</tt>. Such indices
+ * the original, the copy will contain {@code '\\u000'}. Such indices
* will exist if and only if the specified length is greater than that of
* the original array.
*
@@ -3327,8 +3328,8 @@
* @param newLength the length of the copy to be returned
* @return a copy of the original array, truncated or padded with null characters
* to obtain the specified length
- * @throws NegativeArraySizeException if <tt>newLength</tt> is negative
- * @throws NullPointerException if <tt>original</tt> is null
+ * @throws NegativeArraySizeException if {@code newLength} is negative
+ * @throws NullPointerException if {@code original} is null
* @since 1.6
*/
public static char[] copyOf(char[] original, int newLength) {
@@ -3343,7 +3344,7 @@
* so the copy has the specified length. For all indices that are
* valid in both the original array and the copy, the two arrays will
* contain identical values. For any indices that are valid in the
- * copy but not the original, the copy will contain <tt>0f</tt>.
+ * copy but not the original, the copy will contain {@code 0f}.
* Such indices will exist if and only if the specified length
* is greater than that of the original array.
*
@@ -3351,8 +3352,8 @@
* @param newLength the length of the copy to be returned
* @return a copy of the original array, truncated or padded with zeros
* to obtain the specified length
- * @throws NegativeArraySizeException if <tt>newLength</tt> is negative
- * @throws NullPointerException if <tt>original</tt> is null
+ * @throws NegativeArraySizeException if {@code newLength} is negative
+ * @throws NullPointerException if {@code original} is null
* @since 1.6
*/
public static float[] copyOf(float[] original, int newLength) {
@@ -3367,7 +3368,7 @@
* so the copy has the specified length. For all indices that are
* valid in both the original array and the copy, the two arrays will
* contain identical values. For any indices that are valid in the
- * copy but not the original, the copy will contain <tt>0d</tt>.
+ * copy but not the original, the copy will contain {@code 0d}.
* Such indices will exist if and only if the specified length
* is greater than that of the original array.
*
@@ -3375,8 +3376,8 @@
* @param newLength the length of the copy to be returned
* @return a copy of the original array, truncated or padded with zeros
* to obtain the specified length
- * @throws NegativeArraySizeException if <tt>newLength</tt> is negative
- * @throws NullPointerException if <tt>original</tt> is null
+ * @throws NegativeArraySizeException if {@code newLength} is negative
+ * @throws NullPointerException if {@code original} is null
* @since 1.6
*/
public static double[] copyOf(double[] original, int newLength) {
@@ -3387,11 +3388,11 @@
}
/**
- * Copies the specified array, truncating or padding with <tt>false</tt> (if necessary)
+ * Copies the specified array, truncating or padding with {@code false} (if necessary)
* so the copy has the specified length. For all indices that are
* valid in both the original array and the copy, the two arrays will
* contain identical values. For any indices that are valid in the
- * copy but not the original, the copy will contain <tt>false</tt>.
+ * copy but not the original, the copy will contain {@code false}.
* Such indices will exist if and only if the specified length
* is greater than that of the original array.
*
@@ -3399,8 +3400,8 @@
* @param newLength the length of the copy to be returned
* @return a copy of the original array, truncated or padded with false elements
* to obtain the specified length
- * @throws NegativeArraySizeException if <tt>newLength</tt> is negative
- * @throws NullPointerException if <tt>original</tt> is null
+ * @throws NegativeArraySizeException if {@code newLength} is negative
+ * @throws NullPointerException if {@code original} is null
* @since 1.6
*/
public static boolean[] copyOf(boolean[] original, int newLength) {
@@ -3412,17 +3413,17 @@
/**
* Copies the specified range of the specified array into a new array.
- * The initial index of the range (<tt>from</tt>) must lie between zero
- * and <tt>original.length</tt>, inclusive. The value at
- * <tt>original[from]</tt> is placed into the initial element of the copy
- * (unless <tt>from == original.length</tt> or <tt>from == to</tt>).
+ * The initial index of the range ({@code from}) must lie between zero
+ * and {@code original.length}, inclusive. The value at
+ * {@code original[from]} is placed into the initial element of the copy
+ * (unless {@code from == original.length} or {@code from == to}).
* Values from subsequent elements in the original array are placed into
* subsequent elements in the copy. The final index of the range
- * (<tt>to</tt>), which must be greater than or equal to <tt>from</tt>,
- * may be greater than <tt>original.length</tt>, in which case
- * <tt>null</tt> is placed in all elements of the copy whose index is
- * greater than or equal to <tt>original.length - from</tt>. The length
- * of the returned array will be <tt>to - from</tt>.
+ * ({@code to}), which must be greater than or equal to {@code from},
+ * may be greater than {@code original.length}, in which case
+ * {@code null} is placed in all elements of the copy whose index is
+ * greater than or equal to {@code original.length - from}. The length
+ * of the returned array will be {@code to - from}.
* <p>
* The resulting array is of exactly the same class as the original array.
*
@@ -3435,8 +3436,8 @@
* truncated or padded with nulls to obtain the required length
* @throws ArrayIndexOutOfBoundsException if {@code from < 0}
* or {@code from > original.length}
- * @throws IllegalArgumentException if <tt>from > to</tt>
- * @throws NullPointerException if <tt>original</tt> is null
+ * @throws IllegalArgumentException if {@code from > to}
+ * @throws NullPointerException if {@code original} is null
* @since 1.6
*/
@SuppressWarnings("unchecked")
@@ -3446,18 +3447,18 @@
/**
* Copies the specified range of the specified array into a new array.
- * The initial index of the range (<tt>from</tt>) must lie between zero
- * and <tt>original.length</tt>, inclusive. The value at
- * <tt>original[from]</tt> is placed into the initial element of the copy
- * (unless <tt>from == original.length</tt> or <tt>from == to</tt>).
+ * The initial index of the range ({@code from}) must lie between zero
+ * and {@code original.length}, inclusive. The value at
+ * {@code original[from]} is placed into the initial element of the copy
+ * (unless {@code from == original.length} or {@code from == to}).
* Values from subsequent elements in the original array are placed into
* subsequent elements in the copy. The final index of the range
- * (<tt>to</tt>), which must be greater than or equal to <tt>from</tt>,
- * may be greater than <tt>original.length</tt>, in which case
- * <tt>null</tt> is placed in all elements of the copy whose index is
- * greater than or equal to <tt>original.length - from</tt>. The length
- * of the returned array will be <tt>to - from</tt>.
- * The resulting array is of the class <tt>newType</tt>.
+ * ({@code to}), which must be greater than or equal to {@code from},
+ * may be greater than {@code original.length}, in which case
+ * {@code null} is placed in all elements of the copy whose index is
+ * greater than or equal to {@code original.length - from}. The length
+ * of the returned array will be {@code to - from}.
+ * The resulting array is of the class {@code newType}.
*
* @param <U> the class of the objects in the original array
* @param <T> the class of the objects in the returned array
@@ -3470,11 +3471,11 @@
* truncated or padded with nulls to obtain the required length
* @throws ArrayIndexOutOfBoundsException if {@code from < 0}
* or {@code from > original.length}
- * @throws IllegalArgumentException if <tt>from > to</tt>
- * @throws NullPointerException if <tt>original</tt> is null
+ * @throws IllegalArgumentException if {@code from > to}
+ * @throws NullPointerException if {@code original} is null
* @throws ArrayStoreException if an element copied from
- * <tt>original</tt> is not of a runtime type that can be stored in
- * an array of class <tt>newType</tt>.
+ * {@code original} is not of a runtime type that can be stored in
+ * an array of class {@code newType}.
* @since 1.6
*/
@HotSpotIntrinsicCandidate
@@ -3493,17 +3494,17 @@
/**
* Copies the specified range of the specified array into a new array.
- * The initial index of the range (<tt>from</tt>) must lie between zero
- * and <tt>original.length</tt>, inclusive. The value at
- * <tt>original[from]</tt> is placed into the initial element of the copy
- * (unless <tt>from == original.length</tt> or <tt>from == to</tt>).
+ * The initial index of the range ({@code from}) must lie between zero
+ * and {@code original.length}, inclusive. The value at
+ * {@code original[from]} is placed into the initial element of the copy
+ * (unless {@code from == original.length} or {@code from == to}).
* Values from subsequent elements in the original array are placed into
* subsequent elements in the copy. The final index of the range
- * (<tt>to</tt>), which must be greater than or equal to <tt>from</tt>,
- * may be greater than <tt>original.length</tt>, in which case
- * <tt>(byte)0</tt> is placed in all elements of the copy whose index is
- * greater than or equal to <tt>original.length - from</tt>. The length
- * of the returned array will be <tt>to - from</tt>.
+ * ({@code to}), which must be greater than or equal to {@code from},
+ * may be greater than {@code original.length}, in which case
+ * {@code (byte)0} is placed in all elements of the copy whose index is
+ * greater than or equal to {@code original.length - from}. The length
+ * of the returned array will be {@code to - from}.
*
* @param original the array from which a range is to be copied
* @param from the initial index of the range to be copied, inclusive
@@ -3513,8 +3514,8 @@
* truncated or padded with zeros to obtain the required length
* @throws ArrayIndexOutOfBoundsException if {@code from < 0}
* or {@code from > original.length}
- * @throws IllegalArgumentException if <tt>from > to</tt>
- * @throws NullPointerException if <tt>original</tt> is null
+ * @throws IllegalArgumentException if {@code from > to}
+ * @throws NullPointerException if {@code original} is null
* @since 1.6
*/
public static byte[] copyOfRange(byte[] original, int from, int to) {
@@ -3529,17 +3530,17 @@
/**
* Copies the specified range of the specified array into a new array.
- * The initial index of the range (<tt>from</tt>) must lie between zero
- * and <tt>original.length</tt>, inclusive. The value at
- * <tt>original[from]</tt> is placed into the initial element of the copy
- * (unless <tt>from == original.length</tt> or <tt>from == to</tt>).
+ * The initial index of the range ({@code from}) must lie between zero
+ * and {@code original.length}, inclusive. The value at
+ * {@code original[from]} is placed into the initial element of the copy
+ * (unless {@code from == original.length} or {@code from == to}).
* Values from subsequent elements in the original array are placed into
* subsequent elements in the copy. The final index of the range
- * (<tt>to</tt>), which must be greater than or equal to <tt>from</tt>,
- * may be greater than <tt>original.length</tt>, in which case
- * <tt>(short)0</tt> is placed in all elements of the copy whose index is
- * greater than or equal to <tt>original.length - from</tt>. The length
- * of the returned array will be <tt>to - from</tt>.
+ * ({@code to}), which must be greater than or equal to {@code from},
+ * may be greater than {@code original.length}, in which case
+ * {@code (short)0} is placed in all elements of the copy whose index is
+ * greater than or equal to {@code original.length - from}. The length
+ * of the returned array will be {@code to - from}.
*
* @param original the array from which a range is to be copied
* @param from the initial index of the range to be copied, inclusive
@@ -3549,8 +3550,8 @@
* truncated or padded with zeros to obtain the required length
* @throws ArrayIndexOutOfBoundsException if {@code from < 0}
* or {@code from > original.length}
- * @throws IllegalArgumentException if <tt>from > to</tt>
- * @throws NullPointerException if <tt>original</tt> is null
+ * @throws IllegalArgumentException if {@code from > to}
+ * @throws NullPointerException if {@code original} is null
* @since 1.6
*/
public static short[] copyOfRange(short[] original, int from, int to) {
@@ -3565,17 +3566,17 @@
/**
* Copies the specified range of the specified array into a new array.
- * The initial index of the range (<tt>from</tt>) must lie between zero
- * and <tt>original.length</tt>, inclusive. The value at
- * <tt>original[from]</tt> is placed into the initial element of the copy
- * (unless <tt>from == original.length</tt> or <tt>from == to</tt>).
+ * The initial index of the range ({@code from}) must lie between zero
+ * and {@code original.length}, inclusive. The value at
+ * {@code original[from]} is placed into the initial element of the copy
+ * (unless {@code from == original.length} or {@code from == to}).
* Values from subsequent elements in the original array are placed into
* subsequent elements in the copy. The final index of the range
- * (<tt>to</tt>), which must be greater than or equal to <tt>from</tt>,
- * may be greater than <tt>original.length</tt>, in which case
- * <tt>0</tt> is placed in all elements of the copy whose index is
- * greater than or equal to <tt>original.length - from</tt>. The length
- * of the returned array will be <tt>to - from</tt>.
+ * ({@code to}), which must be greater than or equal to {@code from},
+ * may be greater than {@code original.length}, in which case
+ * {@code 0} is placed in all elements of the copy whose index is
+ * greater than or equal to {@code original.length - from}. The length
+ * of the returned array will be {@code to - from}.
*
* @param original the array from which a range is to be copied
* @param from the initial index of the range to be copied, inclusive
@@ -3585,8 +3586,8 @@
* truncated or padded with zeros to obtain the required length
* @throws ArrayIndexOutOfBoundsException if {@code from < 0}
* or {@code from > original.length}
- * @throws IllegalArgumentException if <tt>from > to</tt>
- * @throws NullPointerException if <tt>original</tt> is null
+ * @throws IllegalArgumentException if {@code from > to}
+ * @throws NullPointerException if {@code original} is null
* @since 1.6
*/
public static int[] copyOfRange(int[] original, int from, int to) {
@@ -3601,17 +3602,17 @@
/**
* Copies the specified range of the specified array into a new array.
- * The initial index of the range (<tt>from</tt>) must lie between zero
- * and <tt>original.length</tt>, inclusive. The value at
- * <tt>original[from]</tt> is placed into the initial element of the copy
- * (unless <tt>from == original.length</tt> or <tt>from == to</tt>).
+ * The initial index of the range ({@code from}) must lie between zero
+ * and {@code original.length}, inclusive. The value at
+ * {@code original[from]} is placed into the initial element of the copy
+ * (unless {@code from == original.length} or {@code from == to}).
* Values from subsequent elements in the original array are placed into
* subsequent elements in the copy. The final index of the range
- * (<tt>to</tt>), which must be greater than or equal to <tt>from</tt>,
- * may be greater than <tt>original.length</tt>, in which case
- * <tt>0L</tt> is placed in all elements of the copy whose index is
- * greater than or equal to <tt>original.length - from</tt>. The length
- * of the returned array will be <tt>to - from</tt>.
+ * ({@code to}), which must be greater than or equal to {@code from},
+ * may be greater than {@code original.length}, in which case
+ * {@code 0L} is placed in all elements of the copy whose index is
+ * greater than or equal to {@code original.length - from}. The length
+ * of the returned array will be {@code to - from}.
*
* @param original the array from which a range is to be copied
* @param from the initial index of the range to be copied, inclusive
@@ -3621,8 +3622,8 @@
* truncated or padded with zeros to obtain the required length
* @throws ArrayIndexOutOfBoundsException if {@code from < 0}
* or {@code from > original.length}
- * @throws IllegalArgumentException if <tt>from > to</tt>
- * @throws NullPointerException if <tt>original</tt> is null
+ * @throws IllegalArgumentException if {@code from > to}
+ * @throws NullPointerException if {@code original} is null
* @since 1.6
*/
public static long[] copyOfRange(long[] original, int from, int to) {
@@ -3637,17 +3638,17 @@
/**
* Copies the specified range of the specified array into a new array.
- * The initial index of the range (<tt>from</tt>) must lie between zero
- * and <tt>original.length</tt>, inclusive. The value at
- * <tt>original[from]</tt> is placed into the initial element of the copy
- * (unless <tt>from == original.length</tt> or <tt>from == to</tt>).
+ * The initial index of the range ({@code from}) must lie between zero
+ * and {@code original.length}, inclusive. The value at
+ * {@code original[from]} is placed into the initial element of the copy
+ * (unless {@code from == original.length} or {@code from == to}).
* Values from subsequent elements in the original array are placed into
* subsequent elements in the copy. The final index of the range
- * (<tt>to</tt>), which must be greater than or equal to <tt>from</tt>,
- * may be greater than <tt>original.length</tt>, in which case
- * <tt>'\\u000'</tt> is placed in all elements of the copy whose index is
- * greater than or equal to <tt>original.length - from</tt>. The length
- * of the returned array will be <tt>to - from</tt>.
+ * ({@code to}), which must be greater than or equal to {@code from},
+ * may be greater than {@code original.length}, in which case
+ * {@code '\\u000'} is placed in all elements of the copy whose index is
+ * greater than or equal to {@code original.length - from}. The length
+ * of the returned array will be {@code to - from}.
*
* @param original the array from which a range is to be copied
* @param from the initial index of the range to be copied, inclusive
@@ -3657,8 +3658,8 @@
* truncated or padded with null characters to obtain the required length
* @throws ArrayIndexOutOfBoundsException if {@code from < 0}
* or {@code from > original.length}
- * @throws IllegalArgumentException if <tt>from > to</tt>
- * @throws NullPointerException if <tt>original</tt> is null
+ * @throws IllegalArgumentException if {@code from > to}
+ * @throws NullPointerException if {@code original} is null
* @since 1.6
*/
public static char[] copyOfRange(char[] original, int from, int to) {
@@ -3673,17 +3674,17 @@
/**
* Copies the specified range of the specified array into a new array.
- * The initial index of the range (<tt>from</tt>) must lie between zero
- * and <tt>original.length</tt>, inclusive. The value at
- * <tt>original[from]</tt> is placed into the initial element of the copy
- * (unless <tt>from == original.length</tt> or <tt>from == to</tt>).
+ * The initial index of the range ({@code from}) must lie between zero
+ * and {@code original.length}, inclusive. The value at
+ * {@code original[from]} is placed into the initial element of the copy
+ * (unless {@code from == original.length} or {@code from == to}).
* Values from subsequent elements in the original array are placed into
* subsequent elements in the copy. The final index of the range
- * (<tt>to</tt>), which must be greater than or equal to <tt>from</tt>,
- * may be greater than <tt>original.length</tt>, in which case
- * <tt>0f</tt> is placed in all elements of the copy whose index is
- * greater than or equal to <tt>original.length - from</tt>. The length
- * of the returned array will be <tt>to - from</tt>.
+ * ({@code to}), which must be greater than or equal to {@code from},
+ * may be greater than {@code original.length}, in which case
+ * {@code 0f} is placed in all elements of the copy whose index is
+ * greater than or equal to {@code original.length - from}. The length
+ * of the returned array will be {@code to - from}.
*
* @param original the array from which a range is to be copied
* @param from the initial index of the range to be copied, inclusive
@@ -3693,8 +3694,8 @@
* truncated or padded with zeros to obtain the required length
* @throws ArrayIndexOutOfBoundsException if {@code from < 0}
* or {@code from > original.length}
- * @throws IllegalArgumentException if <tt>from > to</tt>
- * @throws NullPointerException if <tt>original</tt> is null
+ * @throws IllegalArgumentException if {@code from > to}
+ * @throws NullPointerException if {@code original} is null
* @since 1.6
*/
public static float[] copyOfRange(float[] original, int from, int to) {
@@ -3709,17 +3710,17 @@
/**
* Copies the specified range of the specified array into a new array.
- * The initial index of the range (<tt>from</tt>) must lie between zero
- * and <tt>original.length</tt>, inclusive. The value at
- * <tt>original[from]</tt> is placed into the initial element of the copy
- * (unless <tt>from == original.length</tt> or <tt>from == to</tt>).
+ * The initial index of the range ({@code from}) must lie between zero
+ * and {@code original.length}, inclusive. The value at
+ * {@code original[from]} is placed into the initial element of the copy
+ * (unless {@code from == original.length} or {@code from == to}).
* Values from subsequent elements in the original array are placed into
* subsequent elements in the copy. The final index of the range
- * (<tt>to</tt>), which must be greater than or equal to <tt>from</tt>,
- * may be greater than <tt>original.length</tt>, in which case
- * <tt>0d</tt> is placed in all elements of the copy whose index is
- * greater than or equal to <tt>original.length - from</tt>. The length
- * of the returned array will be <tt>to - from</tt>.
+ * ({@code to}), which must be greater than or equal to {@code from},
+ * may be greater than {@code original.length}, in which case
+ * {@code 0d} is placed in all elements of the copy whose index is
+ * greater than or equal to {@code original.length - from}. The length
+ * of the returned array will be {@code to - from}.
*
* @param original the array from which a range is to be copied
* @param from the initial index of the range to be copied, inclusive
@@ -3729,8 +3730,8 @@
* truncated or padded with zeros to obtain the required length
* @throws ArrayIndexOutOfBoundsException if {@code from < 0}
* or {@code from > original.length}
- * @throws IllegalArgumentException if <tt>from > to</tt>
- * @throws NullPointerException if <tt>original</tt> is null
+ * @throws IllegalArgumentException if {@code from > to}
+ * @throws NullPointerException if {@code original} is null
* @since 1.6
*/
public static double[] copyOfRange(double[] original, int from, int to) {
@@ -3745,17 +3746,17 @@
/**
* Copies the specified range of the specified array into a new array.
- * The initial index of the range (<tt>from</tt>) must lie between zero
- * and <tt>original.length</tt>, inclusive. The value at
- * <tt>original[from]</tt> is placed into the initial element of the copy
- * (unless <tt>from == original.length</tt> or <tt>from == to</tt>).
+ * The initial index of the range ({@code from}) must lie between zero
+ * and {@code original.length}, inclusive. The value at
+ * {@code original[from]} is placed into the initial element of the copy
+ * (unless {@code from == original.length} or {@code from == to}).
* Values from subsequent elements in the original array are placed into
* subsequent elements in the copy. The final index of the range
- * (<tt>to</tt>), which must be greater than or equal to <tt>from</tt>,
- * may be greater than <tt>original.length</tt>, in which case
- * <tt>false</tt> is placed in all elements of the copy whose index is
- * greater than or equal to <tt>original.length - from</tt>. The length
- * of the returned array will be <tt>to - from</tt>.
+ * ({@code to}), which must be greater than or equal to {@code from},
+ * may be greater than {@code original.length}, in which case
+ * {@code false} is placed in all elements of the copy whose index is
+ * greater than or equal to {@code original.length - from}. The length
+ * of the returned array will be {@code to - from}.
*
* @param original the array from which a range is to be copied
* @param from the initial index of the range to be copied, inclusive
@@ -3765,8 +3766,8 @@
* truncated or padded with false elements to obtain the required length
* @throws ArrayIndexOutOfBoundsException if {@code from < 0}
* or {@code from > original.length}
- * @throws IllegalArgumentException if <tt>from > to</tt>
- * @throws NullPointerException if <tt>original</tt> is null
+ * @throws IllegalArgumentException if {@code from > to}
+ * @throws NullPointerException if {@code original} is null
* @since 1.6
*/
public static boolean[] copyOfRange(boolean[] original, int from, int to) {
@@ -3902,18 +3903,18 @@
/**
* Returns a hash code based on the contents of the specified array.
- * For any two <tt>long</tt> arrays <tt>a</tt> and <tt>b</tt>
- * such that <tt>Arrays.equals(a, b)</tt>, it is also the case that
- * <tt>Arrays.hashCode(a) == Arrays.hashCode(b)</tt>.
+ * For any two {@code long} arrays {@code a} and {@code b}
+ * such that {@code Arrays.equals(a, b)}, it is also the case that
+ * {@code Arrays.hashCode(a) == Arrays.hashCode(b)}.
*
* <p>The value returned by this method is the same value that would be
- * obtained by invoking the {@link List#hashCode() <tt>hashCode</tt>}
+ * obtained by invoking the {@link List#hashCode() hashCode}
* method on a {@link List} containing a sequence of {@link Long}
- * instances representing the elements of <tt>a</tt> in the same order.
- * If <tt>a</tt> is <tt>null</tt>, this method returns 0.
+ * instances representing the elements of {@code a} in the same order.
+ * If {@code a} is {@code null}, this method returns 0.
*
* @param a the array whose hash value to compute
- * @return a content-based hash code for <tt>a</tt>
+ * @return a content-based hash code for {@code a}
* @since 1.5
*/
public static int hashCode(long a[]) {
@@ -3931,18 +3932,18 @@
/**
* Returns a hash code based on the contents of the specified array.
- * For any two non-null <tt>int</tt> arrays <tt>a</tt> and <tt>b</tt>
- * such that <tt>Arrays.equals(a, b)</tt>, it is also the case that
- * <tt>Arrays.hashCode(a) == Arrays.hashCode(b)</tt>.
+ * For any two non-null {@code int} arrays {@code a} and {@code b}
+ * such that {@code Arrays.equals(a, b)}, it is also the case that
+ * {@code Arrays.hashCode(a) == Arrays.hashCode(b)}.
*
* <p>The value returned by this method is the same value that would be
- * obtained by invoking the {@link List#hashCode() <tt>hashCode</tt>}
+ * obtained by invoking the {@link List#hashCode() hashCode}
* method on a {@link List} containing a sequence of {@link Integer}
- * instances representing the elements of <tt>a</tt> in the same order.
- * If <tt>a</tt> is <tt>null</tt>, this method returns 0.
+ * instances representing the elements of {@code a} in the same order.
+ * If {@code a} is {@code null}, this method returns 0.
*
* @param a the array whose hash value to compute
- * @return a content-based hash code for <tt>a</tt>
+ * @return a content-based hash code for {@code a}
* @since 1.5
*/
public static int hashCode(int a[]) {
@@ -3958,18 +3959,18 @@
/**
* Returns a hash code based on the contents of the specified array.
- * For any two <tt>short</tt> arrays <tt>a</tt> and <tt>b</tt>
- * such that <tt>Arrays.equals(a, b)</tt>, it is also the case that
- * <tt>Arrays.hashCode(a) == Arrays.hashCode(b)</tt>.
+ * For any two {@code short} arrays {@code a} and {@code b}
+ * such that {@code Arrays.equals(a, b)}, it is also the case that
+ * {@code Arrays.hashCode(a) == Arrays.hashCode(b)}.
*
* <p>The value returned by this method is the same value that would be
- * obtained by invoking the {@link List#hashCode() <tt>hashCode</tt>}
+ * obtained by invoking the {@link List#hashCode() hashCode}
* method on a {@link List} containing a sequence of {@link Short}
- * instances representing the elements of <tt>a</tt> in the same order.
- * If <tt>a</tt> is <tt>null</tt>, this method returns 0.
+ * instances representing the elements of {@code a} in the same order.
+ * If {@code a} is {@code null}, this method returns 0.
*
* @param a the array whose hash value to compute
- * @return a content-based hash code for <tt>a</tt>
+ * @return a content-based hash code for {@code a}
* @since 1.5
*/
public static int hashCode(short a[]) {
@@ -3985,18 +3986,18 @@
/**
* Returns a hash code based on the contents of the specified array.
- * For any two <tt>char</tt> arrays <tt>a</tt> and <tt>b</tt>
- * such that <tt>Arrays.equals(a, b)</tt>, it is also the case that
- * <tt>Arrays.hashCode(a) == Arrays.hashCode(b)</tt>.
+ * For any two {@code char} arrays {@code a} and {@code b}
+ * such that {@code Arrays.equals(a, b)}, it is also the case that
+ * {@code Arrays.hashCode(a) == Arrays.hashCode(b)}.
*
* <p>The value returned by this method is the same value that would be
- * obtained by invoking the {@link List#hashCode() <tt>hashCode</tt>}
+ * obtained by invoking the {@link List#hashCode() hashCode}
* method on a {@link List} containing a sequence of {@link Character}
- * instances representing the elements of <tt>a</tt> in the same order.
- * If <tt>a</tt> is <tt>null</tt>, this method returns 0.
+ * instances representing the elements of {@code a} in the same order.
+ * If {@code a} is {@code null}, this method returns 0.
*
* @param a the array whose hash value to compute
- * @return a content-based hash code for <tt>a</tt>
+ * @return a content-based hash code for {@code a}
* @since 1.5
*/
public static int hashCode(char a[]) {
@@ -4012,18 +4013,18 @@
/**
* Returns a hash code based on the contents of the specified array.
- * For any two <tt>byte</tt> arrays <tt>a</tt> and <tt>b</tt>
- * such that <tt>Arrays.equals(a, b)</tt>, it is also the case that
- * <tt>Arrays.hashCode(a) == Arrays.hashCode(b)</tt>.
+ * For any two {@code byte} arrays {@code a} and {@code b}
+ * such that {@code Arrays.equals(a, b)}, it is also the case that
+ * {@code Arrays.hashCode(a) == Arrays.hashCode(b)}.
*
* <p>The value returned by this method is the same value that would be
- * obtained by invoking the {@link List#hashCode() <tt>hashCode</tt>}
+ * obtained by invoking the {@link List#hashCode() hashCode}
* method on a {@link List} containing a sequence of {@link Byte}
- * instances representing the elements of <tt>a</tt> in the same order.
- * If <tt>a</tt> is <tt>null</tt>, this method returns 0.
+ * instances representing the elements of {@code a} in the same order.
+ * If {@code a} is {@code null}, this method returns 0.
*
* @param a the array whose hash value to compute
- * @return a content-based hash code for <tt>a</tt>
+ * @return a content-based hash code for {@code a}
* @since 1.5
*/
public static int hashCode(byte a[]) {
@@ -4039,18 +4040,18 @@
/**
* Returns a hash code based on the contents of the specified array.
- * For any two <tt>boolean</tt> arrays <tt>a</tt> and <tt>b</tt>
- * such that <tt>Arrays.equals(a, b)</tt>, it is also the case that
- * <tt>Arrays.hashCode(a) == Arrays.hashCode(b)</tt>.
+ * For any two {@code boolean} arrays {@code a} and {@code b}
+ * such that {@code Arrays.equals(a, b)}, it is also the case that
+ * {@code Arrays.hashCode(a) == Arrays.hashCode(b)}.
*
* <p>The value returned by this method is the same value that would be
- * obtained by invoking the {@link List#hashCode() <tt>hashCode</tt>}
+ * obtained by invoking the {@link List#hashCode() hashCode}
* method on a {@link List} containing a sequence of {@link Boolean}
- * instances representing the elements of <tt>a</tt> in the same order.
- * If <tt>a</tt> is <tt>null</tt>, this method returns 0.
+ * instances representing the elements of {@code a} in the same order.
+ * If {@code a} is {@code null}, this method returns 0.
*
* @param a the array whose hash value to compute
- * @return a content-based hash code for <tt>a</tt>
+ * @return a content-based hash code for {@code a}
* @since 1.5
*/
public static int hashCode(boolean a[]) {
@@ -4066,18 +4067,18 @@
/**
* Returns a hash code based on the contents of the specified array.
- * For any two <tt>float</tt> arrays <tt>a</tt> and <tt>b</tt>
- * such that <tt>Arrays.equals(a, b)</tt>, it is also the case that
- * <tt>Arrays.hashCode(a) == Arrays.hashCode(b)</tt>.
+ * For any two {@code float} arrays {@code a} and {@code b}
+ * such that {@code Arrays.equals(a, b)}, it is also the case that
+ * {@code Arrays.hashCode(a) == Arrays.hashCode(b)}.
*
* <p>The value returned by this method is the same value that would be
- * obtained by invoking the {@link List#hashCode() <tt>hashCode</tt>}
+ * obtained by invoking the {@link List#hashCode() hashCode}
* method on a {@link List} containing a sequence of {@link Float}
- * instances representing the elements of <tt>a</tt> in the same order.
- * If <tt>a</tt> is <tt>null</tt>, this method returns 0.
+ * instances representing the elements of {@code a} in the same order.
+ * If {@code a} is {@code null}, this method returns 0.
*
* @param a the array whose hash value to compute
- * @return a content-based hash code for <tt>a</tt>
+ * @return a content-based hash code for {@code a}
* @since 1.5
*/
public static int hashCode(float a[]) {
@@ -4093,18 +4094,18 @@
/**
* Returns a hash code based on the contents of the specified array.
- * For any two <tt>double</tt> arrays <tt>a</tt> and <tt>b</tt>
- * such that <tt>Arrays.equals(a, b)</tt>, it is also the case that
- * <tt>Arrays.hashCode(a) == Arrays.hashCode(b)</tt>.
+ * For any two {@code double} arrays {@code a} and {@code b}
+ * such that {@code Arrays.equals(a, b)}, it is also the case that
+ * {@code Arrays.hashCode(a) == Arrays.hashCode(b)}.
*
* <p>The value returned by this method is the same value that would be
- * obtained by invoking the {@link List#hashCode() <tt>hashCode</tt>}
+ * obtained by invoking the {@link List#hashCode() hashCode}
* method on a {@link List} containing a sequence of {@link Double}
- * instances representing the elements of <tt>a</tt> in the same order.
- * If <tt>a</tt> is <tt>null</tt>, this method returns 0.
+ * instances representing the elements of {@code a} in the same order.
+ * If {@code a} is {@code null}, this method returns 0.
*
* @param a the array whose hash value to compute
- * @return a content-based hash code for <tt>a</tt>
+ * @return a content-based hash code for {@code a}
* @since 1.5
*/
public static int hashCode(double a[]) {
@@ -4127,16 +4128,16 @@
* element, either directly or indirectly through one or more levels of
* arrays.
*
- * <p>For any two arrays <tt>a</tt> and <tt>b</tt> such that
- * <tt>Arrays.equals(a, b)</tt>, it is also the case that
- * <tt>Arrays.hashCode(a) == Arrays.hashCode(b)</tt>.
+ * <p>For any two arrays {@code a} and {@code b} such that
+ * {@code Arrays.equals(a, b)}, it is also the case that
+ * {@code Arrays.hashCode(a) == Arrays.hashCode(b)}.
*
* <p>The value returned by this method is equal to the value that would
- * be returned by <tt>Arrays.asList(a).hashCode()</tt>, unless <tt>a</tt>
- * is <tt>null</tt>, in which case <tt>0</tt> is returned.
+ * be returned by {@code Arrays.asList(a).hashCode()}, unless {@code a}
+ * is {@code null}, in which case {@code 0} is returned.
*
* @param a the array whose content-based hash code to compute
- * @return a content-based hash code for <tt>a</tt>
+ * @return a content-based hash code for {@code a}
* @see #deepHashCode(Object[])
* @since 1.5
*/
@@ -4161,23 +4162,23 @@
* one or more levels of arrays. The behavior of such an invocation is
* undefined.
*
- * <p>For any two arrays <tt>a</tt> and <tt>b</tt> such that
- * <tt>Arrays.deepEquals(a, b)</tt>, it is also the case that
- * <tt>Arrays.deepHashCode(a) == Arrays.deepHashCode(b)</tt>.
+ * <p>For any two arrays {@code a} and {@code b} such that
+ * {@code Arrays.deepEquals(a, b)}, it is also the case that
+ * {@code Arrays.deepHashCode(a) == Arrays.deepHashCode(b)}.
*
* <p>The computation of the value returned by this method is similar to
* that of the value returned by {@link List#hashCode()} on a list
- * containing the same elements as <tt>a</tt> in the same order, with one
- * difference: If an element <tt>e</tt> of <tt>a</tt> is itself an array,
- * its hash code is computed not by calling <tt>e.hashCode()</tt>, but as
- * by calling the appropriate overloading of <tt>Arrays.hashCode(e)</tt>
- * if <tt>e</tt> is an array of a primitive type, or as by calling
- * <tt>Arrays.deepHashCode(e)</tt> recursively if <tt>e</tt> is an array
- * of a reference type. If <tt>a</tt> is <tt>null</tt>, this method
+ * containing the same elements as {@code a} in the same order, with one
+ * difference: If an element {@code e} of {@code a} is itself an array,
+ * its hash code is computed not by calling {@code e.hashCode()}, but as
+ * by calling the appropriate overloading of {@code Arrays.hashCode(e)}
+ * if {@code e} is an array of a primitive type, or as by calling
+ * {@code Arrays.deepHashCode(e)} recursively if {@code e} is an array
+ * of a reference type. If {@code a} is {@code null}, this method
* returns 0.
*
* @param a the array whose deep-content-based hash code to compute
- * @return a deep-content-based hash code for <tt>a</tt>
+ * @return a deep-content-based hash code for {@code a}
* @see #hashCode(Object[])
* @since 1.5
*/
@@ -4217,28 +4218,28 @@
}
/**
- * Returns <tt>true</tt> if the two specified arrays are <i>deeply
+ * Returns {@code true} if the two specified arrays are <i>deeply
* equal</i> to one another. Unlike the {@link #equals(Object[],Object[])}
* method, this method is appropriate for use with nested arrays of
* arbitrary depth.
*
* <p>Two array references are considered deeply equal if both
- * are <tt>null</tt>, or if they refer to arrays that contain the same
+ * are {@code null}, or if they refer to arrays that contain the same
* number of elements and all corresponding pairs of elements in the two
* arrays are deeply equal.
*
- * <p>Two possibly <tt>null</tt> elements <tt>e1</tt> and <tt>e2</tt> are
+ * <p>Two possibly {@code null} elements {@code e1} and {@code e2} are
* deeply equal if any of the following conditions hold:
* <ul>
- * <li> <tt>e1</tt> and <tt>e2</tt> are both arrays of object reference
- * types, and <tt>Arrays.deepEquals(e1, e2) would return true</tt>
- * <li> <tt>e1</tt> and <tt>e2</tt> are arrays of the same primitive
+ * <li> {@code e1} and {@code e2} are both arrays of object reference
+ * types, and {@code Arrays.deepEquals(e1, e2) would return true}
+ * <li> {@code e1} and {@code e2} are arrays of the same primitive
* type, and the appropriate overloading of
- * <tt>Arrays.equals(e1, e2)</tt> would return true.
- * <li> <tt>e1 == e2</tt>
- * <li> <tt>e1.equals(e2)</tt> would return true.
+ * {@code Arrays.equals(e1, e2)} would return true.
+ * <li> {@code e1 == e2}
+ * <li> {@code e1.equals(e2)} would return true.
* </ul>
- * Note that this definition permits <tt>null</tt> elements at any depth.
+ * Note that this definition permits {@code null} elements at any depth.
*
* <p>If either of the specified arrays contain themselves as elements
* either directly or indirectly through one or more levels of arrays,
@@ -4246,7 +4247,7 @@
*
* @param a1 one array to be tested for equality
* @param a2 the other array to be tested for equality
- * @return <tt>true</tt> if the two arrays are equal
+ * @return {@code true} if the two arrays are equal
* @see #equals(Object[],Object[])
* @see Objects#deepEquals(Object, Object)
* @since 1.5
@@ -4307,14 +4308,14 @@
/**
* Returns a string representation of the contents of the specified array.
* The string representation consists of a list of the array's elements,
- * enclosed in square brackets (<tt>"[]"</tt>). Adjacent elements are
- * separated by the characters <tt>", "</tt> (a comma followed by a
+ * enclosed in square brackets ({@code "[]"}). Adjacent elements are
+ * separated by the characters {@code ", "} (a comma followed by a
* space). Elements are converted to strings as by
- * <tt>String.valueOf(long)</tt>. Returns <tt>"null"</tt> if <tt>a</tt>
- * is <tt>null</tt>.
+ * {@code String.valueOf(long)}. Returns {@code "null"} if {@code a}
+ * is {@code null}.
*
* @param a the array whose string representation to return
- * @return a string representation of <tt>a</tt>
+ * @return a string representation of {@code a}
* @since 1.5
*/
public static String toString(long[] a) {
@@ -4337,14 +4338,14 @@
/**
* Returns a string representation of the contents of the specified array.
* The string representation consists of a list of the array's elements,
- * enclosed in square brackets (<tt>"[]"</tt>). Adjacent elements are
- * separated by the characters <tt>", "</tt> (a comma followed by a
+ * enclosed in square brackets ({@code "[]"}). Adjacent elements are
+ * separated by the characters {@code ", "} (a comma followed by a
* space). Elements are converted to strings as by
- * <tt>String.valueOf(int)</tt>. Returns <tt>"null"</tt> if <tt>a</tt> is
- * <tt>null</tt>.
+ * {@code String.valueOf(int)}. Returns {@code "null"} if {@code a} is
+ * {@code null}.
*
* @param a the array whose string representation to return
- * @return a string representation of <tt>a</tt>
+ * @return a string representation of {@code a}
* @since 1.5
*/
public static String toString(int[] a) {
@@ -4367,14 +4368,14 @@
/**
* Returns a string representation of the contents of the specified array.
* The string representation consists of a list of the array's elements,
- * enclosed in square brackets (<tt>"[]"</tt>). Adjacent elements are
- * separated by the characters <tt>", "</tt> (a comma followed by a
+ * enclosed in square brackets ({@code "[]"}). Adjacent elements are
+ * separated by the characters {@code ", "} (a comma followed by a
* space). Elements are converted to strings as by
- * <tt>String.valueOf(short)</tt>. Returns <tt>"null"</tt> if <tt>a</tt>
- * is <tt>null</tt>.
+ * {@code String.valueOf(short)}. Returns {@code "null"} if {@code a}
+ * is {@code null}.
*
* @param a the array whose string representation to return
- * @return a string representation of <tt>a</tt>
+ * @return a string representation of {@code a}
* @since 1.5
*/
public static String toString(short[] a) {
@@ -4397,14 +4398,14 @@
/**
* Returns a string representation of the contents of the specified array.
* The string representation consists of a list of the array's elements,
- * enclosed in square brackets (<tt>"[]"</tt>). Adjacent elements are
- * separated by the characters <tt>", "</tt> (a comma followed by a
+ * enclosed in square brackets ({@code "[]"}). Adjacent elements are
+ * separated by the characters {@code ", "} (a comma followed by a
* space). Elements are converted to strings as by
- * <tt>String.valueOf(char)</tt>. Returns <tt>"null"</tt> if <tt>a</tt>
- * is <tt>null</tt>.
+ * {@code String.valueOf(char)}. Returns {@code "null"} if {@code a}
+ * is {@code null}.
*
* @param a the array whose string representation to return
- * @return a string representation of <tt>a</tt>
+ * @return a string representation of {@code a}
* @since 1.5
*/
public static String toString(char[] a) {
@@ -4427,14 +4428,14 @@
/**
* Returns a string representation of the contents of the specified array.
* The string representation consists of a list of the array's elements,
- * enclosed in square brackets (<tt>"[]"</tt>). Adjacent elements
- * are separated by the characters <tt>", "</tt> (a comma followed
+ * enclosed in square brackets ({@code "[]"}). Adjacent elements
+ * are separated by the characters {@code ", "} (a comma followed
* by a space). Elements are converted to strings as by
- * <tt>String.valueOf(byte)</tt>. Returns <tt>"null"</tt> if
- * <tt>a</tt> is <tt>null</tt>.
+ * {@code String.valueOf(byte)}. Returns {@code "null"} if
+ * {@code a} is {@code null}.
*
* @param a the array whose string representation to return
- * @return a string representation of <tt>a</tt>
+ * @return a string representation of {@code a}
* @since 1.5
*/
public static String toString(byte[] a) {
@@ -4457,14 +4458,14 @@
/**
* Returns a string representation of the contents of the specified array.
* The string representation consists of a list of the array's elements,
- * enclosed in square brackets (<tt>"[]"</tt>). Adjacent elements are
- * separated by the characters <tt>", "</tt> (a comma followed by a
+ * enclosed in square brackets ({@code "[]"}). Adjacent elements are
+ * separated by the characters {@code ", "} (a comma followed by a
* space). Elements are converted to strings as by
- * <tt>String.valueOf(boolean)</tt>. Returns <tt>"null"</tt> if
- * <tt>a</tt> is <tt>null</tt>.
+ * {@code String.valueOf(boolean)}. Returns {@code "null"} if
+ * {@code a} is {@code null}.
*
* @param a the array whose string representation to return
- * @return a string representation of <tt>a</tt>
+ * @return a string representation of {@code a}
* @since 1.5
*/
public static String toString(boolean[] a) {
@@ -4487,14 +4488,14 @@
/**
* Returns a string representation of the contents of the specified array.
* The string representation consists of a list of the array's elements,
- * enclosed in square brackets (<tt>"[]"</tt>). Adjacent elements are
- * separated by the characters <tt>", "</tt> (a comma followed by a
+ * enclosed in square brackets ({@code "[]"}). Adjacent elements are
+ * separated by the characters {@code ", "} (a comma followed by a
* space). Elements are converted to strings as by
- * <tt>String.valueOf(float)</tt>. Returns <tt>"null"</tt> if <tt>a</tt>
- * is <tt>null</tt>.
+ * {@code String.valueOf(float)}. Returns {@code "null"} if {@code a}
+ * is {@code null}.
*
* @param a the array whose string representation to return
- * @return a string representation of <tt>a</tt>
+ * @return a string representation of {@code a}
* @since 1.5
*/
public static String toString(float[] a) {
@@ -4518,14 +4519,14 @@
/**
* Returns a string representation of the contents of the specified array.
* The string representation consists of a list of the array's elements,
- * enclosed in square brackets (<tt>"[]"</tt>). Adjacent elements are
- * separated by the characters <tt>", "</tt> (a comma followed by a
+ * enclosed in square brackets ({@code "[]"}). Adjacent elements are
+ * separated by the characters {@code ", "} (a comma followed by a
* space). Elements are converted to strings as by
- * <tt>String.valueOf(double)</tt>. Returns <tt>"null"</tt> if <tt>a</tt>
- * is <tt>null</tt>.
+ * {@code String.valueOf(double)}. Returns {@code "null"} if {@code a}
+ * is {@code null}.
*
* @param a the array whose string representation to return
- * @return a string representation of <tt>a</tt>
+ * @return a string representation of {@code a}
* @since 1.5
*/
public static String toString(double[] a) {
@@ -4549,15 +4550,15 @@
* Returns a string representation of the contents of the specified array.
* If the array contains other arrays as elements, they are converted to
* strings by the {@link Object#toString} method inherited from
- * <tt>Object</tt>, which describes their <i>identities</i> rather than
+ * {@code Object}, which describes their <i>identities</i> rather than
* their contents.
*
* <p>The value returned by this method is equal to the value that would
- * be returned by <tt>Arrays.asList(a).toString()</tt>, unless <tt>a</tt>
- * is <tt>null</tt>, in which case <tt>"null"</tt> is returned.
+ * be returned by {@code Arrays.asList(a).toString()}, unless {@code a}
+ * is {@code null}, in which case {@code "null"} is returned.
*
* @param a the array whose string representation to return
- * @return a string representation of <tt>a</tt>
+ * @return a string representation of {@code a}
* @see #deepToString(Object[])
* @since 1.5
*/
@@ -4586,29 +4587,29 @@
* designed for converting multidimensional arrays to strings.
*
* <p>The string representation consists of a list of the array's
- * elements, enclosed in square brackets (<tt>"[]"</tt>). Adjacent
- * elements are separated by the characters <tt>", "</tt> (a comma
+ * elements, enclosed in square brackets ({@code "[]"}). Adjacent
+ * elements are separated by the characters {@code ", "} (a comma
* followed by a space). Elements are converted to strings as by
- * <tt>String.valueOf(Object)</tt>, unless they are themselves
+ * {@code String.valueOf(Object)}, unless they are themselves
* arrays.
*
- * <p>If an element <tt>e</tt> is an array of a primitive type, it is
+ * <p>If an element {@code e} is an array of a primitive type, it is
* converted to a string as by invoking the appropriate overloading of
- * <tt>Arrays.toString(e)</tt>. If an element <tt>e</tt> is an array of a
+ * {@code Arrays.toString(e)}. If an element {@code e} is an array of a
* reference type, it is converted to a string as by invoking
* this method recursively.
*
* <p>To avoid infinite recursion, if the specified array contains itself
* as an element, or contains an indirect reference to itself through one
* or more levels of arrays, the self-reference is converted to the string
- * <tt>"[...]"</tt>. For example, an array containing only a reference
- * to itself would be rendered as <tt>"[[...]]"</tt>.
+ * {@code "[...]"}. For example, an array containing only a reference
+ * to itself would be rendered as {@code "[[...]]"}.
*
- * <p>This method returns <tt>"null"</tt> if the specified array
- * is <tt>null</tt>.
+ * <p>This method returns {@code "null"} if the specified array
+ * is {@code null}.
*
* @param a the array whose string representation to return
- * @return a string representation of <tt>a</tt>
+ * @return a string representation of {@code a}
* @see #toString(Object[])
* @since 1.5
*/
diff --git a/jdk/src/java.base/share/classes/java/util/Collection.java b/jdk/src/java.base/share/classes/java/util/Collection.java
index 3a01908..f92b9f6 100644
--- a/jdk/src/java.base/share/classes/java/util/Collection.java
+++ b/jdk/src/java.base/share/classes/java/util/Collection.java
@@ -35,30 +35,30 @@
* collections allow duplicate elements and others do not. Some are ordered
* and others unordered. The JDK does not provide any <i>direct</i>
* implementations of this interface: it provides implementations of more
- * specific subinterfaces like <tt>Set</tt> and <tt>List</tt>. This interface
+ * specific subinterfaces like {@code Set} and {@code List}. This interface
* is typically used to pass collections around and manipulate them where
* maximum generality is desired.
*
* <p><i>Bags</i> or <i>multisets</i> (unordered collections that may contain
* duplicate elements) should implement this interface directly.
*
- * <p>All general-purpose <tt>Collection</tt> implementation classes (which
- * typically implement <tt>Collection</tt> indirectly through one of its
+ * <p>All general-purpose {@code Collection} implementation classes (which
+ * typically implement {@code Collection} indirectly through one of its
* subinterfaces) should provide two "standard" constructors: a void (no
* arguments) constructor, which creates an empty collection, and a
- * constructor with a single argument of type <tt>Collection</tt>, which
+ * constructor with a single argument of type {@code Collection}, which
* creates a new collection with the same elements as its argument. In
* effect, the latter constructor allows the user to copy any collection,
* producing an equivalent collection of the desired implementation type.
* There is no way to enforce this convention (as interfaces cannot contain
- * constructors) but all of the general-purpose <tt>Collection</tt>
+ * constructors) but all of the general-purpose {@code Collection}
* implementations in the Java platform libraries comply.
*
* <p>The "destructive" methods contained in this interface, that is, the
* methods that modify the collection on which they operate, are specified to
- * throw <tt>UnsupportedOperationException</tt> if this collection does not
+ * throw {@code UnsupportedOperationException} if this collection does not
* support the operation. If this is the case, these methods may, but are not
- * required to, throw an <tt>UnsupportedOperationException</tt> if the
+ * required to, throw an {@code UnsupportedOperationException} if the
* invocation would have no effect on the collection. For example, invoking
* the {@link #addAll(Collection)} method on an unmodifiable collection may,
* but is not required to, throw the exception if the collection to be added
@@ -69,7 +69,7 @@
* they may contain.</a> For example, some implementations prohibit null elements,
* and some have restrictions on the types of their elements. Attempting to
* add an ineligible element throws an unchecked exception, typically
- * <tt>NullPointerException</tt> or <tt>ClassCastException</tt>. Attempting
+ * {@code NullPointerException} or {@code ClassCastException}. Attempting
* to query the presence of an ineligible element may throw an exception,
* or it may simply return false; some implementations will exhibit the former
* behavior and some will exhibit the latter. More generally, attempting an
@@ -90,13 +90,13 @@
* <p>Many methods in Collections Framework interfaces are defined in
* terms of the {@link Object#equals(Object) equals} method. For example,
* the specification for the {@link #contains(Object) contains(Object o)}
- * method says: "returns <tt>true</tt> if and only if this collection
- * contains at least one element <tt>e</tt> such that
- * <tt>(o==null ? e==null : o.equals(e))</tt>." This specification should
- * <i>not</i> be construed to imply that invoking <tt>Collection.contains</tt>
- * with a non-null argument <tt>o</tt> will cause <tt>o.equals(e)</tt> to be
- * invoked for any element <tt>e</tt>. Implementations are free to implement
- * optimizations whereby the <tt>equals</tt> invocation is avoided, for
+ * method says: "returns {@code true} if and only if this collection
+ * contains at least one element {@code e} such that
+ * {@code (o==null ? e==null : o.equals(e))}." This specification should
+ * <i>not</i> be construed to imply that invoking {@code Collection.contains}
+ * with a non-null argument {@code o} will cause {@code o.equals(e)} to be
+ * invoked for any element {@code e}. Implementations are free to implement
+ * optimizations whereby the {@code equals} invocation is avoided, for
* example, by first comparing the hash codes of the two elements. (The
* {@link Object#hashCode()} specification guarantees that two objects with
* unequal hash codes cannot be equal.) More generally, implementations of
@@ -146,28 +146,28 @@
/**
* Returns the number of elements in this collection. If this collection
- * contains more than <tt>Integer.MAX_VALUE</tt> elements, returns
- * <tt>Integer.MAX_VALUE</tt>.
+ * contains more than {@code Integer.MAX_VALUE} elements, returns
+ * {@code Integer.MAX_VALUE}.
*
* @return the number of elements in this collection
*/
int size();
/**
- * Returns <tt>true</tt> if this collection contains no elements.
+ * Returns {@code true} if this collection contains no elements.
*
- * @return <tt>true</tt> if this collection contains no elements
+ * @return {@code true} if this collection contains no elements
*/
boolean isEmpty();
/**
- * Returns <tt>true</tt> if this collection contains the specified element.
- * More formally, returns <tt>true</tt> if and only if this collection
- * contains at least one element <tt>e</tt> such that
- * <tt>(o==null ? e==null : o.equals(e))</tt>.
+ * Returns {@code true} if this collection contains the specified element.
+ * More formally, returns {@code true} if and only if this collection
+ * contains at least one element {@code e} such that
+ * {@code Objects.equals(o, e)}.
*
* @param o element whose presence in this collection is to be tested
- * @return <tt>true</tt> if this collection contains the specified
+ * @return {@code true} if this collection contains the specified
* element
* @throws ClassCastException if the type of the specified element
* is incompatible with this collection
@@ -184,7 +184,7 @@
* (unless this collection is an instance of some class that provides a
* guarantee).
*
- * @return an <tt>Iterator</tt> over the elements in this collection
+ * @return an {@code Iterator} over the elements in this collection
*/
Iterator<E> iterator();
@@ -216,9 +216,9 @@
* <p>If this collection fits in the specified array with room to spare
* (i.e., the array has more elements than this collection), the element
* in the array immediately following the end of the collection is set to
- * <tt>null</tt>. (This is useful in determining the length of this
+ * {@code null}. (This is useful in determining the length of this
* collection <i>only</i> if the caller knows that this collection does
- * not contain any <tt>null</tt> elements.)
+ * not contain any {@code null} elements.)
*
* <p>If this collection makes any guarantees as to what order its elements
* are returned by its iterator, this method must return the elements in
@@ -229,15 +229,15 @@
* precise control over the runtime type of the output array, and may,
* under certain circumstances, be used to save allocation costs.
*
- * <p>Suppose <tt>x</tt> is a collection known to contain only strings.
+ * <p>Suppose {@code x} is a collection known to contain only strings.
* The following code can be used to dump the collection into a newly
- * allocated array of <tt>String</tt>:
+ * allocated array of {@code String}:
*
* <pre>
* String[] y = x.toArray(new String[0]);</pre>
*
- * Note that <tt>toArray(new Object[0])</tt> is identical in function to
- * <tt>toArray()</tt>.
+ * Note that {@code toArray(new Object[0])} is identical in function to
+ * {@code toArray()}.
*
* @param <T> the runtime type of the array to contain the collection
* @param a the array into which the elements of this collection are to be
@@ -255,27 +255,27 @@
/**
* Ensures that this collection contains the specified element (optional
- * operation). Returns <tt>true</tt> if this collection changed as a
- * result of the call. (Returns <tt>false</tt> if this collection does
+ * operation). Returns {@code true} if this collection changed as a
+ * result of the call. (Returns {@code false} if this collection does
* not permit duplicates and already contains the specified element.)<p>
*
* Collections that support this operation may place limitations on what
* elements may be added to this collection. In particular, some
- * collections will refuse to add <tt>null</tt> elements, and others will
+ * collections will refuse to add {@code null} elements, and others will
* impose restrictions on the type of elements that may be added.
* Collection classes should clearly specify in their documentation any
* restrictions on what elements may be added.<p>
*
* If a collection refuses to add a particular element for any reason
* other than that it already contains the element, it <i>must</i> throw
- * an exception (rather than returning <tt>false</tt>). This preserves
+ * an exception (rather than returning {@code false}). This preserves
* the invariant that a collection always contains the specified element
* after this call returns.
*
* @param e element whose presence in this collection is to be ensured
- * @return <tt>true</tt> if this collection changed as a result of the
+ * @return {@code true} if this collection changed as a result of the
* call
- * @throws UnsupportedOperationException if the <tt>add</tt> operation
+ * @throws UnsupportedOperationException if the {@code add} operation
* is not supported by this collection
* @throws ClassCastException if the class of the specified element
* prevents it from being added to this collection
@@ -291,21 +291,21 @@
/**
* Removes a single instance of the specified element from this
* collection, if it is present (optional operation). More formally,
- * removes an element <tt>e</tt> such that
- * <tt>(o==null ? e==null : o.equals(e))</tt>, if
+ * removes an element {@code e} such that
+ * {@code Objects.equals(o, e)}, if
* this collection contains one or more such elements. Returns
- * <tt>true</tt> if this collection contained the specified element (or
+ * {@code true} if this collection contained the specified element (or
* equivalently, if this collection changed as a result of the call).
*
* @param o element to be removed from this collection, if present
- * @return <tt>true</tt> if an element was removed as a result of this call
+ * @return {@code true} if an element was removed as a result of this call
* @throws ClassCastException if the type of the specified element
* is incompatible with this collection
* (<a href="#optional-restrictions">optional</a>)
* @throws NullPointerException if the specified element is null and this
* collection does not permit null elements
* (<a href="#optional-restrictions">optional</a>)
- * @throws UnsupportedOperationException if the <tt>remove</tt> operation
+ * @throws UnsupportedOperationException if the {@code remove} operation
* is not supported by this collection
*/
boolean remove(Object o);
@@ -314,11 +314,11 @@
// Bulk Operations
/**
- * Returns <tt>true</tt> if this collection contains all of the elements
+ * Returns {@code true} if this collection contains all of the elements
* in the specified collection.
*
* @param c collection to be checked for containment in this collection
- * @return <tt>true</tt> if this collection contains all of the elements
+ * @return {@code true} if this collection contains all of the elements
* in the specified collection
* @throws ClassCastException if the types of one or more elements
* in the specified collection are incompatible with this
@@ -342,8 +342,8 @@
* nonempty.)
*
* @param c collection containing elements to be added to this collection
- * @return <tt>true</tt> if this collection changed as a result of the call
- * @throws UnsupportedOperationException if the <tt>addAll</tt> operation
+ * @return {@code true} if this collection changed as a result of the call
+ * @throws UnsupportedOperationException if the {@code addAll} operation
* is not supported by this collection
* @throws ClassCastException if the class of an element of the specified
* collection prevents it from being added to this collection
@@ -366,9 +366,9 @@
* collection.
*
* @param c collection containing elements to be removed from this collection
- * @return <tt>true</tt> if this collection changed as a result of the
+ * @return {@code true} if this collection changed as a result of the
* call
- * @throws UnsupportedOperationException if the <tt>removeAll</tt> method
+ * @throws UnsupportedOperationException if the {@code removeAll} method
* is not supported by this collection
* @throws ClassCastException if the types of one or more elements
* in this collection are incompatible with the specified
@@ -426,8 +426,8 @@
* specified collection.
*
* @param c collection containing elements to be retained in this collection
- * @return <tt>true</tt> if this collection changed as a result of the call
- * @throws UnsupportedOperationException if the <tt>retainAll</tt> operation
+ * @return {@code true} if this collection changed as a result of the call
+ * @throws UnsupportedOperationException if the {@code retainAll} operation
* is not supported by this collection
* @throws ClassCastException if the types of one or more elements
* in this collection are incompatible with the specified
@@ -447,7 +447,7 @@
* Removes all of the elements from this collection (optional operation).
* The collection will be empty after this method returns.
*
- * @throws UnsupportedOperationException if the <tt>clear</tt> operation
+ * @throws UnsupportedOperationException if the {@code clear} operation
* is not supported by this collection
*/
void clear();
@@ -458,30 +458,30 @@
/**
* Compares the specified object with this collection for equality. <p>
*
- * While the <tt>Collection</tt> interface adds no stipulations to the
- * general contract for the <tt>Object.equals</tt>, programmers who
- * implement the <tt>Collection</tt> interface "directly" (in other words,
- * create a class that is a <tt>Collection</tt> but is not a <tt>Set</tt>
- * or a <tt>List</tt>) must exercise care if they choose to override the
- * <tt>Object.equals</tt>. It is not necessary to do so, and the simplest
- * course of action is to rely on <tt>Object</tt>'s implementation, but
+ * While the {@code Collection} interface adds no stipulations to the
+ * general contract for the {@code Object.equals}, programmers who
+ * implement the {@code Collection} interface "directly" (in other words,
+ * create a class that is a {@code Collection} but is not a {@code Set}
+ * or a {@code List}) must exercise care if they choose to override the
+ * {@code Object.equals}. It is not necessary to do so, and the simplest
+ * course of action is to rely on {@code Object}'s implementation, but
* the implementor may wish to implement a "value comparison" in place of
- * the default "reference comparison." (The <tt>List</tt> and
- * <tt>Set</tt> interfaces mandate such value comparisons.)<p>
+ * the default "reference comparison." (The {@code List} and
+ * {@code Set} interfaces mandate such value comparisons.)<p>
*
- * The general contract for the <tt>Object.equals</tt> method states that
- * equals must be symmetric (in other words, <tt>a.equals(b)</tt> if and
- * only if <tt>b.equals(a)</tt>). The contracts for <tt>List.equals</tt>
- * and <tt>Set.equals</tt> state that lists are only equal to other lists,
- * and sets to other sets. Thus, a custom <tt>equals</tt> method for a
- * collection class that implements neither the <tt>List</tt> nor
- * <tt>Set</tt> interface must return <tt>false</tt> when this collection
+ * The general contract for the {@code Object.equals} method states that
+ * equals must be symmetric (in other words, {@code a.equals(b)} if and
+ * only if {@code b.equals(a)}). The contracts for {@code List.equals}
+ * and {@code Set.equals} state that lists are only equal to other lists,
+ * and sets to other sets. Thus, a custom {@code equals} method for a
+ * collection class that implements neither the {@code List} nor
+ * {@code Set} interface must return {@code false} when this collection
* is compared to any list or set. (By the same logic, it is not possible
- * to write a class that correctly implements both the <tt>Set</tt> and
- * <tt>List</tt> interfaces.)
+ * to write a class that correctly implements both the {@code Set} and
+ * {@code List} interfaces.)
*
* @param o object to be compared for equality with this collection
- * @return <tt>true</tt> if the specified object is equal to this
+ * @return {@code true} if the specified object is equal to this
* collection
*
* @see Object#equals(Object)
@@ -492,13 +492,13 @@
/**
* Returns the hash code value for this collection. While the
- * <tt>Collection</tt> interface adds no stipulations to the general
- * contract for the <tt>Object.hashCode</tt> method, programmers should
- * take note that any class that overrides the <tt>Object.equals</tt>
- * method must also override the <tt>Object.hashCode</tt> method in order
- * to satisfy the general contract for the <tt>Object.hashCode</tt> method.
- * In particular, <tt>c1.equals(c2)</tt> implies that
- * <tt>c1.hashCode()==c2.hashCode()</tt>.
+ * {@code Collection} interface adds no stipulations to the general
+ * contract for the {@code Object.hashCode} method, programmers should
+ * take note that any class that overrides the {@code Object.equals}
+ * method must also override the {@code Object.hashCode} method in order
+ * to satisfy the general contract for the {@code Object.hashCode} method.
+ * In particular, {@code c1.equals(c2)} implies that
+ * {@code c1.hashCode()==c2.hashCode()}.
*
* @return the hash code value for this collection
*
diff --git a/jdk/src/java.base/share/classes/java/util/Collections.java b/jdk/src/java.base/share/classes/java/util/Collections.java
index 6ae9a2f..7f9cb7c 100644
--- a/jdk/src/java.base/share/classes/java/util/Collections.java
+++ b/jdk/src/java.base/share/classes/java/util/Collections.java
@@ -44,7 +44,7 @@
* collections, "wrappers", which return a new collection backed by a
* specified collection, and a few other odds and ends.
*
- * <p>The methods of this class all throw a <tt>NullPointerException</tt>
+ * <p>The methods of this class all throw a {@code NullPointerException}
* if the collections or class objects provided to them are null.
*
* <p>The documentation for the polymorphic algorithms contained in this class
@@ -52,17 +52,17 @@
* descriptions should be regarded as <i>implementation notes</i>, rather than
* parts of the <i>specification</i>. Implementors should feel free to
* substitute other algorithms, so long as the specification itself is adhered
- * to. (For example, the algorithm used by <tt>sort</tt> does not have to be
+ * to. (For example, the algorithm used by {@code sort} does not have to be
* a mergesort, but it does have to be <i>stable</i>.)
*
* <p>The "destructive" algorithms contained in this class, that is, the
* algorithms that modify the collection on which they operate, are specified
- * to throw <tt>UnsupportedOperationException</tt> if the collection does not
- * support the appropriate mutation primitive(s), such as the <tt>set</tt>
+ * to throw {@code UnsupportedOperationException} if the collection does not
+ * support the appropriate mutation primitive(s), such as the {@code set}
* method. These algorithms may, but are not required to, throw this
* exception if an invocation would have no effect on the collection. For
- * example, invoking the <tt>sort</tt> method on an unmodifiable list that is
- * already sorted may or may not throw <tt>UnsupportedOperationException</tt>.
+ * example, invoking the {@code sort} method on an unmodifiable list that is
+ * already sorted may or may not throw {@code UnsupportedOperationException}.
*
* <p>This class is a member of the
* <a href="{@docRoot}/../technotes/guides/collections/index.html">
@@ -195,10 +195,10 @@
* @param list the list to be searched.
* @param key the key to be searched for.
* @return the index of the search key, if it is contained in the list;
- * otherwise, <tt>(-(<i>insertion point</i>) - 1)</tt>. The
+ * otherwise, <code>(-(<i>insertion point</i>) - 1)</code>. The
* <i>insertion point</i> is defined as the point at which the
* key would be inserted into the list: the index of the first
- * element greater than the key, or <tt>list.size()</tt> if all
+ * element greater than the key, or {@code list.size()} if all
* elements in the list are less than the specified key. Note
* that this guarantees that the return value will be >= 0 if
* and only if the key is found.
@@ -296,13 +296,13 @@
* @param list the list to be searched.
* @param key the key to be searched for.
* @param c the comparator by which the list is ordered.
- * A <tt>null</tt> value indicates that the elements'
+ * A {@code null} value indicates that the elements'
* {@linkplain Comparable natural ordering} should be used.
* @return the index of the search key, if it is contained in the list;
- * otherwise, <tt>(-(<i>insertion point</i>) - 1)</tt>. The
+ * otherwise, <code>(-(<i>insertion point</i>) - 1)</code>. The
* <i>insertion point</i> is defined as the point at which the
* key would be inserted into the list: the index of the first
- * element greater than the key, or <tt>list.size()</tt> if all
+ * element greater than the key, or {@code list.size()} if all
* elements in the list are less than the specified key. Note
* that this guarantees that the return value will be >= 0 if
* and only if the key is found.
@@ -368,7 +368,7 @@
*
* @param list the list whose elements are to be reversed.
* @throws UnsupportedOperationException if the specified list or
- * its list-iterator does not support the <tt>set</tt> operation.
+ * its list-iterator does not support the {@code set} operation.
*/
@SuppressWarnings({"rawtypes", "unchecked"})
public static void reverse(List<?> list) {
@@ -416,7 +416,7 @@
*
* @param list the list to be shuffled.
* @throws UnsupportedOperationException if the specified list or
- * its list-iterator does not support the <tt>set</tt> operation.
+ * its list-iterator does not support the {@code set} operation.
*/
public static void shuffle(List<?> list) {
Random rnd = r;
@@ -448,7 +448,7 @@
* @param list the list to be shuffled.
* @param rnd the source of randomness to use to shuffle the list.
* @throws UnsupportedOperationException if the specified list or its
- * list-iterator does not support the <tt>set</tt> operation.
+ * list-iterator does not support the {@code set} operation.
*/
@SuppressWarnings({"rawtypes", "unchecked"})
public static void shuffle(List<?> list, Random rnd) {
@@ -483,7 +483,7 @@
* @param list The list in which to swap elements.
* @param i the index of one element to be swapped.
* @param j the index of the other element to be swapped.
- * @throws IndexOutOfBoundsException if either <tt>i</tt> or <tt>j</tt>
+ * @throws IndexOutOfBoundsException if either {@code i} or {@code j}
* is out of range (i < 0 || i >= list.size()
* || j < 0 || j >= list.size()).
* @since 1.4
@@ -516,7 +516,7 @@
* @param list the list to be filled with the specified element.
* @param obj The element with which to fill the specified list.
* @throws UnsupportedOperationException if the specified list or its
- * list-iterator does not support the <tt>set</tt> operation.
+ * list-iterator does not support the {@code set} operation.
*/
public static <T> void fill(List<? super T> list, T obj) {
int size = list.size();
@@ -548,7 +548,7 @@
* @throws IndexOutOfBoundsException if the destination list is too small
* to contain the entire source List.
* @throws UnsupportedOperationException if the destination list's
- * list-iterator does not support the <tt>set</tt> operation.
+ * list-iterator does not support the {@code set} operation.
*/
public static <T> void copy(List<? super T> dest, List<? extends T> src) {
int srcSize = src.size();
@@ -572,11 +572,11 @@
/**
* Returns the minimum element of the given collection, according to the
* <i>natural ordering</i> of its elements. All elements in the
- * collection must implement the <tt>Comparable</tt> interface.
+ * collection must implement the {@code Comparable} interface.
* Furthermore, all elements in the collection must be <i>mutually
- * comparable</i> (that is, <tt>e1.compareTo(e2)</tt> must not throw a
- * <tt>ClassCastException</tt> for any elements <tt>e1</tt> and
- * <tt>e2</tt> in the collection).<p>
+ * comparable</i> (that is, {@code e1.compareTo(e2)} must not throw a
+ * {@code ClassCastException} for any elements {@code e1} and
+ * {@code e2} in the collection).<p>
*
* This method iterates over the entire collection, hence it requires
* time proportional to the size of the collection.
@@ -607,9 +607,9 @@
* Returns the minimum element of the given collection, according to the
* order induced by the specified comparator. All elements in the
* collection must be <i>mutually comparable</i> by the specified
- * comparator (that is, <tt>comp.compare(e1, e2)</tt> must not throw a
- * <tt>ClassCastException</tt> for any elements <tt>e1</tt> and
- * <tt>e2</tt> in the collection).<p>
+ * comparator (that is, {@code comp.compare(e1, e2)} must not throw a
+ * {@code ClassCastException} for any elements {@code e1} and
+ * {@code e2} in the collection).<p>
*
* This method iterates over the entire collection, hence it requires
* time proportional to the size of the collection.
@@ -617,7 +617,7 @@
* @param <T> the class of the objects in the collection
* @param coll the collection whose minimum element is to be determined.
* @param comp the comparator with which to determine the minimum element.
- * A <tt>null</tt> value indicates that the elements' <i>natural
+ * A {@code null} value indicates that the elements' <i>natural
* ordering</i> should be used.
* @return the minimum element of the given collection, according
* to the specified comparator.
@@ -645,11 +645,11 @@
/**
* Returns the maximum element of the given collection, according to the
* <i>natural ordering</i> of its elements. All elements in the
- * collection must implement the <tt>Comparable</tt> interface.
+ * collection must implement the {@code Comparable} interface.
* Furthermore, all elements in the collection must be <i>mutually
- * comparable</i> (that is, <tt>e1.compareTo(e2)</tt> must not throw a
- * <tt>ClassCastException</tt> for any elements <tt>e1</tt> and
- * <tt>e2</tt> in the collection).<p>
+ * comparable</i> (that is, {@code e1.compareTo(e2)} must not throw a
+ * {@code ClassCastException} for any elements {@code e1} and
+ * {@code e2} in the collection).<p>
*
* This method iterates over the entire collection, hence it requires
* time proportional to the size of the collection.
@@ -680,9 +680,9 @@
* Returns the maximum element of the given collection, according to the
* order induced by the specified comparator. All elements in the
* collection must be <i>mutually comparable</i> by the specified
- * comparator (that is, <tt>comp.compare(e1, e2)</tt> must not throw a
- * <tt>ClassCastException</tt> for any elements <tt>e1</tt> and
- * <tt>e2</tt> in the collection).<p>
+ * comparator (that is, {@code comp.compare(e1, e2)} must not throw a
+ * {@code ClassCastException} for any elements {@code e1} and
+ * {@code e2} in the collection).<p>
*
* This method iterates over the entire collection, hence it requires
* time proportional to the size of the collection.
@@ -690,7 +690,7 @@
* @param <T> the class of the objects in the collection
* @param coll the collection whose maximum element is to be determined.
* @param comp the comparator with which to determine the maximum element.
- * A <tt>null</tt> value indicates that the elements' <i>natural
+ * A {@code null} value indicates that the elements' <i>natural
* ordering</i> should be used.
* @return the maximum element of the given collection, according
* to the specified comparator.
@@ -717,32 +717,32 @@
/**
* Rotates the elements in the specified list by the specified distance.
- * After calling this method, the element at index <tt>i</tt> will be
- * the element previously at index <tt>(i - distance)</tt> mod
- * <tt>list.size()</tt>, for all values of <tt>i</tt> between <tt>0</tt>
- * and <tt>list.size()-1</tt>, inclusive. (This method has no effect on
+ * After calling this method, the element at index {@code i} will be
+ * the element previously at index {@code (i - distance)} mod
+ * {@code list.size()}, for all values of {@code i} between {@code 0}
+ * and {@code list.size()-1}, inclusive. (This method has no effect on
* the size of the list.)
*
- * <p>For example, suppose <tt>list</tt> comprises<tt> [t, a, n, k, s]</tt>.
- * After invoking <tt>Collections.rotate(list, 1)</tt> (or
- * <tt>Collections.rotate(list, -4)</tt>), <tt>list</tt> will comprise
- * <tt>[s, t, a, n, k]</tt>.
+ * <p>For example, suppose {@code list} comprises{@code [t, a, n, k, s]}.
+ * After invoking {@code Collections.rotate(list, 1)} (or
+ * {@code Collections.rotate(list, -4)}), {@code list} will comprise
+ * {@code [s, t, a, n, k]}.
*
* <p>Note that this method can usefully be applied to sublists to
* move one or more elements within a list while preserving the
* order of the remaining elements. For example, the following idiom
- * moves the element at index <tt>j</tt> forward to position
- * <tt>k</tt> (which must be greater than or equal to <tt>j</tt>):
+ * moves the element at index {@code j} forward to position
+ * {@code k} (which must be greater than or equal to {@code j}):
* <pre>
* Collections.rotate(list.subList(j, k+1), -1);
* </pre>
- * To make this concrete, suppose <tt>list</tt> comprises
- * <tt>[a, b, c, d, e]</tt>. To move the element at index <tt>1</tt>
- * (<tt>b</tt>) forward two positions, perform the following invocation:
+ * To make this concrete, suppose {@code list} comprises
+ * {@code [a, b, c, d, e]}. To move the element at index {@code 1}
+ * ({@code b}) forward two positions, perform the following invocation:
* <pre>
* Collections.rotate(l.subList(1, 4), -1);
* </pre>
- * The resulting list is <tt>[a, c, d, b, e]</tt>.
+ * The resulting list is {@code [a, c, d, b, e]}.
*
* <p>To move more than one element forward, increase the absolute value
* of the rotation distance. To move elements backward, use a positive
@@ -755,8 +755,8 @@
* element is swapped into the first element. If necessary, the process
* is repeated on the second and successive elements, until the rotation
* is complete. If the specified list is large and doesn't implement the
- * <tt>RandomAccess</tt> interface, this implementation breaks the
- * list into two sublist views around index <tt>-distance mod size</tt>.
+ * {@code RandomAccess} interface, this implementation breaks the
+ * list into two sublist views around index {@code -distance mod size}.
* Then the {@link #reverse(List)} method is invoked on each sublist view,
* and finally it is invoked on the entire list. For a more complete
* description of both algorithms, see Section 2.3 of Jon Bentley's
@@ -765,9 +765,9 @@
* @param list the list to be rotated.
* @param distance the distance to rotate the list. There are no
* constraints on this value; it may be zero, negative, or
- * greater than <tt>list.size()</tt>.
+ * greater than {@code list.size()}.
* @throws UnsupportedOperationException if the specified list or
- * its list-iterator does not support the <tt>set</tt> operation.
+ * its list-iterator does not support the {@code set} operation.
* @since 1.4
*/
public static void rotate(List<?> list, int distance) {
@@ -817,21 +817,21 @@
/**
* Replaces all occurrences of one specified value in a list with another.
- * More formally, replaces with <tt>newVal</tt> each element <tt>e</tt>
- * in <tt>list</tt> such that
- * <tt>(oldVal==null ? e==null : oldVal.equals(e))</tt>.
+ * More formally, replaces with {@code newVal} each element {@code e}
+ * in {@code list} such that
+ * {@code (oldVal==null ? e==null : oldVal.equals(e))}.
* (This method has no effect on the size of the list.)
*
* @param <T> the class of the objects in the list
* @param list the list in which replacement is to occur.
* @param oldVal the old value to be replaced.
- * @param newVal the new value with which <tt>oldVal</tt> is to be
+ * @param newVal the new value with which {@code oldVal} is to be
* replaced.
- * @return <tt>true</tt> if <tt>list</tt> contained one or more elements
- * <tt>e</tt> such that
- * <tt>(oldVal==null ? e==null : oldVal.equals(e))</tt>.
+ * @return {@code true} if {@code list} contained one or more elements
+ * {@code e} such that
+ * {@code (oldVal==null ? e==null : oldVal.equals(e))}.
* @throws UnsupportedOperationException if the specified list or
- * its list-iterator does not support the <tt>set</tt> operation.
+ * its list-iterator does not support the {@code set} operation.
* @since 1.4
*/
public static <T> boolean replaceAll(List<T> list, T oldVal, T newVal) {
@@ -877,7 +877,7 @@
/**
* Returns the starting position of the first occurrence of the specified
* target list within the specified source list, or -1 if there is no
- * such occurrence. More formally, returns the lowest index <tt>i</tt>
+ * such occurrence. More formally, returns the lowest index {@code i}
* such that {@code source.subList(i, i+target.size()).equals(target)},
* or -1 if there is no such index. (Returns -1 if
* {@code target.size() > source.size()})
@@ -887,8 +887,8 @@
* location in turn.
*
* @param source the list in which to search for the first occurrence
- * of <tt>target</tt>.
- * @param target the list to search for as a subList of <tt>source</tt>.
+ * of {@code target}.
+ * @param target the list to search for as a subList of {@code source}.
* @return the starting position of the first occurrence of the specified
* target list within the specified source list, or -1 if there
* is no such occurrence.
@@ -930,7 +930,7 @@
/**
* Returns the starting position of the last occurrence of the specified
* target list within the specified source list, or -1 if there is no such
- * occurrence. More formally, returns the highest index <tt>i</tt>
+ * occurrence. More formally, returns the highest index {@code i}
* such that {@code source.subList(i, i+target.size()).equals(target)},
* or -1 if there is no such index. (Returns -1 if
* {@code target.size() > source.size()})
@@ -940,8 +940,8 @@
* location in turn.
*
* @param source the list in which to search for the last occurrence
- * of <tt>target</tt>.
- * @param target the list to search for as a subList of <tt>source</tt>.
+ * of {@code target}.
+ * @param target the list to search for as a subList of {@code source}.
* @return the starting position of the last occurrence of the specified
* target list within the specified source list, or -1 if there
* is no such occurrence.
@@ -993,11 +993,11 @@
* collections. Query operations on the returned collection "read through"
* to the specified collection, and attempts to modify the returned
* collection, whether direct or via its iterator, result in an
- * <tt>UnsupportedOperationException</tt>.<p>
+ * {@code UnsupportedOperationException}.<p>
*
* The returned collection does <i>not</i> pass the hashCode and equals
* operations through to the backing collection, but relies on
- * <tt>Object</tt>'s <tt>equals</tt> and <tt>hashCode</tt> methods. This
+ * {@code Object}'s {@code equals} and {@code hashCode} methods. This
* is necessary to preserve the contracts of these operations in the case
* that the backing collection is a set or a list.<p>
*
@@ -1105,7 +1105,7 @@
* modules to provide users with "read-only" access to internal sets.
* Query operations on the returned set "read through" to the specified
* set, and attempts to modify the returned set, whether direct or via its
- * iterator, result in an <tt>UnsupportedOperationException</tt>.<p>
+ * iterator, result in an {@code UnsupportedOperationException}.<p>
*
* The returned set will be serializable if the specified set
* is serializable.
@@ -1136,8 +1136,8 @@
* sorted sets. Query operations on the returned sorted set "read
* through" to the specified sorted set. Attempts to modify the returned
* sorted set, whether direct, via its iterator, or via its
- * <tt>subSet</tt>, <tt>headSet</tt>, or <tt>tailSet</tt> views, result in
- * an <tt>UnsupportedOperationException</tt>.<p>
+ * {@code subSet}, {@code headSet}, or {@code tailSet} views, result in
+ * an {@code UnsupportedOperationException}.<p>
*
* The returned sorted set will be serializable if the specified sorted set
* is serializable.
@@ -1273,7 +1273,7 @@
* lists. Query operations on the returned list "read through" to the
* specified list, and attempts to modify the returned list, whether
* direct or via its iterator, result in an
- * <tt>UnsupportedOperationException</tt>.<p>
+ * {@code UnsupportedOperationException}.<p>
*
* The returned list will be serializable if the specified list
* is serializable. Similarly, the returned list will implement
@@ -1419,7 +1419,7 @@
* maps. Query operations on the returned map "read through"
* to the specified map, and attempts to modify the returned
* map, whether direct or via its collection views, result in an
- * <tt>UnsupportedOperationException</tt>.<p>
+ * {@code UnsupportedOperationException}.<p>
*
* The returned map will be serializable if the specified map
* is serializable.
@@ -1769,8 +1769,8 @@
* sorted maps. Query operations on the returned sorted map "read through"
* to the specified sorted map. Attempts to modify the returned
* sorted map, whether direct, via its collection views, or via its
- * <tt>subMap</tt>, <tt>headMap</tt>, or <tt>tailMap</tt> views, result in
- * an <tt>UnsupportedOperationException</tt>.<p>
+ * {@code subMap}, {@code headMap}, or {@code tailMap} views, result in
+ * an {@code UnsupportedOperationException}.<p>
*
* The returned sorted map will be serializable if the specified sorted map
* is serializable.
@@ -2148,8 +2148,8 @@
* through the returned sorted set (or its views).<p>
*
* It is imperative that the user manually synchronize on the returned
- * sorted set when iterating over it or any of its <tt>subSet</tt>,
- * <tt>headSet</tt>, or <tt>tailSet</tt> views.
+ * sorted set when iterating over it or any of its {@code subSet},
+ * {@code headSet}, or {@code tailSet} views.
* <pre>
* SortedSet s = Collections.synchronizedSortedSet(new TreeSet());
* ...
@@ -2700,8 +2700,8 @@
*
* It is imperative that the user manually synchronize on the returned
* sorted map when iterating over any of its collection views, or the
- * collections views of any of its <tt>subMap</tt>, <tt>headMap</tt> or
- * <tt>tailMap</tt> views.
+ * collections views of any of its {@code subMap}, {@code headMap} or
+ * {@code tailMap} views.
* <pre>
* SortedMap m = Collections.synchronizedSortedMap(new TreeMap());
* ...
@@ -4406,7 +4406,7 @@
* </pre>
*
* @implNote
- * Implementations of this method need not create a separate <tt>List</tt>
+ * Implementations of this method need not create a separate {@code List}
* object for each call. Using this method is likely to have comparable
* cost to using the like-named field. (Unlike this method, the field does
* not provide type safety.)
@@ -4846,7 +4846,7 @@
* @param <K> the class of the map keys
* @param <V> the class of the map values
* @param key the sole key to be stored in the returned map.
- * @param value the value to which the returned map maps <tt>key</tt>.
+ * @param value the value to which the returned map maps {@code key}.
* @return an immutable map containing only the specified key-value
* mapping.
* @since 1.3
@@ -4964,17 +4964,17 @@
// Miscellaneous
/**
- * Returns an immutable list consisting of <tt>n</tt> copies of the
+ * Returns an immutable list consisting of {@code n} copies of the
* specified object. The newly allocated data object is tiny (it contains
* a single reference to the data object). This method is useful in
- * combination with the <tt>List.addAll</tt> method to grow lists.
+ * combination with the {@code List.addAll} method to grow lists.
* The returned list is serializable.
*
* @param <T> the class of the object to copy and of the objects
* in the returned list.
* @param n the number of elements in the returned list.
* @param o the element to appear repeatedly in the returned list.
- * @return an immutable list consisting of <tt>n</tt> copies of the
+ * @return an immutable list consisting of {@code n} copies of the
* specified object.
* @throws IllegalArgumentException if {@code n < 0}
* @see List#addAll(Collection)
@@ -5095,7 +5095,7 @@
* @param <T> the class of the objects compared by the comparator
* @return A comparator that imposes the reverse of the <i>natural
* ordering</i> on a collection of objects that implement
- * the <tt>Comparable</tt> interface.
+ * the {@code Comparable} interface.
* @see Comparable
*/
@SuppressWarnings("unchecked")
@@ -5259,14 +5259,14 @@
/**
* Returns the number of elements in the specified collection equal to the
* specified object. More formally, returns the number of elements
- * <tt>e</tt> in the collection such that
- * <tt>(o == null ? e == null : o.equals(e))</tt>.
+ * {@code e} in the collection such that
+ * {@code Objects.equals(o, e)}.
*
* @param c the collection in which to determine the frequency
- * of <tt>o</tt>
+ * of {@code o}
* @param o the object whose frequency is to be determined
* @return the number of elements in {@code c} equal to {@code o}
- * @throws NullPointerException if <tt>c</tt> is null
+ * @throws NullPointerException if {@code c} is null
* @since 1.5
*/
public static int frequency(Collection<?> c, Object o) {
@@ -5377,7 +5377,7 @@
* Adds all of the specified elements to the specified collection.
* Elements to be added may be specified individually or as an array.
* The behavior of this convenience method is identical to that of
- * <tt>c.addAll(Arrays.asList(elements))</tt>, but this method is likely
+ * {@code c.addAll(Arrays.asList(elements))}, but this method is likely
* to run significantly faster under most implementations.
*
* <p>When elements are specified individually, this method provides a
@@ -5387,16 +5387,16 @@
* </pre>
*
* @param <T> the class of the elements to add and of the collection
- * @param c the collection into which <tt>elements</tt> are to be inserted
- * @param elements the elements to insert into <tt>c</tt>
- * @return <tt>true</tt> if the collection changed as a result of the call
- * @throws UnsupportedOperationException if <tt>c</tt> does not support
- * the <tt>add</tt> operation
- * @throws NullPointerException if <tt>elements</tt> contains one or more
- * null values and <tt>c</tt> does not permit null elements, or
- * if <tt>c</tt> or <tt>elements</tt> are <tt>null</tt>
+ * @param c the collection into which {@code elements} are to be inserted
+ * @param elements the elements to insert into {@code c}
+ * @return {@code true} if the collection changed as a result of the call
+ * @throws UnsupportedOperationException if {@code c} does not support
+ * the {@code add} operation
+ * @throws NullPointerException if {@code elements} contains one or more
+ * null values and {@code c} does not permit null elements, or
+ * if {@code c} or {@code elements} are {@code null}
* @throws IllegalArgumentException if some property of a value in
- * <tt>elements</tt> prevents it from being added to <tt>c</tt>
+ * {@code elements} prevents it from being added to {@code c}
* @see Collection#addAll(Collection)
* @since 1.5
*/
@@ -5418,9 +5418,9 @@
* HashMap} or {@link TreeMap}).
*
* <p>Each method invocation on the set returned by this method results in
- * exactly one method invocation on the backing map or its <tt>keySet</tt>
- * view, with one exception. The <tt>addAll</tt> method is implemented
- * as a sequence of <tt>put</tt> invocations on the backing map.
+ * exactly one method invocation on the backing map or its {@code keySet}
+ * view, with one exception. The {@code addAll} method is implemented
+ * as a sequence of {@code put} invocations on the backing map.
*
* <p>The specified map must be empty at the time this method is invoked,
* and should not be accessed directly after this method returns. These
@@ -5436,7 +5436,7 @@
* returned set
* @param map the backing map
* @return the set backed by the map
- * @throws IllegalArgumentException if <tt>map</tt> is not empty
+ * @throws IllegalArgumentException if {@code map} is not empty
* @since 1.6
*/
public static <E> Set<E> newSetFromMap(Map<E, Boolean> map) {
@@ -5505,10 +5505,10 @@
/**
* Returns a view of a {@link Deque} as a Last-in-first-out (Lifo)
- * {@link Queue}. Method <tt>add</tt> is mapped to <tt>push</tt>,
- * <tt>remove</tt> is mapped to <tt>pop</tt> and so on. This
+ * {@link Queue}. Method {@code add} is mapped to {@code push},
+ * {@code remove} is mapped to {@code pop} and so on. This
* view can be useful when you would like to use a method
- * requiring a <tt>Queue</tt> but you need Lifo ordering.
+ * requiring a {@code Queue} but you need Lifo ordering.
*
* <p>Each method invocation on the queue returned by this method
* results in exactly one method invocation on the backing deque, with
diff --git a/jdk/src/java.base/share/classes/java/util/Comparator.java b/jdk/src/java.base/share/classes/java/util/Comparator.java
index ecf8d64..9afb1c4 100644
--- a/jdk/src/java.base/share/classes/java/util/Comparator.java
+++ b/jdk/src/java.base/share/classes/java/util/Comparator.java
@@ -42,20 +42,20 @@
* SortedMap sorted maps}), or to provide an ordering for collections of
* objects that don't have a {@link Comparable natural ordering}.<p>
*
- * The ordering imposed by a comparator <tt>c</tt> on a set of elements
- * <tt>S</tt> is said to be <i>consistent with equals</i> if and only if
- * <tt>c.compare(e1, e2)==0</tt> has the same boolean value as
- * <tt>e1.equals(e2)</tt> for every <tt>e1</tt> and <tt>e2</tt> in
- * <tt>S</tt>.<p>
+ * The ordering imposed by a comparator {@code c} on a set of elements
+ * {@code S} is said to be <i>consistent with equals</i> if and only if
+ * {@code c.compare(e1, e2)==0} has the same boolean value as
+ * {@code e1.equals(e2)} for every {@code e1} and {@code e2} in
+ * {@code S}.<p>
*
* Caution should be exercised when using a comparator capable of imposing an
* ordering inconsistent with equals to order a sorted set (or sorted map).
- * Suppose a sorted set (or sorted map) with an explicit comparator <tt>c</tt>
- * is used with elements (or keys) drawn from a set <tt>S</tt>. If the
- * ordering imposed by <tt>c</tt> on <tt>S</tt> is inconsistent with equals,
+ * Suppose a sorted set (or sorted map) with an explicit comparator {@code c}
+ * is used with elements (or keys) drawn from a set {@code S}. If the
+ * ordering imposed by {@code c} on {@code S} is inconsistent with equals,
* the sorted set (or sorted map) will behave "strangely." In particular the
* sorted set (or sorted map) will violate the general contract for set (or
- * map), which is defined in terms of <tt>equals</tt>.<p>
+ * map), which is defined in terms of {@code equals}.<p>
*
* For example, suppose one adds two elements {@code a} and {@code b} such that
* {@code (a.equals(b) && c.compare(a, b) != 0)}
@@ -67,23 +67,23 @@
* {@link Set#add Set.add} method.<p>
*
* Note: It is generally a good idea for comparators to also implement
- * <tt>java.io.Serializable</tt>, as they may be used as ordering methods in
+ * {@code java.io.Serializable}, as they may be used as ordering methods in
* serializable data structures (like {@link TreeSet}, {@link TreeMap}). In
* order for the data structure to serialize successfully, the comparator (if
- * provided) must implement <tt>Serializable</tt>.<p>
+ * provided) must implement {@code Serializable}.<p>
*
* For the mathematically inclined, the <i>relation</i> that defines the
- * <i>imposed ordering</i> that a given comparator <tt>c</tt> imposes on a
- * given set of objects <tt>S</tt> is:<pre>
+ * <i>imposed ordering</i> that a given comparator {@code c} imposes on a
+ * given set of objects {@code S} is:<pre>
* {(x, y) such that c.compare(x, y) <= 0}.
* </pre> The <i>quotient</i> for this total order is:<pre>
* {(x, y) such that c.compare(x, y) == 0}.
* </pre>
*
- * It follows immediately from the contract for <tt>compare</tt> that the
- * quotient is an <i>equivalence relation</i> on <tt>S</tt>, and that the
- * imposed ordering is a <i>total order</i> on <tt>S</tt>. When we say that
- * the ordering imposed by <tt>c</tt> on <tt>S</tt> is <i>consistent with
+ * It follows immediately from the contract for {@code compare} that the
+ * quotient is an <i>equivalence relation</i> on {@code S}, and that the
+ * imposed ordering is a <i>total order</i> on {@code S}. When we say that
+ * the ordering imposed by {@code c} on {@code S} is <i>consistent with
* equals</i>, we mean that the quotient for the ordering is the equivalence
* relation defined by the objects' {@link Object#equals(Object)
* equals(Object)} method(s):<pre>
@@ -113,26 +113,26 @@
* to, or greater than the second.<p>
*
* In the foregoing description, the notation
- * <tt>sgn(</tt><i>expression</i><tt>)</tt> designates the mathematical
- * <i>signum</i> function, which is defined to return one of <tt>-1</tt>,
- * <tt>0</tt>, or <tt>1</tt> according to whether the value of
+ * {@code sgn(}<i>expression</i>{@code )} designates the mathematical
+ * <i>signum</i> function, which is defined to return one of {@code -1},
+ * {@code 0}, or {@code 1} according to whether the value of
* <i>expression</i> is negative, zero or positive.<p>
*
- * The implementor must ensure that <tt>sgn(compare(x, y)) ==
- * -sgn(compare(y, x))</tt> for all <tt>x</tt> and <tt>y</tt>. (This
- * implies that <tt>compare(x, y)</tt> must throw an exception if and only
- * if <tt>compare(y, x)</tt> throws an exception.)<p>
+ * The implementor must ensure that {@code sgn(compare(x, y)) ==
+ * -sgn(compare(y, x))} for all {@code x} and {@code y}. (This
+ * implies that {@code compare(x, y)} must throw an exception if and only
+ * if {@code compare(y, x)} throws an exception.)<p>
*
* The implementor must also ensure that the relation is transitive:
- * <tt>((compare(x, y)>0) && (compare(y, z)>0))</tt> implies
- * <tt>compare(x, z)>0</tt>.<p>
+ * {@code ((compare(x, y)>0) && (compare(y, z)>0))} implies
+ * {@code compare(x, z)>0}.<p>
*
- * Finally, the implementor must ensure that <tt>compare(x, y)==0</tt>
- * implies that <tt>sgn(compare(x, z))==sgn(compare(y, z))</tt> for all
- * <tt>z</tt>.<p>
+ * Finally, the implementor must ensure that {@code compare(x, y)==0}
+ * implies that {@code sgn(compare(x, z))==sgn(compare(y, z))} for all
+ * {@code z}.<p>
*
* It is generally the case, but <i>not</i> strictly required that
- * <tt>(compare(x, y)==0) == (x.equals(y))</tt>. Generally speaking,
+ * {@code (compare(x, y)==0) == (x.equals(y))}. Generally speaking,
* any comparator that violates this condition should clearly indicate
* this fact. The recommended language is "Note: this comparator
* imposes orderings that are inconsistent with equals."
@@ -153,19 +153,19 @@
* Indicates whether some other object is "equal to" this
* comparator. This method must obey the general contract of
* {@link Object#equals(Object)}. Additionally, this method can return
- * <tt>true</tt> <i>only</i> if the specified object is also a comparator
+ * {@code true} <i>only</i> if the specified object is also a comparator
* and it imposes the same ordering as this comparator. Thus,
- * <code>comp1.equals(comp2)</code> implies that <tt>sgn(comp1.compare(o1,
- * o2))==sgn(comp2.compare(o1, o2))</tt> for every object reference
- * <tt>o1</tt> and <tt>o2</tt>.<p>
+ * {@code comp1.equals(comp2)} implies that {@code sgn(comp1.compare(o1,
+ * o2))==sgn(comp2.compare(o1, o2))} for every object reference
+ * {@code o1} and {@code o2}.<p>
*
* Note that it is <i>always</i> safe <i>not</i> to override
- * <tt>Object.equals(Object)</tt>. However, overriding this method may,
+ * {@code Object.equals(Object)}. However, overriding this method may,
* in some cases, improve performance by allowing programs to determine
* that two distinct comparators impose the same order.
*
* @param obj the reference object with which to compare.
- * @return <code>true</code> only if the specified object is also
+ * @return {@code true} only if the specified object is also
* a comparator and it imposes the same ordering as this
* comparator.
* @see Object#equals(Object)
diff --git a/jdk/src/java.base/share/classes/java/util/Dictionary.java b/jdk/src/java.base/share/classes/java/util/Dictionary.java
index 5f439b3..4d89ec2 100644
--- a/jdk/src/java.base/share/classes/java/util/Dictionary.java
+++ b/jdk/src/java.base/share/classes/java/util/Dictionary.java
@@ -26,14 +26,14 @@
package java.util;
/**
- * The <code>Dictionary</code> class is the abstract parent of any
- * class, such as <code>Hashtable</code>, which maps keys to values.
- * Every key and every value is an object. In any one <tt>Dictionary</tt>
+ * The {@code Dictionary} class is the abstract parent of any
+ * class, such as {@code Hashtable}, which maps keys to values.
+ * Every key and every value is an object. In any one {@code Dictionary}
* object, every key is associated with at most one value. Given a
- * <tt>Dictionary</tt> and a key, the associated element can be looked up.
- * Any non-<code>null</code> object can be used as a key and as a value.
+ * {@code Dictionary} and a key, the associated element can be looked up.
+ * Any non-{@code null} object can be used as a key and as a value.
* <p>
- * As a rule, the <code>equals</code> method should be used by
+ * As a rule, the {@code equals} method should be used by
* implementations of this class to decide if two keys are the same.
* <p>
* <strong>NOTE: This class is obsolete. New implementations should
@@ -64,17 +64,17 @@
/**
* Tests if this dictionary maps no keys to value. The general contract
- * for the <tt>isEmpty</tt> method is that the result is true if and only
+ * for the {@code isEmpty} method is that the result is true if and only
* if this dictionary contains no entries.
*
- * @return <code>true</code> if this dictionary maps no keys to values;
- * <code>false</code> otherwise.
+ * @return {@code true} if this dictionary maps no keys to values;
+ * {@code false} otherwise.
*/
abstract public boolean isEmpty();
/**
* Returns an enumeration of the keys in this dictionary. The general
- * contract for the keys method is that an <tt>Enumeration</tt> object
+ * contract for the keys method is that an {@code Enumeration} object
* is returned that will generate all the keys for which this dictionary
* contains entries.
*
@@ -86,8 +86,8 @@
/**
* Returns an enumeration of the values in this dictionary. The general
- * contract for the <tt>elements</tt> method is that an
- * <tt>Enumeration</tt> is returned that will generate all the elements
+ * contract for the {@code elements} method is that an
+ * {@code Enumeration} is returned that will generate all the elements
* contained in entries in this dictionary.
*
* @return an enumeration of the values in this dictionary.
@@ -98,58 +98,58 @@
/**
* Returns the value to which the key is mapped in this dictionary.
- * The general contract for the <tt>isEmpty</tt> method is that if this
+ * The general contract for the {@code isEmpty} method is that if this
* dictionary contains an entry for the specified key, the associated
- * value is returned; otherwise, <tt>null</tt> is returned.
+ * value is returned; otherwise, {@code null} is returned.
*
* @return the value to which the key is mapped in this dictionary;
* @param key a key in this dictionary.
- * <code>null</code> if the key is not mapped to any value in
+ * {@code null} if the key is not mapped to any value in
* this dictionary.
- * @exception NullPointerException if the <tt>key</tt> is <tt>null</tt>.
+ * @exception NullPointerException if the {@code key} is {@code null}.
* @see java.util.Dictionary#put(java.lang.Object, java.lang.Object)
*/
abstract public V get(Object key);
/**
- * Maps the specified <code>key</code> to the specified
- * <code>value</code> in this dictionary. Neither the key nor the
- * value can be <code>null</code>.
+ * Maps the specified {@code key} to the specified
+ * {@code value} in this dictionary. Neither the key nor the
+ * value can be {@code null}.
* <p>
* If this dictionary already contains an entry for the specified
- * <tt>key</tt>, the value already in this dictionary for that
- * <tt>key</tt> is returned, after modifying the entry to contain the
+ * {@code key}, the value already in this dictionary for that
+ * {@code key} is returned, after modifying the entry to contain the
* new element. <p>If this dictionary does not already have an entry
- * for the specified <tt>key</tt>, an entry is created for the
- * specified <tt>key</tt> and <tt>value</tt>, and <tt>null</tt> is
+ * for the specified {@code key}, an entry is created for the
+ * specified {@code key} and {@code value}, and {@code null} is
* returned.
* <p>
- * The <code>value</code> can be retrieved by calling the
- * <code>get</code> method with a <code>key</code> that is equal to
- * the original <code>key</code>.
+ * The {@code value} can be retrieved by calling the
+ * {@code get} method with a {@code key} that is equal to
+ * the original {@code key}.
*
* @param key the hashtable key.
* @param value the value.
- * @return the previous value to which the <code>key</code> was mapped
- * in this dictionary, or <code>null</code> if the key did not
+ * @return the previous value to which the {@code key} was mapped
+ * in this dictionary, or {@code null} if the key did not
* have a previous mapping.
- * @exception NullPointerException if the <code>key</code> or
- * <code>value</code> is <code>null</code>.
+ * @exception NullPointerException if the {@code key} or
+ * {@code value} is {@code null}.
* @see java.lang.Object#equals(java.lang.Object)
* @see java.util.Dictionary#get(java.lang.Object)
*/
abstract public V put(K key, V value);
/**
- * Removes the <code>key</code> (and its corresponding
- * <code>value</code>) from this dictionary. This method does nothing
- * if the <code>key</code> is not in this dictionary.
+ * Removes the {@code key} (and its corresponding
+ * {@code value}) from this dictionary. This method does nothing
+ * if the {@code key} is not in this dictionary.
*
* @param key the key that needs to be removed.
- * @return the value to which the <code>key</code> had been mapped in this
- * dictionary, or <code>null</code> if the key did not have a
+ * @return the value to which the {@code key} had been mapped in this
+ * dictionary, or {@code null} if the key did not have a
* mapping.
- * @exception NullPointerException if <tt>key</tt> is <tt>null</tt>.
+ * @exception NullPointerException if {@code key} is {@code null}.
*/
abstract public V remove(Object key);
}
diff --git a/jdk/src/java.base/share/classes/java/util/DuplicateFormatFlagsException.java b/jdk/src/java.base/share/classes/java/util/DuplicateFormatFlagsException.java
index 0dcdf37..ec016a5 100644
--- a/jdk/src/java.base/share/classes/java/util/DuplicateFormatFlagsException.java
+++ b/jdk/src/java.base/share/classes/java/util/DuplicateFormatFlagsException.java
@@ -29,7 +29,7 @@
* Unchecked exception thrown when duplicate flags are provided in the format
* specifier.
*
- * <p> Unless otherwise specified, passing a <tt>null</tt> argument to any
+ * <p> Unless otherwise specified, passing a {@code null} argument to any
* method or constructor in this class will cause a {@link
* NullPointerException} to be thrown.
*
diff --git a/jdk/src/java.base/share/classes/java/util/EmptyStackException.java b/jdk/src/java.base/share/classes/java/util/EmptyStackException.java
index ea1c49d..53dcacd 100644
--- a/jdk/src/java.base/share/classes/java/util/EmptyStackException.java
+++ b/jdk/src/java.base/share/classes/java/util/EmptyStackException.java
@@ -26,7 +26,7 @@
package java.util;
/**
- * Thrown by methods in the <code>Stack</code> class to indicate
+ * Thrown by methods in the {@code Stack} class to indicate
* that the stack is empty.
*
* @author Jonathan Payne
@@ -38,7 +38,7 @@
private static final long serialVersionUID = 5084686378493302095L;
/**
- * Constructs a new <code>EmptyStackException</code> with <tt>null</tt>
+ * Constructs a new {@code EmptyStackException} with {@code null}
* as its error message string.
*/
public EmptyStackException() {
diff --git a/jdk/src/java.base/share/classes/java/util/EnumMap.java b/jdk/src/java.base/share/classes/java/util/EnumMap.java
index b732ef0..b99a93f 100644
--- a/jdk/src/java.base/share/classes/java/util/EnumMap.java
+++ b/jdk/src/java.base/share/classes/java/util/EnumMap.java
@@ -50,7 +50,7 @@
* presence of a null key or to remove one will, however, function properly.
* Null values are permitted.
- * <P>Like most collection implementations <tt>EnumMap</tt> is not
+ * <P>Like most collection implementations {@code EnumMap} is not
* synchronized. If multiple threads access an enum map concurrently, and at
* least one of the threads modifies the map, it should be synchronized
* externally. This is typically accomplished by synchronizing on some
@@ -80,7 +80,7 @@
implements java.io.Serializable, Cloneable
{
/**
- * The <tt>Class</tt> object for the enum type of all the keys of this map.
+ * The {@code Class} object for the enum type of all the keys of this map.
*
* @serial
*/
@@ -131,7 +131,7 @@
* Creates an empty enum map with the specified key type.
*
* @param keyType the class object of the key type for this enum map
- * @throws NullPointerException if <tt>keyType</tt> is null
+ * @throws NullPointerException if {@code keyType} is null
*/
public EnumMap(Class<K> keyType) {
this.keyType = keyType;
@@ -144,7 +144,7 @@
* map, initially containing the same mappings (if any).
*
* @param m the enum map from which to initialize this enum map
- * @throws NullPointerException if <tt>m</tt> is null
+ * @throws NullPointerException if {@code m} is null
*/
public EnumMap(EnumMap<K, ? extends V> m) {
keyType = m.keyType;
@@ -155,15 +155,15 @@
/**
* Creates an enum map initialized from the specified map. If the
- * specified map is an <tt>EnumMap</tt> instance, this constructor behaves
+ * specified map is an {@code EnumMap} instance, this constructor behaves
* identically to {@link #EnumMap(EnumMap)}. Otherwise, the specified map
* must contain at least one mapping (in order to determine the new
* enum map's key type).
*
* @param m the map from which to initialize this enum map
- * @throws IllegalArgumentException if <tt>m</tt> is not an
- * <tt>EnumMap</tt> instance and contains no mappings
- * @throws NullPointerException if <tt>m</tt> is null
+ * @throws IllegalArgumentException if {@code m} is not an
+ * {@code EnumMap} instance and contains no mappings
+ * @throws NullPointerException if {@code m} is null
*/
public EnumMap(Map<K, ? extends V> m) {
if (m instanceof EnumMap) {
@@ -194,11 +194,11 @@
}
/**
- * Returns <tt>true</tt> if this map maps one or more keys to the
+ * Returns {@code true} if this map maps one or more keys to the
* specified value.
*
* @param value the value whose presence in this map is to be tested
- * @return <tt>true</tt> if this map maps one or more keys to this value
+ * @return {@code true} if this map maps one or more keys to this value
*/
public boolean containsValue(Object value) {
value = maskNull(value);
@@ -211,11 +211,11 @@
}
/**
- * Returns <tt>true</tt> if this map contains a mapping for the specified
+ * Returns {@code true} if this map contains a mapping for the specified
* key.
*
* @param key the key whose presence in this map is to be tested
- * @return <tt>true</tt> if this map contains a mapping for the specified
+ * @return {@code true} if this map contains a mapping for the specified
* key
*/
public boolean containsKey(Object key) {
@@ -258,9 +258,9 @@
* @param value the value to be associated with the specified key
*
* @return the previous value associated with specified key, or
- * <tt>null</tt> if there was no mapping for key. (A <tt>null</tt>
+ * {@code null} if there was no mapping for key. (A {@code null}
* return can also indicate that the map previously associated
- * <tt>null</tt> with the specified key.)
+ * {@code null} with the specified key.)
* @throws NullPointerException if the specified key is null
*/
public V put(K key, V value) {
@@ -279,9 +279,9 @@
*
* @param key the key whose mapping is to be removed from the map
* @return the previous value associated with specified key, or
- * <tt>null</tt> if there was no entry for key. (A <tt>null</tt>
+ * {@code null} if there was no entry for key. (A {@code null}
* return can also indicate that the map previously associated
- * <tt>null</tt> with the specified key.)
+ * {@code null} with the specified key.)
*/
public V remove(Object key) {
if (!isValidKey(key))
@@ -644,12 +644,12 @@
/**
* Compares the specified object with this map for equality. Returns
- * <tt>true</tt> if the given object is also a map and the two maps
+ * {@code true} if the given object is also a map and the two maps
* represent the same mappings, as specified in the {@link
* Map#equals(Object)} contract.
*
* @param o the object to be compared for equality with this map
- * @return <tt>true</tt> if the specified object is equal to this map
+ * @return {@code true} if the specified object is equal to this map
*/
public boolean equals(Object o) {
if (this == o)
@@ -758,7 +758,7 @@
private static final long serialVersionUID = 458661240069192865L;
/**
- * Save the state of the <tt>EnumMap</tt> instance to a stream (i.e.,
+ * Save the state of the {@code EnumMap} instance to a stream (i.e.,
* serialize it).
*
* @serialData The <i>size</i> of the enum map (the number of key-value
@@ -787,7 +787,7 @@
}
/**
- * Reconstitute the <tt>EnumMap</tt> instance from a stream (i.e.,
+ * Reconstitute the {@code EnumMap} instance from a stream (i.e.,
* deserialize it).
*/
@SuppressWarnings("unchecked")
diff --git a/jdk/src/java.base/share/classes/java/util/EnumSet.java b/jdk/src/java.base/share/classes/java/util/EnumSet.java
index af40997..b337e66 100644
--- a/jdk/src/java.base/share/classes/java/util/EnumSet.java
+++ b/jdk/src/java.base/share/classes/java/util/EnumSet.java
@@ -34,11 +34,11 @@
* are represented internally as bit vectors. This representation is
* extremely compact and efficient. The space and time performance of this
* class should be good enough to allow its use as a high-quality, typesafe
- * alternative to traditional <tt>int</tt>-based "bit flags." Even bulk
- * operations (such as <tt>containsAll</tt> and <tt>retainAll</tt>) should
+ * alternative to traditional {@code int}-based "bit flags." Even bulk
+ * operations (such as {@code containsAll} and {@code retainAll}) should
* run very quickly if their argument is also an enum set.
*
- * <p>The iterator returned by the <tt>iterator</tt> method traverses the
+ * <p>The iterator returned by the {@code iterator} method traverses the
* elements in their <i>natural order</i> (the order in which the enum
* constants are declared). The returned iterator is <i>weakly
* consistent</i>: it will never throw {@link ConcurrentModificationException}
@@ -50,7 +50,7 @@
* presence of a null element or to remove one will, however, function
* properly.
*
- * <P>Like most collection implementations, <tt>EnumSet</tt> is not
+ * <P>Like most collection implementations, {@code EnumSet} is not
* synchronized. If multiple threads access an enum set concurrently, and at
* least one of the threads modifies the set, it should be synchronized
* externally. This is typically accomplished by synchronizing on some
@@ -106,7 +106,7 @@
* @param elementType the class object of the element type for this enum
* set
* @return An empty enum set of the specified type.
- * @throws NullPointerException if <tt>elementType</tt> is null
+ * @throws NullPointerException if {@code elementType} is null
*/
public static <E extends Enum<E>> EnumSet<E> noneOf(Class<E> elementType) {
Enum<?>[] universe = getUniverse(elementType);
@@ -127,7 +127,7 @@
* @param elementType the class object of the element type for this enum
* set
* @return An enum set containing all the elements in the specified type.
- * @throws NullPointerException if <tt>elementType</tt> is null
+ * @throws NullPointerException if {@code elementType} is null
*/
public static <E extends Enum<E>> EnumSet<E> allOf(Class<E> elementType) {
EnumSet<E> result = noneOf(elementType);
@@ -148,7 +148,7 @@
* @param <E> The class of the elements in the set
* @param s the enum set from which to initialize this enum set
* @return A copy of the specified enum set.
- * @throws NullPointerException if <tt>s</tt> is null
+ * @throws NullPointerException if {@code s} is null
*/
public static <E extends Enum<E>> EnumSet<E> copyOf(EnumSet<E> s) {
return s.clone();
@@ -156,7 +156,7 @@
/**
* Creates an enum set initialized from the specified collection. If
- * the specified collection is an <tt>EnumSet</tt> instance, this static
+ * the specified collection is an {@code EnumSet} instance, this static
* factory method behaves identically to {@link #copyOf(EnumSet)}.
* Otherwise, the specified collection must contain at least one element
* (in order to determine the new enum set's element type).
@@ -164,9 +164,9 @@
* @param <E> The class of the elements in the collection
* @param c the collection from which to initialize this enum set
* @return An enum set initialized from the given collection.
- * @throws IllegalArgumentException if <tt>c</tt> is not an
- * <tt>EnumSet</tt> instance and contains no elements
- * @throws NullPointerException if <tt>c</tt> is null
+ * @throws IllegalArgumentException if {@code c} is not an
+ * {@code EnumSet} instance and contains no elements
+ * @throws NullPointerException if {@code c} is null
*/
public static <E extends Enum<E>> EnumSet<E> copyOf(Collection<E> c) {
if (c instanceof EnumSet) {
@@ -191,7 +191,7 @@
* @param <E> The class of the elements in the enum set
* @param s the enum set from whose complement to initialize this enum set
* @return The complement of the specified set in this set
- * @throws NullPointerException if <tt>s</tt> is null
+ * @throws NullPointerException if {@code s} is null
*/
public static <E extends Enum<E>> EnumSet<E> complementOf(EnumSet<E> s) {
EnumSet<E> result = copyOf(s);
@@ -210,7 +210,7 @@
*
* @param <E> The class of the specified element and of the set
* @param e the element that this set is to contain initially
- * @throws NullPointerException if <tt>e</tt> is null
+ * @throws NullPointerException if {@code e} is null
* @return an enum set initially containing the specified element
*/
public static <E extends Enum<E>> EnumSet<E> of(E e) {
@@ -332,7 +332,7 @@
* @param first an element that the set is to contain initially
* @param rest the remaining elements the set is to contain initially
* @throws NullPointerException if any of the specified elements are null,
- * or if <tt>rest</tt> is null
+ * or if {@code rest} is null
* @return an enum set initially containing the specified elements
*/
@SafeVarargs
diff --git a/jdk/src/java.base/share/classes/java/util/Enumeration.java b/jdk/src/java.base/share/classes/java/util/Enumeration.java
index 93224a9..2cf2a27 100644
--- a/jdk/src/java.base/share/classes/java/util/Enumeration.java
+++ b/jdk/src/java.base/share/classes/java/util/Enumeration.java
@@ -28,10 +28,10 @@
/**
* An object that implements the Enumeration interface generates a
* series of elements, one at a time. Successive calls to the
- * <code>nextElement</code> method return successive elements of the
+ * {@code nextElement} method return successive elements of the
* series.
* <p>
- * For example, to print all elements of a <tt>Vector<E></tt> <i>v</i>:
+ * For example, to print all elements of a {@code Vector<E>} <i>v</i>:
* <pre>
* for (Enumeration<E> e = v.elements(); e.hasMoreElements();)
* System.out.println(e.nextElement());</pre>
@@ -39,7 +39,7 @@
* Methods are provided to enumerate through the elements of a
* vector, the keys of a hashtable, and the values in a hashtable.
* Enumerations are also used to specify the input streams to a
- * <code>SequenceInputStream</code>.
+ * {@code SequenceInputStream}.
*
* @apiNote
* The functionality of this interface is duplicated by the {@link Iterator}
@@ -65,9 +65,9 @@
/**
* Tests if this enumeration contains more elements.
*
- * @return <code>true</code> if and only if this enumeration object
+ * @return {@code true} if and only if this enumeration object
* contains at least one more element to provide;
- * <code>false</code> otherwise.
+ * {@code false} otherwise.
*/
boolean hasMoreElements();
diff --git a/jdk/src/java.base/share/classes/java/util/FormatFlagsConversionMismatchException.java b/jdk/src/java.base/share/classes/java/util/FormatFlagsConversionMismatchException.java
index 58f593e..664cd39 100644
--- a/jdk/src/java.base/share/classes/java/util/FormatFlagsConversionMismatchException.java
+++ b/jdk/src/java.base/share/classes/java/util/FormatFlagsConversionMismatchException.java
@@ -28,7 +28,7 @@
/**
* Unchecked exception thrown when a conversion and flag are incompatible.
*
- * <p> Unless otherwise specified, passing a <tt>null</tt> argument to any
+ * <p> Unless otherwise specified, passing a {@code null} argument to any
* method or constructor in this class will cause a {@link
* NullPointerException} to be thrown.
*
diff --git a/jdk/src/java.base/share/classes/java/util/Formattable.java b/jdk/src/java.base/share/classes/java/util/Formattable.java
index fa87e9c..2caabae 100644
--- a/jdk/src/java.base/share/classes/java/util/Formattable.java
+++ b/jdk/src/java.base/share/classes/java/util/Formattable.java
@@ -28,8 +28,8 @@
import java.io.IOException;
/**
- * The <tt>Formattable</tt> interface must be implemented by any class that
- * needs to perform custom formatting using the <tt>'s'</tt> conversion
+ * The {@code Formattable} interface must be implemented by any class that
+ * needs to perform custom formatting using the {@code 's'} conversion
* specifier of {@link java.util.Formatter}. This interface allows basic
* control for formatting arbitrary objects.
*
@@ -110,7 +110,7 @@
* safety is optional and may be enforced by classes that extend and implement
* this interface.
*
- * <p> Unless otherwise specified, passing a <tt>null</tt> argument to
+ * <p> Unless otherwise specified, passing a {@code null} argument to
* any method in this interface will cause a {@link
* NullPointerException} to be thrown.
*
@@ -126,7 +126,7 @@
* {@link Formatter#out() formatter.out()} or {@link
* Formatter#locale() formatter.locale()} to obtain the {@link
* Appendable} or {@link Locale} used by this
- * <tt>formatter</tt> respectively.
+ * {@code formatter} respectively.
*
* @param flags
* The flags modify the output format. The value is interpreted as
@@ -139,19 +139,19 @@
* @param width
* The minimum number of characters to be written to the output.
* If the length of the converted value is less than the
- * <tt>width</tt> then the output will be padded by
- * <tt>' '</tt> until the total number of characters
+ * {@code width} then the output will be padded by
+ * <code>' '</code> until the total number of characters
* equals width. The padding is at the beginning by default. If
* the {@link FormattableFlags#LEFT_JUSTIFY} flag is set then the
- * padding will be at the end. If <tt>width</tt> is <tt>-1</tt>
+ * padding will be at the end. If {@code width} is {@code -1}
* then there is no minimum.
*
* @param precision
* The maximum number of characters to be written to the output.
* The precision is applied before the width, thus the output will
- * be truncated to <tt>precision</tt> characters even if the
- * <tt>width</tt> is greater than the <tt>precision</tt>. If
- * <tt>precision</tt> is <tt>-1</tt> then there is no explicit
+ * be truncated to {@code precision} characters even if the
+ * {@code width} is greater than the {@code precision}. If
+ * {@code precision} is {@code -1} then there is no explicit
* limit on the number of characters.
*
* @throws IllegalFormatException
diff --git a/jdk/src/java.base/share/classes/java/util/FormattableFlags.java b/jdk/src/java.base/share/classes/java/util/FormattableFlags.java
index 11a10dd..6c9962c 100644
--- a/jdk/src/java.base/share/classes/java/util/FormattableFlags.java
+++ b/jdk/src/java.base/share/classes/java/util/FormattableFlags.java
@@ -39,12 +39,12 @@
private FormattableFlags() {}
/**
- * Left-justifies the output. Spaces (<tt>'\u0020'</tt>) will be added
+ * Left-justifies the output. Spaces (<code>'\u0020'</code>) will be added
* at the end of the converted value as required to fill the minimum width
* of the field. If this flag is not set then the output will be
* right-justified.
*
- * <p> This flag corresponds to <tt>'-'</tt> (<tt>'\u002d'</tt>) in
+ * <p> This flag corresponds to {@code '-'} (<code>'\u002d'</code>) in
* the format specifier.
*/
public static final int LEFT_JUSTIFY = 1<<0; // '-'
@@ -52,23 +52,23 @@
/**
* Converts the output to upper case according to the rules of the
* {@linkplain java.util.Locale locale} given during creation of the
- * <tt>formatter</tt> argument of the {@link Formattable#formatTo
+ * {@code formatter} argument of the {@link Formattable#formatTo
* formatTo()} method. The output should be equivalent the following
* invocation of {@link String#toUpperCase(java.util.Locale)}
*
* <pre>
* out.toUpperCase() </pre>
*
- * <p> This flag corresponds to <tt>'S'</tt> (<tt>'\u0053'</tt>) in
+ * <p> This flag corresponds to {@code 'S'} (<code>'\u0053'</code>) in
* the format specifier.
*/
public static final int UPPERCASE = 1<<1; // 'S'
/**
* Requires the output to use an alternate form. The definition of the
- * form is specified by the <tt>Formattable</tt>.
+ * form is specified by the {@code Formattable}.
*
- * <p> This flag corresponds to <tt>'#'</tt> (<tt>'\u0023'</tt>) in
+ * <p> This flag corresponds to {@code '#'} (<code>'\u0023'</code>) in
* the format specifier.
*/
public static final int ALTERNATE = 1<<2; // '#'
diff --git a/jdk/src/java.base/share/classes/java/util/Formatter.java b/jdk/src/java.base/share/classes/java/util/Formatter.java
index 62fbedd..14909ec 100644
--- a/jdk/src/java.base/share/classes/java/util/Formatter.java
+++ b/jdk/src/java.base/share/classes/java/util/Formatter.java
@@ -267,7 +267,7 @@
* {@link Date} and {@link TemporalAccessor TemporalAccessor}
*
* <li> <b>Percent</b> - produces a literal {@code '%'}
- * (<tt>'\u0025'</tt>)
+ * (<code>'\u0025'</code>)
*
* <li> <b>Line Separator</b> - produces the platform-specific line separator
*
@@ -356,7 +356,7 @@
*
* <tr><td valign="top">{@code '%'}
* <td valign="top"> percent
- * <td> The result is a literal {@code '%'} (<tt>'\u0025'</tt>)
+ * <td> The result is a literal {@code '%'} (<code>'\u0025'</code>)
*
* <tr><td valign="top">{@code 'n'}
* <td valign="top"> line separator
@@ -644,7 +644,7 @@
* "{@code 1$}", the second by "{@code 2$}", etc.
*
* <p> Another way to reference arguments by position is to use the
- * {@code '<'} (<tt>'\u003c'</tt>) flag, which causes the argument for
+ * {@code '<'} (<code>'\u003c'</code>) flag, which causes the argument for
* the previous format specifier to be re-used. For example, the following two
* statements would produce identical strings:
*
@@ -701,7 +701,7 @@
* <table cellpadding=5 summary="dgConv">
*
* <tr><td valign="top"> {@code 'b'}
- * <td valign="top"> <tt>'\u0062'</tt>
+ * <td valign="top"> <code>'\u0062'</code>
* <td> Produces either "{@code true}" or "{@code false}" as returned by
* {@link Boolean#toString(boolean)}.
*
@@ -715,11 +715,11 @@
* FormatFlagsConversionMismatchException} will be thrown.
*
* <tr><td valign="top"> {@code 'B'}
- * <td valign="top"> <tt>'\u0042'</tt>
+ * <td valign="top"> <code>'\u0042'</code>
* <td> The upper-case variant of {@code 'b'}.
*
* <tr><td valign="top"> {@code 'h'}
- * <td valign="top"> <tt>'\u0068'</tt>
+ * <td valign="top"> <code>'\u0068'</code>
* <td> Produces a string representing the hash code value of the object.
*
* <p> If the argument, <i>arg</i> is {@code null}, then the
@@ -730,11 +730,11 @@
* FormatFlagsConversionMismatchException} will be thrown.
*
* <tr><td valign="top"> {@code 'H'}
- * <td valign="top"> <tt>'\u0048'</tt>
+ * <td valign="top"> <code>'\u0048'</code>
* <td> The upper-case variant of {@code 'h'}.
*
* <tr><td valign="top"> {@code 's'}
- * <td valign="top"> <tt>'\u0073'</tt>
+ * <td valign="top"> <code>'\u0073'</code>
* <td> Produces a string.
*
* <p> If the argument is {@code null}, then the result is
@@ -748,7 +748,7 @@
* will be thrown.
*
* <tr><td valign="top"> {@code 'S'}
- * <td valign="top"> <tt>'\u0053'</tt>
+ * <td valign="top"> <code>'\u0053'</code>
* <td> The upper-case variant of {@code 's'}.
*
* </table>
@@ -758,15 +758,15 @@
* <table cellpadding=5 summary="dFlags">
*
* <tr><td valign="top"> {@code '-'}
- * <td valign="top"> <tt>'\u002d'</tt>
- * <td> Left justifies the output. Spaces (<tt>'\u0020'</tt>) will be
+ * <td valign="top"> <code>'\u002d'</code>
+ * <td> Left justifies the output. Spaces (<code>'\u0020'</code>) will be
* added at the end of the converted value as required to fill the minimum
* width of the field. If the width is not provided, then a {@link
* MissingFormatWidthException} will be thrown. If this flag is not given
* then the output will be right-justified.
*
* <tr><td valign="top"> {@code '#'}
- * <td valign="top"> <tt>'\u0023'</tt>
+ * <td valign="top"> <code>'\u0023'</code>
* <td> Requires the output use an alternate form. The definition of the
* form is specified by the conversion.
*
@@ -775,7 +775,7 @@
* <p> The <a name="genWidth">width</a> is the minimum number of characters to
* be written to the
* output. If the length of the converted value is less than the width then
- * the output will be padded by <tt>' '</tt> (<tt>'\u0020'</tt>)
+ * the output will be padded by <code>' '</code> (<code>'\u0020'</code>)
* until the total number of characters equals the width. The padding is on
* the left by default. If the {@code '-'} flag is given, then the padding
* will be on the right. If the width is not specified then there is no
@@ -799,7 +799,7 @@
* <table cellpadding=5 summary="charConv">
*
* <tr><td valign="top"> {@code 'c'}
- * <td valign="top"> <tt>'\u0063'</tt>
+ * <td valign="top"> <code>'\u0063'</code>
* <td> Formats the argument as a Unicode character as described in <a
* href="../lang/Character.html#unicode">Unicode Character
* Representation</a>. This may be more than one 16-bit {@code char} in
@@ -809,7 +809,7 @@
* FormatFlagsConversionMismatchException} will be thrown.
*
* <tr><td valign="top"> {@code 'C'}
- * <td valign="top"> <tt>'\u0043'</tt>
+ * <td valign="top"> <code>'\u0043'</code>
* <td> The upper-case variant of {@code 'c'}.
*
* </table>
@@ -859,7 +859,7 @@
* java.text.DecimalFormatSymbols#getDecimalSeparator decimal separator} is
* substituted.
*
- * <li> If the {@code ','} (<tt>'\u002c'</tt>)
+ * <li> If the {@code ','} (<code>'\u002c'</code>)
* <a name="L10nGroup">flag</a> is given, then the locale-specific {@linkplain
* java.text.DecimalFormatSymbols#getGroupingSeparator grouping separator} is
* inserted by scanning the integer part of the string from least significant
@@ -873,15 +873,15 @@
* the length of the string is equal to the requested field width.
*
* <li> If the value is negative and the {@code '('} flag is given, then a
- * {@code '('} (<tt>'\u0028'</tt>) is prepended and a {@code ')'}
- * (<tt>'\u0029'</tt>) is appended.
+ * {@code '('} (<code>'\u0028'</code>) is prepended and a {@code ')'}
+ * (<code>'\u0029'</code>) is appended.
*
* <li> If the value is negative (or floating-point negative zero) and
- * {@code '('} flag is not given, then a {@code '-'} (<tt>'\u002d'</tt>)
+ * {@code '('} flag is not given, then a {@code '-'} (<code>'\u002d'</code>)
* is prepended.
*
* <li> If the {@code '+'} flag is given and the value is positive or zero (or
- * floating-point positive zero), then a {@code '+'} (<tt>'\u002b'</tt>)
+ * floating-point positive zero), then a {@code '+'} (<code>'\u002b'</code>)
* will be prepended.
*
* </ol>
@@ -900,7 +900,7 @@
* <table cellpadding=5 summary="IntConv">
*
* <tr><td valign="top"> {@code 'd'}
- * <td valign="top"> <tt>'\u0064'</tt>
+ * <td valign="top"> <code>'\u0064'</code>
* <td> Formats the argument as a decimal integer. The <a
* href="#L10nAlgorithm">localization algorithm</a> is applied.
*
@@ -911,7 +911,7 @@
* FormatFlagsConversionMismatchException} will be thrown.
*
* <tr><td valign="top"> {@code 'o'}
- * <td valign="top"> <tt>'\u006f'</tt>
+ * <td valign="top"> <code>'\u006f'</code>
* <td> Formats the argument as an integer in base eight. No localization
* is applied.
*
@@ -933,7 +933,7 @@
* thrown.
*
* <tr><td valign="top"> {@code 'x'}
- * <td valign="top"> <tt>'\u0078'</tt>
+ * <td valign="top"> <code>'\u0078'</code>
* <td> Formats the argument as an integer in base sixteen. No
* localization is applied.
*
@@ -951,17 +951,17 @@
* the field width with leading zeros after the radix indicator or sign (if
* present).
*
- * <p> If {@code '('}, <tt>' '</tt>, {@code '+'}, or
+ * <p> If {@code '('}, <code>' '</code>, {@code '+'}, or
* {@code ','} flags are given then a {@link
* FormatFlagsConversionMismatchException} will be thrown.
*
* <tr><td valign="top"> {@code 'X'}
- * <td valign="top"> <tt>'\u0058'</tt>
+ * <td valign="top"> <code>'\u0058'</code>
* <td> The upper-case variant of {@code 'x'}. The entire string
* representing the number will be converted to {@linkplain
* String#toUpperCase upper case} including the {@code 'x'} (if any) and
* all hexadecimal digits {@code 'a'} - {@code 'f'}
- * (<tt>'\u0061'</tt> - <tt>'\u0066'</tt>).
+ * (<code>'\u0061'</code> - <code>'\u0066'</code>).
*
* </table>
*
@@ -980,24 +980,24 @@
* <table cellpadding=5 summary="intFlags">
*
* <tr><td valign="top"> {@code '+'}
- * <td valign="top"> <tt>'\u002b'</tt>
+ * <td valign="top"> <code>'\u002b'</code>
* <td> Requires the output to include a positive sign for all positive
* numbers. If this flag is not given then only negative values will
* include a sign.
*
- * <p> If both the {@code '+'} and <tt>' '</tt> flags are given
+ * <p> If both the {@code '+'} and <code>' '</code> flags are given
* then an {@link IllegalFormatFlagsException} will be thrown.
*
- * <tr><td valign="top"> <tt>' '</tt>
- * <td valign="top"> <tt>'\u0020'</tt>
+ * <tr><td valign="top"> <code>' '</code>
+ * <td valign="top"> <code>'\u0020'</code>
* <td> Requires the output to include a single extra space
- * (<tt>'\u0020'</tt>) for non-negative values.
+ * (<code>'\u0020'</code>) for non-negative values.
*
- * <p> If both the {@code '+'} and <tt>' '</tt> flags are given
+ * <p> If both the {@code '+'} and <code>' '</code> flags are given
* then an {@link IllegalFormatFlagsException} will be thrown.
*
* <tr><td valign="top"> {@code '0'}
- * <td valign="top"> <tt>'\u0030'</tt>
+ * <td valign="top"> <code>'\u0030'</code>
* <td> Requires the output to be padded with leading {@linkplain
* java.text.DecimalFormatSymbols#getZeroDigit zeros} to the minimum field
* width following any sign or radix indicator except when converting NaN
@@ -1008,17 +1008,17 @@
* {@link IllegalFormatFlagsException} will be thrown.
*
* <tr><td valign="top"> {@code ','}
- * <td valign="top"> <tt>'\u002c'</tt>
+ * <td valign="top"> <code>'\u002c'</code>
* <td> Requires the output to include the locale-specific {@linkplain
* java.text.DecimalFormatSymbols#getGroupingSeparator group separators} as
* described in the <a href="#L10nGroup">"group" section</a> of the
* localization algorithm.
*
* <tr><td valign="top"> {@code '('}
- * <td valign="top"> <tt>'\u0028'</tt>
+ * <td valign="top"> <code>'\u0028'</code>
* <td> Requires the output to prepend a {@code '('}
- * (<tt>'\u0028'</tt>) and append a {@code ')'}
- * (<tt>'\u0029'</tt>) to negative values.
+ * (<code>'\u0028'</code>) and append a {@code ')'}
+ * (<code>'\u0029'</code>) to negative values.
*
* </table>
*
@@ -1029,7 +1029,7 @@
*
* <li> The output is right-justified within the {@code width}
*
- * <li> Negative numbers begin with a {@code '-'} (<tt>'\u002d'</tt>)
+ * <li> Negative numbers begin with a {@code '-'} (<code>'\u002d'</code>)
*
* <li> Positive numbers and zero do not include a sign or extra leading
* space
@@ -1042,7 +1042,7 @@
* be written to the output. This includes any signs, digits, grouping
* separators, radix indicator, and parentheses. If the length of the
* converted value is less than the width then the output will be padded by
- * spaces (<tt>'\u0020'</tt>) until the total number of characters equals
+ * spaces (<code>'\u0020'</code>) until the total number of characters equals
* width. The padding is on the left by default. If {@code '-'} flag is
* given then the padding will be on the right. If width is not specified then
* there is no minimum.
@@ -1058,7 +1058,7 @@
* <table cellpadding=5 summary="BIntConv">
*
* <tr><td valign="top"> {@code 'd'}
- * <td valign="top"> <tt>'\u0064'</tt>
+ * <td valign="top"> <code>'\u0064'</code>
* <td> Requires the output to be formatted as a decimal integer. The <a
* href="#L10nAlgorithm">localization algorithm</a> is applied.
*
@@ -1066,18 +1066,18 @@
* FormatFlagsConversionMismatchException} will be thrown.
*
* <tr><td valign="top"> {@code 'o'}
- * <td valign="top"> <tt>'\u006f'</tt>
+ * <td valign="top"> <code>'\u006f'</code>
* <td> Requires the output to be formatted as an integer in base eight.
* No localization is applied.
*
* <p> If <i>x</i> is negative then the result will be a signed value
- * beginning with {@code '-'} (<tt>'\u002d'</tt>). Signed output is
+ * beginning with {@code '-'} (<code>'\u002d'</code>). Signed output is
* allowed for this type because unlike the primitive types it is not
* possible to create an unsigned equivalent without assuming an explicit
* data-type size.
*
* <p> If <i>x</i> is positive or zero and the {@code '+'} flag is given
- * then the result will begin with {@code '+'} (<tt>'\u002b'</tt>).
+ * then the result will begin with {@code '+'} (<code>'\u002b'</code>).
*
* <p> If the {@code '#'} flag is given then the output will always begin
* with {@code '0'} prefix.
@@ -1089,18 +1089,18 @@
* FormatFlagsConversionMismatchException} will be thrown.
*
* <tr><td valign="top"> {@code 'x'}
- * <td valign="top"> <tt>'\u0078'</tt>
+ * <td valign="top"> <code>'\u0078'</code>
* <td> Requires the output to be formatted as an integer in base
* sixteen. No localization is applied.
*
* <p> If <i>x</i> is negative then the result will be a signed value
- * beginning with {@code '-'} (<tt>'\u002d'</tt>). Signed output is
+ * beginning with {@code '-'} (<code>'\u002d'</code>). Signed output is
* allowed for this type because unlike the primitive types it is not
* possible to create an unsigned equivalent without assuming an explicit
* data-type size.
*
* <p> If <i>x</i> is positive or zero and the {@code '+'} flag is given
- * then the result will begin with {@code '+'} (<tt>'\u002b'</tt>).
+ * then the result will begin with {@code '+'} (<code>'\u002b'</code>).
*
* <p> If the {@code '#'} flag is given then the output will always begin
* with the radix indicator {@code "0x"}.
@@ -1113,12 +1113,12 @@
* FormatFlagsConversionMismatchException} will be thrown.
*
* <tr><td valign="top"> {@code 'X'}
- * <td valign="top"> <tt>'\u0058'</tt>
+ * <td valign="top"> <code>'\u0058'</code>
* <td> The upper-case variant of {@code 'x'}. The entire string
* representing the number will be converted to {@linkplain
* String#toUpperCase upper case} including the {@code 'x'} (if any) and
* all hexadecimal digits {@code 'a'} - {@code 'f'}
- * (<tt>'\u0061'</tt> - <tt>'\u0066'</tt>).
+ * (<code>'\u0061'</code> - <code>'\u0066'</code>).
*
* </table>
*
@@ -1152,7 +1152,7 @@
* <table cellpadding=5 summary="floatConv">
*
* <tr><td valign="top"> {@code 'e'}
- * <td valign="top"> <tt>'\u0065'</tt>
+ * <td valign="top"> <code>'\u0065'</code>
* <td> Requires the output to be formatted using <a
* name="scientific">computerized scientific notation</a>. The <a
* href="#L10nAlgorithm">localization algorithm</a> is applied.
@@ -1179,7 +1179,7 @@
* integer part of <i>a</i>, as a single decimal digit, followed by the
* decimal separator followed by decimal digits representing the fractional
* part of <i>a</i>, followed by the exponent symbol {@code 'e'}
- * (<tt>'\u0065'</tt>), followed by the sign of the exponent, followed
+ * (<code>'\u0065'</code>), followed by the sign of the exponent, followed
* by a representation of <i>n</i> as a decimal integer, as produced by the
* method {@link Long#toString(long, int)}, and zero-padded to include at
* least two digits.
@@ -1200,12 +1200,12 @@
* FormatFlagsConversionMismatchException} will be thrown.
*
* <tr><td valign="top"> {@code 'E'}
- * <td valign="top"> <tt>'\u0045'</tt>
+ * <td valign="top"> <code>'\u0045'</code>
* <td> The upper-case variant of {@code 'e'}. The exponent symbol
- * will be {@code 'E'} (<tt>'\u0045'</tt>).
+ * will be {@code 'E'} (<code>'\u0045'</code>).
*
* <tr><td valign="top"> {@code 'g'}
- * <td valign="top"> <tt>'\u0067'</tt>
+ * <td valign="top"> <code>'\u0067'</code>
* <td> Requires the output to be formatted in general scientific notation
* as described below. The <a href="#L10nAlgorithm">localization
* algorithm</a> is applied.
@@ -1230,11 +1230,11 @@
* FormatFlagsConversionMismatchException} will be thrown.
*
* <tr><td valign="top"> {@code 'G'}
- * <td valign="top"> <tt>'\u0047'</tt>
+ * <td valign="top"> <code>'\u0047'</code>
* <td> The upper-case variant of {@code 'g'}.
*
* <tr><td valign="top"> {@code 'f'}
- * <td valign="top"> <tt>'\u0066'</tt>
+ * <td valign="top"> <code>'\u0066'</code>
* <td> Requires the output to be formatted using <a name="decimal">decimal
* format</a>. The <a href="#L10nAlgorithm">localization algorithm</a> is
* applied.
@@ -1266,7 +1266,7 @@
* appropriate.
*
* <tr><td valign="top"> {@code 'a'}
- * <td valign="top"> <tt>'\u0061'</tt>
+ * <td valign="top"> <code>'\u0061'</code>
* <td> Requires the output to be formatted in hexadecimal exponential
* form. No localization is applied.
*
@@ -1274,11 +1274,11 @@
* (absolute value) of the argument <i>x</i>.
*
* <p> If <i>x</i> is negative or a negative-zero value then the result
- * will begin with {@code '-'} (<tt>'\u002d'</tt>).
+ * will begin with {@code '-'} (<code>'\u002d'</code>).
*
* <p> If <i>x</i> is positive or a positive-zero value and the
* {@code '+'} flag is given then the result will begin with {@code '+'}
- * (<tt>'\u002b'</tt>).
+ * (<code>'\u002b'</code>).
*
* <p> The formatting of the magnitude <i>m</i> depends upon its value.
*
@@ -1295,7 +1295,7 @@
* exponent fields. The significand is represented by the characters
* {@code "0x1."} followed by the hexadecimal representation of the rest
* of the significand as a fraction. The exponent is represented by
- * {@code 'p'} (<tt>'\u0070'</tt>) followed by a decimal string of the
+ * {@code 'p'} (<code>'\u0070'</code>) followed by a decimal string of the
* unbiased exponent as if produced by invoking {@link
* Integer#toString(int) Integer.toString} on the exponent value. If the
* precision is specified, the value is rounded to the given number of
@@ -1319,12 +1319,12 @@
* FormatFlagsConversionMismatchException} will be thrown.
*
* <tr><td valign="top"> {@code 'A'}
- * <td valign="top"> <tt>'\u0041'</tt>
+ * <td valign="top"> <code>'\u0041'</code>
* <td> The upper-case variant of {@code 'a'}. The entire string
* representing the number will be converted to upper case including the
- * {@code 'x'} (<tt>'\u0078'</tt>) and {@code 'p'}
- * (<tt>'\u0070'</tt> and all hexadecimal digits {@code 'a'} -
- * {@code 'f'} (<tt>'\u0061'</tt> - <tt>'\u0066'</tt>).
+ * {@code 'x'} (<code>'\u0078'</code>) and {@code 'p'}
+ * (<code>'\u0070'</code> and all hexadecimal digits {@code 'a'} -
+ * {@code 'f'} (<code>'\u0061'</code> - <code>'\u0066'</code>).
*
* </table>
*
@@ -1357,7 +1357,7 @@
* separators, decimal separators, exponential symbol, radix indicator,
* parentheses, and strings representing infinity and NaN as applicable. If
* the length of the converted value is less than the width then the output
- * will be padded by spaces (<tt>'\u0020'</tt>) until the total number of
+ * will be padded by spaces (<code>'\u0020'</code>) until the total number of
* characters equals width. The padding is on the left by default. If the
* {@code '-'} flag is given then the padding will be on the right. If width
* is not specified then there is no minimum.
@@ -1386,7 +1386,7 @@
* <table cellpadding=5 summary="floatConv">
*
* <tr><td valign="top"> {@code 'e'}
- * <td valign="top"> <tt>'\u0065'</tt>
+ * <td valign="top"> <code>'\u0065'</code>
* <td> Requires the output to be formatted using <a
* name="bscientific">computerized scientific notation</a>. The <a
* href="#L10nAlgorithm">localization algorithm</a> is applied.
@@ -1409,7 +1409,7 @@
* integer part of <i>a</i>, as a single decimal digit, followed by the
* decimal separator followed by decimal digits representing the fractional
* part of <i>a</i>, followed by the exponent symbol {@code 'e'}
- * (<tt>'\u0065'</tt>), followed by the sign of the exponent, followed
+ * (<code>'\u0065'</code>), followed by the sign of the exponent, followed
* by a representation of <i>n</i> as a decimal integer, as produced by the
* method {@link Long#toString(long, int)}, and zero-padded to include at
* least two digits.
@@ -1428,12 +1428,12 @@
* FormatFlagsConversionMismatchException} will be thrown.
*
* <tr><td valign="top"> {@code 'E'}
- * <td valign="top"> <tt>'\u0045'</tt>
+ * <td valign="top"> <code>'\u0045'</code>
* <td> The upper-case variant of {@code 'e'}. The exponent symbol
- * will be {@code 'E'} (<tt>'\u0045'</tt>).
+ * will be {@code 'E'} (<code>'\u0045'</code>).
*
* <tr><td valign="top"> {@code 'g'}
- * <td valign="top"> <tt>'\u0067'</tt>
+ * <td valign="top"> <code>'\u0067'</code>
* <td> Requires the output to be formatted in general scientific notation
* as described below. The <a href="#L10nAlgorithm">localization
* algorithm</a> is applied.
@@ -1458,11 +1458,11 @@
* FormatFlagsConversionMismatchException} will be thrown.
*
* <tr><td valign="top"> {@code 'G'}
- * <td valign="top"> <tt>'\u0047'</tt>
+ * <td valign="top"> <code>'\u0047'</code>
* <td> The upper-case variant of {@code 'g'}.
*
* <tr><td valign="top"> {@code 'f'}
- * <td valign="top"> <tt>'\u0066'</tt>
+ * <td valign="top"> <code>'\u0066'</code>
* <td> Requires the output to be formatted using <a name="bdecimal">decimal
* format</a>. The <a href="#L10nAlgorithm">localization algorithm</a> is
* applied.
@@ -1510,10 +1510,10 @@
* <table cellpadding=5 summary="DTConv">
*
* <tr><td valign="top"> {@code 't'}
- * <td valign="top"> <tt>'\u0074'</tt>
+ * <td valign="top"> <code>'\u0074'</code>
* <td> Prefix for date and time conversion characters.
* <tr><td valign="top"> {@code 'T'}
- * <td valign="top"> <tt>'\u0054'</tt>
+ * <td valign="top"> <code>'\u0054'</code>
* <td> The upper-case variant of {@code 't'}.
*
* </table>
@@ -1530,52 +1530,52 @@
* <table cellpadding=5 summary="time">
*
* <tr><td valign="top"> {@code 'H'}
- * <td valign="top"> <tt>'\u0048'</tt>
+ * <td valign="top"> <code>'\u0048'</code>
* <td> Hour of the day for the 24-hour clock, formatted as two digits with
* a leading zero as necessary i.e. {@code 00 - 23}. {@code 00}
* corresponds to midnight.
*
* <tr><td valign="top">{@code 'I'}
- * <td valign="top"> <tt>'\u0049'</tt>
+ * <td valign="top"> <code>'\u0049'</code>
* <td> Hour for the 12-hour clock, formatted as two digits with a leading
* zero as necessary, i.e. {@code 01 - 12}. {@code 01} corresponds to
* one o'clock (either morning or afternoon).
*
* <tr><td valign="top">{@code 'k'}
- * <td valign="top"> <tt>'\u006b'</tt>
+ * <td valign="top"> <code>'\u006b'</code>
* <td> Hour of the day for the 24-hour clock, i.e. {@code 0 - 23}.
* {@code 0} corresponds to midnight.
*
* <tr><td valign="top">{@code 'l'}
- * <td valign="top"> <tt>'\u006c'</tt>
+ * <td valign="top"> <code>'\u006c'</code>
* <td> Hour for the 12-hour clock, i.e. {@code 1 - 12}. {@code 1}
* corresponds to one o'clock (either morning or afternoon).
*
* <tr><td valign="top">{@code 'M'}
- * <td valign="top"> <tt>'\u004d'</tt>
+ * <td valign="top"> <code>'\u004d'</code>
* <td> Minute within the hour formatted as two digits with a leading zero
* as necessary, i.e. {@code 00 - 59}.
*
* <tr><td valign="top">{@code 'S'}
- * <td valign="top"> <tt>'\u0053'</tt>
+ * <td valign="top"> <code>'\u0053'</code>
* <td> Seconds within the minute, formatted as two digits with a leading
* zero as necessary, i.e. {@code 00 - 60} ("{@code 60}" is a special
* value required to support leap seconds).
*
* <tr><td valign="top">{@code 'L'}
- * <td valign="top"> <tt>'\u004c'</tt>
+ * <td valign="top"> <code>'\u004c'</code>
* <td> Millisecond within the second formatted as three digits with
* leading zeros as necessary, i.e. {@code 000 - 999}.
*
* <tr><td valign="top">{@code 'N'}
- * <td valign="top"> <tt>'\u004e'</tt>
+ * <td valign="top"> <code>'\u004e'</code>
* <td> Nanosecond within the second, formatted as nine digits with leading
* zeros as necessary, i.e. {@code 000000000 - 999999999}. The precision
* of this value is limited by the resolution of the underlying operating
* system or hardware.
*
* <tr><td valign="top">{@code 'p'}
- * <td valign="top"> <tt>'\u0070'</tt>
+ * <td valign="top"> <code>'\u0070'</code>
* <td> Locale-specific {@linkplain
* java.text.DateFormatSymbols#getAmPmStrings morning or afternoon} marker
* in lower case, e.g."{@code am}" or "{@code pm}". Use of the
@@ -1585,7 +1585,7 @@
* upper-case output.)
*
* <tr><td valign="top">{@code 'z'}
- * <td valign="top"> <tt>'\u007a'</tt>
+ * <td valign="top"> <code>'\u007a'</code>
* <td> <a href="http://www.ietf.org/rfc/rfc0822.txt">RFC 822</a>
* style numeric time zone offset from GMT, e.g. {@code -0800}. This
* value will be adjusted as necessary for Daylight Saving Time. For
@@ -1594,7 +1594,7 @@
* instance of the Java virtual machine.
*
* <tr><td valign="top">{@code 'Z'}
- * <td valign="top"> <tt>'\u005a'</tt>
+ * <td valign="top"> <code>'\u005a'</code>
* <td> A string representing the abbreviation for the time zone. This
* value will be adjusted as necessary for Daylight Saving Time. For
* {@code long}, {@link Long}, and {@link Date} the time zone used is
@@ -1603,13 +1603,13 @@
* supersede the locale of the argument (if any).
*
* <tr><td valign="top">{@code 's'}
- * <td valign="top"> <tt>'\u0073'</tt>
+ * <td valign="top"> <code>'\u0073'</code>
* <td> Seconds since the beginning of the epoch starting at 1 January 1970
* {@code 00:00:00} UTC, i.e. {@code Long.MIN_VALUE/1000} to
* {@code Long.MAX_VALUE/1000}.
*
* <tr><td valign="top">{@code 'Q'}
- * <td valign="top"> <tt>'\u004f'</tt>
+ * <td valign="top"> <code>'\u004f'</code>
* <td> Milliseconds since the beginning of the epoch starting at 1 January
* 1970 {@code 00:00:00} UTC, i.e. {@code Long.MIN_VALUE} to
* {@code Long.MAX_VALUE}. The precision of this value is limited by
@@ -1622,68 +1622,68 @@
* <table cellpadding=5 summary="date">
*
* <tr><td valign="top">{@code 'B'}
- * <td valign="top"> <tt>'\u0042'</tt>
+ * <td valign="top"> <code>'\u0042'</code>
* <td> Locale-specific {@linkplain java.text.DateFormatSymbols#getMonths
* full month name}, e.g. {@code "January"}, {@code "February"}.
*
* <tr><td valign="top">{@code 'b'}
- * <td valign="top"> <tt>'\u0062'</tt>
+ * <td valign="top"> <code>'\u0062'</code>
* <td> Locale-specific {@linkplain
* java.text.DateFormatSymbols#getShortMonths abbreviated month name},
* e.g. {@code "Jan"}, {@code "Feb"}.
*
* <tr><td valign="top">{@code 'h'}
- * <td valign="top"> <tt>'\u0068'</tt>
+ * <td valign="top"> <code>'\u0068'</code>
* <td> Same as {@code 'b'}.
*
* <tr><td valign="top">{@code 'A'}
- * <td valign="top"> <tt>'\u0041'</tt>
+ * <td valign="top"> <code>'\u0041'</code>
* <td> Locale-specific full name of the {@linkplain
* java.text.DateFormatSymbols#getWeekdays day of the week},
* e.g. {@code "Sunday"}, {@code "Monday"}
*
* <tr><td valign="top">{@code 'a'}
- * <td valign="top"> <tt>'\u0061'</tt>
+ * <td valign="top"> <code>'\u0061'</code>
* <td> Locale-specific short name of the {@linkplain
* java.text.DateFormatSymbols#getShortWeekdays day of the week},
* e.g. {@code "Sun"}, {@code "Mon"}
*
* <tr><td valign="top">{@code 'C'}
- * <td valign="top"> <tt>'\u0043'</tt>
+ * <td valign="top"> <code>'\u0043'</code>
* <td> Four-digit year divided by {@code 100}, formatted as two digits
* with leading zero as necessary, i.e. {@code 00 - 99}
*
* <tr><td valign="top">{@code 'Y'}
- * <td valign="top"> <tt>'\u0059'</tt> <td> Year, formatted to at least
+ * <td valign="top"> <code>'\u0059'</code> <td> Year, formatted to at least
* four digits with leading zeros as necessary, e.g. {@code 0092} equals
* {@code 92} CE for the Gregorian calendar.
*
* <tr><td valign="top">{@code 'y'}
- * <td valign="top"> <tt>'\u0079'</tt>
+ * <td valign="top"> <code>'\u0079'</code>
* <td> Last two digits of the year, formatted with leading zeros as
* necessary, i.e. {@code 00 - 99}.
*
* <tr><td valign="top">{@code 'j'}
- * <td valign="top"> <tt>'\u006a'</tt>
+ * <td valign="top"> <code>'\u006a'</code>
* <td> Day of year, formatted as three digits with leading zeros as
* necessary, e.g. {@code 001 - 366} for the Gregorian calendar.
* {@code 001} corresponds to the first day of the year.
*
* <tr><td valign="top">{@code 'm'}
- * <td valign="top"> <tt>'\u006d'</tt>
+ * <td valign="top"> <code>'\u006d'</code>
* <td> Month, formatted as two digits with leading zeros as necessary,
* i.e. {@code 01 - 13}, where "{@code 01}" is the first month of the
* year and ("{@code 13}" is a special value required to support lunar
* calendars).
*
* <tr><td valign="top">{@code 'd'}
- * <td valign="top"> <tt>'\u0064'</tt>
+ * <td valign="top"> <code>'\u0064'</code>
* <td> Day of month, formatted as two digits with leading zeros as
* necessary, i.e. {@code 01 - 31}, where "{@code 01}" is the first day
* of the month.
*
* <tr><td valign="top">{@code 'e'}
- * <td valign="top"> <tt>'\u0065'</tt>
+ * <td valign="top"> <code>'\u0065'</code>
* <td> Day of month, formatted as two digits, i.e. {@code 1 - 31} where
* "{@code 1}" is the first day of the month.
*
@@ -1695,30 +1695,30 @@
* <table cellpadding=5 summary="composites">
*
* <tr><td valign="top">{@code 'R'}
- * <td valign="top"> <tt>'\u0052'</tt>
+ * <td valign="top"> <code>'\u0052'</code>
* <td> Time formatted for the 24-hour clock as {@code "%tH:%tM"}
*
* <tr><td valign="top">{@code 'T'}
- * <td valign="top"> <tt>'\u0054'</tt>
+ * <td valign="top"> <code>'\u0054'</code>
* <td> Time formatted for the 24-hour clock as {@code "%tH:%tM:%tS"}.
*
* <tr><td valign="top">{@code 'r'}
- * <td valign="top"> <tt>'\u0072'</tt>
+ * <td valign="top"> <code>'\u0072'</code>
* <td> Time formatted for the 12-hour clock as {@code "%tI:%tM:%tS
* %Tp"}. The location of the morning or afternoon marker
* ({@code '%Tp'}) may be locale-dependent.
*
* <tr><td valign="top">{@code 'D'}
- * <td valign="top"> <tt>'\u0044'</tt>
+ * <td valign="top"> <code>'\u0044'</code>
* <td> Date formatted as {@code "%tm/%td/%ty"}.
*
* <tr><td valign="top">{@code 'F'}
- * <td valign="top"> <tt>'\u0046'</tt>
+ * <td valign="top"> <code>'\u0046'</code>
* <td> <a href="http://www.w3.org/TR/NOTE-datetime">ISO 8601</a>
* complete date formatted as {@code "%tY-%tm-%td"}.
*
* <tr><td valign="top">{@code 'c'}
- * <td valign="top"> <tt>'\u0063'</tt>
+ * <td valign="top"> <code>'\u0063'</code>
* <td> Date and time formatted as {@code "%ta %tb %td %tT %tZ %tY"},
* e.g. {@code "Sun Jul 20 16:17:00 EDT 1969"}.
*
@@ -1731,7 +1731,7 @@
* <p> The width is the minimum number of characters to
* be written to the output. If the length of the converted value is less than
* the {@code width} then the output will be padded by spaces
- * (<tt>'\u0020'</tt>) until the total number of characters equals width.
+ * (<code>'\u0020'</code>) until the total number of characters equals width.
* The padding is on the left by default. If the {@code '-'} flag is given
* then the padding will be on the right. If width is not specified then there
* is no minimum.
@@ -1746,12 +1746,12 @@
* <table cellpadding=5 summary="DTConv">
*
* <tr><td valign="top">{@code '%'}
- * <td> The result is a literal {@code '%'} (<tt>'\u0025'</tt>)
+ * <td> The result is a literal {@code '%'} (<code>'\u0025'</code>)
*
* <p> The width is the minimum number of characters to
* be written to the output including the {@code '%'}. If the length of the
* converted value is less than the {@code width} then the output will be
- * padded by spaces (<tt>'\u0020'</tt>) until the total number of
+ * padded by spaces (<code>'\u0020'</code>) until the total number of
* characters equals width. The padding is on the left. If width is not
* specified then just the {@code '%'} is output.
*
@@ -1801,7 +1801,7 @@
* </pre></blockquote>
*
* <li> <i>Relative indexing</i> is used when the format specifier contains a
- * {@code '<'} (<tt>'\u003c'</tt>) flag which causes the argument for
+ * {@code '<'} (<code>'\u003c'</code>) flag which causes the argument for
* the previous format specifier to be re-used. If there is no previous
* argument, then a {@link MissingFormatArgumentException} is thrown.
*
diff --git a/jdk/src/java.base/share/classes/java/util/FormatterClosedException.java b/jdk/src/java.base/share/classes/java/util/FormatterClosedException.java
index b0aa872..856dc97 100644
--- a/jdk/src/java.base/share/classes/java/util/FormatterClosedException.java
+++ b/jdk/src/java.base/share/classes/java/util/FormatterClosedException.java
@@ -28,7 +28,7 @@
/**
* Unchecked exception thrown when the formatter has been closed.
*
- * <p> Unless otherwise specified, passing a <tt>null</tt> argument to any
+ * <p> Unless otherwise specified, passing a {@code null} argument to any
* method or constructor in this class will cause a {@link
* NullPointerException} to be thrown.
*
diff --git a/jdk/src/java.base/share/classes/java/util/HashMap.java b/jdk/src/java.base/share/classes/java/util/HashMap.java
index ea56781..17b58b1 100644
--- a/jdk/src/java.base/share/classes/java/util/HashMap.java
+++ b/jdk/src/java.base/share/classes/java/util/HashMap.java
@@ -36,24 +36,24 @@
import java.util.function.Function;
/**
- * Hash table based implementation of the <tt>Map</tt> interface. This
+ * Hash table based implementation of the {@code Map} interface. This
* implementation provides all of the optional map operations, and permits
- * <tt>null</tt> values and the <tt>null</tt> key. (The <tt>HashMap</tt>
- * class is roughly equivalent to <tt>Hashtable</tt>, except that it is
+ * {@code null} values and the {@code null} key. (The {@code HashMap}
+ * class is roughly equivalent to {@code Hashtable}, except that it is
* unsynchronized and permits nulls.) This class makes no guarantees as to
* the order of the map; in particular, it does not guarantee that the order
* will remain constant over time.
*
* <p>This implementation provides constant-time performance for the basic
- * operations (<tt>get</tt> and <tt>put</tt>), assuming the hash function
+ * operations ({@code get} and {@code put}), assuming the hash function
* disperses the elements properly among the buckets. Iteration over
* collection views requires time proportional to the "capacity" of the
- * <tt>HashMap</tt> instance (the number of buckets) plus its size (the number
+ * {@code HashMap} instance (the number of buckets) plus its size (the number
* of key-value mappings). Thus, it's very important not to set the initial
* capacity too high (or the load factor too low) if iteration performance is
* important.
*
- * <p>An instance of <tt>HashMap</tt> has two parameters that affect its
+ * <p>An instance of {@code HashMap} has two parameters that affect its
* performance: <i>initial capacity</i> and <i>load factor</i>. The
* <i>capacity</i> is the number of buckets in the hash table, and the initial
* capacity is simply the capacity at the time the hash table is created. The
@@ -67,15 +67,15 @@
* <p>As a general rule, the default load factor (.75) offers a good
* tradeoff between time and space costs. Higher values decrease the
* space overhead but increase the lookup cost (reflected in most of
- * the operations of the <tt>HashMap</tt> class, including
- * <tt>get</tt> and <tt>put</tt>). The expected number of entries in
+ * the operations of the {@code HashMap} class, including
+ * {@code get} and {@code put}). The expected number of entries in
* the map and its load factor should be taken into account when
* setting its initial capacity, so as to minimize the number of
* rehash operations. If the initial capacity is greater than the
* maximum number of entries divided by the load factor, no rehash
* operations will ever occur.
*
- * <p>If many mappings are to be stored in a <tt>HashMap</tt>
+ * <p>If many mappings are to be stored in a {@code HashMap}
* instance, creating it with a sufficiently large capacity will allow
* the mappings to be stored more efficiently than letting it perform
* automatic rehashing as needed to grow the table. Note that using
@@ -102,7 +102,7 @@
* <p>The iterators returned by all of this class's "collection view methods"
* are <i>fail-fast</i>: if the map is structurally modified at any time after
* the iterator is created, in any way except through the iterator's own
- * <tt>remove</tt> method, the iterator will throw a
+ * {@code remove} method, the iterator will throw a
* {@link ConcurrentModificationException}. Thus, in the face of concurrent
* modification, the iterator fails quickly and cleanly, rather than risking
* arbitrary, non-deterministic behavior at an undetermined time in the
@@ -111,7 +111,7 @@
* <p>Note that the fail-fast behavior of an iterator cannot be guaranteed
* as it is, generally speaking, impossible to make any hard guarantees in the
* presence of unsynchronized concurrent modification. Fail-fast iterators
- * throw <tt>ConcurrentModificationException</tt> on a best-effort basis.
+ * throw {@code ConcurrentModificationException} on a best-effort basis.
* Therefore, it would be wrong to write a program that depended on this
* exception for its correctness: <i>the fail-fast behavior of iterators
* should be used only to detect bugs.</i>
@@ -435,7 +435,7 @@
/* ---------------- Public operations -------------- */
/**
- * Constructs an empty <tt>HashMap</tt> with the specified initial
+ * Constructs an empty {@code HashMap} with the specified initial
* capacity and load factor.
*
* @param initialCapacity the initial capacity
@@ -457,7 +457,7 @@
}
/**
- * Constructs an empty <tt>HashMap</tt> with the specified initial
+ * Constructs an empty {@code HashMap} with the specified initial
* capacity and the default load factor (0.75).
*
* @param initialCapacity the initial capacity.
@@ -468,7 +468,7 @@
}
/**
- * Constructs an empty <tt>HashMap</tt> with the default initial capacity
+ * Constructs an empty {@code HashMap} with the default initial capacity
* (16) and the default load factor (0.75).
*/
public HashMap() {
@@ -476,10 +476,10 @@
}
/**
- * Constructs a new <tt>HashMap</tt> with the same mappings as the
- * specified <tt>Map</tt>. The <tt>HashMap</tt> is created with
+ * Constructs a new {@code HashMap} with the same mappings as the
+ * specified {@code Map}. The {@code HashMap} is created with
* default load factor (0.75) and an initial capacity sufficient to
- * hold the mappings in the specified <tt>Map</tt>.
+ * hold the mappings in the specified {@code Map}.
*
* @param m the map whose mappings are to be placed in this map
* @throws NullPointerException if the specified map is null
@@ -526,9 +526,9 @@
}
/**
- * Returns <tt>true</tt> if this map contains no key-value mappings.
+ * Returns {@code true} if this map contains no key-value mappings.
*
- * @return <tt>true</tt> if this map contains no key-value mappings
+ * @return {@code true} if this map contains no key-value mappings
*/
public boolean isEmpty() {
return size == 0;
@@ -584,11 +584,11 @@
}
/**
- * Returns <tt>true</tt> if this map contains a mapping for the
+ * Returns {@code true} if this map contains a mapping for the
* specified key.
*
* @param key The key whose presence in this map is to be tested
- * @return <tt>true</tt> if this map contains a mapping for the specified
+ * @return {@code true} if this map contains a mapping for the specified
* key.
*/
public boolean containsKey(Object key) {
@@ -602,10 +602,10 @@
*
* @param key key with which the specified value is to be associated
* @param value value to be associated with the specified key
- * @return the previous value associated with <tt>key</tt>, or
- * <tt>null</tt> if there was no mapping for <tt>key</tt>.
- * (A <tt>null</tt> return can also indicate that the map
- * previously associated <tt>null</tt> with <tt>key</tt>.)
+ * @return the previous value associated with {@code key}, or
+ * {@code null} if there was no mapping for {@code key}.
+ * (A {@code null} return can also indicate that the map
+ * previously associated {@code null} with {@code key}.)
*/
public V put(K key, V value) {
return putVal(hash(key), key, value, false, true);
@@ -788,10 +788,10 @@
* Removes the mapping for the specified key from this map if present.
*
* @param key key whose mapping is to be removed from the map
- * @return the previous value associated with <tt>key</tt>, or
- * <tt>null</tt> if there was no mapping for <tt>key</tt>.
- * (A <tt>null</tt> return can also indicate that the map
- * previously associated <tt>null</tt> with <tt>key</tt>.)
+ * @return the previous value associated with {@code key}, or
+ * {@code null} if there was no mapping for {@code key}.
+ * (A {@code null} return can also indicate that the map
+ * previously associated {@code null} with {@code key}.)
*/
public V remove(Object key) {
Node<K,V> e;
@@ -865,11 +865,11 @@
}
/**
- * Returns <tt>true</tt> if this map maps one or more keys to the
+ * Returns {@code true} if this map maps one or more keys to the
* specified value.
*
* @param value value whose presence in this map is to be tested
- * @return <tt>true</tt> if this map maps one or more keys to the
+ * @return {@code true} if this map maps one or more keys to the
* specified value
*/
public boolean containsValue(Object value) {
@@ -891,12 +891,12 @@
* The set is backed by the map, so changes to the map are
* reflected in the set, and vice-versa. If the map is modified
* while an iteration over the set is in progress (except through
- * the iterator's own <tt>remove</tt> operation), the results of
+ * the iterator's own {@code remove} operation), the results of
* the iteration are undefined. The set supports element removal,
* which removes the corresponding mapping from the map, via the
- * <tt>Iterator.remove</tt>, <tt>Set.remove</tt>,
- * <tt>removeAll</tt>, <tt>retainAll</tt>, and <tt>clear</tt>
- * operations. It does not support the <tt>add</tt> or <tt>addAll</tt>
+ * {@code Iterator.remove}, {@code Set.remove},
+ * {@code removeAll}, {@code retainAll}, and {@code clear}
+ * operations. It does not support the {@code add} or {@code addAll}
* operations.
*
* @return a set view of the keys contained in this map
@@ -938,13 +938,13 @@
* The collection is backed by the map, so changes to the map are
* reflected in the collection, and vice-versa. If the map is
* modified while an iteration over the collection is in progress
- * (except through the iterator's own <tt>remove</tt> operation),
+ * (except through the iterator's own {@code remove} operation),
* the results of the iteration are undefined. The collection
* supports element removal, which removes the corresponding
- * mapping from the map, via the <tt>Iterator.remove</tt>,
- * <tt>Collection.remove</tt>, <tt>removeAll</tt>,
- * <tt>retainAll</tt> and <tt>clear</tt> operations. It does not
- * support the <tt>add</tt> or <tt>addAll</tt> operations.
+ * mapping from the map, via the {@code Iterator.remove},
+ * {@code Collection.remove}, {@code removeAll},
+ * {@code retainAll} and {@code clear} operations. It does not
+ * support the {@code add} or {@code addAll} operations.
*
* @return a view of the values contained in this map
*/
@@ -982,14 +982,14 @@
* The set is backed by the map, so changes to the map are
* reflected in the set, and vice-versa. If the map is modified
* while an iteration over the set is in progress (except through
- * the iterator's own <tt>remove</tt> operation, or through the
- * <tt>setValue</tt> operation on a map entry returned by the
+ * the iterator's own {@code remove} operation, or through the
+ * {@code setValue} operation on a map entry returned by the
* iterator) the results of the iteration are undefined. The set
* supports element removal, which removes the corresponding
- * mapping from the map, via the <tt>Iterator.remove</tt>,
- * <tt>Set.remove</tt>, <tt>removeAll</tt>, <tt>retainAll</tt> and
- * <tt>clear</tt> operations. It does not support the
- * <tt>add</tt> or <tt>addAll</tt> operations.
+ * mapping from the map, via the {@code Iterator.remove},
+ * {@code Set.remove}, {@code removeAll}, {@code retainAll} and
+ * {@code clear} operations. It does not support the
+ * {@code add} or {@code addAll} operations.
*
* @return a set view of the mappings contained in this map
*/
@@ -1357,7 +1357,7 @@
// Cloning and serialization
/**
- * Returns a shallow copy of this <tt>HashMap</tt> instance: the keys and
+ * Returns a shallow copy of this {@code HashMap} instance: the keys and
* values themselves are not cloned.
*
* @return a shallow copy of this map
@@ -1386,7 +1386,7 @@
}
/**
- * Save the state of the <tt>HashMap</tt> instance to a stream (i.e.,
+ * Save the state of the {@code HashMap} instance to a stream (i.e.,
* serialize it).
*
* @serialData The <i>capacity</i> of the HashMap (the length of the
diff --git a/jdk/src/java.base/share/classes/java/util/HashSet.java b/jdk/src/java.base/share/classes/java/util/HashSet.java
index 4d4e8bd..172cb37 100644
--- a/jdk/src/java.base/share/classes/java/util/HashSet.java
+++ b/jdk/src/java.base/share/classes/java/util/HashSet.java
@@ -28,18 +28,18 @@
import java.io.InvalidObjectException;
/**
- * This class implements the <tt>Set</tt> interface, backed by a hash table
- * (actually a <tt>HashMap</tt> instance). It makes no guarantees as to the
+ * This class implements the {@code Set} interface, backed by a hash table
+ * (actually a {@code HashMap} instance). It makes no guarantees as to the
* iteration order of the set; in particular, it does not guarantee that the
- * order will remain constant over time. This class permits the <tt>null</tt>
+ * order will remain constant over time. This class permits the {@code null}
* element.
*
* <p>This class offers constant time performance for the basic operations
- * (<tt>add</tt>, <tt>remove</tt>, <tt>contains</tt> and <tt>size</tt>),
+ * ({@code add}, {@code remove}, {@code contains} and {@code size}),
* assuming the hash function disperses the elements properly among the
* buckets. Iterating over this set requires time proportional to the sum of
- * the <tt>HashSet</tt> instance's size (the number of elements) plus the
- * "capacity" of the backing <tt>HashMap</tt> instance (the number of
+ * the {@code HashSet} instance's size (the number of elements) plus the
+ * "capacity" of the backing {@code HashMap} instance (the number of
* buckets). Thus, it's very important not to set the initial capacity too
* high (or the load factor too low) if iteration performance is important.
*
@@ -55,9 +55,9 @@
* unsynchronized access to the set:<pre>
* Set s = Collections.synchronizedSet(new HashSet(...));</pre>
*
- * <p>The iterators returned by this class's <tt>iterator</tt> method are
+ * <p>The iterators returned by this class's {@code iterator} method are
* <i>fail-fast</i>: if the set is modified at any time after the iterator is
- * created, in any way except through the iterator's own <tt>remove</tt>
+ * created, in any way except through the iterator's own {@code remove}
* method, the Iterator throws a {@link ConcurrentModificationException}.
* Thus, in the face of concurrent modification, the iterator fails quickly
* and cleanly, rather than risking arbitrary, non-deterministic behavior at
@@ -66,7 +66,7 @@
* <p>Note that the fail-fast behavior of an iterator cannot be guaranteed
* as it is, generally speaking, impossible to make any hard guarantees in the
* presence of unsynchronized concurrent modification. Fail-fast iterators
- * throw <tt>ConcurrentModificationException</tt> on a best-effort basis.
+ * throw {@code ConcurrentModificationException} on a best-effort basis.
* Therefore, it would be wrong to write a program that depended on this
* exception for its correctness: <i>the fail-fast behavior of iterators
* should be used only to detect bugs.</i>
@@ -98,7 +98,7 @@
private static final Object PRESENT = new Object();
/**
- * Constructs a new, empty set; the backing <tt>HashMap</tt> instance has
+ * Constructs a new, empty set; the backing {@code HashMap} instance has
* default initial capacity (16) and load factor (0.75).
*/
public HashSet() {
@@ -107,7 +107,7 @@
/**
* Constructs a new set containing the elements in the specified
- * collection. The <tt>HashMap</tt> is created with default load factor
+ * collection. The {@code HashMap} is created with default load factor
* (0.75) and an initial capacity sufficient to contain the elements in
* the specified collection.
*
@@ -120,7 +120,7 @@
}
/**
- * Constructs a new, empty set; the backing <tt>HashMap</tt> instance has
+ * Constructs a new, empty set; the backing {@code HashMap} instance has
* the specified initial capacity and the specified load factor.
*
* @param initialCapacity the initial capacity of the hash map
@@ -133,7 +133,7 @@
}
/**
- * Constructs a new, empty set; the backing <tt>HashMap</tt> instance has
+ * Constructs a new, empty set; the backing {@code HashMap} instance has
* the specified initial capacity and default load factor (0.75).
*
* @param initialCapacity the initial capacity of the hash table
@@ -182,22 +182,22 @@
}
/**
- * Returns <tt>true</tt> if this set contains no elements.
+ * Returns {@code true} if this set contains no elements.
*
- * @return <tt>true</tt> if this set contains no elements
+ * @return {@code true} if this set contains no elements
*/
public boolean isEmpty() {
return map.isEmpty();
}
/**
- * Returns <tt>true</tt> if this set contains the specified element.
- * More formally, returns <tt>true</tt> if and only if this set
- * contains an element <tt>e</tt> such that
- * <tt>(o==null ? e==null : o.equals(e))</tt>.
+ * Returns {@code true} if this set contains the specified element.
+ * More formally, returns {@code true} if and only if this set
+ * contains an element {@code e} such that
+ * {@code Objects.equals(o, e)}.
*
* @param o element whose presence in this set is to be tested
- * @return <tt>true</tt> if this set contains the specified element
+ * @return {@code true} if this set contains the specified element
*/
public boolean contains(Object o) {
return map.containsKey(o);
@@ -205,14 +205,14 @@
/**
* Adds the specified element to this set if it is not already present.
- * More formally, adds the specified element <tt>e</tt> to this set if
- * this set contains no element <tt>e2</tt> such that
- * <tt>(e==null ? e2==null : e.equals(e2))</tt>.
+ * More formally, adds the specified element {@code e} to this set if
+ * this set contains no element {@code e2} such that
+ * {@code Objects.equals(e, e2)}.
* If this set already contains the element, the call leaves the set
- * unchanged and returns <tt>false</tt>.
+ * unchanged and returns {@code false}.
*
* @param e element to be added to this set
- * @return <tt>true</tt> if this set did not already contain the specified
+ * @return {@code true} if this set did not already contain the specified
* element
*/
public boolean add(E e) {
@@ -221,15 +221,15 @@
/**
* Removes the specified element from this set if it is present.
- * More formally, removes an element <tt>e</tt> such that
- * <tt>(o==null ? e==null : o.equals(e))</tt>,
- * if this set contains such an element. Returns <tt>true</tt> if
+ * More formally, removes an element {@code e} such that
+ * {@code Objects.equals(o, e)},
+ * if this set contains such an element. Returns {@code true} if
* this set contained the element (or equivalently, if this set
* changed as a result of the call). (This set will not contain the
* element once the call returns.)
*
* @param o object to be removed from this set, if present
- * @return <tt>true</tt> if the set contained the specified element
+ * @return {@code true} if the set contained the specified element
*/
public boolean remove(Object o) {
return map.remove(o)==PRESENT;
@@ -244,7 +244,7 @@
}
/**
- * Returns a shallow copy of this <tt>HashSet</tt> instance: the elements
+ * Returns a shallow copy of this {@code HashSet} instance: the elements
* themselves are not cloned.
*
* @return a shallow copy of this set
@@ -261,10 +261,10 @@
}
/**
- * Save the state of this <tt>HashSet</tt> instance to a stream (that is,
+ * Save the state of this {@code HashSet} instance to a stream (that is,
* serialize it).
*
- * @serialData The capacity of the backing <tt>HashMap</tt> instance
+ * @serialData The capacity of the backing {@code HashMap} instance
* (int), and its load factor (float) are emitted, followed by
* the size of the set (the number of elements it contains)
* (int), followed by all of its elements (each an Object) in
@@ -288,7 +288,7 @@
}
/**
- * Reconstitute the <tt>HashSet</tt> instance from a stream (that is,
+ * Reconstitute the {@code HashSet} instance from a stream (that is,
* deserialize it).
*/
private void readObject(java.io.ObjectInputStream s)
diff --git a/jdk/src/java.base/share/classes/java/util/Hashtable.java b/jdk/src/java.base/share/classes/java/util/Hashtable.java
index 9501ee9..6ad2f3a 100644
--- a/jdk/src/java.base/share/classes/java/util/Hashtable.java
+++ b/jdk/src/java.base/share/classes/java/util/Hashtable.java
@@ -32,13 +32,13 @@
/**
* This class implements a hash table, which maps keys to values. Any
- * non-<code>null</code> object can be used as a key or as a value. <p>
+ * non-{@code null} object can be used as a key or as a value. <p>
*
* To successfully store and retrieve objects from a hashtable, the
- * objects used as keys must implement the <code>hashCode</code>
- * method and the <code>equals</code> method. <p>
+ * objects used as keys must implement the {@code hashCode}
+ * method and the {@code equals} method. <p>
*
- * An instance of <code>Hashtable</code> has two parameters that affect its
+ * An instance of {@code Hashtable} has two parameters that affect its
* performance: <i>initial capacity</i> and <i>load factor</i>. The
* <i>capacity</i> is the number of <i>buckets</i> in the hash table, and the
* <i>initial capacity</i> is simply the capacity at the time the hash table
@@ -53,16 +53,16 @@
* Generally, the default load factor (.75) offers a good tradeoff between
* time and space costs. Higher values decrease the space overhead but
* increase the time cost to look up an entry (which is reflected in most
- * <tt>Hashtable</tt> operations, including <tt>get</tt> and <tt>put</tt>).<p>
+ * {@code Hashtable} operations, including {@code get} and {@code put}).<p>
*
* The initial capacity controls a tradeoff between wasted space and the
- * need for <code>rehash</code> operations, which are time-consuming.
- * No <code>rehash</code> operations will <i>ever</i> occur if the initial
+ * need for {@code rehash} operations, which are time-consuming.
+ * No {@code rehash} operations will <i>ever</i> occur if the initial
* capacity is greater than the maximum number of entries the
- * <tt>Hashtable</tt> will contain divided by its load factor. However,
+ * {@code Hashtable} will contain divided by its load factor. However,
* setting the initial capacity too high can waste space.<p>
*
- * If many entries are to be made into a <code>Hashtable</code>,
+ * If many entries are to be made into a {@code Hashtable},
* creating it with a sufficiently large capacity may allow the
* entries to be inserted more efficiently than letting it perform
* automatic rehashing as needed to grow the table. <p>
@@ -83,11 +83,11 @@
* System.out.println("two = " + n);
* }}</pre>
*
- * <p>The iterators returned by the <tt>iterator</tt> method of the collections
+ * <p>The iterators returned by the {@code iterator} method of the collections
* returned by all of this class's "collection view methods" are
* <em>fail-fast</em>: if the Hashtable is structurally modified at any time
* after the iterator is created, in any way except through the iterator's own
- * <tt>remove</tt> method, the iterator will throw a {@link
+ * {@code remove} method, the iterator will throw a {@link
* ConcurrentModificationException}. Thus, in the face of concurrent
* modification, the iterator fails quickly and cleanly, rather than risking
* arbitrary, non-deterministic behavior at an undetermined time in the future.
@@ -99,7 +99,7 @@
* <p>Note that the fail-fast behavior of an iterator cannot be guaranteed
* as it is, generally speaking, impossible to make any hard guarantees in the
* presence of unsynchronized concurrent modification. Fail-fast iterators
- * throw <tt>ConcurrentModificationException</tt> on a best-effort basis.
+ * throw {@code ConcurrentModificationException} on a best-effort basis.
* Therefore, it would be wrong to write a program that depended on this
* exception for its correctness: <i>the fail-fast behavior of iterators
* should be used only to detect bugs.</i>
@@ -241,8 +241,8 @@
/**
* Tests if this hashtable maps no keys to values.
*
- * @return <code>true</code> if this hashtable maps no keys to values;
- * <code>false</code> otherwise.
+ * @return {@code true} if this hashtable maps no keys to values;
+ * {@code false} otherwise.
*/
public synchronized boolean isEmpty() {
return count == 0;
@@ -290,11 +290,11 @@
* {@link Map} interface in the collections framework).
*
* @param value a value to search for
- * @return <code>true</code> if and only if some key maps to the
- * <code>value</code> argument in this hashtable as
- * determined by the <tt>equals</tt> method;
- * <code>false</code> otherwise.
- * @exception NullPointerException if the value is <code>null</code>
+ * @return {@code true} if and only if some key maps to the
+ * {@code value} argument in this hashtable as
+ * determined by the {@code equals} method;
+ * {@code false} otherwise.
+ * @exception NullPointerException if the value is {@code null}
*/
public synchronized boolean contains(Object value) {
if (value == null) {
@@ -319,9 +319,9 @@
* #contains contains} (which predates the {@link Map} interface).
*
* @param value value whose presence in this hashtable is to be tested
- * @return <tt>true</tt> if this map maps one or more keys to the
+ * @return {@code true} if this map maps one or more keys to the
* specified value
- * @throws NullPointerException if the value is <code>null</code>
+ * @throws NullPointerException if the value is {@code null}
* @since 1.2
*/
public boolean containsValue(Object value) {
@@ -332,10 +332,10 @@
* Tests if the specified object is a key in this hashtable.
*
* @param key possible key
- * @return <code>true</code> if and only if the specified object
+ * @return {@code true} if and only if the specified object
* is a key in this hashtable, as determined by the
- * <tt>equals</tt> method; <code>false</code> otherwise.
- * @throws NullPointerException if the key is <code>null</code>
+ * {@code equals} method; {@code false} otherwise.
+ * @throws NullPointerException if the key is {@code null}
* @see #contains(Object)
*/
public synchronized boolean containsKey(Object key) {
@@ -444,19 +444,19 @@
}
/**
- * Maps the specified <code>key</code> to the specified
- * <code>value</code> in this hashtable. Neither the key nor the
- * value can be <code>null</code>. <p>
+ * Maps the specified {@code key} to the specified
+ * {@code value} in this hashtable. Neither the key nor the
+ * value can be {@code null}. <p>
*
- * The value can be retrieved by calling the <code>get</code> method
+ * The value can be retrieved by calling the {@code get} method
* with a key that is equal to the original key.
*
* @param key the hashtable key
* @param value the value
* @return the previous value of the specified key in this hashtable,
- * or <code>null</code> if it did not have one
+ * or {@code null} if it did not have one
* @exception NullPointerException if the key or value is
- * <code>null</code>
+ * {@code null}
* @see Object#equals(Object)
* @see #get(Object)
*/
@@ -490,8 +490,8 @@
*
* @param key the key that needs to be removed
* @return the value to which the key had been mapped in this hashtable,
- * or <code>null</code> if the key did not have a mapping
- * @throws NullPointerException if the key is <code>null</code>
+ * or {@code null} if the key did not have a mapping
+ * @throws NullPointerException if the key is {@code null}
*/
public synchronized V remove(Object key) {
Entry<?,?> tab[] = table;
@@ -568,11 +568,11 @@
}
/**
- * Returns a string representation of this <tt>Hashtable</tt> object
+ * Returns a string representation of this {@code Hashtable} object
* in the form of a set of entries, enclosed in braces and separated
- * by the ASCII characters "<tt>, </tt>" (comma and space). Each
- * entry is rendered as the key, an equals sign <tt>=</tt>, and the
- * associated element, where the <tt>toString</tt> method is used to
+ * by the ASCII characters "<code> , </code>" (comma and space). Each
+ * entry is rendered as the key, an equals sign {@code =}, and the
+ * associated element, where the {@code toString} method is used to
* convert the key and element to strings.
*
* @return a string representation of this hashtable
@@ -633,12 +633,12 @@
* The set is backed by the map, so changes to the map are
* reflected in the set, and vice-versa. If the map is modified
* while an iteration over the set is in progress (except through
- * the iterator's own <tt>remove</tt> operation), the results of
+ * the iterator's own {@code remove} operation), the results of
* the iteration are undefined. The set supports element removal,
* which removes the corresponding mapping from the map, via the
- * <tt>Iterator.remove</tt>, <tt>Set.remove</tt>,
- * <tt>removeAll</tt>, <tt>retainAll</tt>, and <tt>clear</tt>
- * operations. It does not support the <tt>add</tt> or <tt>addAll</tt>
+ * {@code Iterator.remove}, {@code Set.remove},
+ * {@code removeAll}, {@code retainAll}, and {@code clear}
+ * operations. It does not support the {@code add} or {@code addAll}
* operations.
*
* @since 1.2
@@ -672,14 +672,14 @@
* The set is backed by the map, so changes to the map are
* reflected in the set, and vice-versa. If the map is modified
* while an iteration over the set is in progress (except through
- * the iterator's own <tt>remove</tt> operation, or through the
- * <tt>setValue</tt> operation on a map entry returned by the
+ * the iterator's own {@code remove} operation, or through the
+ * {@code setValue} operation on a map entry returned by the
* iterator) the results of the iteration are undefined. The set
* supports element removal, which removes the corresponding
- * mapping from the map, via the <tt>Iterator.remove</tt>,
- * <tt>Set.remove</tt>, <tt>removeAll</tt>, <tt>retainAll</tt> and
- * <tt>clear</tt> operations. It does not support the
- * <tt>add</tt> or <tt>addAll</tt> operations.
+ * mapping from the map, via the {@code Iterator.remove},
+ * {@code Set.remove}, {@code removeAll}, {@code retainAll} and
+ * {@code clear} operations. It does not support the
+ * {@code add} or {@code addAll} operations.
*
* @since 1.2
*/
@@ -754,13 +754,13 @@
* The collection is backed by the map, so changes to the map are
* reflected in the collection, and vice-versa. If the map is
* modified while an iteration over the collection is in progress
- * (except through the iterator's own <tt>remove</tt> operation),
+ * (except through the iterator's own {@code remove} operation),
* the results of the iteration are undefined. The collection
* supports element removal, which removes the corresponding
- * mapping from the map, via the <tt>Iterator.remove</tt>,
- * <tt>Collection.remove</tt>, <tt>removeAll</tt>,
- * <tt>retainAll</tt> and <tt>clear</tt> operations. It does not
- * support the <tt>add</tt> or <tt>addAll</tt> operations.
+ * mapping from the map, via the {@code Iterator.remove},
+ * {@code Collection.remove}, {@code removeAll},
+ * {@code retainAll} and {@code clear} operations. It does not
+ * support the {@code add} or {@code addAll} operations.
*
* @since 1.2
*/
diff --git a/jdk/src/java.base/share/classes/java/util/IdentityHashMap.java b/jdk/src/java.base/share/classes/java/util/IdentityHashMap.java
index d4ad600..efd759f 100644
--- a/jdk/src/java.base/share/classes/java/util/IdentityHashMap.java
+++ b/jdk/src/java.base/share/classes/java/util/IdentityHashMap.java
@@ -31,18 +31,18 @@
import java.util.function.Consumer;
/**
- * This class implements the <tt>Map</tt> interface with a hash table, using
+ * This class implements the {@code Map} interface with a hash table, using
* reference-equality in place of object-equality when comparing keys (and
- * values). In other words, in an <tt>IdentityHashMap</tt>, two keys
- * <tt>k1</tt> and <tt>k2</tt> are considered equal if and only if
- * <tt>(k1==k2)</tt>. (In normal <tt>Map</tt> implementations (like
- * <tt>HashMap</tt>) two keys <tt>k1</tt> and <tt>k2</tt> are considered equal
- * if and only if <tt>(k1==null ? k2==null : k1.equals(k2))</tt>.)
+ * values). In other words, in an {@code IdentityHashMap}, two keys
+ * {@code k1} and {@code k2} are considered equal if and only if
+ * {@code (k1==k2)}. (In normal {@code Map} implementations (like
+ * {@code HashMap}) two keys {@code k1} and {@code k2} are considered equal
+ * if and only if {@code (k1==null ? k2==null : k1.equals(k2))}.)
*
- * <p><b>This class is <i>not</i> a general-purpose <tt>Map</tt>
- * implementation! While this class implements the <tt>Map</tt> interface, it
- * intentionally violates <tt>Map's</tt> general contract, which mandates the
- * use of the <tt>equals</tt> method when comparing objects. This class is
+ * <p><b>This class is <i>not</i> a general-purpose {@code Map}
+ * implementation! While this class implements the {@code Map} interface, it
+ * intentionally violates {@code Map's} general contract, which mandates the
+ * use of the {@code equals} method when comparing objects. This class is
* designed for use only in the rare cases wherein reference-equality
* semantics are required.</b>
*
@@ -56,12 +56,12 @@
* each object in the program being debugged.
*
* <p>This class provides all of the optional map operations, and permits
- * <tt>null</tt> values and the <tt>null</tt> key. This class makes no
+ * {@code null} values and the {@code null} key. This class makes no
* guarantees as to the order of the map; in particular, it does not guarantee
* that the order will remain constant over time.
*
* <p>This class provides constant-time performance for the basic
- * operations (<tt>get</tt> and <tt>put</tt>), assuming the system
+ * operations ({@code get} and {@code put}), assuming the system
* identity hash function ({@link System#identityHashCode(Object)})
* disperses elements properly among the buckets.
*
@@ -96,11 +96,11 @@
* unsynchronized access to the map:<pre>
* Map m = Collections.synchronizedMap(new IdentityHashMap(...));</pre>
*
- * <p>The iterators returned by the <tt>iterator</tt> method of the
+ * <p>The iterators returned by the {@code iterator} method of the
* collections returned by all of this class's "collection view
* methods" are <i>fail-fast</i>: if the map is structurally modified
* at any time after the iterator is created, in any way except
- * through the iterator's own <tt>remove</tt> method, the iterator
+ * through the iterator's own {@code remove} method, the iterator
* will throw a {@link ConcurrentModificationException}. Thus, in the
* face of concurrent modification, the iterator fails quickly and
* cleanly, rather than risking arbitrary, non-deterministic behavior
@@ -109,7 +109,7 @@
* <p>Note that the fail-fast behavior of an iterator cannot be guaranteed
* as it is, generally speaking, impossible to make any hard guarantees in the
* presence of unsynchronized concurrent modification. Fail-fast iterators
- * throw <tt>ConcurrentModificationException</tt> on a best-effort basis.
+ * throw {@code ConcurrentModificationException} on a best-effort basis.
* Therefore, it would be wrong to write a program that depended on this
* exception for its correctness: <i>fail-fast iterators should be used only
* to detect bugs.</i>
@@ -217,7 +217,7 @@
* somewhat time-consuming.
*
* @param expectedMaxSize the expected maximum size of the map
- * @throws IllegalArgumentException if <tt>expectedMaxSize</tt> is negative
+ * @throws IllegalArgumentException if {@code expectedMaxSize} is negative
*/
public IdentityHashMap(int expectedMaxSize) {
if (expectedMaxSize < 0)
@@ -277,10 +277,10 @@
}
/**
- * Returns <tt>true</tt> if this identity hash map contains no key-value
+ * Returns {@code true} if this identity hash map contains no key-value
* mappings.
*
- * @return <tt>true</tt> if this identity hash map contains no key-value
+ * @return {@code true} if this identity hash map contains no key-value
* mappings
*/
public boolean isEmpty() {
@@ -341,7 +341,7 @@
* hash map.
*
* @param key possible key
- * @return <code>true</code> if the specified object reference is a key
+ * @return {@code true} if the specified object reference is a key
* in this map
* @see #containsValue(Object)
*/
@@ -365,7 +365,7 @@
* hash map.
*
* @param value value whose presence in this map is to be tested
- * @return <tt>true</tt> if this map maps one or more keys to the
+ * @return {@code true} if this map maps one or more keys to the
* specified object reference
* @see #containsKey(Object)
*/
@@ -383,7 +383,7 @@
*
* @param key possible key
* @param value possible value
- * @return <code>true</code> if and only if the specified key-value
+ * @return {@code true} if and only if the specified key-value
* mapping is in the map
*/
private boolean containsMapping(Object key, Object value) {
@@ -408,10 +408,10 @@
*
* @param key the key with which the specified value is to be associated
* @param value the value to be associated with the specified key
- * @return the previous value associated with <tt>key</tt>, or
- * <tt>null</tt> if there was no mapping for <tt>key</tt>.
- * (A <tt>null</tt> return can also indicate that the map
- * previously associated <tt>null</tt> with <tt>key</tt>.)
+ * @return the previous value associated with {@code key}, or
+ * {@code null} if there was no mapping for {@code key}.
+ * (A {@code null} return can also indicate that the map
+ * previously associated {@code null} with {@code key}.)
* @see Object#equals(Object)
* @see #get(Object)
* @see #containsKey(Object)
@@ -510,10 +510,10 @@
* Removes the mapping for this key from this map if present.
*
* @param key key whose mapping is to be removed from the map
- * @return the previous value associated with <tt>key</tt>, or
- * <tt>null</tt> if there was no mapping for <tt>key</tt>.
- * (A <tt>null</tt> return can also indicate that the map
- * previously associated <tt>null</tt> with <tt>key</tt>.)
+ * @return the previous value associated with {@code key}, or
+ * {@code null} if there was no mapping for {@code key}.
+ * (A {@code null} return can also indicate that the map
+ * previously associated {@code null} with {@code key}.)
*/
public V remove(Object key) {
Object k = maskNull(key);
@@ -544,7 +544,7 @@
*
* @param key possible key
* @param value possible value
- * @return <code>true</code> if and only if the specified key-value
+ * @return {@code true} if and only if the specified key-value
* mapping was in the map
*/
private boolean removeMapping(Object key, Object value) {
@@ -621,19 +621,19 @@
/**
* Compares the specified object with this map for equality. Returns
- * <tt>true</tt> if the given object is also a map and the two maps
+ * {@code true} if the given object is also a map and the two maps
* represent identical object-reference mappings. More formally, this
- * map is equal to another map <tt>m</tt> if and only if
- * <tt>this.entrySet().equals(m.entrySet())</tt>.
+ * map is equal to another map {@code m} if and only if
+ * {@code this.entrySet().equals(m.entrySet())}.
*
* <p><b>Owing to the reference-equality-based semantics of this map it is
* possible that the symmetry and transitivity requirements of the
- * <tt>Object.equals</tt> contract may be violated if this map is compared
- * to a normal map. However, the <tt>Object.equals</tt> contract is
- * guaranteed to hold among <tt>IdentityHashMap</tt> instances.</b>
+ * {@code Object.equals} contract may be violated if this map is compared
+ * to a normal map. However, the {@code Object.equals} contract is
+ * guaranteed to hold among {@code IdentityHashMap} instances.</b>
*
* @param o object to be compared for equality with this map
- * @return <tt>true</tt> if the specified object is equal to this map
+ * @return {@code true} if the specified object is equal to this map
* @see Object#equals(Object)
*/
public boolean equals(Object o) {
@@ -662,17 +662,17 @@
/**
* Returns the hash code value for this map. The hash code of a map is
* defined to be the sum of the hash codes of each entry in the map's
- * <tt>entrySet()</tt> view. This ensures that <tt>m1.equals(m2)</tt>
- * implies that <tt>m1.hashCode()==m2.hashCode()</tt> for any two
- * <tt>IdentityHashMap</tt> instances <tt>m1</tt> and <tt>m2</tt>, as
+ * {@code entrySet()} view. This ensures that {@code m1.equals(m2)}
+ * implies that {@code m1.hashCode()==m2.hashCode()} for any two
+ * {@code IdentityHashMap} instances {@code m1} and {@code m2}, as
* required by the general contract of {@link Object#hashCode}.
*
* <p><b>Owing to the reference-equality-based semantics of the
- * <tt>Map.Entry</tt> instances in the set returned by this map's
- * <tt>entrySet</tt> method, it is possible that the contractual
- * requirement of <tt>Object.hashCode</tt> mentioned in the previous
+ * {@code Map.Entry} instances in the set returned by this map's
+ * {@code entrySet} method, it is possible that the contractual
+ * requirement of {@code Object.hashCode} mentioned in the previous
* paragraph will be violated if one of the two objects being compared is
- * an <tt>IdentityHashMap</tt> instance and the other is a normal map.</b>
+ * an {@code IdentityHashMap} instance and the other is a normal map.</b>
*
* @return the hash code value for this map
* @see Object#equals(Object)
@@ -930,32 +930,32 @@
* the set, and vice-versa. If the map is modified while an iteration
* over the set is in progress, the results of the iteration are
* undefined. The set supports element removal, which removes the
- * corresponding mapping from the map, via the <tt>Iterator.remove</tt>,
- * <tt>Set.remove</tt>, <tt>removeAll</tt>, <tt>retainAll</tt>, and
- * <tt>clear</tt> methods. It does not support the <tt>add</tt> or
- * <tt>addAll</tt> methods.
+ * corresponding mapping from the map, via the {@code Iterator.remove},
+ * {@code Set.remove}, {@code removeAll}, {@code retainAll}, and
+ * {@code clear} methods. It does not support the {@code add} or
+ * {@code addAll} methods.
*
* <p><b>While the object returned by this method implements the
- * <tt>Set</tt> interface, it does <i>not</i> obey <tt>Set's</tt> general
+ * {@code Set} interface, it does <i>not</i> obey {@code Set's} general
* contract. Like its backing map, the set returned by this method
* defines element equality as reference-equality rather than
- * object-equality. This affects the behavior of its <tt>contains</tt>,
- * <tt>remove</tt>, <tt>containsAll</tt>, <tt>equals</tt>, and
- * <tt>hashCode</tt> methods.</b>
+ * object-equality. This affects the behavior of its {@code contains},
+ * {@code remove}, {@code containsAll}, {@code equals}, and
+ * {@code hashCode} methods.</b>
*
- * <p><b>The <tt>equals</tt> method of the returned set returns <tt>true</tt>
+ * <p><b>The {@code equals} method of the returned set returns {@code true}
* only if the specified object is a set containing exactly the same
* object references as the returned set. The symmetry and transitivity
- * requirements of the <tt>Object.equals</tt> contract may be violated if
+ * requirements of the {@code Object.equals} contract may be violated if
* the set returned by this method is compared to a normal set. However,
- * the <tt>Object.equals</tt> contract is guaranteed to hold among sets
+ * the {@code Object.equals} contract is guaranteed to hold among sets
* returned by this method.</b>
*
- * <p>The <tt>hashCode</tt> method of the returned set returns the sum of
+ * <p>The {@code hashCode} method of the returned set returns the sum of
* the <i>identity hashcodes</i> of the elements in the set, rather than
* the sum of their hashcodes. This is mandated by the change in the
- * semantics of the <tt>equals</tt> method, in order to enforce the
- * general contract of the <tt>Object.hashCode</tt> method among sets
+ * semantics of the {@code equals} method, in order to enforce the
+ * general contract of the {@code Object.hashCode} method among sets
* returned by this method.
*
* @return an identity-based set view of the keys contained in this map
@@ -1054,18 +1054,18 @@
* modified while an iteration over the collection is in progress,
* the results of the iteration are undefined. The collection
* supports element removal, which removes the corresponding
- * mapping from the map, via the <tt>Iterator.remove</tt>,
- * <tt>Collection.remove</tt>, <tt>removeAll</tt>,
- * <tt>retainAll</tt> and <tt>clear</tt> methods. It does not
- * support the <tt>add</tt> or <tt>addAll</tt> methods.
+ * mapping from the map, via the {@code Iterator.remove},
+ * {@code Collection.remove}, {@code removeAll},
+ * {@code retainAll} and {@code clear} methods. It does not
+ * support the {@code add} or {@code addAll} methods.
*
* <p><b>While the object returned by this method implements the
- * <tt>Collection</tt> interface, it does <i>not</i> obey
- * <tt>Collection's</tt> general contract. Like its backing map,
+ * {@code Collection} interface, it does <i>not</i> obey
+ * {@code Collection's} general contract. Like its backing map,
* the collection returned by this method defines element equality as
* reference-equality rather than object-equality. This affects the
- * behavior of its <tt>contains</tt>, <tt>remove</tt> and
- * <tt>containsAll</tt> methods.</b>
+ * behavior of its {@code contains}, {@code remove} and
+ * {@code containsAll} methods.</b>
*/
public Collection<V> values() {
Collection<V> vs = values;
@@ -1136,36 +1136,36 @@
/**
* Returns a {@link Set} view of the mappings contained in this map.
* Each element in the returned set is a reference-equality-based
- * <tt>Map.Entry</tt>. The set is backed by the map, so changes
+ * {@code Map.Entry}. The set is backed by the map, so changes
* to the map are reflected in the set, and vice-versa. If the
* map is modified while an iteration over the set is in progress,
* the results of the iteration are undefined. The set supports
* element removal, which removes the corresponding mapping from
- * the map, via the <tt>Iterator.remove</tt>, <tt>Set.remove</tt>,
- * <tt>removeAll</tt>, <tt>retainAll</tt> and <tt>clear</tt>
- * methods. It does not support the <tt>add</tt> or
- * <tt>addAll</tt> methods.
+ * the map, via the {@code Iterator.remove}, {@code Set.remove},
+ * {@code removeAll}, {@code retainAll} and {@code clear}
+ * methods. It does not support the {@code add} or
+ * {@code addAll} methods.
*
- * <p>Like the backing map, the <tt>Map.Entry</tt> objects in the set
+ * <p>Like the backing map, the {@code Map.Entry} objects in the set
* returned by this method define key and value equality as
* reference-equality rather than object-equality. This affects the
- * behavior of the <tt>equals</tt> and <tt>hashCode</tt> methods of these
- * <tt>Map.Entry</tt> objects. A reference-equality based <tt>Map.Entry
- * e</tt> is equal to an object <tt>o</tt> if and only if <tt>o</tt> is a
- * <tt>Map.Entry</tt> and <tt>e.getKey()==o.getKey() &&
- * e.getValue()==o.getValue()</tt>. To accommodate these equals
- * semantics, the <tt>hashCode</tt> method returns
- * <tt>System.identityHashCode(e.getKey()) ^
- * System.identityHashCode(e.getValue())</tt>.
+ * behavior of the {@code equals} and {@code hashCode} methods of these
+ * {@code Map.Entry} objects. A reference-equality based {@code Map.Entry
+ * e} is equal to an object {@code o} if and only if {@code o} is a
+ * {@code Map.Entry} and {@code e.getKey()==o.getKey() &&
+ * e.getValue()==o.getValue()}. To accommodate these equals
+ * semantics, the {@code hashCode} method returns
+ * {@code System.identityHashCode(e.getKey()) ^
+ * System.identityHashCode(e.getValue())}.
*
* <p><b>Owing to the reference-equality-based semantics of the
- * <tt>Map.Entry</tt> instances in the set returned by this method,
+ * {@code Map.Entry} instances in the set returned by this method,
* it is possible that the symmetry and transitivity requirements of
* the {@link Object#equals(Object)} contract may be violated if any of
* the entries in the set is compared to a normal map entry, or if
* the set returned by this method is compared to a set of normal map
* entries (such as would be returned by a call to this method on a normal
- * map). However, the <tt>Object.equals</tt> contract is guaranteed to
+ * map). However, the {@code Object.equals} contract is guaranteed to
* hold among identity-based map entries, and among sets of such entries.
* </b>
*
@@ -1260,11 +1260,11 @@
private static final long serialVersionUID = 8188218128353913216L;
/**
- * Saves the state of the <tt>IdentityHashMap</tt> instance to a stream
+ * Saves the state of the {@code IdentityHashMap} instance to a stream
* (i.e., serializes it).
*
* @serialData The <i>size</i> of the HashMap (the number of key-value
- * mappings) (<tt>int</tt>), followed by the key (Object) and
+ * mappings) ({@code int}), followed by the key (Object) and
* value (Object) for each key-value mapping represented by the
* IdentityHashMap. The key-value mappings are emitted in no
* particular order.
@@ -1289,7 +1289,7 @@
}
/**
- * Reconstitutes the <tt>IdentityHashMap</tt> instance from a stream (i.e.,
+ * Reconstitutes the {@code IdentityHashMap} instance from a stream (i.e.,
* deserializes it).
*/
private void readObject(java.io.ObjectInputStream s)
diff --git a/jdk/src/java.base/share/classes/java/util/IllegalFormatCodePointException.java b/jdk/src/java.base/share/classes/java/util/IllegalFormatCodePointException.java
index 02add44..d79d4997 100644
--- a/jdk/src/java.base/share/classes/java/util/IllegalFormatCodePointException.java
+++ b/jdk/src/java.base/share/classes/java/util/IllegalFormatCodePointException.java
@@ -30,7 +30,7 @@
* point as defined by {@link Character#isValidCodePoint} is passed to the
* {@link Formatter}.
*
- * <p> Unless otherwise specified, passing a <tt>null</tt> argument to any
+ * <p> Unless otherwise specified, passing a {@code null} argument to any
* method or constructor in this class will cause a {@link
* NullPointerException} to be thrown.
*
diff --git a/jdk/src/java.base/share/classes/java/util/IllegalFormatConversionException.java b/jdk/src/java.base/share/classes/java/util/IllegalFormatConversionException.java
index a9b006f..09ee5c4 100644
--- a/jdk/src/java.base/share/classes/java/util/IllegalFormatConversionException.java
+++ b/jdk/src/java.base/share/classes/java/util/IllegalFormatConversionException.java
@@ -29,7 +29,7 @@
* Unchecked exception thrown when the argument corresponding to the format
* specifier is of an incompatible type.
*
- * <p> Unless otherwise specified, passing a <tt>null</tt> argument to any
+ * <p> Unless otherwise specified, passing a {@code null} argument to any
* method or constructor in this class will cause a {@link
* NullPointerException} to be thrown.
*
diff --git a/jdk/src/java.base/share/classes/java/util/IllegalFormatFlagsException.java b/jdk/src/java.base/share/classes/java/util/IllegalFormatFlagsException.java
index 6b8223a..5374f59 100644
--- a/jdk/src/java.base/share/classes/java/util/IllegalFormatFlagsException.java
+++ b/jdk/src/java.base/share/classes/java/util/IllegalFormatFlagsException.java
@@ -28,7 +28,7 @@
/**
* Unchecked exception thrown when an illegal combination flags is given.
*
- * <p> Unless otherwise specified, passing a <tt>null</tt> argument to any
+ * <p> Unless otherwise specified, passing a {@code null} argument to any
* method or constructor in this class will cause a {@link
* NullPointerException} to be thrown.
*
diff --git a/jdk/src/java.base/share/classes/java/util/IllegalFormatPrecisionException.java b/jdk/src/java.base/share/classes/java/util/IllegalFormatPrecisionException.java
index 41cbbb7..bc9c621 100644
--- a/jdk/src/java.base/share/classes/java/util/IllegalFormatPrecisionException.java
+++ b/jdk/src/java.base/share/classes/java/util/IllegalFormatPrecisionException.java
@@ -27,7 +27,7 @@
/**
* Unchecked exception thrown when the precision is a negative value other than
- * <tt>-1</tt>, the conversion does not support a precision, or the value is
+ * {@code -1}, the conversion does not support a precision, or the value is
* otherwise unsupported.
*
* @since 1.5
diff --git a/jdk/src/java.base/share/classes/java/util/IllegalFormatWidthException.java b/jdk/src/java.base/share/classes/java/util/IllegalFormatWidthException.java
index 08ae47d..c7b7823 100644
--- a/jdk/src/java.base/share/classes/java/util/IllegalFormatWidthException.java
+++ b/jdk/src/java.base/share/classes/java/util/IllegalFormatWidthException.java
@@ -27,7 +27,7 @@
/**
* Unchecked exception thrown when the format width is a negative value other
- * than <tt>-1</tt> or is otherwise unsupported.
+ * than {@code -1} or is otherwise unsupported.
*
* @since 1.5
*/
diff --git a/jdk/src/java.base/share/classes/java/util/InputMismatchException.java b/jdk/src/java.base/share/classes/java/util/InputMismatchException.java
index e4d1ce3..c101c65 100644
--- a/jdk/src/java.base/share/classes/java/util/InputMismatchException.java
+++ b/jdk/src/java.base/share/classes/java/util/InputMismatchException.java
@@ -26,7 +26,7 @@
package java.util;
/**
- * Thrown by a <code>Scanner</code> to indicate that the token
+ * Thrown by a {@code Scanner} to indicate that the token
* retrieved does not match the pattern for the expected type, or
* that the token is out of range for the expected type.
*
@@ -39,7 +39,7 @@
private static final long serialVersionUID = 8811230760997066428L;
/**
- * Constructs an <code>InputMismatchException</code> with <tt>null</tt>
+ * Constructs an {@code InputMismatchException} with {@code null}
* as its error message string.
*/
public InputMismatchException() {
@@ -47,9 +47,9 @@
}
/**
- * Constructs an <code>InputMismatchException</code>, saving a reference
- * to the error message string <tt>s</tt> for later retrieval by the
- * <tt>getMessage</tt> method.
+ * Constructs an {@code InputMismatchException}, saving a reference
+ * to the error message string {@code s} for later retrieval by the
+ * {@code getMessage} method.
*
* @param s the detail message.
*/
diff --git a/jdk/src/java.base/share/classes/java/util/JumboEnumSet.java b/jdk/src/java.base/share/classes/java/util/JumboEnumSet.java
index 6798511..20e8222 100644
--- a/jdk/src/java.base/share/classes/java/util/JumboEnumSet.java
+++ b/jdk/src/java.base/share/classes/java/util/JumboEnumSet.java
@@ -163,19 +163,19 @@
}
/**
- * Returns <tt>true</tt> if this set contains no elements.
+ * Returns {@code true} if this set contains no elements.
*
- * @return <tt>true</tt> if this set contains no elements
+ * @return {@code true} if this set contains no elements
*/
public boolean isEmpty() {
return size == 0;
}
/**
- * Returns <tt>true</tt> if this set contains the specified element.
+ * Returns {@code true} if this set contains the specified element.
*
* @param e element to be checked for containment in this collection
- * @return <tt>true</tt> if this set contains the specified element
+ * @return {@code true} if this set contains the specified element
*/
public boolean contains(Object e) {
if (e == null)
@@ -194,9 +194,9 @@
* Adds the specified element to this set if it is not already present.
*
* @param e element to be added to this set
- * @return <tt>true</tt> if the set changed as a result of the call
+ * @return {@code true} if the set changed as a result of the call
*
- * @throws NullPointerException if <tt>e</tt> is null
+ * @throws NullPointerException if {@code e} is null
*/
public boolean add(E e) {
typeCheck(e);
@@ -216,7 +216,7 @@
* Removes the specified element from this set if it is present.
*
* @param e element to be removed from this set, if present
- * @return <tt>true</tt> if the set contained the specified element
+ * @return {@code true} if the set contained the specified element
*/
public boolean remove(Object e) {
if (e == null)
@@ -238,11 +238,11 @@
// Bulk Operations
/**
- * Returns <tt>true</tt> if this set contains all of the elements
+ * Returns {@code true} if this set contains all of the elements
* in the specified collection.
*
* @param c collection to be checked for containment in this set
- * @return <tt>true</tt> if this set contains all of the elements
+ * @return {@code true} if this set contains all of the elements
* in the specified collection
* @throws NullPointerException if the specified collection is null
*/
@@ -264,7 +264,7 @@
* Adds all of the elements in the specified collection to this set.
*
* @param c collection whose elements are to be added to this set
- * @return <tt>true</tt> if this set changed as a result of the call
+ * @return {@code true} if this set changed as a result of the call
* @throws NullPointerException if the specified collection or any of
* its elements are null
*/
@@ -291,7 +291,7 @@
* the specified collection.
*
* @param c elements to be removed from this set
- * @return <tt>true</tt> if this set changed as a result of the call
+ * @return {@code true} if this set changed as a result of the call
* @throws NullPointerException if the specified collection is null
*/
public boolean removeAll(Collection<?> c) {
@@ -312,7 +312,7 @@
* specified collection.
*
* @param c elements to be retained in this set
- * @return <tt>true</tt> if this set changed as a result of the call
+ * @return {@code true} if this set changed as a result of the call
* @throws NullPointerException if the specified collection is null
*/
public boolean retainAll(Collection<?> c) {
@@ -341,12 +341,12 @@
/**
* Compares the specified object with this set for equality. Returns
- * <tt>true</tt> if the given object is also a set, the two sets have
+ * {@code true} if the given object is also a set, the two sets have
* the same size, and every member of the given set is contained in
* this set.
*
* @param o object to be compared for equality with this set
- * @return <tt>true</tt> if the specified object is equal to this set
+ * @return {@code true} if the specified object is equal to this set
*/
public boolean equals(Object o) {
if (!(o instanceof JumboEnumSet))
diff --git a/jdk/src/java.base/share/classes/java/util/LinkedHashMap.java b/jdk/src/java.base/share/classes/java/util/LinkedHashMap.java
index b8d3fdb..15ade87 100644
--- a/jdk/src/java.base/share/classes/java/util/LinkedHashMap.java
+++ b/jdk/src/java.base/share/classes/java/util/LinkedHashMap.java
@@ -31,15 +31,15 @@
import java.io.IOException;
/**
- * <p>Hash table and linked list implementation of the <tt>Map</tt> interface,
+ * <p>Hash table and linked list implementation of the {@code Map} interface,
* with predictable iteration order. This implementation differs from
- * <tt>HashMap</tt> in that it maintains a doubly-linked list running through
+ * {@code HashMap} in that it maintains a doubly-linked list running through
* all of its entries. This linked list defines the iteration ordering,
* which is normally the order in which keys were inserted into the map
* (<i>insertion-order</i>). Note that insertion order is not affected
- * if a key is <i>re-inserted</i> into the map. (A key <tt>k</tt> is
- * reinserted into a map <tt>m</tt> if <tt>m.put(k, v)</tt> is invoked when
- * <tt>m.containsKey(k)</tt> would return <tt>true</tt> immediately prior to
+ * if a key is <i>re-inserted</i> into the map. (A key {@code k} is
+ * reinserted into a map {@code m} if {@code m.put(k, v)} is invoked when
+ * {@code m.containsKey(k)} would return {@code true} immediately prior to
* the invocation.)
*
* <p>This implementation spares its clients from the unspecified, generally
@@ -78,23 +78,23 @@
* impose a policy for removing stale mappings automatically when new mappings
* are added to the map.
*
- * <p>This class provides all of the optional <tt>Map</tt> operations, and
- * permits null elements. Like <tt>HashMap</tt>, it provides constant-time
- * performance for the basic operations (<tt>add</tt>, <tt>contains</tt> and
- * <tt>remove</tt>), assuming the hash function disperses elements
+ * <p>This class provides all of the optional {@code Map} operations, and
+ * permits null elements. Like {@code HashMap}, it provides constant-time
+ * performance for the basic operations ({@code add}, {@code contains} and
+ * {@code remove}), assuming the hash function disperses elements
* properly among the buckets. Performance is likely to be just slightly
- * below that of <tt>HashMap</tt>, due to the added expense of maintaining the
+ * below that of {@code HashMap}, due to the added expense of maintaining the
* linked list, with one exception: Iteration over the collection-views
- * of a <tt>LinkedHashMap</tt> requires time proportional to the <i>size</i>
- * of the map, regardless of its capacity. Iteration over a <tt>HashMap</tt>
+ * of a {@code LinkedHashMap} requires time proportional to the <i>size</i>
+ * of the map, regardless of its capacity. Iteration over a {@code HashMap}
* is likely to be more expensive, requiring time proportional to its
* <i>capacity</i>.
*
* <p>A linked hash map has two parameters that affect its performance:
* <i>initial capacity</i> and <i>load factor</i>. They are defined precisely
- * as for <tt>HashMap</tt>. Note, however, that the penalty for choosing an
+ * as for {@code HashMap}. Note, however, that the penalty for choosing an
* excessively high value for initial capacity is less severe for this class
- * than for <tt>HashMap</tt>, as iteration times for this class are unaffected
+ * than for {@code HashMap}, as iteration times for this class are unaffected
* by capacity.
*
* <p><strong>Note that this implementation is not synchronized.</strong>
@@ -114,14 +114,14 @@
* iteration order. In insertion-ordered linked hash maps, merely changing
* the value associated with a key that is already contained in the map is not
* a structural modification. <strong>In access-ordered linked hash maps,
- * merely querying the map with <tt>get</tt> is a structural modification.
+ * merely querying the map with {@code get} is a structural modification.
* </strong>)
*
- * <p>The iterators returned by the <tt>iterator</tt> method of the collections
+ * <p>The iterators returned by the {@code iterator} method of the collections
* returned by all of this class's collection view methods are
* <em>fail-fast</em>: if the map is structurally modified at any time after
* the iterator is created, in any way except through the iterator's own
- * <tt>remove</tt> method, the iterator will throw a {@link
+ * {@code remove} method, the iterator will throw a {@link
* ConcurrentModificationException}. Thus, in the face of concurrent
* modification, the iterator fails quickly and cleanly, rather than risking
* arbitrary, non-deterministic behavior at an undetermined time in the future.
@@ -129,7 +129,7 @@
* <p>Note that the fail-fast behavior of an iterator cannot be guaranteed
* as it is, generally speaking, impossible to make any hard guarantees in the
* presence of unsynchronized concurrent modification. Fail-fast iterators
- * throw <tt>ConcurrentModificationException</tt> on a best-effort basis.
+ * throw {@code ConcurrentModificationException} on a best-effort basis.
* Therefore, it would be wrong to write a program that depended on this
* exception for its correctness: <i>the fail-fast behavior of iterators
* should be used only to detect bugs.</i>
@@ -209,8 +209,8 @@
transient LinkedHashMap.Entry<K,V> tail;
/**
- * The iteration ordering method for this linked hash map: <tt>true</tt>
- * for access-order, <tt>false</tt> for insertion-order.
+ * The iteration ordering method for this linked hash map: {@code true}
+ * for access-order, {@code false} for insertion-order.
*
* @serial
*/
@@ -335,7 +335,7 @@
}
/**
- * Constructs an empty insertion-ordered <tt>LinkedHashMap</tt> instance
+ * Constructs an empty insertion-ordered {@code LinkedHashMap} instance
* with the specified initial capacity and load factor.
*
* @param initialCapacity the initial capacity
@@ -349,7 +349,7 @@
}
/**
- * Constructs an empty insertion-ordered <tt>LinkedHashMap</tt> instance
+ * Constructs an empty insertion-ordered {@code LinkedHashMap} instance
* with the specified initial capacity and a default load factor (0.75).
*
* @param initialCapacity the initial capacity
@@ -361,7 +361,7 @@
}
/**
- * Constructs an empty insertion-ordered <tt>LinkedHashMap</tt> instance
+ * Constructs an empty insertion-ordered {@code LinkedHashMap} instance
* with the default initial capacity (16) and load factor (0.75).
*/
public LinkedHashMap() {
@@ -370,8 +370,8 @@
}
/**
- * Constructs an insertion-ordered <tt>LinkedHashMap</tt> instance with
- * the same mappings as the specified map. The <tt>LinkedHashMap</tt>
+ * Constructs an insertion-ordered {@code LinkedHashMap} instance with
+ * the same mappings as the specified map. The {@code LinkedHashMap}
* instance is created with a default load factor (0.75) and an initial
* capacity sufficient to hold the mappings in the specified map.
*
@@ -385,13 +385,13 @@
}
/**
- * Constructs an empty <tt>LinkedHashMap</tt> instance with the
+ * Constructs an empty {@code LinkedHashMap} instance with the
* specified initial capacity, load factor and ordering mode.
*
* @param initialCapacity the initial capacity
* @param loadFactor the load factor
- * @param accessOrder the ordering mode - <tt>true</tt> for
- * access-order, <tt>false</tt> for insertion-order
+ * @param accessOrder the ordering mode - {@code true} for
+ * access-order, {@code false} for insertion-order
* @throws IllegalArgumentException if the initial capacity is negative
* or the load factor is nonpositive
*/
@@ -404,11 +404,11 @@
/**
- * Returns <tt>true</tt> if this map maps one or more keys to the
+ * Returns {@code true} if this map maps one or more keys to the
* specified value.
*
* @param value value whose presence in this map is to be tested
- * @return <tt>true</tt> if this map maps one or more keys to the
+ * @return {@code true} if this map maps one or more keys to the
* specified value
*/
public boolean containsValue(Object value) {
@@ -465,8 +465,8 @@
}
/**
- * Returns <tt>true</tt> if this map should remove its eldest entry.
- * This method is invoked by <tt>put</tt> and <tt>putAll</tt> after
+ * Returns {@code true} if this map should remove its eldest entry.
+ * This method is invoked by {@code put} and {@code putAll} after
* inserting a new entry into the map. It provides the implementor
* with the opportunity to remove the eldest entry each time a new one
* is added. This is useful if the map represents a cache: it allows
@@ -487,23 +487,23 @@
* instead allowing the map to modify itself as directed by its
* return value. It <i>is</i> permitted for this method to modify
* the map directly, but if it does so, it <i>must</i> return
- * <tt>false</tt> (indicating that the map should not attempt any
- * further modification). The effects of returning <tt>true</tt>
+ * {@code false} (indicating that the map should not attempt any
+ * further modification). The effects of returning {@code true}
* after modifying the map from within this method are unspecified.
*
- * <p>This implementation merely returns <tt>false</tt> (so that this
+ * <p>This implementation merely returns {@code false} (so that this
* map acts like a normal map - the eldest element is never removed).
*
* @param eldest The least recently inserted entry in the map, or if
* this is an access-ordered map, the least recently accessed
* entry. This is the entry that will be removed it this
- * method returns <tt>true</tt>. If the map was empty prior
- * to the <tt>put</tt> or <tt>putAll</tt> invocation resulting
+ * method returns {@code true}. If the map was empty prior
+ * to the {@code put} or {@code putAll} invocation resulting
* in this invocation, this will be the entry that was just
* inserted; in other words, if the map contains a single
* entry, the eldest entry is also the newest.
- * @return <tt>true</tt> if the eldest entry should be removed
- * from the map; <tt>false</tt> if it should be retained.
+ * @return {@code true} if the eldest entry should be removed
+ * from the map; {@code false} if it should be retained.
*/
protected boolean removeEldestEntry(Map.Entry<K,V> eldest) {
return false;
@@ -514,12 +514,12 @@
* The set is backed by the map, so changes to the map are
* reflected in the set, and vice-versa. If the map is modified
* while an iteration over the set is in progress (except through
- * the iterator's own <tt>remove</tt> operation), the results of
+ * the iterator's own {@code remove} operation), the results of
* the iteration are undefined. The set supports element removal,
* which removes the corresponding mapping from the map, via the
- * <tt>Iterator.remove</tt>, <tt>Set.remove</tt>,
- * <tt>removeAll</tt>, <tt>retainAll</tt>, and <tt>clear</tt>
- * operations. It does not support the <tt>add</tt> or <tt>addAll</tt>
+ * {@code Iterator.remove}, {@code Set.remove},
+ * {@code removeAll}, {@code retainAll}, and {@code clear}
+ * operations. It does not support the {@code add} or {@code addAll}
* operations.
* Its {@link Spliterator} typically provides faster sequential
* performance but much poorer parallel performance than that of
@@ -563,13 +563,13 @@
* The collection is backed by the map, so changes to the map are
* reflected in the collection, and vice-versa. If the map is
* modified while an iteration over the collection is in progress
- * (except through the iterator's own <tt>remove</tt> operation),
+ * (except through the iterator's own {@code remove} operation),
* the results of the iteration are undefined. The collection
* supports element removal, which removes the corresponding
- * mapping from the map, via the <tt>Iterator.remove</tt>,
- * <tt>Collection.remove</tt>, <tt>removeAll</tt>,
- * <tt>retainAll</tt> and <tt>clear</tt> operations. It does not
- * support the <tt>add</tt> or <tt>addAll</tt> operations.
+ * mapping from the map, via the {@code Iterator.remove},
+ * {@code Collection.remove}, {@code removeAll},
+ * {@code retainAll} and {@code clear} operations. It does not
+ * support the {@code add} or {@code addAll} operations.
* Its {@link Spliterator} typically provides faster sequential
* performance but much poorer parallel performance than that of
* {@code HashMap}.
@@ -608,14 +608,14 @@
* The set is backed by the map, so changes to the map are
* reflected in the set, and vice-versa. If the map is modified
* while an iteration over the set is in progress (except through
- * the iterator's own <tt>remove</tt> operation, or through the
- * <tt>setValue</tt> operation on a map entry returned by the
+ * the iterator's own {@code remove} operation, or through the
+ * {@code setValue} operation on a map entry returned by the
* iterator) the results of the iteration are undefined. The set
* supports element removal, which removes the corresponding
- * mapping from the map, via the <tt>Iterator.remove</tt>,
- * <tt>Set.remove</tt>, <tt>removeAll</tt>, <tt>retainAll</tt> and
- * <tt>clear</tt> operations. It does not support the
- * <tt>add</tt> or <tt>addAll</tt> operations.
+ * mapping from the map, via the {@code Iterator.remove},
+ * {@code Set.remove}, {@code removeAll}, {@code retainAll} and
+ * {@code clear} operations. It does not support the
+ * {@code add} or {@code addAll} operations.
* Its {@link Spliterator} typically provides faster sequential
* performance but much poorer parallel performance than that of
* {@code HashMap}.
diff --git a/jdk/src/java.base/share/classes/java/util/LinkedHashSet.java b/jdk/src/java.base/share/classes/java/util/LinkedHashSet.java
index 08606cf..c0e1f2e 100644
--- a/jdk/src/java.base/share/classes/java/util/LinkedHashSet.java
+++ b/jdk/src/java.base/share/classes/java/util/LinkedHashSet.java
@@ -26,15 +26,15 @@
package java.util;
/**
- * <p>Hash table and linked list implementation of the <tt>Set</tt> interface,
+ * <p>Hash table and linked list implementation of the {@code Set} interface,
* with predictable iteration order. This implementation differs from
- * <tt>HashSet</tt> in that it maintains a doubly-linked list running through
+ * {@code HashSet} in that it maintains a doubly-linked list running through
* all of its entries. This linked list defines the iteration ordering,
* which is the order in which elements were inserted into the set
* (<i>insertion-order</i>). Note that insertion order is <i>not</i> affected
- * if an element is <i>re-inserted</i> into the set. (An element <tt>e</tt>
- * is reinserted into a set <tt>s</tt> if <tt>s.add(e)</tt> is invoked when
- * <tt>s.contains(e)</tt> would return <tt>true</tt> immediately prior to
+ * if an element is <i>re-inserted</i> into the set. (An element {@code e}
+ * is reinserted into a set {@code s} if {@code s.add(e)} is invoked when
+ * {@code s.contains(e)} would return {@code true} immediately prior to
* the invocation.)
*
* <p>This implementation spares its clients from the unspecified, generally
@@ -53,22 +53,22 @@
* the copy. (Clients generally appreciate having things returned in the same
* order they were presented.)
*
- * <p>This class provides all of the optional <tt>Set</tt> operations, and
- * permits null elements. Like <tt>HashSet</tt>, it provides constant-time
- * performance for the basic operations (<tt>add</tt>, <tt>contains</tt> and
- * <tt>remove</tt>), assuming the hash function disperses elements
+ * <p>This class provides all of the optional {@code Set} operations, and
+ * permits null elements. Like {@code HashSet}, it provides constant-time
+ * performance for the basic operations ({@code add}, {@code contains} and
+ * {@code remove}), assuming the hash function disperses elements
* properly among the buckets. Performance is likely to be just slightly
- * below that of <tt>HashSet</tt>, due to the added expense of maintaining the
- * linked list, with one exception: Iteration over a <tt>LinkedHashSet</tt>
+ * below that of {@code HashSet}, due to the added expense of maintaining the
+ * linked list, with one exception: Iteration over a {@code LinkedHashSet}
* requires time proportional to the <i>size</i> of the set, regardless of
- * its capacity. Iteration over a <tt>HashSet</tt> is likely to be more
+ * its capacity. Iteration over a {@code HashSet} is likely to be more
* expensive, requiring time proportional to its <i>capacity</i>.
*
* <p>A linked hash set has two parameters that affect its performance:
* <i>initial capacity</i> and <i>load factor</i>. They are defined precisely
- * as for <tt>HashSet</tt>. Note, however, that the penalty for choosing an
+ * as for {@code HashSet}. Note, however, that the penalty for choosing an
* excessively high value for initial capacity is less severe for this class
- * than for <tt>HashSet</tt>, as iteration times for this class are unaffected
+ * than for {@code HashSet}, as iteration times for this class are unaffected
* by capacity.
*
* <p><strong>Note that this implementation is not synchronized.</strong>
@@ -83,9 +83,9 @@
* unsynchronized access to the set: <pre>
* Set s = Collections.synchronizedSet(new LinkedHashSet(...));</pre>
*
- * <p>The iterators returned by this class's <tt>iterator</tt> method are
+ * <p>The iterators returned by this class's {@code iterator} method are
* <em>fail-fast</em>: if the set is modified at any time after the iterator
- * is created, in any way except through the iterator's own <tt>remove</tt>
+ * is created, in any way except through the iterator's own {@code remove}
* method, the iterator will throw a {@link ConcurrentModificationException}.
* Thus, in the face of concurrent modification, the iterator fails quickly
* and cleanly, rather than risking arbitrary, non-deterministic behavior at
@@ -94,7 +94,7 @@
* <p>Note that the fail-fast behavior of an iterator cannot be guaranteed
* as it is, generally speaking, impossible to make any hard guarantees in the
* presence of unsynchronized concurrent modification. Fail-fast iterators
- * throw <tt>ConcurrentModificationException</tt> on a best-effort basis.
+ * throw {@code ConcurrentModificationException} on a best-effort basis.
* Therefore, it would be wrong to write a program that depended on this
* exception for its correctness: <i>the fail-fast behavior of iterators
* should be used only to detect bugs.</i>
diff --git a/jdk/src/java.base/share/classes/java/util/LinkedList.java b/jdk/src/java.base/share/classes/java/util/LinkedList.java
index e2e57e8..2d21ff1 100644
--- a/jdk/src/java.base/share/classes/java/util/LinkedList.java
+++ b/jdk/src/java.base/share/classes/java/util/LinkedList.java
@@ -312,7 +312,7 @@
* Returns {@code true} if this list contains the specified element.
* More formally, returns {@code true} if and only if this list contains
* at least one element {@code e} such that
- * <tt>(o==null ? e==null : o.equals(e))</tt>.
+ * {@code Objects.equals(o, e)}.
*
* @param o element whose presence in this list is to be tested
* @return {@code true} if this list contains the specified element
@@ -348,7 +348,7 @@
* if it is present. If this list does not contain the element, it is
* unchanged. More formally, removes the element with the lowest index
* {@code i} such that
- * <tt>(o==null ? get(i)==null : o.equals(get(i)))</tt>
+ * {@code Objects.equals(o, get(i))}
* (if such an element exists). Returns {@code true} if this list
* contained the specified element (or equivalently, if this list
* changed as a result of the call).
@@ -589,7 +589,7 @@
* Returns the index of the first occurrence of the specified element
* in this list, or -1 if this list does not contain the element.
* More formally, returns the lowest index {@code i} such that
- * <tt>(o==null ? get(i)==null : o.equals(get(i)))</tt>,
+ * {@code Objects.equals(o, get(i))},
* or -1 if there is no such index.
*
* @param o element to search for
@@ -618,7 +618,7 @@
* Returns the index of the last occurrence of the specified element
* in this list, or -1 if this list does not contain the element.
* More formally, returns the highest index {@code i} such that
- * <tt>(o==null ? get(i)==null : o.equals(get(i)))</tt>,
+ * {@code Objects.equals(o, get(i))},
* or -1 if there is no such index.
*
* @param o element to search for
diff --git a/jdk/src/java.base/share/classes/java/util/List.java b/jdk/src/java.base/share/classes/java/util/List.java
index 80fe4be..6e3751f 100644
--- a/jdk/src/java.base/share/classes/java/util/List.java
+++ b/jdk/src/java.base/share/classes/java/util/List.java
@@ -34,50 +34,50 @@
* the list), and search for elements in the list.<p>
*
* Unlike sets, lists typically allow duplicate elements. More formally,
- * lists typically allow pairs of elements <tt>e1</tt> and <tt>e2</tt>
- * such that <tt>e1.equals(e2)</tt>, and they typically allow multiple
+ * lists typically allow pairs of elements {@code e1} and {@code e2}
+ * such that {@code e1.equals(e2)}, and they typically allow multiple
* null elements if they allow null elements at all. It is not inconceivable
* that someone might wish to implement a list that prohibits duplicates, by
* throwing runtime exceptions when the user attempts to insert them, but we
* expect this usage to be rare.<p>
*
- * The <tt>List</tt> interface places additional stipulations, beyond those
- * specified in the <tt>Collection</tt> interface, on the contracts of the
- * <tt>iterator</tt>, <tt>add</tt>, <tt>remove</tt>, <tt>equals</tt>, and
- * <tt>hashCode</tt> methods. Declarations for other inherited methods are
+ * The {@code List} interface places additional stipulations, beyond those
+ * specified in the {@code Collection} interface, on the contracts of the
+ * {@code iterator}, {@code add}, {@code remove}, {@code equals}, and
+ * {@code hashCode} methods. Declarations for other inherited methods are
* also included here for convenience.<p>
*
- * The <tt>List</tt> interface provides four methods for positional (indexed)
+ * The {@code List} interface provides four methods for positional (indexed)
* access to list elements. Lists (like Java arrays) are zero based. Note
* that these operations may execute in time proportional to the index value
- * for some implementations (the <tt>LinkedList</tt> class, for
+ * for some implementations (the {@code LinkedList} class, for
* example). Thus, iterating over the elements in a list is typically
* preferable to indexing through it if the caller does not know the
* implementation.<p>
*
- * The <tt>List</tt> interface provides a special iterator, called a
- * <tt>ListIterator</tt>, that allows element insertion and replacement, and
+ * The {@code List} interface provides a special iterator, called a
+ * {@code ListIterator}, that allows element insertion and replacement, and
* bidirectional access in addition to the normal operations that the
- * <tt>Iterator</tt> interface provides. A method is provided to obtain a
+ * {@code Iterator} interface provides. A method is provided to obtain a
* list iterator that starts at a specified position in the list.<p>
*
- * The <tt>List</tt> interface provides two methods to search for a specified
+ * The {@code List} interface provides two methods to search for a specified
* object. From a performance standpoint, these methods should be used with
* caution. In many implementations they will perform costly linear
* searches.<p>
*
- * The <tt>List</tt> interface provides two methods to efficiently insert and
+ * The {@code List} interface provides two methods to efficiently insert and
* remove multiple elements at an arbitrary point in the list.<p>
*
* Note: While it is permissible for lists to contain themselves as elements,
- * extreme caution is advised: the <tt>equals</tt> and <tt>hashCode</tt>
+ * extreme caution is advised: the {@code equals} and {@code hashCode}
* methods are no longer well defined on such a list.
*
* <p>Some list implementations have restrictions on the elements that
* they may contain. For example, some implementations prohibit null elements,
* and some have restrictions on the types of their elements. Attempting to
* add an ineligible element throws an unchecked exception, typically
- * <tt>NullPointerException</tt> or <tt>ClassCastException</tt>. Attempting
+ * {@code NullPointerException} or {@code ClassCastException}. Attempting
* to query the presence of an ineligible element may throw an exception,
* or it may simply return false; some implementations will exhibit the former
* behavior and some will exhibit the latter. More generally, attempting an
@@ -113,28 +113,28 @@
/**
* Returns the number of elements in this list. If this list contains
- * more than <tt>Integer.MAX_VALUE</tt> elements, returns
- * <tt>Integer.MAX_VALUE</tt>.
+ * more than {@code Integer.MAX_VALUE} elements, returns
+ * {@code Integer.MAX_VALUE}.
*
* @return the number of elements in this list
*/
int size();
/**
- * Returns <tt>true</tt> if this list contains no elements.
+ * Returns {@code true} if this list contains no elements.
*
- * @return <tt>true</tt> if this list contains no elements
+ * @return {@code true} if this list contains no elements
*/
boolean isEmpty();
/**
- * Returns <tt>true</tt> if this list contains the specified element.
- * More formally, returns <tt>true</tt> if and only if this list contains
- * at least one element <tt>e</tt> such that
- * <tt>(o==null ? e==null : o.equals(e))</tt>.
+ * Returns {@code true} if this list contains the specified element.
+ * More formally, returns {@code true} if and only if this list contains
+ * at least one element {@code e} such that
+ * {@code Objects.equals(o, e)}.
*
* @param o element whose presence in this list is to be tested
- * @return <tt>true</tt> if this list contains the specified element
+ * @return {@code true} if this list contains the specified element
* @throws ClassCastException if the type of the specified element
* is incompatible with this list
* (<a href="Collection.html#optional-restrictions">optional</a>)
@@ -179,7 +179,7 @@
*
* <p>If the list fits in the specified array with room to spare (i.e.,
* the array has more elements than the list), the element in the array
- * immediately following the end of the list is set to <tt>null</tt>.
+ * immediately following the end of the list is set to {@code null}.
* (This is useful in determining the length of the list <i>only</i> if
* the caller knows that the list does not contain any null elements.)
*
@@ -188,16 +188,16 @@
* precise control over the runtime type of the output array, and may,
* under certain circumstances, be used to save allocation costs.
*
- * <p>Suppose <tt>x</tt> is a list known to contain only strings.
+ * <p>Suppose {@code x} is a list known to contain only strings.
* The following code can be used to dump the list into a newly
- * allocated array of <tt>String</tt>:
+ * allocated array of {@code String}:
*
* <pre>{@code
* String[] y = x.toArray(new String[0]);
* }</pre>
*
- * Note that <tt>toArray(new Object[0])</tt> is identical in function to
- * <tt>toArray()</tt>.
+ * Note that {@code toArray(new Object[0])} is identical in function to
+ * {@code toArray()}.
*
* @param a the array into which the elements of this list are to
* be stored, if it is big enough; otherwise, a new array of the
@@ -225,8 +225,8 @@
* on what elements may be added.
*
* @param e element to be appended to this list
- * @return <tt>true</tt> (as specified by {@link Collection#add})
- * @throws UnsupportedOperationException if the <tt>add</tt> operation
+ * @return {@code true} (as specified by {@link Collection#add})
+ * @throws UnsupportedOperationException if the {@code add} operation
* is not supported by this list
* @throws ClassCastException if the class of the specified element
* prevents it from being added to this list
@@ -241,21 +241,21 @@
* Removes the first occurrence of the specified element from this list,
* if it is present (optional operation). If this list does not contain
* the element, it is unchanged. More formally, removes the element with
- * the lowest index <tt>i</tt> such that
- * <tt>(o==null ? get(i)==null : o.equals(get(i)))</tt>
- * (if such an element exists). Returns <tt>true</tt> if this list
+ * the lowest index {@code i} such that
+ * {@code Objects.equals(o, get(i))}
+ * (if such an element exists). Returns {@code true} if this list
* contained the specified element (or equivalently, if this list changed
* as a result of the call).
*
* @param o element to be removed from this list, if present
- * @return <tt>true</tt> if this list contained the specified element
+ * @return {@code true} if this list contained the specified element
* @throws ClassCastException if the type of the specified element
* is incompatible with this list
* (<a href="Collection.html#optional-restrictions">optional</a>)
* @throws NullPointerException if the specified element is null and this
* list does not permit null elements
* (<a href="Collection.html#optional-restrictions">optional</a>)
- * @throws UnsupportedOperationException if the <tt>remove</tt> operation
+ * @throws UnsupportedOperationException if the {@code remove} operation
* is not supported by this list
*/
boolean remove(Object o);
@@ -264,11 +264,11 @@
// Bulk Modification Operations
/**
- * Returns <tt>true</tt> if this list contains all of the elements of the
+ * Returns {@code true} if this list contains all of the elements of the
* specified collection.
*
* @param c collection to be checked for containment in this list
- * @return <tt>true</tt> if this list contains all of the elements of the
+ * @return {@code true} if this list contains all of the elements of the
* specified collection
* @throws ClassCastException if the types of one or more elements
* in the specified collection are incompatible with this
@@ -292,8 +292,8 @@
* specified collection is this list, and it's nonempty.)
*
* @param c collection containing elements to be added to this list
- * @return <tt>true</tt> if this list changed as a result of the call
- * @throws UnsupportedOperationException if the <tt>addAll</tt> operation
+ * @return {@code true} if this list changed as a result of the call
+ * @throws UnsupportedOperationException if the {@code addAll} operation
* is not supported by this list
* @throws ClassCastException if the class of an element of the specified
* collection prevents it from being added to this list
@@ -320,8 +320,8 @@
* @param index index at which to insert the first element from the
* specified collection
* @param c collection containing elements to be added to this list
- * @return <tt>true</tt> if this list changed as a result of the call
- * @throws UnsupportedOperationException if the <tt>addAll</tt> operation
+ * @return {@code true} if this list changed as a result of the call
+ * @throws UnsupportedOperationException if the {@code addAll} operation
* is not supported by this list
* @throws ClassCastException if the class of an element of the specified
* collection prevents it from being added to this list
@@ -331,7 +331,7 @@
* @throws IllegalArgumentException if some property of an element of the
* specified collection prevents it from being added to this list
* @throws IndexOutOfBoundsException if the index is out of range
- * (<tt>index < 0 || index > size()</tt>)
+ * ({@code index < 0 || index > size()})
*/
boolean addAll(int index, Collection<? extends E> c);
@@ -340,8 +340,8 @@
* specified collection (optional operation).
*
* @param c collection containing elements to be removed from this list
- * @return <tt>true</tt> if this list changed as a result of the call
- * @throws UnsupportedOperationException if the <tt>removeAll</tt> operation
+ * @return {@code true} if this list changed as a result of the call
+ * @throws UnsupportedOperationException if the {@code removeAll} operation
* is not supported by this list
* @throws ClassCastException if the class of an element of this list
* is incompatible with the specified collection
@@ -362,8 +362,8 @@
* specified collection.
*
* @param c collection containing elements to be retained in this list
- * @return <tt>true</tt> if this list changed as a result of the call
- * @throws UnsupportedOperationException if the <tt>retainAll</tt> operation
+ * @return {@code true} if this list changed as a result of the call
+ * @throws UnsupportedOperationException if the {@code retainAll} operation
* is not supported by this list
* @throws ClassCastException if the class of an element of this list
* is incompatible with the specified collection
@@ -487,7 +487,7 @@
* Removes all of the elements from this list (optional operation).
* The list will be empty after this call returns.
*
- * @throws UnsupportedOperationException if the <tt>clear</tt> operation
+ * @throws UnsupportedOperationException if the {@code clear} operation
* is not supported by this list
*/
void clear();
@@ -497,17 +497,17 @@
/**
* Compares the specified object with this list for equality. Returns
- * <tt>true</tt> if and only if the specified object is also a list, both
+ * {@code true} if and only if the specified object is also a list, both
* lists have the same size, and all corresponding pairs of elements in
- * the two lists are <i>equal</i>. (Two elements <tt>e1</tt> and
- * <tt>e2</tt> are <i>equal</i> if <tt>(e1==null ? e2==null :
- * e1.equals(e2))</tt>.) In other words, two lists are defined to be
+ * the two lists are <i>equal</i>. (Two elements {@code e1} and
+ * {@code e2} are <i>equal</i> if {@code Objects.equals(e1, e2)}.)
+ * In other words, two lists are defined to be
* equal if they contain the same elements in the same order. This
* definition ensures that the equals method works properly across
- * different implementations of the <tt>List</tt> interface.
+ * different implementations of the {@code List} interface.
*
* @param o the object to be compared for equality with this list
- * @return <tt>true</tt> if the specified object is equal to this list
+ * @return {@code true} if the specified object is equal to this list
*/
boolean equals(Object o);
@@ -519,9 +519,9 @@
* for (E e : list)
* hashCode = 31*hashCode + (e==null ? 0 : e.hashCode());
* }</pre>
- * This ensures that <tt>list1.equals(list2)</tt> implies that
- * <tt>list1.hashCode()==list2.hashCode()</tt> for any two lists,
- * <tt>list1</tt> and <tt>list2</tt>, as required by the general
+ * This ensures that {@code list1.equals(list2)} implies that
+ * {@code list1.hashCode()==list2.hashCode()} for any two lists,
+ * {@code list1} and {@code list2}, as required by the general
* contract of {@link Object#hashCode}.
*
* @return the hash code value for this list
@@ -539,7 +539,7 @@
* @param index index of the element to return
* @return the element at the specified position in this list
* @throws IndexOutOfBoundsException if the index is out of range
- * (<tt>index < 0 || index >= size()</tt>)
+ * ({@code index < 0 || index >= size()})
*/
E get(int index);
@@ -550,7 +550,7 @@
* @param index index of the element to replace
* @param element element to be stored at the specified position
* @return the element previously at the specified position
- * @throws UnsupportedOperationException if the <tt>set</tt> operation
+ * @throws UnsupportedOperationException if the {@code set} operation
* is not supported by this list
* @throws ClassCastException if the class of the specified element
* prevents it from being added to this list
@@ -559,7 +559,7 @@
* @throws IllegalArgumentException if some property of the specified
* element prevents it from being added to this list
* @throws IndexOutOfBoundsException if the index is out of range
- * (<tt>index < 0 || index >= size()</tt>)
+ * ({@code index < 0 || index >= size()})
*/
E set(int index, E element);
@@ -571,7 +571,7 @@
*
* @param index index at which the specified element is to be inserted
* @param element element to be inserted
- * @throws UnsupportedOperationException if the <tt>add</tt> operation
+ * @throws UnsupportedOperationException if the {@code add} operation
* is not supported by this list
* @throws ClassCastException if the class of the specified element
* prevents it from being added to this list
@@ -580,7 +580,7 @@
* @throws IllegalArgumentException if some property of the specified
* element prevents it from being added to this list
* @throws IndexOutOfBoundsException if the index is out of range
- * (<tt>index < 0 || index > size()</tt>)
+ * ({@code index < 0 || index > size()})
*/
void add(int index, E element);
@@ -592,10 +592,10 @@
*
* @param index the index of the element to be removed
* @return the element previously at the specified position
- * @throws UnsupportedOperationException if the <tt>remove</tt> operation
+ * @throws UnsupportedOperationException if the {@code remove} operation
* is not supported by this list
* @throws IndexOutOfBoundsException if the index is out of range
- * (<tt>index < 0 || index >= size()</tt>)
+ * ({@code index < 0 || index >= size()})
*/
E remove(int index);
@@ -605,8 +605,8 @@
/**
* Returns the index of the first occurrence of the specified element
* in this list, or -1 if this list does not contain the element.
- * More formally, returns the lowest index <tt>i</tt> such that
- * <tt>(o==null ? get(i)==null : o.equals(get(i)))</tt>,
+ * More formally, returns the lowest index {@code i} such that
+ * {@code Objects.equals(o, get(i))},
* or -1 if there is no such index.
*
* @param o element to search for
@@ -624,8 +624,8 @@
/**
* Returns the index of the last occurrence of the specified element
* in this list, or -1 if this list does not contain the element.
- * More formally, returns the highest index <tt>i</tt> such that
- * <tt>(o==null ? get(i)==null : o.equals(get(i)))</tt>,
+ * More formally, returns the highest index {@code i} such that
+ * {@code Objects.equals(o, get(i))},
* or -1 if there is no such index.
*
* @param o element to search for
@@ -673,8 +673,8 @@
/**
* Returns a view of the portion of this list between the specified
- * <tt>fromIndex</tt>, inclusive, and <tt>toIndex</tt>, exclusive. (If
- * <tt>fromIndex</tt> and <tt>toIndex</tt> are equal, the returned list is
+ * {@code fromIndex}, inclusive, and {@code toIndex}, exclusive. (If
+ * {@code fromIndex} and {@code toIndex} are equal, the returned list is
* empty.) The returned list is backed by this list, so non-structural
* changes in the returned list are reflected in this list, and vice-versa.
* The returned list supports all of the optional list operations supported
@@ -688,9 +688,9 @@
* <pre>{@code
* list.subList(from, to).clear();
* }</pre>
- * Similar idioms may be constructed for <tt>indexOf</tt> and
- * <tt>lastIndexOf</tt>, and all of the algorithms in the
- * <tt>Collections</tt> class can be applied to a subList.<p>
+ * Similar idioms may be constructed for {@code indexOf} and
+ * {@code lastIndexOf}, and all of the algorithms in the
+ * {@code Collections} class can be applied to a subList.<p>
*
* The semantics of the list returned by this method become undefined if
* the backing list (i.e., this list) is <i>structurally modified</i> in
@@ -702,8 +702,8 @@
* @param toIndex high endpoint (exclusive) of the subList
* @return a view of the specified range within this list
* @throws IndexOutOfBoundsException for an illegal endpoint index value
- * (<tt>fromIndex < 0 || toIndex > size ||
- * fromIndex > toIndex</tt>)
+ * ({@code fromIndex < 0 || toIndex > size ||
+ * fromIndex > toIndex})
*/
List<E> subList(int fromIndex, int toIndex);
diff --git a/jdk/src/java.base/share/classes/java/util/Locale.java b/jdk/src/java.base/share/classes/java/util/Locale.java
index e3b12c5..e785677 100644
--- a/jdk/src/java.base/share/classes/java/util/Locale.java
+++ b/jdk/src/java.base/share/classes/java/util/Locale.java
@@ -413,24 +413,24 @@
*
* <p>For compatibility reasons, two
* non-conforming locales are treated as special cases. These are
- * <b><tt>ja_JP_JP</tt></b> and <b><tt>th_TH_TH</tt></b>. These are ill-formed
+ * <b>{@code ja_JP_JP}</b> and <b>{@code th_TH_TH}</b>. These are ill-formed
* in BCP 47 since the variants are too short. To ease migration to BCP 47,
* these are treated specially during construction. These two cases (and only
* these) cause a constructor to generate an extension, all other values behave
* exactly as they did prior to Java 7.
*
- * <p>Java has used <tt>ja_JP_JP</tt> to represent Japanese as used in
+ * <p>Java has used {@code ja_JP_JP} to represent Japanese as used in
* Japan together with the Japanese Imperial calendar. This is now
* representable using a Unicode locale extension, by specifying the
- * Unicode locale key <tt>ca</tt> (for "calendar") and type
- * <tt>japanese</tt>. When the Locale constructor is called with the
+ * Unicode locale key {@code ca} (for "calendar") and type
+ * {@code japanese}. When the Locale constructor is called with the
* arguments "ja", "JP", "JP", the extension "u-ca-japanese" is
* automatically added.
*
- * <p>Java has used <tt>th_TH_TH</tt> to represent Thai as used in
+ * <p>Java has used {@code th_TH_TH} to represent Thai as used in
* Thailand together with Thai digits. This is also now representable using
* a Unicode locale extension, by specifying the Unicode locale key
- * <tt>nu</tt> (for "number") and value <tt>thai</tt>. When the Locale
+ * {@code nu} (for "number") and value {@code thai}. When the Locale
* constructor is called with the arguments "th", "TH", "TH", the
* extension "u-nu-thai" is automatically added.
*
@@ -446,9 +446,9 @@
* <h5>Legacy language codes</h5>
*
* <p>Locale's constructor has always converted three language codes to
- * their earlier, obsoleted forms: <tt>he</tt> maps to <tt>iw</tt>,
- * <tt>yi</tt> maps to <tt>ji</tt>, and <tt>id</tt> maps to
- * <tt>in</tt>. This continues to be the case, in order to not break
+ * their earlier, obsoleted forms: {@code he} maps to {@code iw},
+ * {@code yi} maps to {@code ji}, and {@code id} maps to
+ * {@code in}. This continues to be the case, in order to not break
* backwards compatibility.
*
* <p>The APIs added in 1.7 map between the old and new language codes,
@@ -1272,14 +1272,14 @@
* {@link #toLanguageTag}.
*
* <p>Examples: <ul>
- * <li><tt>en</tt></li>
- * <li><tt>de_DE</tt></li>
- * <li><tt>_GB</tt></li>
- * <li><tt>en_US_WIN</tt></li>
- * <li><tt>de__POSIX</tt></li>
- * <li><tt>zh_CN_#Hans</tt></li>
- * <li><tt>zh_TW_#Hant-x-java</tt></li>
- * <li><tt>th_TH_TH_#u-nu-thai</tt></li></ul>
+ * <li>{@code en}</li>
+ * <li>{@code de_DE}</li>
+ * <li>{@code _GB}</li>
+ * <li>{@code en_US_WIN}</li>
+ * <li>{@code de__POSIX}</li>
+ * <li>{@code zh_CN_#Hans}</li>
+ * <li>{@code zh_TW_#Hant-x-java}</li>
+ * <li>{@code th_TH_TH_#u-nu-thai}</li></ul>
*
* @return A string representation of the Locale, for debugging.
* @see #getDisplayName
diff --git a/jdk/src/java.base/share/classes/java/util/Map.java b/jdk/src/java.base/share/classes/java/util/Map.java
index cf9448b..9d79c6c 100644
--- a/jdk/src/java.base/share/classes/java/util/Map.java
+++ b/jdk/src/java.base/share/classes/java/util/Map.java
@@ -34,29 +34,29 @@
* An object that maps keys to values. A map cannot contain duplicate keys;
* each key can map to at most one value.
*
- * <p>This interface takes the place of the <tt>Dictionary</tt> class, which
+ * <p>This interface takes the place of the {@code Dictionary} class, which
* was a totally abstract class rather than an interface.
*
- * <p>The <tt>Map</tt> interface provides three <i>collection views</i>, which
+ * <p>The {@code Map} interface provides three <i>collection views</i>, which
* allow a map's contents to be viewed as a set of keys, collection of values,
* or set of key-value mappings. The <i>order</i> of a map is defined as
* the order in which the iterators on the map's collection views return their
- * elements. Some map implementations, like the <tt>TreeMap</tt> class, make
- * specific guarantees as to their order; others, like the <tt>HashMap</tt>
+ * elements. Some map implementations, like the {@code TreeMap} class, make
+ * specific guarantees as to their order; others, like the {@code HashMap}
* class, do not.
*
* <p>Note: great care must be exercised if mutable objects are used as map
* keys. The behavior of a map is not specified if the value of an object is
- * changed in a manner that affects <tt>equals</tt> comparisons while the
+ * changed in a manner that affects {@code equals} comparisons while the
* object is a key in the map. A special case of this prohibition is that it
* is not permissible for a map to contain itself as a key. While it is
* permissible for a map to contain itself as a value, extreme caution is
- * advised: the <tt>equals</tt> and <tt>hashCode</tt> methods are no longer
+ * advised: the {@code equals} and {@code hashCode} methods are no longer
* well defined on such a map.
*
* <p>All general-purpose map implementation classes should provide two
* "standard" constructors: a void (no arguments) constructor which creates an
- * empty map, and a constructor with a single argument of type <tt>Map</tt>,
+ * empty map, and a constructor with a single argument of type {@code Map},
* which creates a new map with the same key-value mappings as its argument.
* In effect, the latter constructor allows the user to copy any map,
* producing an equivalent map of the desired class. There is no way to
@@ -65,9 +65,9 @@
*
* <p>The "destructive" methods contained in this interface, that is, the
* methods that modify the map on which they operate, are specified to throw
- * <tt>UnsupportedOperationException</tt> if this map does not support the
+ * {@code UnsupportedOperationException} if this map does not support the
* operation. If this is the case, these methods may, but are not required
- * to, throw an <tt>UnsupportedOperationException</tt> if the invocation would
+ * to, throw an {@code UnsupportedOperationException} if the invocation would
* have no effect on the map. For example, invoking the {@link #putAll(Map)}
* method on an unmodifiable map may, but is not required to, throw the
* exception if the map whose mappings are to be "superimposed" is empty.
@@ -76,7 +76,7 @@
* may contain. For example, some implementations prohibit null keys and
* values, and some have restrictions on the types of their keys. Attempting
* to insert an ineligible key or value throws an unchecked exception,
- * typically <tt>NullPointerException</tt> or <tt>ClassCastException</tt>.
+ * typically {@code NullPointerException} or {@code ClassCastException}.
* Attempting to query the presence of an ineligible key or value may throw an
* exception, or it may simply return false; some implementations will exhibit
* the former behavior and some will exhibit the latter. More generally,
@@ -89,13 +89,13 @@
* <p>Many methods in Collections Framework interfaces are defined
* in terms of the {@link Object#equals(Object) equals} method. For
* example, the specification for the {@link #containsKey(Object)
- * containsKey(Object key)} method says: "returns <tt>true</tt> if and
- * only if this map contains a mapping for a key <tt>k</tt> such that
- * <tt>(key==null ? k==null : key.equals(k))</tt>." This specification should
- * <i>not</i> be construed to imply that invoking <tt>Map.containsKey</tt>
- * with a non-null argument <tt>key</tt> will cause <tt>key.equals(k)</tt> to
- * be invoked for any key <tt>k</tt>. Implementations are free to
- * implement optimizations whereby the <tt>equals</tt> invocation is avoided,
+ * containsKey(Object key)} method says: "returns {@code true} if and
+ * only if this map contains a mapping for a key {@code k} such that
+ * {@code (key==null ? k==null : key.equals(k))}." This specification should
+ * <i>not</i> be construed to imply that invoking {@code Map.containsKey}
+ * with a non-null argument {@code key} will cause {@code key.equals(k)} to
+ * be invoked for any key {@code k}. Implementations are free to
+ * implement optimizations whereby the {@code equals} invocation is avoided,
* for example, by first comparing the hash codes of the two keys. (The
* {@link Object#hashCode()} specification guarantees that two objects with
* unequal hash codes cannot be equal.) More generally, implementations of
@@ -131,29 +131,29 @@
/**
* Returns the number of key-value mappings in this map. If the
- * map contains more than <tt>Integer.MAX_VALUE</tt> elements, returns
- * <tt>Integer.MAX_VALUE</tt>.
+ * map contains more than {@code Integer.MAX_VALUE} elements, returns
+ * {@code Integer.MAX_VALUE}.
*
* @return the number of key-value mappings in this map
*/
int size();
/**
- * Returns <tt>true</tt> if this map contains no key-value mappings.
+ * Returns {@code true} if this map contains no key-value mappings.
*
- * @return <tt>true</tt> if this map contains no key-value mappings
+ * @return {@code true} if this map contains no key-value mappings
*/
boolean isEmpty();
/**
- * Returns <tt>true</tt> if this map contains a mapping for the specified
- * key. More formally, returns <tt>true</tt> if and only if
- * this map contains a mapping for a key <tt>k</tt> such that
- * <tt>(key==null ? k==null : key.equals(k))</tt>. (There can be
+ * Returns {@code true} if this map contains a mapping for the specified
+ * key. More formally, returns {@code true} if and only if
+ * this map contains a mapping for a key {@code k} such that
+ * {@code Objects.equals(key, k)}. (There can be
* at most one such mapping.)
*
* @param key key whose presence in this map is to be tested
- * @return <tt>true</tt> if this map contains a mapping for the specified
+ * @return {@code true} if this map contains a mapping for the specified
* key
* @throws ClassCastException if the key is of an inappropriate type for
* this map
@@ -165,15 +165,15 @@
boolean containsKey(Object key);
/**
- * Returns <tt>true</tt> if this map maps one or more keys to the
- * specified value. More formally, returns <tt>true</tt> if and only if
- * this map contains at least one mapping to a value <tt>v</tt> such that
- * <tt>(value==null ? v==null : value.equals(v))</tt>. This operation
+ * Returns {@code true} if this map maps one or more keys to the
+ * specified value. More formally, returns {@code true} if and only if
+ * this map contains at least one mapping to a value {@code v} such that
+ * {@code Objects.equals(value, v)}. This operation
* will probably require time linear in the map size for most
- * implementations of the <tt>Map</tt> interface.
+ * implementations of the {@code Map} interface.
*
* @param value value whose presence in this map is to be tested
- * @return <tt>true</tt> if this map maps one or more keys to the
+ * @return {@code true} if this map maps one or more keys to the
* specified value
* @throws ClassCastException if the value is of an inappropriate type for
* this map
@@ -189,8 +189,9 @@
* or {@code null} if this map contains no mapping for the key.
*
* <p>More formally, if this map contains a mapping from a key
- * {@code k} to a value {@code v} such that {@code (key==null ? k==null :
- * key.equals(k))}, then this method returns {@code v}; otherwise
+ * {@code k} to a value {@code v} such that
+ * {@code Objects.equals(key, k)},
+ * then this method returns {@code v}; otherwise
* it returns {@code null}. (There can be at most one such mapping.)
*
* <p>If this map permits null values, then a return value of
@@ -217,18 +218,18 @@
* Associates the specified value with the specified key in this map
* (optional operation). If the map previously contained a mapping for
* the key, the old value is replaced by the specified value. (A map
- * <tt>m</tt> is said to contain a mapping for a key <tt>k</tt> if and only
+ * {@code m} is said to contain a mapping for a key {@code k} if and only
* if {@link #containsKey(Object) m.containsKey(k)} would return
- * <tt>true</tt>.)
+ * {@code true}.)
*
* @param key key with which the specified value is to be associated
* @param value value to be associated with the specified key
- * @return the previous value associated with <tt>key</tt>, or
- * <tt>null</tt> if there was no mapping for <tt>key</tt>.
- * (A <tt>null</tt> return can also indicate that the map
- * previously associated <tt>null</tt> with <tt>key</tt>,
- * if the implementation supports <tt>null</tt> values.)
- * @throws UnsupportedOperationException if the <tt>put</tt> operation
+ * @return the previous value associated with {@code key}, or
+ * {@code null} if there was no mapping for {@code key}.
+ * (A {@code null} return can also indicate that the map
+ * previously associated {@code null} with {@code key},
+ * if the implementation supports {@code null} values.)
+ * @throws UnsupportedOperationException if the {@code put} operation
* is not supported by this map
* @throws ClassCastException if the class of the specified key or value
* prevents it from being stored in this map
@@ -242,25 +243,25 @@
/**
* Removes the mapping for a key from this map if it is present
* (optional operation). More formally, if this map contains a mapping
- * from key <tt>k</tt> to value <tt>v</tt> such that
- * <code>(key==null ? k==null : key.equals(k))</code>, that mapping
+ * from key {@code k} to value {@code v} such that
+ * {@code Objects.equals(key, k)}, that mapping
* is removed. (The map can contain at most one such mapping.)
*
* <p>Returns the value to which this map previously associated the key,
- * or <tt>null</tt> if the map contained no mapping for the key.
+ * or {@code null} if the map contained no mapping for the key.
*
* <p>If this map permits null values, then a return value of
- * <tt>null</tt> does not <i>necessarily</i> indicate that the map
+ * {@code null} does not <i>necessarily</i> indicate that the map
* contained no mapping for the key; it's also possible that the map
- * explicitly mapped the key to <tt>null</tt>.
+ * explicitly mapped the key to {@code null}.
*
* <p>The map will not contain a mapping for the specified key once the
* call returns.
*
* @param key key whose mapping is to be removed from the map
- * @return the previous value associated with <tt>key</tt>, or
- * <tt>null</tt> if there was no mapping for <tt>key</tt>.
- * @throws UnsupportedOperationException if the <tt>remove</tt> operation
+ * @return the previous value associated with {@code key}, or
+ * {@code null} if there was no mapping for {@code key}.
+ * @throws UnsupportedOperationException if the {@code remove} operation
* is not supported by this map
* @throws ClassCastException if the key is of an inappropriate type for
* this map
@@ -278,12 +279,12 @@
* Copies all of the mappings from the specified map to this map
* (optional operation). The effect of this call is equivalent to that
* of calling {@link #put(Object,Object) put(k, v)} on this map once
- * for each mapping from key <tt>k</tt> to value <tt>v</tt> in the
+ * for each mapping from key {@code k} to value {@code v} in the
* specified map. The behavior of this operation is undefined if the
* specified map is modified while the operation is in progress.
*
* @param m mappings to be stored in this map
- * @throws UnsupportedOperationException if the <tt>putAll</tt> operation
+ * @throws UnsupportedOperationException if the {@code putAll} operation
* is not supported by this map
* @throws ClassCastException if the class of a key or value in the
* specified map prevents it from being stored in this map
@@ -299,7 +300,7 @@
* Removes all of the mappings from this map (optional operation).
* The map will be empty after this call returns.
*
- * @throws UnsupportedOperationException if the <tt>clear</tt> operation
+ * @throws UnsupportedOperationException if the {@code clear} operation
* is not supported by this map
*/
void clear();
@@ -312,12 +313,12 @@
* The set is backed by the map, so changes to the map are
* reflected in the set, and vice-versa. If the map is modified
* while an iteration over the set is in progress (except through
- * the iterator's own <tt>remove</tt> operation), the results of
+ * the iterator's own {@code remove} operation), the results of
* the iteration are undefined. The set supports element removal,
* which removes the corresponding mapping from the map, via the
- * <tt>Iterator.remove</tt>, <tt>Set.remove</tt>,
- * <tt>removeAll</tt>, <tt>retainAll</tt>, and <tt>clear</tt>
- * operations. It does not support the <tt>add</tt> or <tt>addAll</tt>
+ * {@code Iterator.remove}, {@code Set.remove},
+ * {@code removeAll}, {@code retainAll}, and {@code clear}
+ * operations. It does not support the {@code add} or {@code addAll}
* operations.
*
* @return a set view of the keys contained in this map
@@ -329,13 +330,13 @@
* The collection is backed by the map, so changes to the map are
* reflected in the collection, and vice-versa. If the map is
* modified while an iteration over the collection is in progress
- * (except through the iterator's own <tt>remove</tt> operation),
+ * (except through the iterator's own {@code remove} operation),
* the results of the iteration are undefined. The collection
* supports element removal, which removes the corresponding
- * mapping from the map, via the <tt>Iterator.remove</tt>,
- * <tt>Collection.remove</tt>, <tt>removeAll</tt>,
- * <tt>retainAll</tt> and <tt>clear</tt> operations. It does not
- * support the <tt>add</tt> or <tt>addAll</tt> operations.
+ * mapping from the map, via the {@code Iterator.remove},
+ * {@code Collection.remove}, {@code removeAll},
+ * {@code retainAll} and {@code clear} operations. It does not
+ * support the {@code add} or {@code addAll} operations.
*
* @return a collection view of the values contained in this map
*/
@@ -346,28 +347,28 @@
* The set is backed by the map, so changes to the map are
* reflected in the set, and vice-versa. If the map is modified
* while an iteration over the set is in progress (except through
- * the iterator's own <tt>remove</tt> operation, or through the
- * <tt>setValue</tt> operation on a map entry returned by the
+ * the iterator's own {@code remove} operation, or through the
+ * {@code setValue} operation on a map entry returned by the
* iterator) the results of the iteration are undefined. The set
* supports element removal, which removes the corresponding
- * mapping from the map, via the <tt>Iterator.remove</tt>,
- * <tt>Set.remove</tt>, <tt>removeAll</tt>, <tt>retainAll</tt> and
- * <tt>clear</tt> operations. It does not support the
- * <tt>add</tt> or <tt>addAll</tt> operations.
+ * mapping from the map, via the {@code Iterator.remove},
+ * {@code Set.remove}, {@code removeAll}, {@code retainAll} and
+ * {@code clear} operations. It does not support the
+ * {@code add} or {@code addAll} operations.
*
* @return a set view of the mappings contained in this map
*/
Set<Map.Entry<K, V>> entrySet();
/**
- * A map entry (key-value pair). The <tt>Map.entrySet</tt> method returns
+ * A map entry (key-value pair). The {@code Map.entrySet} method returns
* a collection-view of the map, whose elements are of this class. The
* <i>only</i> way to obtain a reference to a map entry is from the
- * iterator of this collection-view. These <tt>Map.Entry</tt> objects are
+ * iterator of this collection-view. These {@code Map.Entry} objects are
* valid <i>only</i> for the duration of the iteration; more formally,
* the behavior of a map entry is undefined if the backing map has been
* modified after the entry was returned by the iterator, except through
- * the <tt>setValue</tt> operation on the map entry.
+ * the {@code setValue} operation on the map entry.
*
* @see Map#entrySet()
* @since 1.2
@@ -386,7 +387,7 @@
/**
* Returns the value corresponding to this entry. If the mapping
* has been removed from the backing map (by the iterator's
- * <tt>remove</tt> operation), the results of this call are undefined.
+ * {@code remove} operation), the results of this call are undefined.
*
* @return the value corresponding to this entry
* @throws IllegalStateException implementations may, but are not
@@ -399,11 +400,11 @@
* Replaces the value corresponding to this entry with the specified
* value (optional operation). (Writes through to the map.) The
* behavior of this call is undefined if the mapping has already been
- * removed from the map (by the iterator's <tt>remove</tt> operation).
+ * removed from the map (by the iterator's {@code remove} operation).
*
* @param value new value to be stored in this entry
* @return old value corresponding to the entry
- * @throws UnsupportedOperationException if the <tt>put</tt> operation
+ * @throws UnsupportedOperationException if the {@code put} operation
* is not supported by the backing map
* @throws ClassCastException if the class of the specified value
* prevents it from being stored in the backing map
@@ -419,34 +420,34 @@
/**
* Compares the specified object with this entry for equality.
- * Returns <tt>true</tt> if the given object is also a map entry and
+ * Returns {@code true} if the given object is also a map entry and
* the two entries represent the same mapping. More formally, two
- * entries <tt>e1</tt> and <tt>e2</tt> represent the same mapping
+ * entries {@code e1} and {@code e2} represent the same mapping
* if<pre>
* (e1.getKey()==null ?
* e2.getKey()==null : e1.getKey().equals(e2.getKey())) &&
* (e1.getValue()==null ?
* e2.getValue()==null : e1.getValue().equals(e2.getValue()))
* </pre>
- * This ensures that the <tt>equals</tt> method works properly across
- * different implementations of the <tt>Map.Entry</tt> interface.
+ * This ensures that the {@code equals} method works properly across
+ * different implementations of the {@code Map.Entry} interface.
*
* @param o object to be compared for equality with this map entry
- * @return <tt>true</tt> if the specified object is equal to this map
+ * @return {@code true} if the specified object is equal to this map
* entry
*/
boolean equals(Object o);
/**
* Returns the hash code value for this map entry. The hash code
- * of a map entry <tt>e</tt> is defined to be: <pre>
+ * of a map entry {@code e} is defined to be: <pre>
* (e.getKey()==null ? 0 : e.getKey().hashCode()) ^
* (e.getValue()==null ? 0 : e.getValue().hashCode())
* </pre>
- * This ensures that <tt>e1.equals(e2)</tt> implies that
- * <tt>e1.hashCode()==e2.hashCode()</tt> for any two Entries
- * <tt>e1</tt> and <tt>e2</tt>, as required by the general
- * contract of <tt>Object.hashCode</tt>.
+ * This ensures that {@code e1.equals(e2)} implies that
+ * {@code e1.hashCode()==e2.hashCode()} for any two Entries
+ * {@code e1} and {@code e2}, as required by the general
+ * contract of {@code Object.hashCode}.
*
* @return the hash code value for this map entry
* @see Object#hashCode()
@@ -532,24 +533,24 @@
/**
* Compares the specified object with this map for equality. Returns
- * <tt>true</tt> if the given object is also a map and the two maps
- * represent the same mappings. More formally, two maps <tt>m1</tt> and
- * <tt>m2</tt> represent the same mappings if
- * <tt>m1.entrySet().equals(m2.entrySet())</tt>. This ensures that the
- * <tt>equals</tt> method works properly across different implementations
- * of the <tt>Map</tt> interface.
+ * {@code true} if the given object is also a map and the two maps
+ * represent the same mappings. More formally, two maps {@code m1} and
+ * {@code m2} represent the same mappings if
+ * {@code m1.entrySet().equals(m2.entrySet())}. This ensures that the
+ * {@code equals} method works properly across different implementations
+ * of the {@code Map} interface.
*
* @param o object to be compared for equality with this map
- * @return <tt>true</tt> if the specified object is equal to this map
+ * @return {@code true} if the specified object is equal to this map
*/
boolean equals(Object o);
/**
* Returns the hash code value for this map. The hash code of a map is
* defined to be the sum of the hash codes of each entry in the map's
- * <tt>entrySet()</tt> view. This ensures that <tt>m1.equals(m2)</tt>
- * implies that <tt>m1.hashCode()==m2.hashCode()</tt> for any two maps
- * <tt>m1</tt> and <tt>m2</tt>, as required by the general contract of
+ * {@code entrySet()} view. This ensures that {@code m1.equals(m2)}
+ * implies that {@code m1.hashCode()==m2.hashCode()} for any two maps
+ * {@code m1} and {@code m2}, as required by the general contract of
* {@link Object#hashCode}.
*
* @return the hash code value for this map
diff --git a/jdk/src/java.base/share/classes/java/util/MissingFormatArgumentException.java b/jdk/src/java.base/share/classes/java/util/MissingFormatArgumentException.java
index 79b04a3..926a697 100644
--- a/jdk/src/java.base/share/classes/java/util/MissingFormatArgumentException.java
+++ b/jdk/src/java.base/share/classes/java/util/MissingFormatArgumentException.java
@@ -30,7 +30,7 @@
* have a corresponding argument or if an argument index refers to an argument
* that does not exist.
*
- * <p> Unless otherwise specified, passing a <tt>null</tt> argument to any
+ * <p> Unless otherwise specified, passing a {@code null} argument to any
* method or constructor in this class will cause a {@link
* NullPointerException} to be thrown.
*
diff --git a/jdk/src/java.base/share/classes/java/util/MissingFormatWidthException.java b/jdk/src/java.base/share/classes/java/util/MissingFormatWidthException.java
index 9650fe2..e748695 100644
--- a/jdk/src/java.base/share/classes/java/util/MissingFormatWidthException.java
+++ b/jdk/src/java.base/share/classes/java/util/MissingFormatWidthException.java
@@ -28,7 +28,7 @@
/**
* Unchecked exception thrown when the format width is required.
*
- * <p> Unless otherwise specified, passing a <tt>null</tt> argument to any
+ * <p> Unless otherwise specified, passing a {@code null} argument to any
* method or constructor in this class will cause a {@link
* NullPointerException} to be thrown.
*
diff --git a/jdk/src/java.base/share/classes/java/util/MissingResourceException.java b/jdk/src/java.base/share/classes/java/util/MissingResourceException.java
index 5602739..3e09dfa 100644
--- a/jdk/src/java.base/share/classes/java/util/MissingResourceException.java
+++ b/jdk/src/java.base/share/classes/java/util/MissingResourceException.java
@@ -64,10 +64,10 @@
}
/**
- * Constructs a <code>MissingResourceException</code> with
- * <code>message</code>, <code>className</code>, <code>key</code>,
- * and <code>cause</code>. This constructor is package private for
- * use by <code>ResourceBundle.getBundle</code>.
+ * Constructs a {@code MissingResourceException} with
+ * {@code message}, {@code className}, {@code key},
+ * and {@code cause}. This constructor is package private for
+ * use by {@code ResourceBundle.getBundle}.
*
* @param message
* the detail message
diff --git a/jdk/src/java.base/share/classes/java/util/NoSuchElementException.java b/jdk/src/java.base/share/classes/java/util/NoSuchElementException.java
index 0469cd9..6ce6c28 100644
--- a/jdk/src/java.base/share/classes/java/util/NoSuchElementException.java
+++ b/jdk/src/java.base/share/classes/java/util/NoSuchElementException.java
@@ -39,7 +39,7 @@
private static final long serialVersionUID = 6769829250639411880L;
/**
- * Constructs a <code>NoSuchElementException</code> with <tt>null</tt>
+ * Constructs a {@code NoSuchElementException} with {@code null}
* as its error message string.
*/
public NoSuchElementException() {
@@ -47,9 +47,9 @@
}
/**
- * Constructs a <code>NoSuchElementException</code>, saving a reference
- * to the error message string <tt>s</tt> for later retrieval by the
- * <tt>getMessage</tt> method.
+ * Constructs a {@code NoSuchElementException}, saving a reference
+ * to the error message string {@code s} for later retrieval by the
+ * {@code getMessage} method.
*
* @param s the detail message.
*/
diff --git a/jdk/src/java.base/share/classes/java/util/Observable.java b/jdk/src/java.base/share/classes/java/util/Observable.java
index af39bda..cff9e1f 100644
--- a/jdk/src/java.base/share/classes/java/util/Observable.java
+++ b/jdk/src/java.base/share/classes/java/util/Observable.java
@@ -31,11 +31,11 @@
* object that the application wants to have observed.
* <p>
* An observable object can have one or more observers. An observer
- * may be any object that implements interface <tt>Observer</tt>. After an
+ * may be any object that implements interface {@code Observer}. After an
* observable instance changes, an application calling the
- * <code>Observable</code>'s <code>notifyObservers</code> method
+ * {@code Observable}'s {@code notifyObservers} method
* causes all of its observers to be notified of the change by a call
- * to their <code>update</code> method.
+ * to their {@code update} method.
* <p>
* The order in which notifications will be delivered is unspecified.
* The default implementation provided in the Observable class will
@@ -45,12 +45,12 @@
* subclass follows this order, as they choose.
* <p>
* Note that this notification mechanism has nothing to do with threads
- * and is completely separate from the <tt>wait</tt> and <tt>notify</tt>
- * mechanism of class <tt>Object</tt>.
+ * and is completely separate from the {@code wait} and {@code notify}
+ * mechanism of class {@code Object}.
* <p>
* When an observable object is newly created, its set of observers is
* empty. Two observers are considered the same if and only if the
- * <tt>equals</tt> method returns true for them.
+ * {@code equals} method returns true for them.
*
* @author Chris Warth
* @see java.util.Observable#notifyObservers()
@@ -88,7 +88,7 @@
/**
* Deletes an observer from the set of observers of this object.
- * Passing <CODE>null</CODE> to this method will have no effect.
+ * Passing {@code null} to this method will have no effect.
* @param o the observer to be deleted.
*/
public synchronized void deleteObserver(Observer o) {
@@ -97,15 +97,15 @@
/**
* If this object has changed, as indicated by the
- * <code>hasChanged</code> method, then notify all of its observers
- * and then call the <code>clearChanged</code> method to
+ * {@code hasChanged} method, then notify all of its observers
+ * and then call the {@code clearChanged} method to
* indicate that this object has no longer changed.
* <p>
- * Each observer has its <code>update</code> method called with two
- * arguments: this observable object and <code>null</code>. In other
+ * Each observer has its {@code update} method called with two
+ * arguments: this observable object and {@code null}. In other
* words, this method is equivalent to:
- * <blockquote><tt>
- * notifyObservers(null)</tt></blockquote>
+ * <blockquote>{@code
+ * notifyObservers(null)}</blockquote>
*
* @see java.util.Observable#clearChanged()
* @see java.util.Observable#hasChanged()
@@ -117,12 +117,12 @@
/**
* If this object has changed, as indicated by the
- * <code>hasChanged</code> method, then notify all of its observers
- * and then call the <code>clearChanged</code> method to indicate
+ * {@code hasChanged} method, then notify all of its observers
+ * and then call the {@code clearChanged} method to indicate
* that this object has no longer changed.
* <p>
- * Each observer has its <code>update</code> method called with two
- * arguments: this observable object and the <code>arg</code> argument.
+ * Each observer has its {@code update} method called with two
+ * arguments: this observable object and the {@code arg} argument.
*
* @param arg any object.
* @see java.util.Observable#clearChanged()
@@ -167,8 +167,8 @@
}
/**
- * Marks this <tt>Observable</tt> object as having been changed; the
- * <tt>hasChanged</tt> method will now return <tt>true</tt>.
+ * Marks this {@code Observable} object as having been changed; the
+ * {@code hasChanged} method will now return {@code true}.
*/
protected synchronized void setChanged() {
changed = true;
@@ -177,9 +177,9 @@
/**
* Indicates that this object has no longer changed, or that it has
* already notified all of its observers of its most recent change,
- * so that the <tt>hasChanged</tt> method will now return <tt>false</tt>.
+ * so that the {@code hasChanged} method will now return {@code false}.
* This method is called automatically by the
- * <code>notifyObservers</code> methods.
+ * {@code notifyObservers} methods.
*
* @see java.util.Observable#notifyObservers()
* @see java.util.Observable#notifyObservers(java.lang.Object)
@@ -191,10 +191,10 @@
/**
* Tests if this object has changed.
*
- * @return <code>true</code> if and only if the <code>setChanged</code>
+ * @return {@code true} if and only if the {@code setChanged}
* method has been called more recently than the
- * <code>clearChanged</code> method on this object;
- * <code>false</code> otherwise.
+ * {@code clearChanged} method on this object;
+ * {@code false} otherwise.
* @see java.util.Observable#clearChanged()
* @see java.util.Observable#setChanged()
*/
@@ -203,7 +203,7 @@
}
/**
- * Returns the number of observers of this <tt>Observable</tt> object.
+ * Returns the number of observers of this {@code Observable} object.
*
* @return the number of observers of this object.
*/
diff --git a/jdk/src/java.base/share/classes/java/util/Observer.java b/jdk/src/java.base/share/classes/java/util/Observer.java
index e9694fe..2db27b4 100644
--- a/jdk/src/java.base/share/classes/java/util/Observer.java
+++ b/jdk/src/java.base/share/classes/java/util/Observer.java
@@ -25,7 +25,7 @@
package java.util;
/**
- * A class can implement the <code>Observer</code> interface when it
+ * A class can implement the {@code Observer} interface when it
* wants to be informed of changes in observable objects.
*
* @author Chris Warth
@@ -35,12 +35,12 @@
public interface Observer {
/**
* This method is called whenever the observed object is changed. An
- * application calls an <tt>Observable</tt> object's
- * <code>notifyObservers</code> method to have all the object's
+ * application calls an {@code Observable} object's
+ * {@code notifyObservers} method to have all the object's
* observers notified of the change.
*
* @param o the observable object.
- * @param arg an argument passed to the <code>notifyObservers</code>
+ * @param arg an argument passed to the {@code notifyObservers}
* method.
*/
void update(Observable o, Object arg);
diff --git a/jdk/src/java.base/share/classes/java/util/Properties.java b/jdk/src/java.base/share/classes/java/util/Properties.java
index 0d983e5..1eddbab 100644
--- a/jdk/src/java.base/share/classes/java/util/Properties.java
+++ b/jdk/src/java.base/share/classes/java/util/Properties.java
@@ -60,12 +60,12 @@
* object that contains a non-{@code String} key.
*
* <p>
- * The {@link #load(java.io.Reader) load(Reader)} <tt>/</tt>
+ * The {@link #load(java.io.Reader) load(Reader)} {@code /}
* {@link #store(java.io.Writer, java.lang.String) store(Writer, String)}
* methods load and store properties from and to a character based stream
* in a simple line-oriented format specified below.
*
- * The {@link #load(java.io.InputStream) load(InputStream)} <tt>/</tt>
+ * The {@link #load(java.io.InputStream) load(InputStream)} {@code /}
* {@link #store(java.io.OutputStream, java.lang.String) store(OutputStream, String)}
* methods work the same way as the load(Reader)/store(Writer, String) pair, except
* the input/output stream is encoded in ISO 8859-1 character encoding.
@@ -105,7 +105,7 @@
* </pre>
*
* <p>This class is thread-safe: multiple threads can share a single
- * <tt>Properties</tt> object without the need for external synchronization.
+ * {@code Properties} object without the need for external synchronization.
*
* @author Arthur van Hoff
* @author Michael McCloskey
@@ -144,13 +144,13 @@
}
/**
- * Calls the <tt>Hashtable</tt> method {@code put}. Provided for
- * parallelism with the <tt>getProperty</tt> method. Enforces use of
+ * Calls the {@code Hashtable} method {@code put}. Provided for
+ * parallelism with the {@code getProperty} method. Enforces use of
* strings for property keys and values. The value returned is the
- * result of the <tt>Hashtable</tt> call to {@code put}.
+ * result of the {@code Hashtable} call to {@code put}.
*
* @param key the key to be placed into this property list.
- * @param value the value corresponding to <tt>key</tt>.
+ * @param value the value corresponding to {@code key}.
* @return the previous value of the specified key in this property
* list, or {@code null} if it did not have one.
* @see #getProperty
@@ -756,7 +756,7 @@
* @param writer an output character stream writer.
* @param comments a description of the property list.
* @exception IOException if writing this property list to the specified
- * output stream throws an <tt>IOException</tt>.
+ * output stream throws an {@code IOException}.
* @exception ClassCastException if this {@code Properties} object
* contains any keys or values that are not {@code Strings}.
* @exception NullPointerException if {@code writer} is null.
@@ -803,7 +803,7 @@
* @param out an output stream.
* @param comments a description of the property list.
* @exception IOException if writing this property list to the specified
- * output stream throws an <tt>IOException</tt>.
+ * output stream throws an {@code IOException}.
* @exception ClassCastException if this {@code Properties} object
* contains any keys or values that are not {@code Strings}.
* @exception NullPointerException if {@code out} is null.
@@ -860,7 +860,7 @@
*
* @param in the input stream from which to read the XML document.
* @throws IOException if reading from the specified input stream
- * results in an <tt>IOException</tt>.
+ * results in an {@code IOException}.
* @throws java.io.UnsupportedEncodingException if the document's encoding
* declaration can be read and it specifies an encoding that is not
* supported
@@ -885,15 +885,15 @@
* Emits an XML document representing all of the properties contained
* in this table.
*
- * <p> An invocation of this method of the form <tt>props.storeToXML(os,
- * comment)</tt> behaves in exactly the same way as the invocation
- * <tt>props.storeToXML(os, comment, "UTF-8");</tt>.
+ * <p> An invocation of this method of the form {@code props.storeToXML(os,
+ * comment)} behaves in exactly the same way as the invocation
+ * {@code props.storeToXML(os, comment, "UTF-8");}.
*
* @param os the output stream on which to emit the XML document.
* @param comment a description of the property list, or {@code null}
* if no comment is desired.
* @throws IOException if writing to the specified output stream
- * results in an <tt>IOException</tt>.
+ * results in an {@code IOException}.
* @throws NullPointerException if {@code os} is null.
* @throws ClassCastException if this {@code Properties} object
* contains any keys or values that are not
@@ -933,7 +933,7 @@
* character encoding</a>
*
* @throws IOException if writing to the specified output stream
- * results in an <tt>IOException</tt>.
+ * results in an {@code IOException}.
* @throws java.io.UnsupportedEncodingException if the encoding is not
* supported by the implementation.
* @throws NullPointerException if {@code os} is {@code null},
@@ -1016,10 +1016,10 @@
* including distinct keys in the default property list if a key
* of the same name has not already been found from the main
* properties list. Properties whose key or value is not
- * of type <tt>String</tt> are omitted.
+ * of type {@code String} are omitted.
* <p>
- * The returned set is not backed by the <tt>Properties</tt> object.
- * Changes to this <tt>Properties</tt> are not reflected in the set,
+ * The returned set is not backed by the {@code Properties} object.
+ * Changes to this {@code Properties} are not reflected in the set,
* or vice versa.
*
* @return a set of keys in this property list where
diff --git a/jdk/src/java.base/share/classes/java/util/RandomAccess.java b/jdk/src/java.base/share/classes/java/util/RandomAccess.java
index 09ce29e..a4d4893 100644
--- a/jdk/src/java.base/share/classes/java/util/RandomAccess.java
+++ b/jdk/src/java.base/share/classes/java/util/RandomAccess.java
@@ -26,27 +26,27 @@
package java.util;
/**
- * Marker interface used by <tt>List</tt> implementations to indicate that
+ * Marker interface used by {@code List} implementations to indicate that
* they support fast (generally constant time) random access. The primary
* purpose of this interface is to allow generic algorithms to alter their
* behavior to provide good performance when applied to either random or
* sequential access lists.
*
* <p>The best algorithms for manipulating random access lists (such as
- * <tt>ArrayList</tt>) can produce quadratic behavior when applied to
- * sequential access lists (such as <tt>LinkedList</tt>). Generic list
+ * {@code ArrayList}) can produce quadratic behavior when applied to
+ * sequential access lists (such as {@code LinkedList}). Generic list
* algorithms are encouraged to check whether the given list is an
- * <tt>instanceof</tt> this interface before applying an algorithm that would
+ * {@code instanceof} this interface before applying an algorithm that would
* provide poor performance if it were applied to a sequential access list,
* and to alter their behavior if necessary to guarantee acceptable
* performance.
*
* <p>It is recognized that the distinction between random and sequential
- * access is often fuzzy. For example, some <tt>List</tt> implementations
+ * access is often fuzzy. For example, some {@code List} implementations
* provide asymptotically linear access times if they get huge, but constant
- * access times in practice. Such a <tt>List</tt> implementation
+ * access times in practice. Such a {@code List} implementation
* should generally implement this interface. As a rule of thumb, a
- * <tt>List</tt> implementation should implement this interface if,
+ * {@code List} implementation should implement this interface if,
* for typical instances of the class, this loop:
* <pre>
* for (int i=0, n=list.size(); i < n; i++)
diff --git a/jdk/src/java.base/share/classes/java/util/RegularEnumSet.java b/jdk/src/java.base/share/classes/java/util/RegularEnumSet.java
index 31a63f1..eef447e 100644
--- a/jdk/src/java.base/share/classes/java/util/RegularEnumSet.java
+++ b/jdk/src/java.base/share/classes/java/util/RegularEnumSet.java
@@ -123,19 +123,19 @@
}
/**
- * Returns <tt>true</tt> if this set contains no elements.
+ * Returns {@code true} if this set contains no elements.
*
- * @return <tt>true</tt> if this set contains no elements
+ * @return {@code true} if this set contains no elements
*/
public boolean isEmpty() {
return elements == 0;
}
/**
- * Returns <tt>true</tt> if this set contains the specified element.
+ * Returns {@code true} if this set contains the specified element.
*
* @param e element to be checked for containment in this collection
- * @return <tt>true</tt> if this set contains the specified element
+ * @return {@code true} if this set contains the specified element
*/
public boolean contains(Object e) {
if (e == null)
@@ -153,9 +153,9 @@
* Adds the specified element to this set if it is not already present.
*
* @param e element to be added to this set
- * @return <tt>true</tt> if the set changed as a result of the call
+ * @return {@code true} if the set changed as a result of the call
*
- * @throws NullPointerException if <tt>e</tt> is null
+ * @throws NullPointerException if {@code e} is null
*/
public boolean add(E e) {
typeCheck(e);
@@ -169,7 +169,7 @@
* Removes the specified element from this set if it is present.
*
* @param e element to be removed from this set, if present
- * @return <tt>true</tt> if the set contained the specified element
+ * @return {@code true} if the set contained the specified element
*/
public boolean remove(Object e) {
if (e == null)
@@ -186,11 +186,11 @@
// Bulk Operations
/**
- * Returns <tt>true</tt> if this set contains all of the elements
+ * Returns {@code true} if this set contains all of the elements
* in the specified collection.
*
* @param c collection to be checked for containment in this set
- * @return <tt>true</tt> if this set contains all of the elements
+ * @return {@code true} if this set contains all of the elements
* in the specified collection
* @throws NullPointerException if the specified collection is null
*/
@@ -209,7 +209,7 @@
* Adds all of the elements in the specified collection to this set.
*
* @param c collection whose elements are to be added to this set
- * @return <tt>true</tt> if this set changed as a result of the call
+ * @return {@code true} if this set changed as a result of the call
* @throws NullPointerException if the specified collection or any
* of its elements are null
*/
@@ -236,7 +236,7 @@
* the specified collection.
*
* @param c elements to be removed from this set
- * @return <tt>true</tt> if this set changed as a result of the call
+ * @return {@code true} if this set changed as a result of the call
* @throws NullPointerException if the specified collection is null
*/
public boolean removeAll(Collection<?> c) {
@@ -257,7 +257,7 @@
* specified collection.
*
* @param c elements to be retained in this set
- * @return <tt>true</tt> if this set changed as a result of the call
+ * @return {@code true} if this set changed as a result of the call
* @throws NullPointerException if the specified collection is null
*/
public boolean retainAll(Collection<?> c) {
@@ -285,12 +285,12 @@
/**
* Compares the specified object with this set for equality. Returns
- * <tt>true</tt> if the given object is also a set, the two sets have
+ * {@code true} if the given object is also a set, the two sets have
* the same size, and every member of the given set is contained in
* this set.
*
* @param o object to be compared for equality with this set
- * @return <tt>true</tt> if the specified object is equal to this set
+ * @return {@code true} if the specified object is equal to this set
*/
public boolean equals(Object o) {
if (!(o instanceof RegularEnumSet))
diff --git a/jdk/src/java.base/share/classes/java/util/Scanner.java b/jdk/src/java.base/share/classes/java/util/Scanner.java
index 6839648..6577cab 100644
--- a/jdk/src/java.base/share/classes/java/util/Scanner.java
+++ b/jdk/src/java.base/share/classes/java/util/Scanner.java
@@ -42,20 +42,20 @@
* A simple text scanner which can parse primitive types and strings using
* regular expressions.
*
- * <p>A <code>Scanner</code> breaks its input into tokens using a
+ * <p>A {@code Scanner} breaks its input into tokens using a
* delimiter pattern, which by default matches whitespace. The resulting
* tokens may then be converted into values of different types using the
- * various <tt>next</tt> methods.
+ * various {@code next} methods.
*
* <p>For example, this code allows a user to read a number from
- * <tt>System.in</tt>:
+ * {@code System.in}:
* <blockquote><pre>{@code
* Scanner sc = new Scanner(System.in);
* int i = sc.nextInt();
* }</pre></blockquote>
*
- * <p>As another example, this code allows <code>long</code> types to be
- * assigned from entries in a file <code>myNumbers</code>:
+ * <p>As another example, this code allows {@code long} types to be
+ * assigned from entries in a file {@code myNumbers}:
* <blockquote><pre>{@code
* Scanner sc = new Scanner(new File("myNumbers"));
* while (sc.hasNextLong()) {
@@ -106,10 +106,10 @@
* <p>The {@link #next} and {@link #hasNext} methods and their
* primitive-type companion methods (such as {@link #nextInt} and
* {@link #hasNextInt}) first skip any input that matches the delimiter
- * pattern, and then attempt to return the next token. Both <tt>hasNext</tt>
- * and <tt>next</tt> methods may block waiting for further input. Whether a
- * <tt>hasNext</tt> method blocks has no connection to whether or not its
- * associated <tt>next</tt> method will block.
+ * pattern, and then attempt to return the next token. Both {@code hasNext}
+ * and {@code next} methods may block waiting for further input. Whether a
+ * {@code hasNext} method blocks has no connection to whether or not its
+ * associated {@code next} method will block.
*
* <p> The {@link #findInLine}, {@link #findWithinHorizon}, and {@link #skip}
* methods operate independently of the delimiter pattern. These methods will
@@ -122,32 +122,32 @@
* retrieved or skipped via some other method.
*
* <p>Depending upon the type of delimiting pattern, empty tokens may be
- * returned. For example, the pattern <tt>"\\s+"</tt> will return no empty
+ * returned. For example, the pattern {@code "\\s+"} will return no empty
* tokens since it matches multiple instances of the delimiter. The delimiting
- * pattern <tt>"\\s"</tt> could return empty tokens since it only passes one
+ * pattern {@code "\\s"} could return empty tokens since it only passes one
* space at a time.
*
* <p> A scanner can read text from any object which implements the {@link
* java.lang.Readable} interface. If an invocation of the underlying
* readable's {@link java.lang.Readable#read} method throws an {@link
* java.io.IOException} then the scanner assumes that the end of the input
- * has been reached. The most recent <tt>IOException</tt> thrown by the
+ * has been reached. The most recent {@code IOException} thrown by the
* underlying readable can be retrieved via the {@link #ioException} method.
*
- * <p>When a <code>Scanner</code> is closed, it will close its input source
+ * <p>When a {@code Scanner} is closed, it will close its input source
* if the source implements the {@link java.io.Closeable} interface.
*
- * <p>A <code>Scanner</code> is not safe for multithreaded use without
+ * <p>A {@code Scanner} is not safe for multithreaded use without
* external synchronization.
*
- * <p>Unless otherwise mentioned, passing a <code>null</code> parameter into
- * any method of a <code>Scanner</code> will cause a
- * <code>NullPointerException</code> to be thrown.
+ * <p>Unless otherwise mentioned, passing a {@code null} parameter into
+ * any method of a {@code Scanner} will cause a
+ * {@code NullPointerException} to be thrown.
*
* <p>A scanner will default to interpreting numbers as decimal unless a
* different radix has been set by using the {@link #useRadix} method. The
* {@link #reset} method will reset the value of the scanner's radix to
- * <code>10</code> regardless of whether it was previously changed.
+ * {@code 10} regardless of whether it was previously changed.
*
* <h3> <a name="localized-numbers">Localized numbers</a> </h3>
*
@@ -162,50 +162,50 @@
*
* <p>The localized formats are defined in terms of the following parameters,
* which for a particular locale are taken from that locale's {@link
- * java.text.DecimalFormat DecimalFormat} object, <tt>df</tt>, and its and
+ * java.text.DecimalFormat DecimalFormat} object, {@code df}, and its and
* {@link java.text.DecimalFormatSymbols DecimalFormatSymbols} object,
- * <tt>dfs</tt>.
+ * {@code dfs}.
*
* <blockquote><dl>
* <dt><i>LocalGroupSeparator </i>
* <dd>The character used to separate thousands groups,
- * <i>i.e.,</i> <tt>dfs.</tt>{@link
+ * <i>i.e.,</i> {@code dfs.}{@link
* java.text.DecimalFormatSymbols#getGroupingSeparator
* getGroupingSeparator()}
* <dt><i>LocalDecimalSeparator </i>
* <dd>The character used for the decimal point,
- * <i>i.e.,</i> <tt>dfs.</tt>{@link
+ * <i>i.e.,</i> {@code dfs.}{@link
* java.text.DecimalFormatSymbols#getDecimalSeparator
* getDecimalSeparator()}
* <dt><i>LocalPositivePrefix </i>
* <dd>The string that appears before a positive number (may
- * be empty), <i>i.e.,</i> <tt>df.</tt>{@link
+ * be empty), <i>i.e.,</i> {@code df.}{@link
* java.text.DecimalFormat#getPositivePrefix
* getPositivePrefix()}
* <dt><i>LocalPositiveSuffix </i>
* <dd>The string that appears after a positive number (may be
- * empty), <i>i.e.,</i> <tt>df.</tt>{@link
+ * empty), <i>i.e.,</i> {@code df.}{@link
* java.text.DecimalFormat#getPositiveSuffix
* getPositiveSuffix()}
* <dt><i>LocalNegativePrefix </i>
* <dd>The string that appears before a negative number (may
- * be empty), <i>i.e.,</i> <tt>df.</tt>{@link
+ * be empty), <i>i.e.,</i> {@code df.}{@link
* java.text.DecimalFormat#getNegativePrefix
* getNegativePrefix()}
* <dt><i>LocalNegativeSuffix </i>
* <dd>The string that appears after a negative number (may be
- * empty), <i>i.e.,</i> <tt>df.</tt>{@link
+ * empty), <i>i.e.,</i> {@code df.}{@link
* java.text.DecimalFormat#getNegativeSuffix
* getNegativeSuffix()}
* <dt><i>LocalNaN </i>
* <dd>The string that represents not-a-number for
* floating-point values,
- * <i>i.e.,</i> <tt>dfs.</tt>{@link
+ * <i>i.e.,</i> {@code dfs.}{@link
* java.text.DecimalFormatSymbols#getNaN
* getNaN()}
* <dt><i>LocalInfinity </i>
* <dd>The string that represents infinity for floating-point
- * values, <i>i.e.,</i> <tt>dfs.</tt>{@link
+ * values, <i>i.e.,</i> {@code dfs.}{@link
* java.text.DecimalFormatSymbols#getInfinity
* getInfinity()}
* </dl></blockquote>
@@ -219,82 +219,82 @@
* <dl>
* <dt><i>NonAsciiDigit</i>:
* <dd>A non-ASCII character c for which
- * {@link java.lang.Character#isDigit Character.isDigit}<tt>(c)</tt>
+ * {@link java.lang.Character#isDigit Character.isDigit}{@code (c)}
* returns true
*
* <dt><i>Non0Digit</i>:
- * <dd><tt>[1-</tt><i>Rmax</i><tt>] | </tt><i>NonASCIIDigit</i>
+ * <dd>{@code [1-}<i>Rmax</i>{@code ] | }<i>NonASCIIDigit</i>
*
* <dt><i>Digit</i>:
- * <dd><tt>[0-</tt><i>Rmax</i><tt>] | </tt><i>NonASCIIDigit</i>
+ * <dd>{@code [0-}<i>Rmax</i>{@code ] | }<i>NonASCIIDigit</i>
*
* <dt><i>GroupedNumeral</i>:
- * <dd><tt>( </tt><i>Non0Digit</i>
- * <i>Digit</i><tt>?
- * </tt><i>Digit</i><tt>?</tt>
- * <dd> <tt>( </tt><i>LocalGroupSeparator</i>
+ * <dd><code>( </code><i>Non0Digit</i>
+ * <i>Digit</i>{@code ?
+ * }<i>Digit</i>{@code ?}
+ * <dd> <code>( </code><i>LocalGroupSeparator</i>
* <i>Digit</i>
* <i>Digit</i>
- * <i>Digit</i><tt> )+ )</tt>
+ * <i>Digit</i>{@code )+ )}
*
* <dt><i>Numeral</i>:
- * <dd><tt>( ( </tt><i>Digit</i><tt>+ )
- * | </tt><i>GroupedNumeral</i><tt> )</tt>
+ * <dd>{@code ( ( }<i>Digit</i>{@code + )
+ * | }<i>GroupedNumeral</i>{@code )}
*
* <dt><a name="Integer-regex"><i>Integer</i>:</a>
- * <dd><tt>( [-+]? ( </tt><i>Numeral</i><tt>
- * ) )</tt>
- * <dd><tt>| </tt><i>LocalPositivePrefix</i> <i>Numeral</i>
+ * <dd>{@code ( [-+]? ( }<i>Numeral</i>{@code
+ * ) )}
+ * <dd>{@code | }<i>LocalPositivePrefix</i> <i>Numeral</i>
* <i>LocalPositiveSuffix</i>
- * <dd><tt>| </tt><i>LocalNegativePrefix</i> <i>Numeral</i>
+ * <dd>{@code | }<i>LocalNegativePrefix</i> <i>Numeral</i>
* <i>LocalNegativeSuffix</i>
*
* <dt><i>DecimalNumeral</i>:
* <dd><i>Numeral</i>
- * <dd><tt>| </tt><i>Numeral</i>
+ * <dd>{@code | }<i>Numeral</i>
* <i>LocalDecimalSeparator</i>
- * <i>Digit</i><tt>*</tt>
- * <dd><tt>| </tt><i>LocalDecimalSeparator</i>
- * <i>Digit</i><tt>+</tt>
+ * <i>Digit</i>{@code *}
+ * <dd>{@code | }<i>LocalDecimalSeparator</i>
+ * <i>Digit</i>{@code +}
*
* <dt><i>Exponent</i>:
- * <dd><tt>( [eE] [+-]? </tt><i>Digit</i><tt>+ )</tt>
+ * <dd>{@code ( [eE] [+-]? }<i>Digit</i>{@code + )}
*
* <dt><a name="Decimal-regex"><i>Decimal</i>:</a>
- * <dd><tt>( [-+]? </tt><i>DecimalNumeral</i>
- * <i>Exponent</i><tt>? )</tt>
- * <dd><tt>| </tt><i>LocalPositivePrefix</i>
+ * <dd>{@code ( [-+]? }<i>DecimalNumeral</i>
+ * <i>Exponent</i>{@code ? )}
+ * <dd>{@code | }<i>LocalPositivePrefix</i>
* <i>DecimalNumeral</i>
* <i>LocalPositiveSuffix</i>
- * <i>Exponent</i><tt>?</tt>
- * <dd><tt>| </tt><i>LocalNegativePrefix</i>
+ * <i>Exponent</i>{@code ?}
+ * <dd>{@code | }<i>LocalNegativePrefix</i>
* <i>DecimalNumeral</i>
* <i>LocalNegativeSuffix</i>
- * <i>Exponent</i><tt>?</tt>
+ * <i>Exponent</i>{@code ?}
*
* <dt><i>HexFloat</i>:
- * <dd><tt>[-+]? 0[xX][0-9a-fA-F]*\.[0-9a-fA-F]+
- * ([pP][-+]?[0-9]+)?</tt>
+ * <dd>{@code [-+]? 0[xX][0-9a-fA-F]*\.[0-9a-fA-F]+
+ * ([pP][-+]?[0-9]+)?}
*
* <dt><i>NonNumber</i>:
- * <dd><tt>NaN
- * | </tt><i>LocalNan</i><tt>
+ * <dd>{@code NaN
+ * | }<i>LocalNan</i>{@code
* | Infinity
- * | </tt><i>LocalInfinity</i>
+ * | }<i>LocalInfinity</i>
*
* <dt><i>SignedNonNumber</i>:
- * <dd><tt>( [-+]? </tt><i>NonNumber</i><tt> )</tt>
- * <dd><tt>| </tt><i>LocalPositivePrefix</i>
+ * <dd>{@code ( [-+]? }<i>NonNumber</i>{@code )}
+ * <dd>{@code | }<i>LocalPositivePrefix</i>
* <i>NonNumber</i>
* <i>LocalPositiveSuffix</i>
- * <dd><tt>| </tt><i>LocalNegativePrefix</i>
+ * <dd>{@code | }<i>LocalNegativePrefix</i>
* <i>NonNumber</i>
* <i>LocalNegativeSuffix</i>
*
* <dt><a name="Float-regex"><i>Float</i></a>:
* <dd><i>Decimal</i>
- * <tt>| </tt><i>HexFloat</i>
- * <tt>| </tt><i>SignedNonNumber</i>
+ * {@code | }<i>HexFloat</i>
+ * {@code | }<i>SignedNonNumber</i>
*
* </dl>
* <p>Whitespace is not significant in the above regular expressions.
@@ -521,7 +521,7 @@
// Constructors
/**
- * Constructs a <code>Scanner</code> that returns values scanned
+ * Constructs a {@code Scanner} that returns values scanned
* from the specified source delimited by the specified pattern.
*
* @param source A character source implementing the Readable interface
@@ -541,7 +541,7 @@
}
/**
- * Constructs a new <code>Scanner</code> that produces values scanned
+ * Constructs a new {@code Scanner} that produces values scanned
* from the specified source.
*
* @param source A character source implementing the {@link Readable}
@@ -552,7 +552,7 @@
}
/**
- * Constructs a new <code>Scanner</code> that produces values scanned
+ * Constructs a new {@code Scanner} that produces values scanned
* from the specified input stream. Bytes from the stream are converted
* into characters using the underlying platform's
* {@linkplain java.nio.charset.Charset#defaultCharset() default charset}.
@@ -564,7 +564,7 @@
}
/**
- * Constructs a new <code>Scanner</code> that produces values scanned
+ * Constructs a new {@code Scanner} that produces values scanned
* from the specified input stream. Bytes from the stream are converted
* into characters using the specified charset.
*
@@ -599,7 +599,7 @@
}
/**
- * Constructs a new <code>Scanner</code> that produces values scanned
+ * Constructs a new {@code Scanner} that produces values scanned
* from the specified file. Bytes from the file are converted into
* characters using the underlying platform's
* {@linkplain java.nio.charset.Charset#defaultCharset() default charset}.
@@ -612,7 +612,7 @@
}
/**
- * Constructs a new <code>Scanner</code> that produces values scanned
+ * Constructs a new {@code Scanner} that produces values scanned
* from the specified file. Bytes from the file are converted into
* characters using the specified charset.
*
@@ -650,7 +650,7 @@
}
/**
- * Constructs a new <code>Scanner</code> that produces values scanned
+ * Constructs a new {@code Scanner} that produces values scanned
* from the specified file. Bytes from the file are converted into
* characters using the underlying platform's
* {@linkplain java.nio.charset.Charset#defaultCharset() default charset}.
@@ -669,7 +669,7 @@
}
/**
- * Constructs a new <code>Scanner</code> that produces values scanned
+ * Constructs a new {@code Scanner} that produces values scanned
* from the specified file. Bytes from the file are converted into
* characters using the specified charset.
*
@@ -693,7 +693,7 @@
}
/**
- * Constructs a new <code>Scanner</code> that produces values scanned
+ * Constructs a new {@code Scanner} that produces values scanned
* from the specified string.
*
* @param source A string to scan
@@ -703,7 +703,7 @@
}
/**
- * Constructs a new <code>Scanner</code> that produces values scanned
+ * Constructs a new {@code Scanner} that produces values scanned
* from the specified channel. Bytes from the source are converted into
* characters using the underlying platform's
* {@linkplain java.nio.charset.Charset#defaultCharset() default charset}.
@@ -720,7 +720,7 @@
}
/**
- * Constructs a new <code>Scanner</code> that produces values scanned
+ * Constructs a new {@code Scanner} that produces values scanned
* from the specified channel. Bytes from the source are converted into
* characters using the specified charset.
*
@@ -1077,7 +1077,7 @@
*
* <p> If this scanner has not yet been closed then if its underlying
* {@linkplain java.lang.Readable readable} also implements the {@link
- * java.io.Closeable} interface then the readable's <tt>close</tt> method
+ * java.io.Closeable} interface then the readable's {@code close} method
* will be invoked. If this scanner is already closed then invoking this
* method will have no effect.
*
@@ -1101,9 +1101,9 @@
}
/**
- * Returns the <code>IOException</code> last thrown by this
- * <code>Scanner</code>'s underlying <code>Readable</code>. This method
- * returns <code>null</code> if no such exception exists.
+ * Returns the {@code IOException} last thrown by this
+ * {@code Scanner}'s underlying {@code Readable}. This method
+ * returns {@code null} if no such exception exists.
*
* @return the last exception thrown by this scanner's readable
*/
@@ -1112,7 +1112,7 @@
}
/**
- * Returns the <code>Pattern</code> this <code>Scanner</code> is currently
+ * Returns the {@code Pattern} this {@code Scanner} is currently
* using to match delimiters.
*
* @return this scanner's delimiting pattern.
@@ -1134,11 +1134,11 @@
/**
* Sets this scanner's delimiting pattern to a pattern constructed from
- * the specified <code>String</code>.
+ * the specified {@code String}.
*
* <p> An invocation of this method of the form
- * <tt>useDelimiter(pattern)</tt> behaves in exactly the same way as the
- * invocation <tt>useDelimiter(Pattern.compile(pattern))</tt>.
+ * {@code useDelimiter(pattern)} behaves in exactly the same way as the
+ * invocation {@code useDelimiter(Pattern.compile(pattern))}.
*
* <p> Invoking the {@link #reset} method will set the scanner's delimiter
* to the <a href= "#default-delimiter">default</a>.
@@ -1236,12 +1236,12 @@
* number matching regular expressions; see
* <a href= "#localized-numbers">localized numbers</a> above.
*
- * <p>If the radix is less than <code>Character.MIN_RADIX</code>
- * or greater than <code>Character.MAX_RADIX</code>, then an
- * <code>IllegalArgumentException</code> is thrown.
+ * <p>If the radix is less than {@code Character.MIN_RADIX}
+ * or greater than {@code Character.MAX_RADIX}, then an
+ * {@code IllegalArgumentException} is thrown.
*
* <p>Invoking the {@link #reset} method will set the scanner's radix to
- * <code>10</code>.
+ * {@code 10}.
*
* @param radix The radix to use when scanning numbers
* @return this scanner
@@ -1271,15 +1271,15 @@
/**
* Returns the match result of the last scanning operation performed
- * by this scanner. This method throws <code>IllegalStateException</code>
+ * by this scanner. This method throws {@code IllegalStateException}
* if no match has been performed, or if the last match was
* not successful.
*
- * <p>The various <code>next</code>methods of <code>Scanner</code>
+ * <p>The various {@code next}methods of {@code Scanner}
* make a match result available if they complete without throwing an
* exception. For instance, after an invocation of the {@link #nextInt}
* method that returned an int, this method returns a
- * <code>MatchResult</code> for the search of the
+ * {@code MatchResult} for the search of the
* <a href="#Integer-regex"><i>Integer</i></a> regular expression
* defined above. Similarly the {@link #findInLine},
* {@link #findWithinHorizon}, and {@link #skip} methods will make a
@@ -1295,8 +1295,8 @@
}
/**
- * <p>Returns the string representation of this <code>Scanner</code>. The
- * string representation of a <code>Scanner</code> contains information
+ * <p>Returns the string representation of this {@code Scanner}. The
+ * string representation of a {@code Scanner} contains information
* that may be useful for debugging. The exact format is unspecified.
*
* @return The string representation of this scanner
@@ -1347,7 +1347,7 @@
* A complete token is preceded and followed by input that matches
* the delimiter pattern. This method may block while waiting for input
* to scan, even if a previous invocation of {@link #hasNext} returned
- * <code>true</code>.
+ * {@code true}.
*
* @return the next token
* @throws NoSuchElementException if no more tokens are available
@@ -1374,7 +1374,7 @@
/**
* The remove operation is not supported by this implementation of
- * <code>Iterator</code>.
+ * {@code Iterator}.
*
* @throws UnsupportedOperationException if this method is invoked.
* @see java.util.Iterator
@@ -1387,9 +1387,9 @@
* Returns true if the next token matches the pattern constructed from the
* specified string. The scanner does not advance past any input.
*
- * <p> An invocation of this method of the form <tt>hasNext(pattern)</tt>
+ * <p> An invocation of this method of the form {@code hasNext(pattern)}
* behaves in exactly the same way as the invocation
- * <tt>hasNext(Pattern.compile(pattern))</tt>.
+ * {@code hasNext(Pattern.compile(pattern))}.
*
* @param pattern a string specifying the pattern to scan
* @return true if and only if this scanner has another token matching
@@ -1405,9 +1405,9 @@
* specified string. If the match is successful, the scanner advances
* past the input that matched the pattern.
*
- * <p> An invocation of this method of the form <tt>next(pattern)</tt>
+ * <p> An invocation of this method of the form {@code next(pattern)}
* behaves in exactly the same way as the invocation
- * <tt>next(Pattern.compile(pattern))</tt>.
+ * {@code next(Pattern.compile(pattern))}.
*
* @param pattern a string specifying the pattern to scan
* @return the next token
@@ -1452,7 +1452,7 @@
/**
* Returns the next token if it matches the specified pattern. This
* method may block while waiting for input to scan, even if a previous
- * invocation of {@link #hasNext(Pattern)} returned <code>true</code>.
+ * invocation of {@link #hasNext(Pattern)} returned {@code true}.
* If the match is successful, the scanner advances past the input that
* matched the pattern.
*
@@ -1554,9 +1554,9 @@
* Attempts to find the next occurrence of a pattern constructed from the
* specified string, ignoring delimiters.
*
- * <p>An invocation of this method of the form <tt>findInLine(pattern)</tt>
+ * <p>An invocation of this method of the form {@code findInLine(pattern)}
* behaves in exactly the same way as the invocation
- * <tt>findInLine(Pattern.compile(pattern))</tt>.
+ * {@code findInLine(Pattern.compile(pattern))}.
*
* @param pattern a string specifying the pattern to search for
* @return the text that matched the specified pattern
@@ -1572,7 +1572,7 @@
* scanner advances past the input that matched and returns the string that
* matched the pattern.
* If no such pattern is detected in the input up to the next line
- * separator, then <code>null</code> is returned and the scanner's
+ * separator, then {@code null} is returned and the scanner's
* position is unchanged. This method may block waiting for input that
* matches the pattern.
*
@@ -1621,9 +1621,9 @@
* specified string, ignoring delimiters.
*
* <p>An invocation of this method of the form
- * <tt>findWithinHorizon(pattern)</tt> behaves in exactly the same way as
+ * {@code findWithinHorizon(pattern)} behaves in exactly the same way as
* the invocation
- * <tt>findWithinHorizon(Pattern.compile(pattern, horizon))</tt>.
+ * {@code findWithinHorizon(Pattern.compile(pattern, horizon))}.
*
* @param pattern a string specifying the pattern to search for
* @param horizon the search horizon
@@ -1645,14 +1645,14 @@
* null is returned and the scanner's position remains unchanged. This
* method may block waiting for input that matches the pattern.
*
- * <p>A scanner will never search more than <code>horizon</code> code
+ * <p>A scanner will never search more than {@code horizon} code
* points beyond its current position. Note that a match may be clipped
* by the horizon; that is, an arbitrary match result may have been
* different if the horizon had been larger. The scanner treats the
* horizon as a transparent, non-anchoring bound (see {@link
* Matcher#useTransparentBounds} and {@link Matcher#useAnchoringBounds}).
*
- * <p>If horizon is <code>0</code>, then the horizon is ignored and
+ * <p>If horizon is {@code 0}, then the horizon is ignored and
* this method continues to search through the input looking for the
* specified pattern without bound. In this case it may buffer all of
* the input searching for the pattern.
@@ -1696,7 +1696,7 @@
*
* <p>If a match to the specified pattern is not found at the
* current position, then no input is skipped and a
- * <tt>NoSuchElementException</tt> is thrown.
+ * {@code NoSuchElementException} is thrown.
*
* <p>Since this method seeks to match the specified pattern starting at
* the scanner's current position, patterns that can match a lot of
@@ -1704,8 +1704,8 @@
* amount of input.
*
* <p>Note that it is possible to skip something without risking a
- * <code>NoSuchElementException</code> by using a pattern that can
- * match nothing, e.g., <code>sc.skip("[ \t]*")</code>.
+ * {@code NoSuchElementException} by using a pattern that can
+ * match nothing, e.g., {@code sc.skip("[ \t]*")}.
*
* @param pattern a string specifying the pattern to skip over
* @return this scanner
@@ -1737,9 +1737,9 @@
* Skips input that matches a pattern constructed from the specified
* string.
*
- * <p> An invocation of this method of the form <tt>skip(pattern)</tt>
+ * <p> An invocation of this method of the form {@code skip(pattern)}
* behaves in exactly the same way as the invocation
- * <tt>skip(Pattern.compile(pattern))</tt>.
+ * {@code skip(Pattern.compile(pattern))}.
*
* @param pattern a string specifying the pattern to skip over
* @return this scanner
@@ -1767,7 +1767,7 @@
/**
* Scans the next token of the input into a boolean value and returns
- * that value. This method will throw <code>InputMismatchException</code>
+ * that value. This method will throw {@code InputMismatchException}
* if the next token cannot be translated into a valid boolean value.
* If the match is successful, the scanner advances past the input that
* matched.
@@ -1822,14 +1822,14 @@
}
/**
- * Scans the next token of the input as a <tt>byte</tt>.
+ * Scans the next token of the input as a {@code byte}.
*
* <p> An invocation of this method of the form
- * <tt>nextByte()</tt> behaves in exactly the same way as the
- * invocation <tt>nextByte(radix)</tt>, where <code>radix</code>
+ * {@code nextByte()} behaves in exactly the same way as the
+ * invocation {@code nextByte(radix)}, where {@code radix}
* is the default radix of this scanner.
*
- * @return the <tt>byte</tt> scanned from the input
+ * @return the {@code byte} scanned from the input
* @throws InputMismatchException
* if the next token does not match the <i>Integer</i>
* regular expression, or is out of range
@@ -1841,15 +1841,15 @@
}
/**
- * Scans the next token of the input as a <tt>byte</tt>.
- * This method will throw <code>InputMismatchException</code>
+ * Scans the next token of the input as a {@code byte}.
+ * This method will throw {@code InputMismatchException}
* if the next token cannot be translated into a valid byte value as
* described below. If the translation is successful, the scanner advances
* past the input that matched.
*
* <p> If the next token matches the <a
* href="#Integer-regex"><i>Integer</i></a> regular expression defined
- * above then the token is converted into a <tt>byte</tt> value as if by
+ * above then the token is converted into a {@code byte} value as if by
* removing all locale specific prefixes, group separators, and locale
* specific suffixes, then mapping non-ASCII digits into ASCII
* digits via {@link Character#digit Character.digit}, prepending a
@@ -1859,7 +1859,7 @@
* specified radix.
*
* @param radix the radix used to interpret the token as a byte value
- * @return the <tt>byte</tt> scanned from the input
+ * @return the {@code byte} scanned from the input
* @throws InputMismatchException
* if the next token does not match the <i>Integer</i>
* regular expression, or is out of range
@@ -1928,14 +1928,14 @@
}
/**
- * Scans the next token of the input as a <tt>short</tt>.
+ * Scans the next token of the input as a {@code short}.
*
* <p> An invocation of this method of the form
- * <tt>nextShort()</tt> behaves in exactly the same way as the
- * invocation <tt>nextShort(radix)</tt>, where <code>radix</code>
+ * {@code nextShort()} behaves in exactly the same way as the
+ * invocation {@code nextShort(radix)}, where {@code radix}
* is the default radix of this scanner.
*
- * @return the <tt>short</tt> scanned from the input
+ * @return the {@code short} scanned from the input
* @throws InputMismatchException
* if the next token does not match the <i>Integer</i>
* regular expression, or is out of range
@@ -1947,15 +1947,15 @@
}
/**
- * Scans the next token of the input as a <tt>short</tt>.
- * This method will throw <code>InputMismatchException</code>
+ * Scans the next token of the input as a {@code short}.
+ * This method will throw {@code InputMismatchException}
* if the next token cannot be translated into a valid short value as
* described below. If the translation is successful, the scanner advances
* past the input that matched.
*
* <p> If the next token matches the <a
* href="#Integer-regex"><i>Integer</i></a> regular expression defined
- * above then the token is converted into a <tt>short</tt> value as if by
+ * above then the token is converted into a {@code short} value as if by
* removing all locale specific prefixes, group separators, and locale
* specific suffixes, then mapping non-ASCII digits into ASCII
* digits via {@link Character#digit Character.digit}, prepending a
@@ -1965,7 +1965,7 @@
* specified radix.
*
* @param radix the radix used to interpret the token as a short value
- * @return the <tt>short</tt> scanned from the input
+ * @return the {@code short} scanned from the input
* @throws InputMismatchException
* if the next token does not match the <i>Integer</i>
* regular expression, or is out of range
@@ -2058,14 +2058,14 @@
}
/**
- * Scans the next token of the input as an <tt>int</tt>.
+ * Scans the next token of the input as an {@code int}.
*
* <p> An invocation of this method of the form
- * <tt>nextInt()</tt> behaves in exactly the same way as the
- * invocation <tt>nextInt(radix)</tt>, where <code>radix</code>
+ * {@code nextInt()} behaves in exactly the same way as the
+ * invocation {@code nextInt(radix)}, where {@code radix}
* is the default radix of this scanner.
*
- * @return the <tt>int</tt> scanned from the input
+ * @return the {@code int} scanned from the input
* @throws InputMismatchException
* if the next token does not match the <i>Integer</i>
* regular expression, or is out of range
@@ -2077,15 +2077,15 @@
}
/**
- * Scans the next token of the input as an <tt>int</tt>.
- * This method will throw <code>InputMismatchException</code>
+ * Scans the next token of the input as an {@code int}.
+ * This method will throw {@code InputMismatchException}
* if the next token cannot be translated into a valid int value as
* described below. If the translation is successful, the scanner advances
* past the input that matched.
*
* <p> If the next token matches the <a
* href="#Integer-regex"><i>Integer</i></a> regular expression defined
- * above then the token is converted into an <tt>int</tt> value as if by
+ * above then the token is converted into an {@code int} value as if by
* removing all locale specific prefixes, group separators, and locale
* specific suffixes, then mapping non-ASCII digits into ASCII
* digits via {@link Character#digit Character.digit}, prepending a
@@ -2095,7 +2095,7 @@
* specified radix.
*
* @param radix the radix used to interpret the token as an int value
- * @return the <tt>int</tt> scanned from the input
+ * @return the {@code int} scanned from the input
* @throws InputMismatchException
* if the next token does not match the <i>Integer</i>
* regular expression, or is out of range
@@ -2164,14 +2164,14 @@
}
/**
- * Scans the next token of the input as a <tt>long</tt>.
+ * Scans the next token of the input as a {@code long}.
*
* <p> An invocation of this method of the form
- * <tt>nextLong()</tt> behaves in exactly the same way as the
- * invocation <tt>nextLong(radix)</tt>, where <code>radix</code>
+ * {@code nextLong()} behaves in exactly the same way as the
+ * invocation {@code nextLong(radix)}, where {@code radix}
* is the default radix of this scanner.
*
- * @return the <tt>long</tt> scanned from the input
+ * @return the {@code long} scanned from the input
* @throws InputMismatchException
* if the next token does not match the <i>Integer</i>
* regular expression, or is out of range
@@ -2183,15 +2183,15 @@
}
/**
- * Scans the next token of the input as a <tt>long</tt>.
- * This method will throw <code>InputMismatchException</code>
+ * Scans the next token of the input as a {@code long}.
+ * This method will throw {@code InputMismatchException}
* if the next token cannot be translated into a valid long value as
* described below. If the translation is successful, the scanner advances
* past the input that matched.
*
* <p> If the next token matches the <a
* href="#Integer-regex"><i>Integer</i></a> regular expression defined
- * above then the token is converted into a <tt>long</tt> value as if by
+ * above then the token is converted into a {@code long} value as if by
* removing all locale specific prefixes, group separators, and locale
* specific suffixes, then mapping non-ASCII digits into ASCII
* digits via {@link Character#digit Character.digit}, prepending a
@@ -2201,7 +2201,7 @@
* specified radix.
*
* @param radix the radix used to interpret the token as an int value
- * @return the <tt>long</tt> scanned from the input
+ * @return the {@code long} scanned from the input
* @throws InputMismatchException
* if the next token does not match the <i>Integer</i>
* regular expression, or is out of range
@@ -2306,15 +2306,15 @@
}
/**
- * Scans the next token of the input as a <tt>float</tt>.
- * This method will throw <code>InputMismatchException</code>
+ * Scans the next token of the input as a {@code float}.
+ * This method will throw {@code InputMismatchException}
* if the next token cannot be translated into a valid float value as
* described below. If the translation is successful, the scanner advances
* past the input that matched.
*
* <p> If the next token matches the <a
* href="#Float-regex"><i>Float</i></a> regular expression defined above
- * then the token is converted into a <tt>float</tt> value as if by
+ * then the token is converted into a {@code float} value as if by
* removing all locale specific prefixes, group separators, and locale
* specific suffixes, then mapping non-ASCII digits into ASCII
* digits via {@link Character#digit Character.digit}, prepending a
@@ -2325,7 +2325,7 @@
* is passed to {@link Float#parseFloat(String) Float.parseFloat} as
* appropriate.
*
- * @return the <tt>float</tt> scanned from the input
+ * @return the {@code float} scanned from the input
* @throws InputMismatchException
* if the next token does not match the <i>Float</i>
* regular expression, or is out of range
@@ -2373,15 +2373,15 @@
}
/**
- * Scans the next token of the input as a <tt>double</tt>.
- * This method will throw <code>InputMismatchException</code>
+ * Scans the next token of the input as a {@code double}.
+ * This method will throw {@code InputMismatchException}
* if the next token cannot be translated into a valid double value.
* If the translation is successful, the scanner advances past the input
* that matched.
*
* <p> If the next token matches the <a
* href="#Float-regex"><i>Float</i></a> regular expression defined above
- * then the token is converted into a <tt>double</tt> value as if by
+ * then the token is converted into a {@code double} value as if by
* removing all locale specific prefixes, group separators, and locale
* specific suffixes, then mapping non-ASCII digits into ASCII
* digits via {@link Character#digit Character.digit}, prepending a
@@ -2392,7 +2392,7 @@
* is passed to {@link Double#parseDouble(String) Double.parseDouble} as
* appropriate.
*
- * @return the <tt>double</tt> scanned from the input
+ * @return the {@code double} scanned from the input
* @throws InputMismatchException
* if the next token does not match the <i>Float</i>
* regular expression, or is out of range
@@ -2421,12 +2421,12 @@
/**
* Returns true if the next token in this scanner's input can be
- * interpreted as a <code>BigInteger</code> in the default radix using the
+ * interpreted as a {@code BigInteger} in the default radix using the
* {@link #nextBigInteger} method. The scanner does not advance past any
* input.
*
* @return true if and only if this scanner's next token is a valid
- * <code>BigInteger</code>
+ * {@code BigInteger}
* @throws IllegalStateException if this scanner is closed
*/
public boolean hasNextBigInteger() {
@@ -2435,13 +2435,13 @@
/**
* Returns true if the next token in this scanner's input can be
- * interpreted as a <code>BigInteger</code> in the specified radix using
+ * interpreted as a {@code BigInteger} in the specified radix using
* the {@link #nextBigInteger} method. The scanner does not advance past
* any input.
*
* @param radix the radix used to interpret the token as an integer
* @return true if and only if this scanner's next token is a valid
- * <code>BigInteger</code>
+ * {@code BigInteger}
* @throws IllegalStateException if this scanner is closed
*/
public boolean hasNextBigInteger(int radix) {
@@ -2465,11 +2465,11 @@
* BigInteger}.
*
* <p> An invocation of this method of the form
- * <tt>nextBigInteger()</tt> behaves in exactly the same way as the
- * invocation <tt>nextBigInteger(radix)</tt>, where <code>radix</code>
+ * {@code nextBigInteger()} behaves in exactly the same way as the
+ * invocation {@code nextBigInteger(radix)}, where {@code radix}
* is the default radix of this scanner.
*
- * @return the <tt>BigInteger</tt> scanned from the input
+ * @return the {@code BigInteger} scanned from the input
* @throws InputMismatchException
* if the next token does not match the <i>Integer</i>
* regular expression, or is out of range
@@ -2486,7 +2486,7 @@
*
* <p> If the next token matches the <a
* href="#Integer-regex"><i>Integer</i></a> regular expression defined
- * above then the token is converted into a <tt>BigInteger</tt> value as if
+ * above then the token is converted into a {@code BigInteger} value as if
* by removing all group separators, mapping non-ASCII digits into ASCII
* digits via the {@link Character#digit Character.digit}, and passing the
* resulting string to the {@link
@@ -2494,7 +2494,7 @@
* BigInteger(String, int)} constructor with the specified radix.
*
* @param radix the radix used to interpret the token
- * @return the <tt>BigInteger</tt> scanned from the input
+ * @return the {@code BigInteger} scanned from the input
* @throws InputMismatchException
* if the next token does not match the <i>Integer</i>
* regular expression, or is out of range
@@ -2525,12 +2525,12 @@
/**
* Returns true if the next token in this scanner's input can be
- * interpreted as a <code>BigDecimal</code> using the
+ * interpreted as a {@code BigDecimal} using the
* {@link #nextBigDecimal} method. The scanner does not advance past any
* input.
*
* @return true if and only if this scanner's next token is a valid
- * <code>BigDecimal</code>
+ * {@code BigDecimal}
* @throws IllegalStateException if this scanner is closed
*/
public boolean hasNextBigDecimal() {
@@ -2553,14 +2553,14 @@
*
* <p> If the next token matches the <a
* href="#Decimal-regex"><i>Decimal</i></a> regular expression defined
- * above then the token is converted into a <tt>BigDecimal</tt> value as if
+ * above then the token is converted into a {@code BigDecimal} value as if
* by removing all group separators, mapping non-ASCII digits into ASCII
* digits via the {@link Character#digit Character.digit}, and passing the
* resulting string to the {@link
* java.math.BigDecimal#BigDecimal(java.lang.String) BigDecimal(String)}
* constructor.
*
- * @return the <tt>BigDecimal</tt> scanned from the input
+ * @return the {@code BigDecimal} scanned from the input
* @throws InputMismatchException
* if the next token does not match the <i>Decimal</i>
* regular expression, or is out of range
@@ -2594,7 +2594,7 @@
* #useDelimiter}, {@link #useLocale}, or {@link #useRadix}.
*
* <p> An invocation of this method of the form
- * <tt>scanner.reset()</tt> behaves in exactly the same way as the
+ * {@code scanner.reset()} behaves in exactly the same way as the
* invocation
*
* <blockquote><pre>{@code
diff --git a/jdk/src/java.base/share/classes/java/util/ServiceConfigurationError.java b/jdk/src/java.base/share/classes/java/util/ServiceConfigurationError.java
index e0335f6..42db72d 100644
--- a/jdk/src/java.base/share/classes/java/util/ServiceConfigurationError.java
+++ b/jdk/src/java.base/share/classes/java/util/ServiceConfigurationError.java
@@ -65,7 +65,7 @@
/**
* Constructs a new instance with the specified message.
*
- * @param msg The message, or <tt>null</tt> if there is no message
+ * @param msg The message, or {@code null} if there is no message
*
*/
public ServiceConfigurationError(String msg) {
@@ -75,9 +75,9 @@
/**
* Constructs a new instance with the specified message and cause.
*
- * @param msg The message, or <tt>null</tt> if there is no message
+ * @param msg The message, or {@code null} if there is no message
*
- * @param cause The cause, or <tt>null</tt> if the cause is nonexistent
+ * @param cause The cause, or {@code null} if the cause is nonexistent
* or unknown
*/
public ServiceConfigurationError(String msg, Throwable cause) {
diff --git a/jdk/src/java.base/share/classes/java/util/Set.java b/jdk/src/java.base/share/classes/java/util/Set.java
index 2703049..93d008c 100644
--- a/jdk/src/java.base/share/classes/java/util/Set.java
+++ b/jdk/src/java.base/share/classes/java/util/Set.java
@@ -27,16 +27,16 @@
/**
* A collection that contains no duplicate elements. More formally, sets
- * contain no pair of elements <code>e1</code> and <code>e2</code> such that
- * <code>e1.equals(e2)</code>, and at most one null element. As implied by
+ * contain no pair of elements {@code e1} and {@code e2} such that
+ * {@code e1.equals(e2)}, and at most one null element. As implied by
* its name, this interface models the mathematical <i>set</i> abstraction.
*
- * <p>The <tt>Set</tt> interface places additional stipulations, beyond those
- * inherited from the <tt>Collection</tt> interface, on the contracts of all
- * constructors and on the contracts of the <tt>add</tt>, <tt>equals</tt> and
- * <tt>hashCode</tt> methods. Declarations for other inherited methods are
+ * <p>The {@code Set} interface places additional stipulations, beyond those
+ * inherited from the {@code Collection} interface, on the contracts of all
+ * constructors and on the contracts of the {@code add}, {@code equals} and
+ * {@code hashCode} methods. Declarations for other inherited methods are
* also included here for convenience. (The specifications accompanying these
- * declarations have been tailored to the <tt>Set</tt> interface, but they do
+ * declarations have been tailored to the {@code Set} interface, but they do
* not contain any additional stipulations.)
*
* <p>The additional stipulation on constructors is, not surprisingly,
@@ -45,7 +45,7 @@
*
* <p>Note: Great care must be exercised if mutable objects are used as set
* elements. The behavior of a set is not specified if the value of an object
- * is changed in a manner that affects <tt>equals</tt> comparisons while the
+ * is changed in a manner that affects {@code equals} comparisons while the
* object is an element in the set. A special case of this prohibition is
* that it is not permissible for a set to contain itself as an element.
*
@@ -53,7 +53,7 @@
* they may contain. For example, some implementations prohibit null elements,
* and some have restrictions on the types of their elements. Attempting to
* add an ineligible element throws an unchecked exception, typically
- * <tt>NullPointerException</tt> or <tt>ClassCastException</tt>. Attempting
+ * {@code NullPointerException} or {@code ClassCastException}. Attempting
* to query the presence of an ineligible element may throw an exception,
* or it may simply return false; some implementations will exhibit the former
* behavior and some will exhibit the latter. More generally, attempting an
@@ -87,28 +87,28 @@
/**
* Returns the number of elements in this set (its cardinality). If this
- * set contains more than <tt>Integer.MAX_VALUE</tt> elements, returns
- * <tt>Integer.MAX_VALUE</tt>.
+ * set contains more than {@code Integer.MAX_VALUE} elements, returns
+ * {@code Integer.MAX_VALUE}.
*
* @return the number of elements in this set (its cardinality)
*/
int size();
/**
- * Returns <tt>true</tt> if this set contains no elements.
+ * Returns {@code true} if this set contains no elements.
*
- * @return <tt>true</tt> if this set contains no elements
+ * @return {@code true} if this set contains no elements
*/
boolean isEmpty();
/**
- * Returns <tt>true</tt> if this set contains the specified element.
- * More formally, returns <tt>true</tt> if and only if this set
- * contains an element <tt>e</tt> such that
- * <tt>(o==null ? e==null : o.equals(e))</tt>.
+ * Returns {@code true} if this set contains the specified element.
+ * More formally, returns {@code true} if and only if this set
+ * contains an element {@code e} such that
+ * {@code Objects.equals(o, e)}.
*
* @param o element whose presence in this set is to be tested
- * @return <tt>true</tt> if this set contains the specified element
+ * @return {@code true} if this set contains the specified element
* @throws ClassCastException if the type of the specified element
* is incompatible with this set
* (<a href="Collection.html#optional-restrictions">optional</a>)
@@ -155,7 +155,7 @@
* <p>If this set fits in the specified array with room to spare
* (i.e., the array has more elements than this set), the element in
* the array immediately following the end of the set is set to
- * <tt>null</tt>. (This is useful in determining the length of this
+ * {@code null}. (This is useful in determining the length of this
* set <i>only</i> if the caller knows that this set does not contain
* any null elements.)
*
@@ -168,15 +168,15 @@
* precise control over the runtime type of the output array, and may,
* under certain circumstances, be used to save allocation costs.
*
- * <p>Suppose <tt>x</tt> is a set known to contain only strings.
+ * <p>Suppose {@code x} is a set known to contain only strings.
* The following code can be used to dump the set into a newly allocated
- * array of <tt>String</tt>:
+ * array of {@code String}:
*
* <pre>
* String[] y = x.toArray(new String[0]);</pre>
*
- * Note that <tt>toArray(new Object[0])</tt> is identical in function to
- * <tt>toArray()</tt>.
+ * Note that {@code toArray(new Object[0])} is identical in function to
+ * {@code toArray()}.
*
* @param a the array into which the elements of this set are to be
* stored, if it is big enough; otherwise, a new array of the same
@@ -195,25 +195,25 @@
/**
* Adds the specified element to this set if it is not already present
* (optional operation). More formally, adds the specified element
- * <tt>e</tt> to this set if the set contains no element <tt>e2</tt>
+ * {@code e} to this set if the set contains no element {@code e2}
* such that
- * <tt>(e==null ? e2==null : e.equals(e2))</tt>.
+ * {@code Objects.equals(e, e2)}.
* If this set already contains the element, the call leaves the set
- * unchanged and returns <tt>false</tt>. In combination with the
+ * unchanged and returns {@code false}. In combination with the
* restriction on constructors, this ensures that sets never contain
* duplicate elements.
*
* <p>The stipulation above does not imply that sets must accept all
* elements; sets may refuse to add any particular element, including
- * <tt>null</tt>, and throw an exception, as described in the
+ * {@code null}, and throw an exception, as described in the
* specification for {@link Collection#add Collection.add}.
* Individual set implementations should clearly document any
* restrictions on the elements that they may contain.
*
* @param e element to be added to this set
- * @return <tt>true</tt> if this set did not already contain the specified
+ * @return {@code true} if this set did not already contain the specified
* element
- * @throws UnsupportedOperationException if the <tt>add</tt> operation
+ * @throws UnsupportedOperationException if the {@code add} operation
* is not supported by this set
* @throws ClassCastException if the class of the specified element
* prevents it from being added to this set
@@ -227,23 +227,23 @@
/**
* Removes the specified element from this set if it is present
- * (optional operation). More formally, removes an element <tt>e</tt>
+ * (optional operation). More formally, removes an element {@code e}
* such that
- * <tt>(o==null ? e==null : o.equals(e))</tt>, if
- * this set contains such an element. Returns <tt>true</tt> if this set
+ * {@code Objects.equals(o, e)}, if
+ * this set contains such an element. Returns {@code true} if this set
* contained the element (or equivalently, if this set changed as a
* result of the call). (This set will not contain the element once the
* call returns.)
*
* @param o object to be removed from this set, if present
- * @return <tt>true</tt> if this set contained the specified element
+ * @return {@code true} if this set contained the specified element
* @throws ClassCastException if the type of the specified element
* is incompatible with this set
* (<a href="Collection.html#optional-restrictions">optional</a>)
* @throws NullPointerException if the specified element is null and this
* set does not permit null elements
* (<a href="Collection.html#optional-restrictions">optional</a>)
- * @throws UnsupportedOperationException if the <tt>remove</tt> operation
+ * @throws UnsupportedOperationException if the {@code remove} operation
* is not supported by this set
*/
boolean remove(Object o);
@@ -252,12 +252,12 @@
// Bulk Operations
/**
- * Returns <tt>true</tt> if this set contains all of the elements of the
+ * Returns {@code true} if this set contains all of the elements of the
* specified collection. If the specified collection is also a set, this
- * method returns <tt>true</tt> if it is a <i>subset</i> of this set.
+ * method returns {@code true} if it is a <i>subset</i> of this set.
*
* @param c collection to be checked for containment in this set
- * @return <tt>true</tt> if this set contains all of the elements of the
+ * @return {@code true} if this set contains all of the elements of the
* specified collection
* @throws ClassCastException if the types of one or more elements
* in the specified collection are incompatible with this
@@ -275,15 +275,15 @@
/**
* Adds all of the elements in the specified collection to this set if
* they're not already present (optional operation). If the specified
- * collection is also a set, the <tt>addAll</tt> operation effectively
+ * collection is also a set, the {@code addAll} operation effectively
* modifies this set so that its value is the <i>union</i> of the two
* sets. The behavior of this operation is undefined if the specified
* collection is modified while the operation is in progress.
*
* @param c collection containing elements to be added to this set
- * @return <tt>true</tt> if this set changed as a result of the call
+ * @return {@code true} if this set changed as a result of the call
*
- * @throws UnsupportedOperationException if the <tt>addAll</tt> operation
+ * @throws UnsupportedOperationException if the {@code addAll} operation
* is not supported by this set
* @throws ClassCastException if the class of an element of the
* specified collection prevents it from being added to this set
@@ -305,8 +305,8 @@
* <i>intersection</i> of the two sets.
*
* @param c collection containing elements to be retained in this set
- * @return <tt>true</tt> if this set changed as a result of the call
- * @throws UnsupportedOperationException if the <tt>retainAll</tt> operation
+ * @return {@code true} if this set changed as a result of the call
+ * @throws UnsupportedOperationException if the {@code retainAll} operation
* is not supported by this set
* @throws ClassCastException if the class of an element of this set
* is incompatible with the specified collection
@@ -327,8 +327,8 @@
* the two sets.
*
* @param c collection containing elements to be removed from this set
- * @return <tt>true</tt> if this set changed as a result of the call
- * @throws UnsupportedOperationException if the <tt>removeAll</tt> operation
+ * @return {@code true} if this set changed as a result of the call
+ * @throws UnsupportedOperationException if the {@code removeAll} operation
* is not supported by this set
* @throws ClassCastException if the class of an element of this set
* is incompatible with the specified collection
@@ -346,7 +346,7 @@
* Removes all of the elements from this set (optional operation).
* The set will be empty after this call returns.
*
- * @throws UnsupportedOperationException if the <tt>clear</tt> method
+ * @throws UnsupportedOperationException if the {@code clear} method
* is not supported by this set
*/
void clear();
@@ -356,7 +356,7 @@
/**
* Compares the specified object with this set for equality. Returns
- * <tt>true</tt> if the specified object is also a set, the two sets
+ * {@code true} if the specified object is also a set, the two sets
* have the same size, and every member of the specified set is
* contained in this set (or equivalently, every member of this set is
* contained in the specified set). This definition ensures that the
@@ -364,17 +364,17 @@
* set interface.
*
* @param o object to be compared for equality with this set
- * @return <tt>true</tt> if the specified object is equal to this set
+ * @return {@code true} if the specified object is equal to this set
*/
boolean equals(Object o);
/**
* Returns the hash code value for this set. The hash code of a set is
* defined to be the sum of the hash codes of the elements in the set,
- * where the hash code of a <tt>null</tt> element is defined to be zero.
- * This ensures that <tt>s1.equals(s2)</tt> implies that
- * <tt>s1.hashCode()==s2.hashCode()</tt> for any two sets <tt>s1</tt>
- * and <tt>s2</tt>, as required by the general contract of
+ * where the hash code of a {@code null} element is defined to be zero.
+ * This ensures that {@code s1.equals(s2)} implies that
+ * {@code s1.hashCode()==s2.hashCode()} for any two sets {@code s1}
+ * and {@code s2}, as required by the general contract of
* {@link Object#hashCode}.
*
* @return the hash code value for this set
diff --git a/jdk/src/java.base/share/classes/java/util/SortedSet.java b/jdk/src/java.base/share/classes/java/util/SortedSet.java
index 3ea9329..5eb7f76 100644
--- a/jdk/src/java.base/share/classes/java/util/SortedSet.java
+++ b/jdk/src/java.base/share/classes/java/util/SortedSet.java
@@ -34,38 +34,38 @@
* to take advantage of the ordering. (This interface is the set
* analogue of {@link SortedMap}.)
*
- * <p>All elements inserted into a sorted set must implement the <tt>Comparable</tt>
+ * <p>All elements inserted into a sorted set must implement the {@code Comparable}
* interface (or be accepted by the specified comparator). Furthermore, all
- * such elements must be <i>mutually comparable</i>: <tt>e1.compareTo(e2)</tt>
- * (or <tt>comparator.compare(e1, e2)</tt>) must not throw a
- * <tt>ClassCastException</tt> for any elements <tt>e1</tt> and <tt>e2</tt> in
+ * such elements must be <i>mutually comparable</i>: {@code e1.compareTo(e2)}
+ * (or {@code comparator.compare(e1, e2)}) must not throw a
+ * {@code ClassCastException} for any elements {@code e1} and {@code e2} in
* the sorted set. Attempts to violate this restriction will cause the
* offending method or constructor invocation to throw a
- * <tt>ClassCastException</tt>.
+ * {@code ClassCastException}.
*
* <p>Note that the ordering maintained by a sorted set (whether or not an
* explicit comparator is provided) must be <i>consistent with equals</i> if
- * the sorted set is to correctly implement the <tt>Set</tt> interface. (See
- * the <tt>Comparable</tt> interface or <tt>Comparator</tt> interface for a
+ * the sorted set is to correctly implement the {@code Set} interface. (See
+ * the {@code Comparable} interface or {@code Comparator} interface for a
* precise definition of <i>consistent with equals</i>.) This is so because
- * the <tt>Set</tt> interface is defined in terms of the <tt>equals</tt>
+ * the {@code Set} interface is defined in terms of the {@code equals}
* operation, but a sorted set performs all element comparisons using its
- * <tt>compareTo</tt> (or <tt>compare</tt>) method, so two elements that are
+ * {@code compareTo} (or {@code compare}) method, so two elements that are
* deemed equal by this method are, from the standpoint of the sorted set,
* equal. The behavior of a sorted set <i>is</i> well-defined even if its
* ordering is inconsistent with equals; it just fails to obey the general
- * contract of the <tt>Set</tt> interface.
+ * contract of the {@code Set} interface.
*
* <p>All general-purpose sorted set implementation classes should
* provide four "standard" constructors: 1) A void (no arguments)
* constructor, which creates an empty sorted set sorted according to
* the natural ordering of its elements. 2) A constructor with a
- * single argument of type <tt>Comparator</tt>, which creates an empty
+ * single argument of type {@code Comparator}, which creates an empty
* sorted set sorted according to the specified comparator. 3) A
- * constructor with a single argument of type <tt>Collection</tt>,
+ * constructor with a single argument of type {@code Collection},
* which creates a new sorted set with the same elements as its
* argument, sorted according to the natural ordering of the elements.
- * 4) A constructor with a single argument of type <tt>SortedSet</tt>,
+ * 4) A constructor with a single argument of type {@code SortedSet},
* which creates a new sorted set with the same elements and the same
* ordering as the input sorted set. There is no way to enforce this
* recommendation, as interfaces cannot contain constructors.
@@ -75,17 +75,17 @@
* endpoint but not their high endpoint (where applicable).
* If you need a <i>closed range</i> (which includes both endpoints), and
* the element type allows for calculation of the successor of a given
- * value, merely request the subrange from <tt>lowEndpoint</tt> to
- * <tt>successor(highEndpoint)</tt>. For example, suppose that <tt>s</tt>
+ * value, merely request the subrange from {@code lowEndpoint} to
+ * {@code successor(highEndpoint)}. For example, suppose that {@code s}
* is a sorted set of strings. The following idiom obtains a view
- * containing all of the strings in <tt>s</tt> from <tt>low</tt> to
- * <tt>high</tt>, inclusive:<pre>
+ * containing all of the strings in {@code s} from {@code low} to
+ * {@code high}, inclusive:<pre>
* SortedSet<String> sub = s.subSet(low, high+"\0");</pre>
*
* A similar technique can be used to generate an <i>open range</i> (which
* contains neither endpoint). The following idiom obtains a view
- * containing all of the Strings in <tt>s</tt> from <tt>low</tt> to
- * <tt>high</tt>, exclusive:<pre>
+ * containing all of the Strings in {@code s} from {@code low} to
+ * {@code high}, exclusive:<pre>
* SortedSet<String> sub = s.subSet(low+"\0", high);</pre>
*
* <p>This interface is a member of the
@@ -108,98 +108,98 @@
public interface SortedSet<E> extends Set<E> {
/**
* Returns the comparator used to order the elements in this set,
- * or <tt>null</tt> if this set uses the {@linkplain Comparable
+ * or {@code null} if this set uses the {@linkplain Comparable
* natural ordering} of its elements.
*
* @return the comparator used to order the elements in this set,
- * or <tt>null</tt> if this set uses the natural ordering
+ * or {@code null} if this set uses the natural ordering
* of its elements
*/
Comparator<? super E> comparator();
/**
* Returns a view of the portion of this set whose elements range
- * from <tt>fromElement</tt>, inclusive, to <tt>toElement</tt>,
- * exclusive. (If <tt>fromElement</tt> and <tt>toElement</tt> are
+ * from {@code fromElement}, inclusive, to {@code toElement},
+ * exclusive. (If {@code fromElement} and {@code toElement} are
* equal, the returned set is empty.) The returned set is backed
* by this set, so changes in the returned set are reflected in
* this set, and vice-versa. The returned set supports all
* optional set operations that this set supports.
*
- * <p>The returned set will throw an <tt>IllegalArgumentException</tt>
+ * <p>The returned set will throw an {@code IllegalArgumentException}
* on an attempt to insert an element outside its range.
*
* @param fromElement low endpoint (inclusive) of the returned set
* @param toElement high endpoint (exclusive) of the returned set
* @return a view of the portion of this set whose elements range from
- * <tt>fromElement</tt>, inclusive, to <tt>toElement</tt>, exclusive
- * @throws ClassCastException if <tt>fromElement</tt> and
- * <tt>toElement</tt> cannot be compared to one another using this
+ * {@code fromElement}, inclusive, to {@code toElement}, exclusive
+ * @throws ClassCastException if {@code fromElement} and
+ * {@code toElement} cannot be compared to one another using this
* set's comparator (or, if the set has no comparator, using
* natural ordering). Implementations may, but are not required
- * to, throw this exception if <tt>fromElement</tt> or
- * <tt>toElement</tt> cannot be compared to elements currently in
+ * to, throw this exception if {@code fromElement} or
+ * {@code toElement} cannot be compared to elements currently in
* the set.
- * @throws NullPointerException if <tt>fromElement</tt> or
- * <tt>toElement</tt> is null and this set does not permit null
+ * @throws NullPointerException if {@code fromElement} or
+ * {@code toElement} is null and this set does not permit null
* elements
- * @throws IllegalArgumentException if <tt>fromElement</tt> is
- * greater than <tt>toElement</tt>; or if this set itself
- * has a restricted range, and <tt>fromElement</tt> or
- * <tt>toElement</tt> lies outside the bounds of the range
+ * @throws IllegalArgumentException if {@code fromElement} is
+ * greater than {@code toElement}; or if this set itself
+ * has a restricted range, and {@code fromElement} or
+ * {@code toElement} lies outside the bounds of the range
*/
SortedSet<E> subSet(E fromElement, E toElement);
/**
* Returns a view of the portion of this set whose elements are
- * strictly less than <tt>toElement</tt>. The returned set is
+ * strictly less than {@code toElement}. The returned set is
* backed by this set, so changes in the returned set are
* reflected in this set, and vice-versa. The returned set
* supports all optional set operations that this set supports.
*
- * <p>The returned set will throw an <tt>IllegalArgumentException</tt>
+ * <p>The returned set will throw an {@code IllegalArgumentException}
* on an attempt to insert an element outside its range.
*
* @param toElement high endpoint (exclusive) of the returned set
* @return a view of the portion of this set whose elements are strictly
- * less than <tt>toElement</tt>
- * @throws ClassCastException if <tt>toElement</tt> is not compatible
+ * less than {@code toElement}
+ * @throws ClassCastException if {@code toElement} is not compatible
* with this set's comparator (or, if the set has no comparator,
- * if <tt>toElement</tt> does not implement {@link Comparable}).
+ * if {@code toElement} does not implement {@link Comparable}).
* Implementations may, but are not required to, throw this
- * exception if <tt>toElement</tt> cannot be compared to elements
+ * exception if {@code toElement} cannot be compared to elements
* currently in the set.
- * @throws NullPointerException if <tt>toElement</tt> is null and
+ * @throws NullPointerException if {@code toElement} is null and
* this set does not permit null elements
* @throws IllegalArgumentException if this set itself has a
- * restricted range, and <tt>toElement</tt> lies outside the
+ * restricted range, and {@code toElement} lies outside the
* bounds of the range
*/
SortedSet<E> headSet(E toElement);
/**
* Returns a view of the portion of this set whose elements are
- * greater than or equal to <tt>fromElement</tt>. The returned
+ * greater than or equal to {@code fromElement}. The returned
* set is backed by this set, so changes in the returned set are
* reflected in this set, and vice-versa. The returned set
* supports all optional set operations that this set supports.
*
- * <p>The returned set will throw an <tt>IllegalArgumentException</tt>
+ * <p>The returned set will throw an {@code IllegalArgumentException}
* on an attempt to insert an element outside its range.
*
* @param fromElement low endpoint (inclusive) of the returned set
* @return a view of the portion of this set whose elements are greater
- * than or equal to <tt>fromElement</tt>
- * @throws ClassCastException if <tt>fromElement</tt> is not compatible
+ * than or equal to {@code fromElement}
+ * @throws ClassCastException if {@code fromElement} is not compatible
* with this set's comparator (or, if the set has no comparator,
- * if <tt>fromElement</tt> does not implement {@link Comparable}).
+ * if {@code fromElement} does not implement {@link Comparable}).
* Implementations may, but are not required to, throw this
- * exception if <tt>fromElement</tt> cannot be compared to elements
+ * exception if {@code fromElement} cannot be compared to elements
* currently in the set.
- * @throws NullPointerException if <tt>fromElement</tt> is null
+ * @throws NullPointerException if {@code fromElement} is null
* and this set does not permit null elements
* @throws IllegalArgumentException if this set itself has a
- * restricted range, and <tt>fromElement</tt> lies outside the
+ * restricted range, and {@code fromElement} lies outside the
* bounds of the range
*/
SortedSet<E> tailSet(E fromElement);
diff --git a/jdk/src/java.base/share/classes/java/util/Stack.java b/jdk/src/java.base/share/classes/java/util/Stack.java
index 540ac2d..2573276 100644
--- a/jdk/src/java.base/share/classes/java/util/Stack.java
+++ b/jdk/src/java.base/share/classes/java/util/Stack.java
@@ -26,12 +26,12 @@
package java.util;
/**
- * The <code>Stack</code> class represents a last-in-first-out
- * (LIFO) stack of objects. It extends class <tt>Vector</tt> with five
+ * The {@code Stack} class represents a last-in-first-out
+ * (LIFO) stack of objects. It extends class {@code Vector} with five
* operations that allow a vector to be treated as a stack. The usual
- * <tt>push</tt> and <tt>pop</tt> operations are provided, as well as a
- * method to <tt>peek</tt> at the top item on the stack, a method to test
- * for whether the stack is <tt>empty</tt>, and a method to <tt>search</tt>
+ * {@code push} and {@code pop} operations are provided, as well as a
+ * method to {@code peek} at the top item on the stack, a method to test
+ * for whether the stack is {@code empty}, and a method to {@code search}
* the stack for an item and discover how far it is from the top.
* <p>
* When a stack is first created, it contains no items.
@@ -60,7 +60,7 @@
* addElement(item)</pre></blockquote>
*
* @param item the item to be pushed onto this stack.
- * @return the <code>item</code> argument.
+ * @return the {@code item} argument.
* @see java.util.Vector#addElement
*/
public E push(E item) {
@@ -74,7 +74,7 @@
* object as the value of this function.
*
* @return The object at the top of this stack (the last item
- * of the <tt>Vector</tt> object).
+ * of the {@code Vector} object).
* @throws EmptyStackException if this stack is empty.
*/
public synchronized E pop() {
@@ -92,7 +92,7 @@
* from the stack.
*
* @return the object at the top of this stack (the last item
- * of the <tt>Vector</tt> object).
+ * of the {@code Vector} object).
* @throws EmptyStackException if this stack is empty.
*/
public synchronized E peek() {
@@ -106,8 +106,8 @@
/**
* Tests if this stack is empty.
*
- * @return <code>true</code> if and only if this stack contains
- * no items; <code>false</code> otherwise.
+ * @return {@code true} if and only if this stack contains
+ * no items; {@code false} otherwise.
*/
public boolean empty() {
return size() == 0;
@@ -115,16 +115,16 @@
/**
* Returns the 1-based position where an object is on this stack.
- * If the object <tt>o</tt> occurs as an item in this stack, this
+ * If the object {@code o} occurs as an item in this stack, this
* method returns the distance from the top of the stack of the
* occurrence nearest the top of the stack; the topmost item on the
- * stack is considered to be at distance <tt>1</tt>. The <tt>equals</tt>
- * method is used to compare <tt>o</tt> to the
+ * stack is considered to be at distance {@code 1}. The {@code equals}
+ * method is used to compare {@code o} to the
* items in this stack.
*
* @param o the desired object.
* @return the 1-based position from the top of the stack where
- * the object is located; the return value <code>-1</code>
+ * the object is located; the return value {@code -1}
* indicates that the object is not on the stack.
*/
public synchronized int search(Object o) {
diff --git a/jdk/src/java.base/share/classes/java/util/StringTokenizer.java b/jdk/src/java.base/share/classes/java/util/StringTokenizer.java
index f9a4b46..5d55ae0 100644
--- a/jdk/src/java.base/share/classes/java/util/StringTokenizer.java
+++ b/jdk/src/java.base/share/classes/java/util/StringTokenizer.java
@@ -30,32 +30,32 @@
/**
* The string tokenizer class allows an application to break a
* string into tokens. The tokenization method is much simpler than
- * the one used by the <code>StreamTokenizer</code> class. The
- * <code>StringTokenizer</code> methods do not distinguish among
+ * the one used by the {@code StreamTokenizer} class. The
+ * {@code StringTokenizer} methods do not distinguish among
* identifiers, numbers, and quoted strings, nor do they recognize
* and skip comments.
* <p>
* The set of delimiters (the characters that separate tokens) may
* be specified either at creation time or on a per-token basis.
* <p>
- * An instance of <code>StringTokenizer</code> behaves in one of two
+ * An instance of {@code StringTokenizer} behaves in one of two
* ways, depending on whether it was created with the
- * <code>returnDelims</code> flag having the value <code>true</code>
- * or <code>false</code>:
+ * {@code returnDelims} flag having the value {@code true}
+ * or {@code false}:
* <ul>
- * <li>If the flag is <code>false</code>, delimiter characters serve to
+ * <li>If the flag is {@code false}, delimiter characters serve to
* separate tokens. A token is a maximal sequence of consecutive
* characters that are not delimiters.
- * <li>If the flag is <code>true</code>, delimiter characters are themselves
+ * <li>If the flag is {@code true}, delimiter characters are themselves
* considered to be tokens. A token is thus either one delimiter
* character, or a maximal sequence of consecutive characters that are
* not delimiters.
* </ul><p>
- * A <tt>StringTokenizer</tt> object internally maintains a current
+ * A {@code StringTokenizer} object internally maintains a current
* position within the string to be tokenized. Some operations advance this
* current position past the characters processed.<p>
* A token is returned by taking a substring of the string that was used to
- * create the <tt>StringTokenizer</tt> object.
+ * create the {@code StringTokenizer} object.
* <p>
* The following is one example of the use of the tokenizer. The code:
* <blockquote><pre>
@@ -74,12 +74,12 @@
* </pre></blockquote>
*
* <p>
- * <tt>StringTokenizer</tt> is a legacy class that is retained for
+ * {@code StringTokenizer} is a legacy class that is retained for
* compatibility reasons although its use is discouraged in new code. It is
- * recommended that anyone seeking this functionality use the <tt>split</tt>
- * method of <tt>String</tt> or the java.util.regex package instead.
+ * recommended that anyone seeking this functionality use the {@code split}
+ * method of {@code String} or the java.util.regex package instead.
* <p>
- * The following example illustrates how the <tt>String.split</tt>
+ * The following example illustrates how the {@code String.split}
* method can be used to break up a string into its basic tokens:
* <blockquote><pre>
* String[] result = "this is a test".split("\\s");
@@ -171,25 +171,25 @@
/**
* Constructs a string tokenizer for the specified string. All
- * characters in the <code>delim</code> argument are the delimiters
+ * characters in the {@code delim} argument are the delimiters
* for separating tokens.
* <p>
- * If the <code>returnDelims</code> flag is <code>true</code>, then
+ * If the {@code returnDelims} flag is {@code true}, then
* the delimiter characters are also returned as tokens. Each
* delimiter is returned as a string of length one. If the flag is
- * <code>false</code>, the delimiter characters are skipped and only
+ * {@code false}, the delimiter characters are skipped and only
* serve as separators between tokens.
* <p>
- * Note that if <tt>delim</tt> is <tt>null</tt>, this constructor does
+ * Note that if {@code delim} is {@code null}, this constructor does
* not throw an exception. However, trying to invoke other methods on the
- * resulting <tt>StringTokenizer</tt> may result in a
- * <tt>NullPointerException</tt>.
+ * resulting {@code StringTokenizer} may result in a
+ * {@code NullPointerException}.
*
* @param str a string to be parsed.
* @param delim the delimiters.
* @param returnDelims flag indicating whether to return the delimiters
* as tokens.
- * @exception NullPointerException if str is <CODE>null</CODE>
+ * @exception NullPointerException if str is {@code null}
*/
public StringTokenizer(String str, String delim, boolean returnDelims) {
currentPosition = 0;
@@ -204,18 +204,18 @@
/**
* Constructs a string tokenizer for the specified string. The
- * characters in the <code>delim</code> argument are the delimiters
+ * characters in the {@code delim} argument are the delimiters
* for separating tokens. Delimiter characters themselves will not
* be treated as tokens.
* <p>
- * Note that if <tt>delim</tt> is <tt>null</tt>, this constructor does
+ * Note that if {@code delim} is {@code null}, this constructor does
* not throw an exception. However, trying to invoke other methods on the
- * resulting <tt>StringTokenizer</tt> may result in a
- * <tt>NullPointerException</tt>.
+ * resulting {@code StringTokenizer} may result in a
+ * {@code NullPointerException}.
*
* @param str a string to be parsed.
* @param delim the delimiters.
- * @exception NullPointerException if str is <CODE>null</CODE>
+ * @exception NullPointerException if str is {@code null}
*/
public StringTokenizer(String str, String delim) {
this(str, delim, false);
@@ -230,7 +230,7 @@
* not be treated as tokens.
*
* @param str a string to be parsed.
- * @exception NullPointerException if str is <CODE>null</CODE>
+ * @exception NullPointerException if str is {@code null}
*/
public StringTokenizer(String str) {
this(str, " \t\n\r\f", false);
@@ -307,11 +307,11 @@
/**
* Tests if there are more tokens available from this tokenizer's string.
- * If this method returns <tt>true</tt>, then a subsequent call to
- * <tt>nextToken</tt> with no argument will successfully return a token.
+ * If this method returns {@code true}, then a subsequent call to
+ * {@code nextToken} with no argument will successfully return a token.
*
- * @return <code>true</code> if and only if there is at least one token
- * in the string after the current position; <code>false</code>
+ * @return {@code true} if and only if there is at least one token
+ * in the string after the current position; {@code false}
* otherwise.
*/
public boolean hasMoreTokens() {
@@ -355,8 +355,8 @@
/**
* Returns the next token in this string tokenizer's string. First,
* the set of characters considered to be delimiters by this
- * <tt>StringTokenizer</tt> object is changed to be the characters in
- * the string <tt>delim</tt>. Then the next token in the string
+ * {@code StringTokenizer} object is changed to be the characters in
+ * the string {@code delim}. Then the next token in the string
* after the current position is returned. The current position is
* advanced beyond the recognized token. The new delimiter set
* remains the default after this call.
@@ -365,7 +365,7 @@
* @return the next token, after switching to the new delimiter set.
* @exception NoSuchElementException if there are no more tokens in this
* tokenizer's string.
- * @exception NullPointerException if delim is <CODE>null</CODE>
+ * @exception NullPointerException if delim is {@code null}
*/
public String nextToken(String delim) {
delimiters = delim;
@@ -378,12 +378,12 @@
}
/**
- * Returns the same value as the <code>hasMoreTokens</code>
+ * Returns the same value as the {@code hasMoreTokens}
* method. It exists so that this class can implement the
- * <code>Enumeration</code> interface.
+ * {@code Enumeration} interface.
*
- * @return <code>true</code> if there are more tokens;
- * <code>false</code> otherwise.
+ * @return {@code true} if there are more tokens;
+ * {@code false} otherwise.
* @see java.util.Enumeration
* @see java.util.StringTokenizer#hasMoreTokens()
*/
@@ -392,10 +392,10 @@
}
/**
- * Returns the same value as the <code>nextToken</code> method,
- * except that its declared return value is <code>Object</code> rather than
- * <code>String</code>. It exists so that this class can implement the
- * <code>Enumeration</code> interface.
+ * Returns the same value as the {@code nextToken} method,
+ * except that its declared return value is {@code Object} rather than
+ * {@code String}. It exists so that this class can implement the
+ * {@code Enumeration} interface.
*
* @return the next token in the string.
* @exception NoSuchElementException if there are no more tokens in this
@@ -409,7 +409,7 @@
/**
* Calculates the number of times that this tokenizer's
- * <code>nextToken</code> method can be called before it generates an
+ * {@code nextToken} method can be called before it generates an
* exception. The current position is not advanced.
*
* @return the number of tokens remaining in the string using the current
diff --git a/jdk/src/java.base/share/classes/java/util/Timer.java b/jdk/src/java.base/share/classes/java/util/Timer.java
index df18d79..9310b08 100644
--- a/jdk/src/java.base/share/classes/java/util/Timer.java
+++ b/jdk/src/java.base/share/classes/java/util/Timer.java
@@ -32,7 +32,7 @@
* background thread. Tasks may be scheduled for one-time execution, or for
* repeated execution at regular intervals.
*
- * <p>Corresponding to each <tt>Timer</tt> object is a single background
+ * <p>Corresponding to each {@code Timer} object is a single background
* thread that is used to execute all of the timer's tasks, sequentially.
* Timer tasks should complete quickly. If a timer task takes excessive time
* to complete, it "hogs" the timer's task execution thread. This can, in
@@ -40,26 +40,26 @@
* execute in rapid succession when (and if) the offending task finally
* completes.
*
- * <p>After the last live reference to a <tt>Timer</tt> object goes away
+ * <p>After the last live reference to a {@code Timer} object goes away
* <i>and</i> all outstanding tasks have completed execution, the timer's task
* execution thread terminates gracefully (and becomes subject to garbage
* collection). However, this can take arbitrarily long to occur. By
* default, the task execution thread does not run as a <i>daemon thread</i>,
* so it is capable of keeping an application from terminating. If a caller
* wants to terminate a timer's task execution thread rapidly, the caller
- * should invoke the timer's <tt>cancel</tt> method.
+ * should invoke the timer's {@code cancel} method.
*
* <p>If the timer's task execution thread terminates unexpectedly, for
- * example, because its <tt>stop</tt> method is invoked, any further
+ * example, because its {@code stop} method is invoked, any further
* attempt to schedule a task on the timer will result in an
- * <tt>IllegalStateException</tt>, as if the timer's <tt>cancel</tt>
+ * {@code IllegalStateException}, as if the timer's {@code cancel}
* method had been invoked.
*
* <p>This class is thread-safe: multiple threads can share a single
- * <tt>Timer</tt> object without the need for external synchronization.
+ * {@code Timer} object without the need for external synchronization.
*
* <p>This class does <i>not</i> offer real-time guarantees: it schedules
- * tasks using the <tt>Object.wait(long)</tt> method.
+ * tasks using the {@code Object.wait(long)} method.
*
* <p>Java 5.0 introduced the {@code java.util.concurrent} package and
* one of the concurrency utilities therein is the {@link
@@ -181,8 +181,8 @@
*
* @param task task to be scheduled.
* @param delay delay in milliseconds before task is to be executed.
- * @throws IllegalArgumentException if <tt>delay</tt> is negative, or
- * <tt>delay + System.currentTimeMillis()</tt> is negative.
+ * @throws IllegalArgumentException if {@code delay} is negative, or
+ * {@code delay + System.currentTimeMillis()} is negative.
* @throws IllegalStateException if task was already scheduled or
* cancelled, timer was cancelled, or timer thread terminated.
* @throws NullPointerException if {@code task} is null
@@ -199,7 +199,7 @@
*
* @param task task to be scheduled.
* @param time time at which task is to be executed.
- * @throws IllegalArgumentException if <tt>time.getTime()</tt> is negative.
+ * @throws IllegalArgumentException if {@code time.getTime()} is negative.
* @throws IllegalStateException if task was already scheduled or
* cancelled, timer was cancelled, or timer thread terminated.
* @throws NullPointerException if {@code task} or {@code time} is null
@@ -219,7 +219,7 @@
* background activity), subsequent executions will be delayed as well.
* In the long run, the frequency of execution will generally be slightly
* lower than the reciprocal of the specified period (assuming the system
- * clock underlying <tt>Object.wait(long)</tt> is accurate).
+ * clock underlying {@code Object.wait(long)} is accurate).
*
* <p>Fixed-delay execution is appropriate for recurring activities
* that require "smoothness." In other words, it is appropriate for
@@ -259,7 +259,7 @@
* background activity), subsequent executions will be delayed as well.
* In the long run, the frequency of execution will generally be slightly
* lower than the reciprocal of the specified period (assuming the system
- * clock underlying <tt>Object.wait(long)</tt> is accurate). As a
+ * clock underlying {@code Object.wait(long)} is accurate). As a
* consequence of the above, if the scheduled first time is in the past,
* it is scheduled for immediate execution.
*
@@ -298,7 +298,7 @@
* activity), two or more executions will occur in rapid succession to
* "catch up." In the long run, the frequency of execution will be
* exactly the reciprocal of the specified period (assuming the system
- * clock underlying <tt>Object.wait(long)</tt> is accurate).
+ * clock underlying {@code Object.wait(long)} is accurate).
*
* <p>Fixed-rate execution is appropriate for recurring activities that
* are sensitive to <i>absolute</i> time, such as ringing a chime every
@@ -339,7 +339,7 @@
* activity), two or more executions will occur in rapid succession to
* "catch up." In the long run, the frequency of execution will be
* exactly the reciprocal of the specified period (assuming the system
- * clock underlying <tt>Object.wait(long)</tt> is accurate). As a
+ * clock underlying {@code Object.wait(long)} is accurate). As a
* consequence of the above, if the scheduled first time is in the past,
* then any "missed" executions will be scheduled for immediate "catch up"
* execution.
@@ -378,7 +378,7 @@
* in Date.getTime() format. This method checks timer state, task state,
* and initial execution time, but not period.
*
- * @throws IllegalArgumentException if <tt>time</tt> is negative.
+ * @throws IllegalArgumentException if {@code time} is negative.
* @throws IllegalStateException if task was already scheduled or
* cancelled, timer was cancelled, or timer thread terminated.
* @throws NullPointerException if {@code task} is null
diff --git a/jdk/src/java.base/share/classes/java/util/TimerTask.java b/jdk/src/java.base/share/classes/java/util/TimerTask.java
index fe89656..6703cc0 100644
--- a/jdk/src/java.base/share/classes/java/util/TimerTask.java
+++ b/jdk/src/java.base/share/classes/java/util/TimerTask.java
@@ -102,7 +102,7 @@
* will never run again. (If the task is running when this call occurs,
* the task will run to completion, but will never run again.)
*
- * <p>Note that calling this method from within the <tt>run</tt> method of
+ * <p>Note that calling this method from within the {@code run} method of
* a repeating timer task absolutely guarantees that the timer task will
* not run again.
*
@@ -114,7 +114,7 @@
* Returns false if the task was scheduled for one-time execution
* and has already run, or if the task was never scheduled, or if
* the task was already cancelled. (Loosely speaking, this method
- * returns <tt>true</tt> if it prevents one or more scheduled
+ * returns {@code true} if it prevents one or more scheduled
* executions from taking place.)
*/
public boolean cancel() {
diff --git a/jdk/src/java.base/share/classes/java/util/TreeSet.java b/jdk/src/java.base/share/classes/java/util/TreeSet.java
index f71a616..b80021e 100644
--- a/jdk/src/java.base/share/classes/java/util/TreeSet.java
+++ b/jdk/src/java.base/share/classes/java/util/TreeSet.java
@@ -220,7 +220,7 @@
* Returns {@code true} if this set contains the specified element.
* More formally, returns {@code true} if and only if this set
* contains an element {@code e} such that
- * <tt>(o==null ? e==null : o.equals(e))</tt>.
+ * {@code Objects.equals(o, e)}.
*
* @param o object to be checked for containment in this set
* @return {@code true} if this set contains the specified element
@@ -238,7 +238,7 @@
* Adds the specified element to this set if it is not already present.
* More formally, adds the specified element {@code e} to this set if
* the set contains no element {@code e2} such that
- * <tt>(e==null ? e2==null : e.equals(e2))</tt>.
+ * {@code Objects.equals(e, e2)}.
* If this set already contains the element, the call leaves the set
* unchanged and returns {@code false}.
*
@@ -258,7 +258,7 @@
/**
* Removes the specified element from this set if it is present.
* More formally, removes an element {@code e} such that
- * <tt>(o==null ? e==null : o.equals(e))</tt>,
+ * {@code Objects.equals(o, e)},
* if this set contains such an element. Returns {@code true} if
* this set contained the element (or equivalently, if this set
* changed as a result of the call). (This set will not contain the
diff --git a/jdk/src/java.base/share/classes/java/util/UnknownFormatConversionException.java b/jdk/src/java.base/share/classes/java/util/UnknownFormatConversionException.java
index 9ef964d..1278c6e 100644
--- a/jdk/src/java.base/share/classes/java/util/UnknownFormatConversionException.java
+++ b/jdk/src/java.base/share/classes/java/util/UnknownFormatConversionException.java
@@ -28,7 +28,7 @@
/**
* Unchecked exception thrown when an unknown conversion is given.
*
- * <p> Unless otherwise specified, passing a <tt>null</tt> argument to
+ * <p> Unless otherwise specified, passing a {@code null} argument to
* any method or constructor in this class will cause a {@link
* NullPointerException} to be thrown.
*
diff --git a/jdk/src/java.base/share/classes/java/util/UnknownFormatFlagsException.java b/jdk/src/java.base/share/classes/java/util/UnknownFormatFlagsException.java
index 764fe6d..8549566 100644
--- a/jdk/src/java.base/share/classes/java/util/UnknownFormatFlagsException.java
+++ b/jdk/src/java.base/share/classes/java/util/UnknownFormatFlagsException.java
@@ -28,7 +28,7 @@
/**
* Unchecked exception thrown when an unknown flag is given.
*
- * <p> Unless otherwise specified, passing a <tt>null</tt> argument to any
+ * <p> Unless otherwise specified, passing a {@code null} argument to any
* method or constructor in this class will cause a {@link
* NullPointerException} to be thrown.
*
diff --git a/jdk/src/java.base/share/classes/java/util/Vector.java b/jdk/src/java.base/share/classes/java/util/Vector.java
index 815a646..6e833f7 100644
--- a/jdk/src/java.base/share/classes/java/util/Vector.java
+++ b/jdk/src/java.base/share/classes/java/util/Vector.java
@@ -365,7 +365,7 @@
* Returns {@code true} if this vector contains the specified element.
* More formally, returns {@code true} if and only if this vector
* contains at least one element {@code e} such that
- * <tt>(o==null ? e==null : o.equals(e))</tt>.
+ * {@code Objects.equals(o, e)}.
*
* @param o element whose presence in this vector is to be tested
* @return {@code true} if this vector contains the specified element
@@ -378,7 +378,7 @@
* Returns the index of the first occurrence of the specified element
* in this vector, or -1 if this vector does not contain the element.
* More formally, returns the lowest index {@code i} such that
- * <tt>(o==null ? get(i)==null : o.equals(get(i)))</tt>,
+ * {@code Objects.equals(o, get(i))},
* or -1 if there is no such index.
*
* @param o element to search for
@@ -394,7 +394,7 @@
* this vector, searching forwards from {@code index}, or returns -1 if
* the element is not found.
* More formally, returns the lowest index {@code i} such that
- * <tt>(i >= index && (o==null ? get(i)==null : o.equals(get(i))))</tt>,
+ * {@code (i >= index && Objects.equals(o, get(i)))},
* or -1 if there is no such index.
*
* @param o element to search for
@@ -422,7 +422,7 @@
* Returns the index of the last occurrence of the specified element
* in this vector, or -1 if this vector does not contain the element.
* More formally, returns the highest index {@code i} such that
- * <tt>(o==null ? get(i)==null : o.equals(get(i)))</tt>,
+ * {@code Objects.equals(o, get(i))},
* or -1 if there is no such index.
*
* @param o element to search for
@@ -438,7 +438,7 @@
* this vector, searching backwards from {@code index}, or returns -1 if
* the element is not found.
* More formally, returns the highest index {@code i} such that
- * <tt>(i <= index && (o==null ? get(i)==null : o.equals(get(i))))</tt>,
+ * {@code (i <= index && Objects.equals(o, get(i)))},
* or -1 if there is no such index.
*
* @param o element to search for
@@ -798,7 +798,7 @@
* Removes the first occurrence of the specified element in this Vector
* If the Vector does not contain the element, it is unchanged. More
* formally, removes the element with the lowest index i such that
- * {@code (o==null ? get(i)==null : o.equals(get(i)))} (if such
+ * {@code Objects.equals(o, get(i))} (if such
* an element exists).
*
* @param o element to be removed from this Vector, if present
@@ -991,8 +991,8 @@
* true if and only if the specified Object is also a List, both Lists
* have the same size, and all corresponding pairs of elements in the two
* Lists are <em>equal</em>. (Two elements {@code e1} and
- * {@code e2} are <em>equal</em> if {@code (e1==null ? e2==null :
- * e1.equals(e2))}.) In other words, two Lists are defined to be
+ * {@code e2} are <em>equal</em> if {@code Objects.equals(e1, e2)}.)
+ * In other words, two Lists are defined to be
* equal if they contain the same elements in the same order.
*
* @param o the Object to be compared for equality with this Vector
diff --git a/jdk/src/java.base/share/classes/java/util/WeakHashMap.java b/jdk/src/java.base/share/classes/java/util/WeakHashMap.java
index 4dd8e99..c89567a 100644
--- a/jdk/src/java.base/share/classes/java/util/WeakHashMap.java
+++ b/jdk/src/java.base/share/classes/java/util/WeakHashMap.java
@@ -34,79 +34,79 @@
/**
- * Hash table based implementation of the <tt>Map</tt> interface, with
+ * Hash table based implementation of the {@code Map} interface, with
* <em>weak keys</em>.
- * An entry in a <tt>WeakHashMap</tt> will automatically be removed when
+ * An entry in a {@code WeakHashMap} will automatically be removed when
* its key is no longer in ordinary use. More precisely, the presence of a
* mapping for a given key will not prevent the key from being discarded by the
* garbage collector, that is, made finalizable, finalized, and then reclaimed.
* When a key has been discarded its entry is effectively removed from the map,
- * so this class behaves somewhat differently from other <tt>Map</tt>
+ * so this class behaves somewhat differently from other {@code Map}
* implementations.
*
* <p> Both null values and the null key are supported. This class has
- * performance characteristics similar to those of the <tt>HashMap</tt>
+ * performance characteristics similar to those of the {@code HashMap}
* class, and has the same efficiency parameters of <em>initial capacity</em>
* and <em>load factor</em>.
*
* <p> Like most collection classes, this class is not synchronized.
- * A synchronized <tt>WeakHashMap</tt> may be constructed using the
+ * A synchronized {@code WeakHashMap} may be constructed using the
* {@link Collections#synchronizedMap Collections.synchronizedMap}
* method.
*
* <p> This class is intended primarily for use with key objects whose
- * <tt>equals</tt> methods test for object identity using the
- * <tt>==</tt> operator. Once such a key is discarded it can never be
+ * {@code equals} methods test for object identity using the
+ * {@code ==} operator. Once such a key is discarded it can never be
* recreated, so it is impossible to do a lookup of that key in a
- * <tt>WeakHashMap</tt> at some later time and be surprised that its entry
+ * {@code WeakHashMap} at some later time and be surprised that its entry
* has been removed. This class will work perfectly well with key objects
- * whose <tt>equals</tt> methods are not based upon object identity, such
- * as <tt>String</tt> instances. With such recreatable key objects,
- * however, the automatic removal of <tt>WeakHashMap</tt> entries whose
+ * whose {@code equals} methods are not based upon object identity, such
+ * as {@code String} instances. With such recreatable key objects,
+ * however, the automatic removal of {@code WeakHashMap} entries whose
* keys have been discarded may prove to be confusing.
*
- * <p> The behavior of the <tt>WeakHashMap</tt> class depends in part upon
+ * <p> The behavior of the {@code WeakHashMap} class depends in part upon
* the actions of the garbage collector, so several familiar (though not
- * required) <tt>Map</tt> invariants do not hold for this class. Because
+ * required) {@code Map} invariants do not hold for this class. Because
* the garbage collector may discard keys at any time, a
- * <tt>WeakHashMap</tt> may behave as though an unknown thread is silently
+ * {@code WeakHashMap} may behave as though an unknown thread is silently
* removing entries. In particular, even if you synchronize on a
- * <tt>WeakHashMap</tt> instance and invoke none of its mutator methods, it
- * is possible for the <tt>size</tt> method to return smaller values over
- * time, for the <tt>isEmpty</tt> method to return <tt>false</tt> and
- * then <tt>true</tt>, for the <tt>containsKey</tt> method to return
- * <tt>true</tt> and later <tt>false</tt> for a given key, for the
- * <tt>get</tt> method to return a value for a given key but later return
- * <tt>null</tt>, for the <tt>put</tt> method to return
- * <tt>null</tt> and the <tt>remove</tt> method to return
- * <tt>false</tt> for a key that previously appeared to be in the map, and
+ * {@code WeakHashMap} instance and invoke none of its mutator methods, it
+ * is possible for the {@code size} method to return smaller values over
+ * time, for the {@code isEmpty} method to return {@code false} and
+ * then {@code true}, for the {@code containsKey} method to return
+ * {@code true} and later {@code false} for a given key, for the
+ * {@code get} method to return a value for a given key but later return
+ * {@code null}, for the {@code put} method to return
+ * {@code null} and the {@code remove} method to return
+ * {@code false} for a key that previously appeared to be in the map, and
* for successive examinations of the key set, the value collection, and
* the entry set to yield successively smaller numbers of elements.
*
- * <p> Each key object in a <tt>WeakHashMap</tt> is stored indirectly as
+ * <p> Each key object in a {@code WeakHashMap} is stored indirectly as
* the referent of a weak reference. Therefore a key will automatically be
* removed only after the weak references to it, both inside and outside of the
* map, have been cleared by the garbage collector.
*
* <p> <strong>Implementation note:</strong> The value objects in a
- * <tt>WeakHashMap</tt> are held by ordinary strong references. Thus care
+ * {@code WeakHashMap} are held by ordinary strong references. Thus care
* should be taken to ensure that value objects do not strongly refer to their
* own keys, either directly or indirectly, since that will prevent the keys
* from being discarded. Note that a value object may refer indirectly to its
- * key via the <tt>WeakHashMap</tt> itself; that is, a value object may
+ * key via the {@code WeakHashMap} itself; that is, a value object may
* strongly refer to some other key object whose associated value object, in
* turn, strongly refers to the key of the first value object. If the values
* in the map do not rely on the map holding strong references to them, one way
* to deal with this is to wrap values themselves within
- * <tt>WeakReferences</tt> before
- * inserting, as in: <tt>m.put(key, new WeakReference(value))</tt>,
- * and then unwrapping upon each <tt>get</tt>.
+ * {@code WeakReferences} before
+ * inserting, as in: {@code m.put(key, new WeakReference(value))},
+ * and then unwrapping upon each {@code get}.
*
- * <p>The iterators returned by the <tt>iterator</tt> method of the collections
+ * <p>The iterators returned by the {@code iterator} method of the collections
* returned by all of this class's "collection view methods" are
* <i>fail-fast</i>: if the map is structurally modified at any time after the
* iterator is created, in any way except through the iterator's own
- * <tt>remove</tt> method, the iterator will throw a {@link
+ * {@code remove} method, the iterator will throw a {@link
* ConcurrentModificationException}. Thus, in the face of concurrent
* modification, the iterator fails quickly and cleanly, rather than risking
* arbitrary, non-deterministic behavior at an undetermined time in the future.
@@ -114,7 +114,7 @@
* <p>Note that the fail-fast behavior of an iterator cannot be guaranteed
* as it is, generally speaking, impossible to make any hard guarantees in the
* presence of unsynchronized concurrent modification. Fail-fast iterators
- * throw <tt>ConcurrentModificationException</tt> on a best-effort basis.
+ * throw {@code ConcurrentModificationException} on a best-effort basis.
* Therefore, it would be wrong to write a program that depended on this
* exception for its correctness: <i>the fail-fast behavior of iterators
* should be used only to detect bugs.</i>
@@ -196,11 +196,11 @@
}
/**
- * Constructs a new, empty <tt>WeakHashMap</tt> with the given initial
+ * Constructs a new, empty {@code WeakHashMap} with the given initial
* capacity and the given load factor.
*
- * @param initialCapacity The initial capacity of the <tt>WeakHashMap</tt>
- * @param loadFactor The load factor of the <tt>WeakHashMap</tt>
+ * @param initialCapacity The initial capacity of the {@code WeakHashMap}
+ * @param loadFactor The load factor of the {@code WeakHashMap}
* @throws IllegalArgumentException if the initial capacity is negative,
* or if the load factor is nonpositive.
*/
@@ -223,10 +223,10 @@
}
/**
- * Constructs a new, empty <tt>WeakHashMap</tt> with the given initial
+ * Constructs a new, empty {@code WeakHashMap} with the given initial
* capacity and the default load factor (0.75).
*
- * @param initialCapacity The initial capacity of the <tt>WeakHashMap</tt>
+ * @param initialCapacity The initial capacity of the {@code WeakHashMap}
* @throws IllegalArgumentException if the initial capacity is negative
*/
public WeakHashMap(int initialCapacity) {
@@ -234,7 +234,7 @@
}
/**
- * Constructs a new, empty <tt>WeakHashMap</tt> with the default initial
+ * Constructs a new, empty {@code WeakHashMap} with the default initial
* capacity (16) and load factor (0.75).
*/
public WeakHashMap() {
@@ -242,8 +242,8 @@
}
/**
- * Constructs a new <tt>WeakHashMap</tt> with the same mappings as the
- * specified map. The <tt>WeakHashMap</tt> is created with the default
+ * Constructs a new {@code WeakHashMap} with the same mappings as the
+ * specified map. The {@code WeakHashMap} is created with the default
* load factor (0.75) and an initial capacity sufficient to hold the
* mappings in the specified map.
*
@@ -365,7 +365,7 @@
}
/**
- * Returns <tt>true</tt> if this map contains no key-value mappings.
+ * Returns {@code true} if this map contains no key-value mappings.
* This result is a snapshot, and may not reflect unprocessed
* entries that will be removed before next attempted access
* because they are no longer referenced.
@@ -379,8 +379,9 @@
* or {@code null} if this map contains no mapping for the key.
*
* <p>More formally, if this map contains a mapping from a key
- * {@code k} to a value {@code v} such that {@code (key==null ? k==null :
- * key.equals(k))}, then this method returns {@code v}; otherwise
+ * {@code k} to a value {@code v} such that
+ * {@code Objects.equals(key, k)},
+ * then this method returns {@code v}; otherwise
* it returns {@code null}. (There can be at most one such mapping.)
*
* <p>A return value of {@code null} does not <i>necessarily</i>
@@ -406,12 +407,12 @@
}
/**
- * Returns <tt>true</tt> if this map contains a mapping for the
+ * Returns {@code true} if this map contains a mapping for the
* specified key.
*
* @param key The key whose presence in this map is to be tested
- * @return <tt>true</tt> if there is a mapping for <tt>key</tt>;
- * <tt>false</tt> otherwise
+ * @return {@code true} if there is a mapping for {@code key};
+ * {@code false} otherwise
*/
public boolean containsKey(Object key) {
return getEntry(key) != null;
@@ -439,10 +440,10 @@
*
* @param key key with which the specified value is to be associated.
* @param value value to be associated with the specified key.
- * @return the previous value associated with <tt>key</tt>, or
- * <tt>null</tt> if there was no mapping for <tt>key</tt>.
- * (A <tt>null</tt> return can also indicate that the map
- * previously associated <tt>null</tt> with <tt>key</tt>.)
+ * @return the previous value associated with {@code key}, or
+ * {@code null} if there was no mapping for {@code key}.
+ * (A {@code null} return can also indicate that the map
+ * previously associated {@code null} with {@code key}.)
*/
public V put(K key, V value) {
Object k = maskNull(key);
@@ -568,23 +569,23 @@
/**
* Removes the mapping for a key from this weak hash map if it is present.
- * More formally, if this map contains a mapping from key <tt>k</tt> to
- * value <tt>v</tt> such that <code>(key==null ? k==null :
+ * More formally, if this map contains a mapping from key {@code k} to
+ * value {@code v} such that <code>(key==null ? k==null :
* key.equals(k))</code>, that mapping is removed. (The map can contain
* at most one such mapping.)
*
* <p>Returns the value to which this map previously associated the key,
- * or <tt>null</tt> if the map contained no mapping for the key. A
- * return value of <tt>null</tt> does not <i>necessarily</i> indicate
+ * or {@code null} if the map contained no mapping for the key. A
+ * return value of {@code null} does not <i>necessarily</i> indicate
* that the map contained no mapping for the key; it's also possible
- * that the map explicitly mapped the key to <tt>null</tt>.
+ * that the map explicitly mapped the key to {@code null}.
*
* <p>The map will not contain a mapping for the specified key once the
* call returns.
*
* @param key key whose mapping is to be removed from the map
- * @return the previous value associated with <tt>key</tt>, or
- * <tt>null</tt> if there was no mapping for <tt>key</tt>
+ * @return the previous value associated with {@code key}, or
+ * {@code null} if there was no mapping for {@code key}
*/
public V remove(Object key) {
Object k = maskNull(key);
@@ -664,11 +665,11 @@
}
/**
- * Returns <tt>true</tt> if this map maps one or more keys to the
+ * Returns {@code true} if this map maps one or more keys to the
* specified value.
*
* @param value value whose presence in this map is to be tested
- * @return <tt>true</tt> if this map maps one or more keys to the
+ * @return {@code true} if this map maps one or more keys to the
* specified value
*/
public boolean containsValue(Object value) {
@@ -855,12 +856,12 @@
* The set is backed by the map, so changes to the map are
* reflected in the set, and vice-versa. If the map is modified
* while an iteration over the set is in progress (except through
- * the iterator's own <tt>remove</tt> operation), the results of
+ * the iterator's own {@code remove} operation), the results of
* the iteration are undefined. The set supports element removal,
* which removes the corresponding mapping from the map, via the
- * <tt>Iterator.remove</tt>, <tt>Set.remove</tt>,
- * <tt>removeAll</tt>, <tt>retainAll</tt>, and <tt>clear</tt>
- * operations. It does not support the <tt>add</tt> or <tt>addAll</tt>
+ * {@code Iterator.remove}, {@code Set.remove},
+ * {@code removeAll}, {@code retainAll}, and {@code clear}
+ * operations. It does not support the {@code add} or {@code addAll}
* operations.
*/
public Set<K> keySet() {
@@ -904,13 +905,13 @@
* The collection is backed by the map, so changes to the map are
* reflected in the collection, and vice-versa. If the map is
* modified while an iteration over the collection is in progress
- * (except through the iterator's own <tt>remove</tt> operation),
+ * (except through the iterator's own {@code remove} operation),
* the results of the iteration are undefined. The collection
* supports element removal, which removes the corresponding
- * mapping from the map, via the <tt>Iterator.remove</tt>,
- * <tt>Collection.remove</tt>, <tt>removeAll</tt>,
- * <tt>retainAll</tt> and <tt>clear</tt> operations. It does not
- * support the <tt>add</tt> or <tt>addAll</tt> operations.
+ * mapping from the map, via the {@code Iterator.remove},
+ * {@code Collection.remove}, {@code removeAll},
+ * {@code retainAll} and {@code clear} operations. It does not
+ * support the {@code add} or {@code addAll} operations.
*/
public Collection<V> values() {
Collection<V> vs = values;
@@ -944,14 +945,14 @@
* The set is backed by the map, so changes to the map are
* reflected in the set, and vice-versa. If the map is modified
* while an iteration over the set is in progress (except through
- * the iterator's own <tt>remove</tt> operation, or through the
- * <tt>setValue</tt> operation on a map entry returned by the
+ * the iterator's own {@code remove} operation, or through the
+ * {@code setValue} operation on a map entry returned by the
* iterator) the results of the iteration are undefined. The set
* supports element removal, which removes the corresponding
- * mapping from the map, via the <tt>Iterator.remove</tt>,
- * <tt>Set.remove</tt>, <tt>removeAll</tt>, <tt>retainAll</tt> and
- * <tt>clear</tt> operations. It does not support the
- * <tt>add</tt> or <tt>addAll</tt> operations.
+ * mapping from the map, via the {@code Iterator.remove},
+ * {@code Set.remove}, {@code removeAll}, {@code retainAll} and
+ * {@code clear} operations. It does not support the
+ * {@code add} or {@code addAll} operations.
*/
public Set<Map.Entry<K,V>> entrySet() {
Set<Map.Entry<K,V>> es = entrySet;
diff --git a/jdk/src/java.base/share/classes/java/util/regex/MatchResult.java b/jdk/src/java.base/share/classes/java/util/regex/MatchResult.java
index 4f42eae..1e69638 100644
--- a/jdk/src/java.base/share/classes/java/util/regex/MatchResult.java
+++ b/jdk/src/java.base/share/classes/java/util/regex/MatchResult.java
@@ -31,7 +31,7 @@
* <p>This interface contains query methods used to determine the
* results of a match against a regular expression. The match boundaries,
* groups and group boundaries can be seen but not modified through
- * a <code>MatchResult</code>.
+ * a {@code MatchResult}.
*
* @author Michael McCloskey
* @see Matcher
@@ -56,14 +56,14 @@
*
* <p> <a href="Pattern.html#cg">Capturing groups</a> are indexed from left
* to right, starting at one. Group zero denotes the entire pattern, so
- * the expression <i>m.</i><tt>start(0)</tt> is equivalent to
- * <i>m.</i><tt>start()</tt>. </p>
+ * the expression <i>m.</i>{@code start(0)} is equivalent to
+ * <i>m.</i>{@code start()}. </p>
*
* @param group
* The index of a capturing group in this matcher's pattern
*
* @return The index of the first character captured by the group,
- * or <tt>-1</tt> if the match was successful but the group
+ * or {@code -1} if the match was successful but the group
* itself did not match anything
*
* @throws IllegalStateException
@@ -93,14 +93,14 @@
*
* <p> <a href="Pattern.html#cg">Capturing groups</a> are indexed from left
* to right, starting at one. Group zero denotes the entire pattern, so
- * the expression <i>m.</i><tt>end(0)</tt> is equivalent to
- * <i>m.</i><tt>end()</tt>. </p>
+ * the expression <i>m.</i>{@code end(0)} is equivalent to
+ * <i>m.</i>{@code end()}. </p>
*
* @param group
* The index of a capturing group in this matcher's pattern
*
* @return The offset after the last character captured by the group,
- * or <tt>-1</tt> if the match was successful
+ * or {@code -1} if the match was successful
* but the group itself did not match anything
*
* @throws IllegalStateException
@@ -117,11 +117,11 @@
* Returns the input subsequence matched by the previous match.
*
* <p> For a matcher <i>m</i> with input sequence <i>s</i>,
- * the expressions <i>m.</i><tt>group()</tt> and
- * <i>s.</i><tt>substring(</tt><i>m.</i><tt>start(),</tt> <i>m.</i><tt>end())</tt>
+ * the expressions <i>m.</i>{@code group()} and
+ * <i>s.</i>{@code substring(}<i>m.</i>{@code start(),} <i>m.</i>{@code end())}
* are equivalent. </p>
*
- * <p> Note that some patterns, for example <tt>a*</tt>, match the empty
+ * <p> Note that some patterns, for example {@code a*}, match the empty
* string. This method will return the empty string when the pattern
* successfully matches the empty string in the input. </p>
*
@@ -139,18 +139,19 @@
* previous match operation.
*
* <p> For a matcher <i>m</i>, input sequence <i>s</i>, and group index
- * <i>g</i>, the expressions <i>m.</i><tt>group(</tt><i>g</i><tt>)</tt> and
- * <i>s.</i><tt>substring(</tt><i>m.</i><tt>start(</tt><i>g</i><tt>),</tt> <i>m.</i><tt>end(</tt><i>g</i><tt>))</tt>
+ * <i>g</i>, the expressions <i>m.</i>{@code group(}<i>g</i>{@code )} and
+ * <i>s.</i>{@code substring(}<i>m.</i>{@code start(}<i>g</i>{@code
+ * ),} <i>m.</i>{@code end(}<i>g</i>{@code ))}
* are equivalent. </p>
*
* <p> <a href="Pattern.html#cg">Capturing groups</a> are indexed from left
* to right, starting at one. Group zero denotes the entire pattern, so
- * the expression <tt>m.group(0)</tt> is equivalent to <tt>m.group()</tt>.
+ * the expression {@code m.group(0)} is equivalent to {@code m.group()}.
* </p>
*
* <p> If the match was successful but the group specified failed to match
- * any part of the input sequence, then <tt>null</tt> is returned. Note
- * that some groups, for example <tt>(a*)</tt>, match the empty string.
+ * any part of the input sequence, then {@code null} is returned. Note
+ * that some groups, for example {@code (a*)}, match the empty string.
* This method will return the empty string when such a group successfully
* matches the empty string in the input. </p>
*
@@ -158,7 +159,7 @@
* The index of a capturing group in this matcher's pattern
*
* @return The (possibly empty) subsequence captured by the group
- * during the previous match, or <tt>null</tt> if the group
+ * during the previous match, or {@code null} if the group
* failed to match part of the input
*
* @throws IllegalStateException
diff --git a/jdk/src/java.base/share/classes/java/util/regex/Matcher.java b/jdk/src/java.base/share/classes/java/util/regex/Matcher.java
index 2340e72..f8231e8 100644
--- a/jdk/src/java.base/share/classes/java/util/regex/Matcher.java
+++ b/jdk/src/java.base/share/classes/java/util/regex/Matcher.java
@@ -258,7 +258,7 @@
* The result is unaffected by subsequent operations performed upon this
* matcher.
*
- * @return a <code>MatchResult</code> with the state of this matcher
+ * @return a {@code MatchResult} with the state of this matcher
* @since 1.5
*/
public MatchResult toMatchResult() {
@@ -347,7 +347,7 @@
}
/**
- * Changes the <tt>Pattern</tt> that this <tt>Matcher</tt> uses to
+ * Changes the {@code Pattern} that this {@code Matcher} uses to
* find matches with.
*
* <p> This method causes this matcher to lose information
@@ -359,7 +359,7 @@
* The new pattern used by this matcher
* @return This matcher
* @throws IllegalArgumentException
- * If newPattern is <tt>null</tt>
+ * If newPattern is {@code null}
* @since 1.5
*/
public Matcher usePattern(Pattern newPattern) {
@@ -444,14 +444,14 @@
*
* <p> <a href="Pattern.html#cg">Capturing groups</a> are indexed from left
* to right, starting at one. Group zero denotes the entire pattern, so
- * the expression <i>m.</i><tt>start(0)</tt> is equivalent to
- * <i>m.</i><tt>start()</tt>. </p>
+ * the expression <i>m.</i>{@code start(0)} is equivalent to
+ * <i>m.</i>{@code start()}. </p>
*
* @param group
* The index of a capturing group in this matcher's pattern
*
* @return The index of the first character captured by the group,
- * or <tt>-1</tt> if the match was successful but the group
+ * or {@code -1} if the match was successful but the group
* itself did not match anything
*
* @throws IllegalStateException
@@ -516,14 +516,14 @@
*
* <p> <a href="Pattern.html#cg">Capturing groups</a> are indexed from left
* to right, starting at one. Group zero denotes the entire pattern, so
- * the expression <i>m.</i><tt>end(0)</tt> is equivalent to
- * <i>m.</i><tt>end()</tt>. </p>
+ * the expression <i>m.</i>{@code end(0)} is equivalent to
+ * <i>m.</i>{@code end()}. </p>
*
* @param group
* The index of a capturing group in this matcher's pattern
*
* @return The offset after the last character captured by the group,
- * or <tt>-1</tt> if the match was successful
+ * or {@code -1} if the match was successful
* but the group itself did not match anything
*
* @throws IllegalStateException
@@ -571,11 +571,11 @@
* Returns the input subsequence matched by the previous match.
*
* <p> For a matcher <i>m</i> with input sequence <i>s</i>,
- * the expressions <i>m.</i><tt>group()</tt> and
- * <i>s.</i><tt>substring(</tt><i>m.</i><tt>start(),</tt> <i>m.</i><tt>end())</tt>
+ * the expressions <i>m.</i>{@code group()} and
+ * <i>s.</i>{@code substring(}<i>m.</i>{@code start(),} <i>m.</i>{@code end())}
* are equivalent. </p>
*
- * <p> Note that some patterns, for example <tt>a*</tt>, match the empty
+ * <p> Note that some patterns, for example {@code a*}, match the empty
* string. This method will return the empty string when the pattern
* successfully matches the empty string in the input. </p>
*
@@ -595,18 +595,19 @@
* previous match operation.
*
* <p> For a matcher <i>m</i>, input sequence <i>s</i>, and group index
- * <i>g</i>, the expressions <i>m.</i><tt>group(</tt><i>g</i><tt>)</tt> and
- * <i>s.</i><tt>substring(</tt><i>m.</i><tt>start(</tt><i>g</i><tt>),</tt> <i>m.</i><tt>end(</tt><i>g</i><tt>))</tt>
+ * <i>g</i>, the expressions <i>m.</i>{@code group(}<i>g</i>{@code )} and
+ * <i>s.</i>{@code substring(}<i>m.</i>{@code start(}<i>g</i>{@code
+ * ),} <i>m.</i>{@code end(}<i>g</i>{@code ))}
* are equivalent. </p>
*
* <p> <a href="Pattern.html#cg">Capturing groups</a> are indexed from left
* to right, starting at one. Group zero denotes the entire pattern, so
- * the expression <tt>m.group(0)</tt> is equivalent to <tt>m.group()</tt>.
+ * the expression {@code m.group(0)} is equivalent to {@code m.group()}.
* </p>
*
* <p> If the match was successful but the group specified failed to match
- * any part of the input sequence, then <tt>null</tt> is returned. Note
- * that some groups, for example <tt>(a*)</tt>, match the empty string.
+ * any part of the input sequence, then {@code null} is returned. Note
+ * that some groups, for example {@code (a*)}, match the empty string.
* This method will return the empty string when such a group successfully
* matches the empty string in the input. </p>
*
@@ -614,7 +615,7 @@
* The index of a capturing group in this matcher's pattern
*
* @return The (possibly empty) subsequence captured by the group
- * during the previous match, or <tt>null</tt> if the group
+ * during the previous match, or {@code null} if the group
* failed to match part of the input
*
* @throws IllegalStateException
@@ -641,8 +642,8 @@
* match operation.
*
* <p> If the match was successful but the group specified failed to match
- * any part of the input sequence, then <tt>null</tt> is returned. Note
- * that some groups, for example <tt>(a*)</tt>, match the empty string.
+ * any part of the input sequence, then {@code null} is returned. Note
+ * that some groups, for example {@code (a*)}, match the empty string.
* This method will return the empty string when such a group successfully
* matches the empty string in the input. </p>
*
@@ -650,7 +651,7 @@
* The name of a named-capturing group in this matcher's pattern
*
* @return The (possibly empty) subsequence captured by the named group
- * during the previous match, or <tt>null</tt> if the group
+ * during the previous match, or {@code null} if the group
* failed to match part of the input
*
* @throws IllegalStateException
@@ -689,9 +690,9 @@
* Attempts to match the entire region against the pattern.
*
* <p> If the match succeeds then more information can be obtained via the
- * <tt>start</tt>, <tt>end</tt>, and <tt>group</tt> methods. </p>
+ * {@code start}, {@code end}, and {@code group} methods. </p>
*
- * @return <tt>true</tt> if, and only if, the entire region sequence
+ * @return {@code true} if, and only if, the entire region sequence
* matches this matcher's pattern
*/
public boolean matches() {
@@ -708,9 +709,9 @@
* match.
*
* <p> If the match succeeds then more information can be obtained via the
- * <tt>start</tt>, <tt>end</tt>, and <tt>group</tt> methods. </p>
+ * {@code start}, {@code end}, and {@code group} methods. </p>
*
- * @return <tt>true</tt> if, and only if, a subsequence of the input
+ * @return {@code true} if, and only if, a subsequence of the input
* sequence matches this matcher's pattern
*/
public boolean find() {
@@ -737,7 +738,7 @@
* index.
*
* <p> If the match succeeds then more information can be obtained via the
- * <tt>start</tt>, <tt>end</tt>, and <tt>group</tt> methods, and subsequent
+ * {@code start}, {@code end}, and {@code group} methods, and subsequent
* invocations of the {@link #find()} method will start at the first
* character not matched by this match. </p>
*
@@ -746,7 +747,7 @@
* If start is less than zero or if start is greater than the
* length of the input sequence.
*
- * @return <tt>true</tt> if, and only if, a subsequence of the input
+ * @return {@code true} if, and only if, a subsequence of the input
* sequence starting at the given index matches this matcher's
* pattern
*/
@@ -767,9 +768,9 @@
* require that the entire region be matched.
*
* <p> If the match succeeds then more information can be obtained via the
- * <tt>start</tt>, <tt>end</tt>, and <tt>group</tt> methods. </p>
+ * {@code start}, {@code end}, and {@code group} methods. </p>
*
- * @return <tt>true</tt> if, and only if, a prefix of the input
+ * @return {@code true} if, and only if, a prefix of the input
* sequence matches this matcher's pattern
*/
public boolean lookingAt() {
@@ -777,14 +778,14 @@
}
/**
- * Returns a literal replacement <code>String</code> for the specified
- * <code>String</code>.
+ * Returns a literal replacement {@code String} for the specified
+ * {@code String}.
*
- * This method produces a <code>String</code> that will work
- * as a literal replacement <code>s</code> in the
- * <code>appendReplacement</code> method of the {@link Matcher} class.
- * The <code>String</code> produced will match the sequence of characters
- * in <code>s</code> treated as a literal sequence. Slashes ('\') and
+ * This method produces a {@code String} that will work
+ * as a literal replacement {@code s} in the
+ * {@code appendReplacement} method of the {@link Matcher} class.
+ * The {@code String} produced will match the sequence of characters
+ * in {@code s} treated as a literal sequence. Slashes ('\') and
* dollar signs ('$') will be given no special meaning.
*
* @param s The string to be literalized
@@ -816,7 +817,7 @@
* append position, and appends them to the given string buffer. It
* stops after reading the last character preceding the previous match,
* that is, the character at index {@link
- * #start()} <tt>-</tt> <tt>1</tt>. </p></li>
+ * #start()} {@code -} {@code 1}. </p></li>
*
* <li><p> It appends the given replacement string to the string buffer.
* </p></li>
@@ -829,21 +830,21 @@
*
* <p> The replacement string may contain references to subsequences
* captured during the previous match: Each occurrence of
- * <tt>${</tt><i>name</i><tt>}</tt> or <tt>$</tt><i>g</i>
+ * <code>${</code><i>name</i><code>}</code> or {@code $}<i>g</i>
* will be replaced by the result of evaluating the corresponding
* {@link #group(String) group(name)} or {@link #group(int) group(g)}
- * respectively. For <tt>$</tt><i>g</i>,
- * the first number after the <tt>$</tt> is always treated as part of
+ * respectively. For {@code $}<i>g</i>,
+ * the first number after the {@code $} is always treated as part of
* the group reference. Subsequent numbers are incorporated into g if
* they would form a legal group reference. Only the numerals '0'
* through '9' are considered as potential components of the group
- * reference. If the second group matched the string <tt>"foo"</tt>, for
- * example, then passing the replacement string <tt>"$2bar"</tt> would
- * cause <tt>"foobar"</tt> to be appended to the string buffer. A dollar
- * sign (<tt>$</tt>) may be included as a literal in the replacement
- * string by preceding it with a backslash (<tt>\$</tt>).
+ * reference. If the second group matched the string {@code "foo"}, for
+ * example, then passing the replacement string {@code "$2bar"} would
+ * cause {@code "foobar"} to be appended to the string buffer. A dollar
+ * sign ({@code $}) may be included as a literal in the replacement
+ * string by preceding it with a backslash ({@code \$}).
*
- * <p> Note that backslashes (<tt>\</tt>) and dollar signs (<tt>$</tt>) in
+ * <p> Note that backslashes ({@code \}) and dollar signs ({@code $}) in
* the replacement string may cause the results to be different than if it
* were being treated as a literal replacement string. Dollar signs may be
* treated as references to captured subsequences as described above, and
@@ -852,8 +853,8 @@
*
* <p> This method is intended to be used in a loop together with the
* {@link #appendTail appendTail} and {@link #find find} methods. The
- * following code, for example, writes <tt>one dog two dogs in the
- * yard</tt> to the standard-output stream: </p>
+ * following code, for example, writes {@code one dog two dogs in the
+ * yard} to the standard-output stream: </p>
*
* <blockquote><pre>
* Pattern p = Pattern.compile("cat");
@@ -911,7 +912,7 @@
* append position, and appends them to the given string builder. It
* stops after reading the last character preceding the previous match,
* that is, the character at index {@link
- * #start()} <tt>-</tt> <tt>1</tt>. </p></li>
+ * #start()} {@code -} {@code 1}. </p></li>
*
* <li><p> It appends the given replacement string to the string builder.
* </p></li>
@@ -924,19 +925,19 @@
*
* <p> The replacement string may contain references to subsequences
* captured during the previous match: Each occurrence of
- * <tt>$</tt><i>g</i> will be replaced by the result of
- * evaluating {@link #group(int) group}<tt>(</tt><i>g</i><tt>)</tt>.
- * The first number after the <tt>$</tt> is always treated as part of
+ * {@code $}<i>g</i> will be replaced by the result of
+ * evaluating {@link #group(int) group}{@code (}<i>g</i>{@code )}.
+ * The first number after the {@code $} is always treated as part of
* the group reference. Subsequent numbers are incorporated into g if
* they would form a legal group reference. Only the numerals '0'
* through '9' are considered as potential components of the group
- * reference. If the second group matched the string <tt>"foo"</tt>, for
- * example, then passing the replacement string <tt>"$2bar"</tt> would
- * cause <tt>"foobar"</tt> to be appended to the string builder. A dollar
- * sign (<tt>$</tt>) may be included as a literal in the replacement
- * string by preceding it with a backslash (<tt>\$</tt>).
+ * reference. If the second group matched the string {@code "foo"}, for
+ * example, then passing the replacement string {@code "$2bar"} would
+ * cause {@code "foobar"} to be appended to the string builder. A dollar
+ * sign ({@code $}) may be included as a literal in the replacement
+ * string by preceding it with a backslash ({@code \$}).
*
- * <p> Note that backslashes (<tt>\</tt>) and dollar signs (<tt>$</tt>) in
+ * <p> Note that backslashes ({@code \}) and dollar signs ({@code $}) in
* the replacement string may cause the results to be different than if it
* were being treated as a literal replacement string. Dollar signs may be
* treated as references to captured subsequences as described above, and
@@ -945,8 +946,8 @@
*
* <p> This method is intended to be used in a loop together with the
* {@link #appendTail appendTail} and {@link #find find} methods. The
- * following code, for example, writes <tt>one dog two dogs in the
- * yard</tt> to the standard-output stream: </p>
+ * following code, for example, writes {@code one dog two dogs in the
+ * yard} to the standard-output stream: </p>
*
* <blockquote><pre>
* Pattern p = Pattern.compile("cat");
@@ -1134,17 +1135,17 @@
* string may contain references to captured subsequences as in the {@link
* #appendReplacement appendReplacement} method.
*
- * <p> Note that backslashes (<tt>\</tt>) and dollar signs (<tt>$</tt>) in
+ * <p> Note that backslashes ({@code \}) and dollar signs ({@code $}) in
* the replacement string may cause the results to be different than if it
* were being treated as a literal replacement string. Dollar signs may be
* treated as references to captured subsequences as described above, and
* backslashes are used to escape literal characters in the replacement
* string.
*
- * <p> Given the regular expression <tt>a*b</tt>, the input
- * <tt>"aabfooaabfooabfoob"</tt>, and the replacement string
- * <tt>"-"</tt>, an invocation of this method on a matcher for that
- * expression would yield the string <tt>"-foo-foo-foo-"</tt>.
+ * <p> Given the regular expression {@code a*b}, the input
+ * {@code "aabfooaabfooabfoob"}, and the replacement string
+ * {@code "-"}, an invocation of this method on a matcher for that
+ * expression would yield the string {@code "-foo-foo-foo-"}.
*
* <p> Invoking this method changes this matcher's state. If the matcher
* is to be used in further matching operations then it should first be
@@ -1186,18 +1187,18 @@
* references to captured subsequences as in the {@link #appendReplacement
* appendReplacement} method.
*
- * <p> Note that backslashes (<tt>\</tt>) and dollar signs (<tt>$</tt>) in
+ * <p> Note that backslashes ({@code \}) and dollar signs ({@code $}) in
* a replacement string may cause the results to be different than if it
* were being treated as a literal replacement string. Dollar signs may be
* treated as references to captured subsequences as described above, and
* backslashes are used to escape literal characters in the replacement
* string.
*
- * <p> Given the regular expression <tt>dog</tt>, the input
- * <tt>"zzzdogzzzdogzzz"</tt>, and the function
+ * <p> Given the regular expression {@code dog}, the input
+ * {@code "zzzdogzzzdogzzz"}, and the function
* {@code mr -> mr.group().toUpperCase()}, an invocation of this method on
* a matcher for that expression would yield the string
- * <tt>"zzzDOGzzzDOGzzz"</tt>.
+ * {@code "zzzDOGzzzDOGzzz"}.
*
* <p> Invoking this method changes this matcher's state. If the matcher
* is to be used in further matching operations then it should first be
@@ -1360,17 +1361,17 @@
* string may contain references to captured subsequences as in the {@link
* #appendReplacement appendReplacement} method.
*
- * <p>Note that backslashes (<tt>\</tt>) and dollar signs (<tt>$</tt>) in
+ * <p>Note that backslashes ({@code \}) and dollar signs ({@code $}) in
* the replacement string may cause the results to be different than if it
* were being treated as a literal replacement string. Dollar signs may be
* treated as references to captured subsequences as described above, and
* backslashes are used to escape literal characters in the replacement
* string.
*
- * <p> Given the regular expression <tt>dog</tt>, the input
- * <tt>"zzzdogzzzdogzzz"</tt>, and the replacement string
- * <tt>"cat"</tt>, an invocation of this method on a matcher for that
- * expression would yield the string <tt>"zzzcatzzzdogzzz"</tt>. </p>
+ * <p> Given the regular expression {@code dog}, the input
+ * {@code "zzzdogzzzdogzzz"}, and the replacement string
+ * {@code "cat"}, an invocation of this method on a matcher for that
+ * expression would yield the string {@code "zzzcatzzzdogzzz"}. </p>
*
* <p> Invoking this method changes this matcher's state. If the matcher
* is to be used in further matching operations then it should first be
@@ -1408,18 +1409,18 @@
* references to captured subsequences as in the {@link #appendReplacement
* appendReplacement} method.
*
- * <p>Note that backslashes (<tt>\</tt>) and dollar signs (<tt>$</tt>) in
+ * <p>Note that backslashes ({@code \}) and dollar signs ({@code $}) in
* the replacement string may cause the results to be different than if it
* were being treated as a literal replacement string. Dollar signs may be
* treated as references to captured subsequences as described above, and
* backslashes are used to escape literal characters in the replacement
* string.
*
- * <p> Given the regular expression <tt>dog</tt>, the input
- * <tt>"zzzdogzzzdogzzz"</tt>, and the function
+ * <p> Given the regular expression {@code dog}, the input
+ * {@code "zzzdogzzzdogzzz"}, and the function
* {@code mr -> mr.group().toUpperCase()}, an invocation of this method on
* a matcher for that expression would yield the string
- * <tt>"zzzDOGzzzdogzzz"</tt>.
+ * {@code "zzzDOGzzzdogzzz"}.
*
* <p> Invoking this method changes this matcher's state. If the matcher
* is to be used in further matching operations then it should first be
@@ -1471,8 +1472,8 @@
* Sets the limits of this matcher's region. The region is the part of the
* input sequence that will be searched to find a match. Invoking this
* method resets the matcher, and then sets the region to start at the
- * index specified by the <code>start</code> parameter and end at the
- * index specified by the <code>end</code> parameter.
+ * index specified by the {@code start} parameter and end at the
+ * index specified by the {@code end} parameter.
*
* <p>Depending on the transparency and anchoring being used (see
* {@link #useTransparentBounds useTransparentBounds} and
@@ -1534,8 +1535,8 @@
/**
* Queries the transparency of region bounds for this matcher.
*
- * <p> This method returns <tt>true</tt> if this matcher uses
- * <i>transparent</i> bounds, <tt>false</tt> if it uses <i>opaque</i>
+ * <p> This method returns {@code true} if this matcher uses
+ * <i>transparent</i> bounds, {@code false} if it uses <i>opaque</i>
* bounds.
*
* <p> See {@link #useTransparentBounds useTransparentBounds} for a
@@ -1543,8 +1544,8 @@
*
* <p> By default, a matcher uses opaque region boundaries.
*
- * @return <tt>true</tt> iff this matcher is using transparent bounds,
- * <tt>false</tt> otherwise.
+ * @return {@code true} iff this matcher is using transparent bounds,
+ * {@code false} otherwise.
* @see java.util.regex.Matcher#useTransparentBounds(boolean)
* @since 1.5
*/
@@ -1555,9 +1556,9 @@
/**
* Sets the transparency of region bounds for this matcher.
*
- * <p> Invoking this method with an argument of <tt>true</tt> will set this
+ * <p> Invoking this method with an argument of {@code true} will set this
* matcher to use <i>transparent</i> bounds. If the boolean
- * argument is <tt>false</tt>, then <i>opaque</i> bounds will be used.
+ * argument is {@code false}, then <i>opaque</i> bounds will be used.
*
* <p> Using transparent bounds, the boundaries of this
* matcher's region are transparent to lookahead, lookbehind,
@@ -1586,16 +1587,16 @@
/**
* Queries the anchoring of region bounds for this matcher.
*
- * <p> This method returns <tt>true</tt> if this matcher uses
- * <i>anchoring</i> bounds, <tt>false</tt> otherwise.
+ * <p> This method returns {@code true} if this matcher uses
+ * <i>anchoring</i> bounds, {@code false} otherwise.
*
* <p> See {@link #useAnchoringBounds useAnchoringBounds} for a
* description of anchoring bounds.
*
* <p> By default, a matcher uses anchoring region boundaries.
*
- * @return <tt>true</tt> iff this matcher is using anchoring bounds,
- * <tt>false</tt> otherwise.
+ * @return {@code true} iff this matcher is using anchoring bounds,
+ * {@code false} otherwise.
* @see java.util.regex.Matcher#useAnchoringBounds(boolean)
* @since 1.5
*/
@@ -1606,9 +1607,9 @@
/**
* Sets the anchoring of region bounds for this matcher.
*
- * <p> Invoking this method with an argument of <tt>true</tt> will set this
+ * <p> Invoking this method with an argument of {@code true} will set this
* matcher to use <i>anchoring</i> bounds. If the boolean
- * argument is <tt>false</tt>, then <i>non-anchoring</i> bounds will be
+ * argument is {@code false}, then <i>non-anchoring</i> bounds will be
* used.
*
* <p> Using anchoring bounds, the boundaries of this
@@ -1631,7 +1632,7 @@
/**
* <p>Returns the string representation of this matcher. The
- * string representation of a <code>Matcher</code> contains information
+ * string representation of a {@code Matcher} contains information
* that may be useful for debugging. The exact format is unspecified.
*
* @return The string representation of this matcher
diff --git a/jdk/src/java.base/share/classes/java/util/regex/Pattern.java b/jdk/src/java.base/share/classes/java/util/regex/Pattern.java
index 4dbb8356..756567d 100644
--- a/jdk/src/java.base/share/classes/java/util/regex/Pattern.java
+++ b/jdk/src/java.base/share/classes/java/util/regex/Pattern.java
@@ -88,40 +88,40 @@
*
* <tr><td valign="top" headers="construct characters"><i>x</i></td>
* <td headers="matches">The character <i>x</i></td></tr>
- * <tr><td valign="top" headers="construct characters"><tt>\\</tt></td>
+ * <tr><td valign="top" headers="construct characters">{@code \\}</td>
* <td headers="matches">The backslash character</td></tr>
- * <tr><td valign="top" headers="construct characters"><tt>\0</tt><i>n</i></td>
- * <td headers="matches">The character with octal value <tt>0</tt><i>n</i>
- * (0 <tt><=</tt> <i>n</i> <tt><=</tt> 7)</td></tr>
- * <tr><td valign="top" headers="construct characters"><tt>\0</tt><i>nn</i></td>
- * <td headers="matches">The character with octal value <tt>0</tt><i>nn</i>
- * (0 <tt><=</tt> <i>n</i> <tt><=</tt> 7)</td></tr>
- * <tr><td valign="top" headers="construct characters"><tt>\0</tt><i>mnn</i></td>
- * <td headers="matches">The character with octal value <tt>0</tt><i>mnn</i>
- * (0 <tt><=</tt> <i>m</i> <tt><=</tt> 3,
- * 0 <tt><=</tt> <i>n</i> <tt><=</tt> 7)</td></tr>
- * <tr><td valign="top" headers="construct characters"><tt>\x</tt><i>hh</i></td>
- * <td headers="matches">The character with hexadecimal value <tt>0x</tt><i>hh</i></td></tr>
- * <tr><td valign="top" headers="construct characters"><tt>\u</tt><i>hhhh</i></td>
- * <td headers="matches">The character with hexadecimal value <tt>0x</tt><i>hhhh</i></td></tr>
- * <tr><td valign="top" headers="construct characters"><tt>\x</tt><i>{h...h}</i></td>
- * <td headers="matches">The character with hexadecimal value <tt>0x</tt><i>h...h</i>
+ * <tr><td valign="top" headers="construct characters">{@code \0}<i>n</i></td>
+ * <td headers="matches">The character with octal value {@code 0}<i>n</i>
+ * (0 {@code <=} <i>n</i> {@code <=} 7)</td></tr>
+ * <tr><td valign="top" headers="construct characters">{@code \0}<i>nn</i></td>
+ * <td headers="matches">The character with octal value {@code 0}<i>nn</i>
+ * (0 {@code <=} <i>n</i> {@code <=} 7)</td></tr>
+ * <tr><td valign="top" headers="construct characters">{@code \0}<i>mnn</i></td>
+ * <td headers="matches">The character with octal value {@code 0}<i>mnn</i>
+ * (0 {@code <=} <i>m</i> {@code <=} 3,
+ * 0 {@code <=} <i>n</i> {@code <=} 7)</td></tr>
+ * <tr><td valign="top" headers="construct characters">{@code \x}<i>hh</i></td>
+ * <td headers="matches">The character with hexadecimal value {@code 0x}<i>hh</i></td></tr>
+ * <tr><td valign="top" headers="construct characters"><code>\u</code><i>hhhh</i></td>
+ * <td headers="matches">The character with hexadecimal value {@code 0x}<i>hhhh</i></td></tr>
+ * <tr><td valign="top" headers="construct characters"><code>\x</code><i>{h...h}</i></td>
+ * <td headers="matches">The character with hexadecimal value {@code 0x}<i>h...h</i>
* ({@link java.lang.Character#MIN_CODE_POINT Character.MIN_CODE_POINT}
- * <= <tt>0x</tt><i>h...h</i> <=
+ * <= {@code 0x}<i>h...h</i> <=
* {@link java.lang.Character#MAX_CODE_POINT Character.MAX_CODE_POINT})</td></tr>
- * <tr><td valign="top" headers="matches"><tt>\t</tt></td>
- * <td headers="matches">The tab character (<tt>'\u0009'</tt>)</td></tr>
- * <tr><td valign="top" headers="construct characters"><tt>\n</tt></td>
- * <td headers="matches">The newline (line feed) character (<tt>'\u000A'</tt>)</td></tr>
- * <tr><td valign="top" headers="construct characters"><tt>\r</tt></td>
- * <td headers="matches">The carriage-return character (<tt>'\u000D'</tt>)</td></tr>
- * <tr><td valign="top" headers="construct characters"><tt>\f</tt></td>
- * <td headers="matches">The form-feed character (<tt>'\u000C'</tt>)</td></tr>
- * <tr><td valign="top" headers="construct characters"><tt>\a</tt></td>
- * <td headers="matches">The alert (bell) character (<tt>'\u0007'</tt>)</td></tr>
- * <tr><td valign="top" headers="construct characters"><tt>\e</tt></td>
- * <td headers="matches">The escape character (<tt>'\u001B'</tt>)</td></tr>
- * <tr><td valign="top" headers="construct characters"><tt>\c</tt><i>x</i></td>
+ * <tr><td valign="top" headers="matches">{@code \t}</td>
+ * <td headers="matches">The tab character (<code>'\u0009'</code>)</td></tr>
+ * <tr><td valign="top" headers="construct characters">{@code \n}</td>
+ * <td headers="matches">The newline (line feed) character (<code>'\u000A'</code>)</td></tr>
+ * <tr><td valign="top" headers="construct characters">{@code \r}</td>
+ * <td headers="matches">The carriage-return character (<code>'\u000D'</code>)</td></tr>
+ * <tr><td valign="top" headers="construct characters">{@code \f}</td>
+ * <td headers="matches">The form-feed character (<code>'\u000C'</code>)</td></tr>
+ * <tr><td valign="top" headers="construct characters">{@code \a}</td>
+ * <td headers="matches">The alert (bell) character (<code>'\u0007'</code>)</td></tr>
+ * <tr><td valign="top" headers="construct characters">{@code \e}</td>
+ * <td headers="matches">The escape character (<code>'\u001B'</code>)</td></tr>
+ * <tr><td valign="top" headers="construct characters">{@code \c}<i>x</i></td>
* <td headers="matches">The control character corresponding to <i>x</i></td></tr>
*
* <tr><th> </th></tr>
@@ -149,30 +149,30 @@
*
* <tr align="left"><th colspan="2" id="predef">Predefined character classes</th></tr>
*
- * <tr><td valign="top" headers="construct predef"><tt>.</tt></td>
+ * <tr><td valign="top" headers="construct predef">{@code .}</td>
* <td headers="matches">Any character (may or may not match <a href="#lt">line terminators</a>)</td></tr>
- * <tr><td valign="top" headers="construct predef"><tt>\d</tt></td>
- * <td headers="matches">A digit: <tt>[0-9]</tt></td></tr>
- * <tr><td valign="top" headers="construct predef"><tt>\D</tt></td>
- * <td headers="matches">A non-digit: <tt>[^0-9]</tt></td></tr>
- * <tr><td valign="top" headers="construct predef"><tt>\h</tt></td>
+ * <tr><td valign="top" headers="construct predef">{@code \d}</td>
+ * <td headers="matches">A digit: {@code [0-9]}</td></tr>
+ * <tr><td valign="top" headers="construct predef">{@code \D}</td>
+ * <td headers="matches">A non-digit: {@code [^0-9]}</td></tr>
+ * <tr><td valign="top" headers="construct predef">{@code \h}</td>
* <td headers="matches">A horizontal whitespace character:
- * <tt>[ \t\xA0\u1680\u180e\u2000-\u200a\u202f\u205f\u3000]</tt></td></tr>
- * <tr><td valign="top" headers="construct predef"><tt>\H</tt></td>
- * <td headers="matches">A non-horizontal whitespace character: <tt>[^\h]</tt></td></tr>
- * <tr><td valign="top" headers="construct predef"><tt>\s</tt></td>
- * <td headers="matches">A whitespace character: <tt>[ \t\n\x0B\f\r]</tt></td></tr>
- * <tr><td valign="top" headers="construct predef"><tt>\S</tt></td>
- * <td headers="matches">A non-whitespace character: <tt>[^\s]</tt></td></tr>
- * <tr><td valign="top" headers="construct predef"><tt>\v</tt></td>
- * <td headers="matches">A vertical whitespace character: <tt>[\n\x0B\f\r\x85\u2028\u2029]</tt>
+ * <code>[ \t\xA0\u1680\u180e\u2000-\u200a\u202f\u205f\u3000]</code></td></tr>
+ * <tr><td valign="top" headers="construct predef">{@code \H}</td>
+ * <td headers="matches">A non-horizontal whitespace character: {@code [^\h]}</td></tr>
+ * <tr><td valign="top" headers="construct predef">{@code \s}</td>
+ * <td headers="matches">A whitespace character: {@code [ \t\n\x0B\f\r]}</td></tr>
+ * <tr><td valign="top" headers="construct predef">{@code \S}</td>
+ * <td headers="matches">A non-whitespace character: {@code [^\s]}</td></tr>
+ * <tr><td valign="top" headers="construct predef">{@code \v}</td>
+ * <td headers="matches">A vertical whitespace character: <code>[\n\x0B\f\r\x85\u2028\u2029]</code>
* </td></tr>
- * <tr><td valign="top" headers="construct predef"><tt>\V</tt></td>
- * <td headers="matches">A non-vertical whitespace character: <tt>[^\v]</tt></td></tr>
- * <tr><td valign="top" headers="construct predef"><tt>\w</tt></td>
- * <td headers="matches">A word character: <tt>[a-zA-Z_0-9]</tt></td></tr>
- * <tr><td valign="top" headers="construct predef"><tt>\W</tt></td>
- * <td headers="matches">A non-word character: <tt>[^\w]</tt></td></tr>
+ * <tr><td valign="top" headers="construct predef">{@code \V}</td>
+ * <td headers="matches">A non-vertical whitespace character: {@code [^\v]}</td></tr>
+ * <tr><td valign="top" headers="construct predef">{@code \w}</td>
+ * <td headers="matches">A word character: {@code [a-zA-Z_0-9]}</td></tr>
+ * <tr><td valign="top" headers="construct predef">{@code \W}</td>
+ * <td headers="matches">A non-word character: {@code [^\w]}</td></tr>
* <tr><th> </th></tr>
* <tr align="left"><th colspan="2" id="posix"><b>POSIX character classes (US-ASCII only)</b></th></tr>
*
@@ -208,13 +208,13 @@
* <tr><th> </th></tr>
* <tr align="left"><th colspan="2">java.lang.Character classes (simple <a href="#jcc">java character type</a>)</th></tr>
*
- * <tr><td valign="top"><tt>\p{javaLowerCase}</tt></td>
+ * <tr><td valign="top">{@code \p{javaLowerCase}}</td>
* <td>Equivalent to java.lang.Character.isLowerCase()</td></tr>
- * <tr><td valign="top"><tt>\p{javaUpperCase}</tt></td>
+ * <tr><td valign="top">{@code \p{javaUpperCase}}</td>
* <td>Equivalent to java.lang.Character.isUpperCase()</td></tr>
- * <tr><td valign="top"><tt>\p{javaWhitespace}</tt></td>
+ * <tr><td valign="top">{@code \p{javaWhitespace}}</td>
* <td>Equivalent to java.lang.Character.isWhitespace()</td></tr>
- * <tr><td valign="top"><tt>\p{javaMirrored}</tt></td>
+ * <tr><td valign="top">{@code \p{javaMirrored}}</td>
* <td>Equivalent to java.lang.Character.isMirrored()</td></tr>
*
* <tr><th> </th></tr>
@@ -237,77 +237,77 @@
* <tr><th> </th></tr>
* <tr align="left"><th colspan="2" id="bounds">Boundary matchers</th></tr>
*
- * <tr><td valign="top" headers="construct bounds"><tt>^</tt></td>
+ * <tr><td valign="top" headers="construct bounds">{@code ^}</td>
* <td headers="matches">The beginning of a line</td></tr>
- * <tr><td valign="top" headers="construct bounds"><tt>$</tt></td>
+ * <tr><td valign="top" headers="construct bounds">{@code $}</td>
* <td headers="matches">The end of a line</td></tr>
- * <tr><td valign="top" headers="construct bounds"><tt>\b</tt></td>
+ * <tr><td valign="top" headers="construct bounds">{@code \b}</td>
* <td headers="matches">A word boundary</td></tr>
- * <tr><td valign="top" headers="construct bounds"><tt>\B</tt></td>
+ * <tr><td valign="top" headers="construct bounds">{@code \B}</td>
* <td headers="matches">A non-word boundary</td></tr>
- * <tr><td valign="top" headers="construct bounds"><tt>\A</tt></td>
+ * <tr><td valign="top" headers="construct bounds">{@code \A}</td>
* <td headers="matches">The beginning of the input</td></tr>
- * <tr><td valign="top" headers="construct bounds"><tt>\G</tt></td>
+ * <tr><td valign="top" headers="construct bounds">{@code \G}</td>
* <td headers="matches">The end of the previous match</td></tr>
- * <tr><td valign="top" headers="construct bounds"><tt>\Z</tt></td>
+ * <tr><td valign="top" headers="construct bounds">{@code \Z}</td>
* <td headers="matches">The end of the input but for the final
* <a href="#lt">terminator</a>, if any</td></tr>
- * <tr><td valign="top" headers="construct bounds"><tt>\z</tt></td>
+ * <tr><td valign="top" headers="construct bounds">{@code \z}</td>
* <td headers="matches">The end of the input</td></tr>
*
* <tr><th> </th></tr>
* <tr align="left"><th colspan="2" id="lineending">Linebreak matcher</th></tr>
- * <tr><td valign="top" headers="construct lineending"><tt>\R</tt></td>
+ * <tr><td valign="top" headers="construct lineending">{@code \R}</td>
* <td headers="matches">Any Unicode linebreak sequence, is equivalent to
- * <tt>\u000D\u000A|[\u000A\u000B\u000C\u000D\u0085\u2028\u2029]
- * </tt></td></tr>
+ * <code>\u000D\u000A|[\u000A\u000B\u000C\u000D\u0085\u2028\u2029]
+ * </code></td></tr>
*
* <tr><th> </th></tr>
* <tr align="left"><th colspan="2" id="greedy">Greedy quantifiers</th></tr>
*
- * <tr><td valign="top" headers="construct greedy"><i>X</i><tt>?</tt></td>
+ * <tr><td valign="top" headers="construct greedy"><i>X</i>{@code ?}</td>
* <td headers="matches"><i>X</i>, once or not at all</td></tr>
- * <tr><td valign="top" headers="construct greedy"><i>X</i><tt>*</tt></td>
+ * <tr><td valign="top" headers="construct greedy"><i>X</i>{@code *}</td>
* <td headers="matches"><i>X</i>, zero or more times</td></tr>
- * <tr><td valign="top" headers="construct greedy"><i>X</i><tt>+</tt></td>
+ * <tr><td valign="top" headers="construct greedy"><i>X</i>{@code +}</td>
* <td headers="matches"><i>X</i>, one or more times</td></tr>
- * <tr><td valign="top" headers="construct greedy"><i>X</i><tt>{</tt><i>n</i><tt>}</tt></td>
+ * <tr><td valign="top" headers="construct greedy"><i>X</i><code>{</code><i>n</i><code>}</code></td>
* <td headers="matches"><i>X</i>, exactly <i>n</i> times</td></tr>
- * <tr><td valign="top" headers="construct greedy"><i>X</i><tt>{</tt><i>n</i><tt>,}</tt></td>
+ * <tr><td valign="top" headers="construct greedy"><i>X</i><code>{</code><i>n</i>{@code ,}}</td>
* <td headers="matches"><i>X</i>, at least <i>n</i> times</td></tr>
- * <tr><td valign="top" headers="construct greedy"><i>X</i><tt>{</tt><i>n</i><tt>,</tt><i>m</i><tt>}</tt></td>
+ * <tr><td valign="top" headers="construct greedy"><i>X</i><code>{</code><i>n</i>{@code ,}<i>m</i><code>}</code></td>
* <td headers="matches"><i>X</i>, at least <i>n</i> but not more than <i>m</i> times</td></tr>
*
* <tr><th> </th></tr>
* <tr align="left"><th colspan="2" id="reluc">Reluctant quantifiers</th></tr>
*
- * <tr><td valign="top" headers="construct reluc"><i>X</i><tt>??</tt></td>
+ * <tr><td valign="top" headers="construct reluc"><i>X</i>{@code ??}</td>
* <td headers="matches"><i>X</i>, once or not at all</td></tr>
- * <tr><td valign="top" headers="construct reluc"><i>X</i><tt>*?</tt></td>
+ * <tr><td valign="top" headers="construct reluc"><i>X</i>{@code *?}</td>
* <td headers="matches"><i>X</i>, zero or more times</td></tr>
- * <tr><td valign="top" headers="construct reluc"><i>X</i><tt>+?</tt></td>
+ * <tr><td valign="top" headers="construct reluc"><i>X</i>{@code +?}</td>
* <td headers="matches"><i>X</i>, one or more times</td></tr>
- * <tr><td valign="top" headers="construct reluc"><i>X</i><tt>{</tt><i>n</i><tt>}?</tt></td>
+ * <tr><td valign="top" headers="construct reluc"><i>X</i><code>{</code><i>n</i><code>}?</code></td>
* <td headers="matches"><i>X</i>, exactly <i>n</i> times</td></tr>
- * <tr><td valign="top" headers="construct reluc"><i>X</i><tt>{</tt><i>n</i><tt>,}?</tt></td>
+ * <tr><td valign="top" headers="construct reluc"><i>X</i><code>{</code><i>n</i><code>,}?</code></td>
* <td headers="matches"><i>X</i>, at least <i>n</i> times</td></tr>
- * <tr><td valign="top" headers="construct reluc"><i>X</i><tt>{</tt><i>n</i><tt>,</tt><i>m</i><tt>}?</tt></td>
+ * <tr><td valign="top" headers="construct reluc"><i>X</i><code>{</code><i>n</i>{@code ,}<i>m</i><code>}?</code></td>
* <td headers="matches"><i>X</i>, at least <i>n</i> but not more than <i>m</i> times</td></tr>
*
* <tr><th> </th></tr>
* <tr align="left"><th colspan="2" id="poss">Possessive quantifiers</th></tr>
*
- * <tr><td valign="top" headers="construct poss"><i>X</i><tt>?+</tt></td>
+ * <tr><td valign="top" headers="construct poss"><i>X</i>{@code ?+}</td>
* <td headers="matches"><i>X</i>, once or not at all</td></tr>
- * <tr><td valign="top" headers="construct poss"><i>X</i><tt>*+</tt></td>
+ * <tr><td valign="top" headers="construct poss"><i>X</i>{@code *+}</td>
* <td headers="matches"><i>X</i>, zero or more times</td></tr>
- * <tr><td valign="top" headers="construct poss"><i>X</i><tt>++</tt></td>
+ * <tr><td valign="top" headers="construct poss"><i>X</i>{@code ++}</td>
* <td headers="matches"><i>X</i>, one or more times</td></tr>
- * <tr><td valign="top" headers="construct poss"><i>X</i><tt>{</tt><i>n</i><tt>}+</tt></td>
+ * <tr><td valign="top" headers="construct poss"><i>X</i><code>{</code><i>n</i><code>}+</code></td>
* <td headers="matches"><i>X</i>, exactly <i>n</i> times</td></tr>
- * <tr><td valign="top" headers="construct poss"><i>X</i><tt>{</tt><i>n</i><tt>,}+</tt></td>
+ * <tr><td valign="top" headers="construct poss"><i>X</i><code>{</code><i>n</i><code>,}+</code></td>
* <td headers="matches"><i>X</i>, at least <i>n</i> times</td></tr>
- * <tr><td valign="top" headers="construct poss"><i>X</i><tt>{</tt><i>n</i><tt>,</tt><i>m</i><tt>}+</tt></td>
+ * <tr><td valign="top" headers="construct poss"><i>X</i><code>{</code><i>n</i>{@code ,}<i>m</i><code>}+</code></td>
* <td headers="matches"><i>X</i>, at least <i>n</i> but not more than <i>m</i> times</td></tr>
*
* <tr><th> </th></tr>
@@ -315,59 +315,59 @@
*
* <tr><td valign="top" headers="construct logical"><i>XY</i></td>
* <td headers="matches"><i>X</i> followed by <i>Y</i></td></tr>
- * <tr><td valign="top" headers="construct logical"><i>X</i><tt>|</tt><i>Y</i></td>
+ * <tr><td valign="top" headers="construct logical"><i>X</i>{@code |}<i>Y</i></td>
* <td headers="matches">Either <i>X</i> or <i>Y</i></td></tr>
- * <tr><td valign="top" headers="construct logical"><tt>(</tt><i>X</i><tt>)</tt></td>
+ * <tr><td valign="top" headers="construct logical">{@code (}<i>X</i>{@code )}</td>
* <td headers="matches">X, as a <a href="#cg">capturing group</a></td></tr>
*
* <tr><th> </th></tr>
* <tr align="left"><th colspan="2" id="backref">Back references</th></tr>
*
- * <tr><td valign="bottom" headers="construct backref"><tt>\</tt><i>n</i></td>
+ * <tr><td valign="bottom" headers="construct backref">{@code \}<i>n</i></td>
* <td valign="bottom" headers="matches">Whatever the <i>n</i><sup>th</sup>
* <a href="#cg">capturing group</a> matched</td></tr>
*
- * <tr><td valign="bottom" headers="construct backref"><tt>\</tt><i>k</i><<i>name</i>></td>
+ * <tr><td valign="bottom" headers="construct backref">{@code \}<i>k</i><<i>name</i>></td>
* <td valign="bottom" headers="matches">Whatever the
* <a href="#groupname">named-capturing group</a> "name" matched</td></tr>
*
* <tr><th> </th></tr>
* <tr align="left"><th colspan="2" id="quot">Quotation</th></tr>
*
- * <tr><td valign="top" headers="construct quot"><tt>\</tt></td>
+ * <tr><td valign="top" headers="construct quot">{@code \}</td>
* <td headers="matches">Nothing, but quotes the following character</td></tr>
- * <tr><td valign="top" headers="construct quot"><tt>\Q</tt></td>
- * <td headers="matches">Nothing, but quotes all characters until <tt>\E</tt></td></tr>
- * <tr><td valign="top" headers="construct quot"><tt>\E</tt></td>
- * <td headers="matches">Nothing, but ends quoting started by <tt>\Q</tt></td></tr>
+ * <tr><td valign="top" headers="construct quot">{@code \Q}</td>
+ * <td headers="matches">Nothing, but quotes all characters until {@code \E}</td></tr>
+ * <tr><td valign="top" headers="construct quot">{@code \E}</td>
+ * <td headers="matches">Nothing, but ends quoting started by {@code \Q}</td></tr>
* <!-- Metachars: !$()*+.<>?[\]^{|} -->
*
* <tr><th> </th></tr>
* <tr align="left"><th colspan="2" id="special">Special constructs (named-capturing and non-capturing)</th></tr>
*
- * <tr><td valign="top" headers="construct special"><tt>(?<<a href="#groupname">name</a>></tt><i>X</i><tt>)</tt></td>
+ * <tr><td valign="top" headers="construct special"><code>(?<<a href="#groupname">name</a>></code><i>X</i>{@code )}</td>
* <td headers="matches"><i>X</i>, as a named-capturing group</td></tr>
- * <tr><td valign="top" headers="construct special"><tt>(?:</tt><i>X</i><tt>)</tt></td>
+ * <tr><td valign="top" headers="construct special">{@code (?:}<i>X</i>{@code )}</td>
* <td headers="matches"><i>X</i>, as a non-capturing group</td></tr>
- * <tr><td valign="top" headers="construct special"><tt>(?idmsuxU-idmsuxU) </tt></td>
+ * <tr><td valign="top" headers="construct special"><code>(?idmsuxU-idmsuxU) </code></td>
* <td headers="matches">Nothing, but turns match flags <a href="#CASE_INSENSITIVE">i</a>
* <a href="#UNIX_LINES">d</a> <a href="#MULTILINE">m</a> <a href="#DOTALL">s</a>
* <a href="#UNICODE_CASE">u</a> <a href="#COMMENTS">x</a> <a href="#UNICODE_CHARACTER_CLASS">U</a>
* on - off</td></tr>
- * <tr><td valign="top" headers="construct special"><tt>(?idmsux-idmsux:</tt><i>X</i><tt>)</tt> </td>
+ * <tr><td valign="top" headers="construct special"><code>(?idmsux-idmsux:</code><i>X</i>{@code )} </td>
* <td headers="matches"><i>X</i>, as a <a href="#cg">non-capturing group</a> with the
* given flags <a href="#CASE_INSENSITIVE">i</a> <a href="#UNIX_LINES">d</a>
* <a href="#MULTILINE">m</a> <a href="#DOTALL">s</a> <a href="#UNICODE_CASE">u</a >
* <a href="#COMMENTS">x</a> on - off</td></tr>
- * <tr><td valign="top" headers="construct special"><tt>(?=</tt><i>X</i><tt>)</tt></td>
+ * <tr><td valign="top" headers="construct special">{@code (?=}<i>X</i>{@code )}</td>
* <td headers="matches"><i>X</i>, via zero-width positive lookahead</td></tr>
- * <tr><td valign="top" headers="construct special"><tt>(?!</tt><i>X</i><tt>)</tt></td>
+ * <tr><td valign="top" headers="construct special">{@code (?!}<i>X</i>{@code )}</td>
* <td headers="matches"><i>X</i>, via zero-width negative lookahead</td></tr>
- * <tr><td valign="top" headers="construct special"><tt>(?<=</tt><i>X</i><tt>)</tt></td>
+ * <tr><td valign="top" headers="construct special">{@code (?<=}<i>X</i>{@code )}</td>
* <td headers="matches"><i>X</i>, via zero-width positive lookbehind</td></tr>
- * <tr><td valign="top" headers="construct special"><tt>(?<!</tt><i>X</i><tt>)</tt></td>
+ * <tr><td valign="top" headers="construct special">{@code (?<!}<i>X</i>{@code )}</td>
* <td headers="matches"><i>X</i>, via zero-width negative lookbehind</td></tr>
- * <tr><td valign="top" headers="construct special"><tt>(?></tt><i>X</i><tt>)</tt></td>
+ * <tr><td valign="top" headers="construct special">{@code (?>}<i>X</i>{@code )}</td>
* <td headers="matches"><i>X</i>, as an independent, non-capturing group</td></tr>
*
* </table>
@@ -377,10 +377,10 @@
*
* <h3><a name="bs">Backslashes, escapes, and quoting</a></h3>
*
- * <p> The backslash character (<tt>'\'</tt>) serves to introduce escaped
+ * <p> The backslash character ({@code '\'}) serves to introduce escaped
* constructs, as defined in the table above, as well as to quote characters
* that otherwise would be interpreted as unescaped constructs. Thus the
- * expression <tt>\\</tt> matches a single backslash and <tt>\{</tt> matches a
+ * expression {@code \\} matches a single backslash and <code>\{</code> matches a
* left brace.
*
* <p> It is an error to use a backslash prior to any alphabetic character that
@@ -396,18 +396,18 @@
* It is therefore necessary to double backslashes in string
* literals that represent regular expressions to protect them from
* interpretation by the Java bytecode compiler. The string literal
- * <tt>"\b"</tt>, for example, matches a single backspace character when
- * interpreted as a regular expression, while <tt>"\\b"</tt> matches a
- * word boundary. The string literal <tt>"\(hello\)"</tt> is illegal
+ * <code>"\b"</code>, for example, matches a single backspace character when
+ * interpreted as a regular expression, while {@code "\\b"} matches a
+ * word boundary. The string literal {@code "\(hello\)"} is illegal
* and leads to a compile-time error; in order to match the string
- * <tt>(hello)</tt> the string literal <tt>"\\(hello\\)"</tt>
+ * {@code (hello)} the string literal {@code "\\(hello\\)"}
* must be used.
*
* <h3><a name="cc">Character Classes</a></h3>
*
* <p> Character classes may appear within other character classes, and
* may be composed by the union operator (implicit) and the intersection
- * operator (<tt>&&</tt>).
+ * operator ({@code &&}).
* The union operator denotes a class that contains every character that is
* in at least one of its operand classes. The intersection operator
* denotes a class that contains every character that is in both of its
@@ -420,16 +420,16 @@
* summary="Precedence of character class operators.">
* <tr><th>1 </th>
* <td>Literal escape </td>
- * <td><tt>\x</tt></td></tr>
+ * <td>{@code \x}</td></tr>
* <tr><th>2 </th>
* <td>Grouping</td>
- * <td><tt>[...]</tt></td></tr>
+ * <td>{@code [...]}</td></tr>
* <tr><th>3 </th>
* <td>Range</td>
- * <td><tt>a-z</tt></td></tr>
+ * <td>{@code a-z}</td></tr>
* <tr><th>4 </th>
* <td>Union</td>
- * <td><tt>[a-e][i-u]</tt></td></tr>
+ * <td>{@code [a-e][i-u]}</td></tr>
* <tr><th>5 </th>
* <td>Intersection</td>
* <td>{@code [a-z&&[aeiou]]}</td></tr>
@@ -437,8 +437,8 @@
*
* <p> Note that a different set of metacharacters are in effect inside
* a character class than outside a character class. For instance, the
- * regular expression <tt>.</tt> loses its special meaning inside a
- * character class, while the expression <tt>-</tt> becomes a range
+ * regular expression {@code .} loses its special meaning inside a
+ * character class, while the expression {@code -} becomes a range
* forming metacharacter.
*
* <h3><a name="lt">Line terminators</a></h3>
@@ -449,49 +449,49 @@
*
* <ul>
*
- * <li> A newline (line feed) character (<tt>'\n'</tt>),
+ * <li> A newline (line feed) character ({@code '\n'}),
*
* <li> A carriage-return character followed immediately by a newline
- * character (<tt>"\r\n"</tt>),
+ * character ({@code "\r\n"}),
*
- * <li> A standalone carriage-return character (<tt>'\r'</tt>),
+ * <li> A standalone carriage-return character ({@code '\r'}),
*
- * <li> A next-line character (<tt>'\u0085'</tt>),
+ * <li> A next-line character (<code>'\u0085'</code>),
*
- * <li> A line-separator character (<tt>'\u2028'</tt>), or
+ * <li> A line-separator character (<code>'\u2028'</code>), or
*
- * <li> A paragraph-separator character (<tt>'\u2029</tt>).
+ * <li> A paragraph-separator character (<code>'\u2029</code>).
*
* </ul>
* <p>If {@link #UNIX_LINES} mode is activated, then the only line terminators
* recognized are newline characters.
*
- * <p> The regular expression <tt>.</tt> matches any character except a line
+ * <p> The regular expression {@code .} matches any character except a line
* terminator unless the {@link #DOTALL} flag is specified.
*
- * <p> By default, the regular expressions <tt>^</tt> and <tt>$</tt> ignore
+ * <p> By default, the regular expressions {@code ^} and {@code $} ignore
* line terminators and only match at the beginning and the end, respectively,
* of the entire input sequence. If {@link #MULTILINE} mode is activated then
- * <tt>^</tt> matches at the beginning of input and after any line terminator
- * except at the end of input. When in {@link #MULTILINE} mode <tt>$</tt>
+ * {@code ^} matches at the beginning of input and after any line terminator
+ * except at the end of input. When in {@link #MULTILINE} mode {@code $}
* matches just before a line terminator or the end of the input sequence.
*
* <h3><a name="cg">Groups and capturing</a></h3>
*
* <h4><a name="gnumber">Group number</a></h4>
* <p> Capturing groups are numbered by counting their opening parentheses from
- * left to right. In the expression <tt>((A)(B(C)))</tt>, for example, there
+ * left to right. In the expression {@code ((A)(B(C)))}, for example, there
* are four such groups: </p>
*
* <blockquote><table cellpadding=1 cellspacing=0 summary="Capturing group numberings">
* <tr><th>1 </th>
- * <td><tt>((A)(B(C)))</tt></td></tr>
+ * <td>{@code ((A)(B(C)))}</td></tr>
* <tr><th>2 </th>
- * <td><tt>(A)</tt></td></tr>
+ * <td>{@code (A)}</td></tr>
* <tr><th>3 </th>
- * <td><tt>(B(C))</tt></td></tr>
+ * <td>{@code (B(C))}</td></tr>
* <tr><th>4 </th>
- * <td><tt>(C)</tt></td></tr>
+ * <td>{@code (C)}</td></tr>
* </table></blockquote>
*
* <p> Group zero always stands for the entire expression.
@@ -502,31 +502,31 @@
* may also be retrieved from the matcher once the match operation is complete.
*
* <h4><a name="groupname">Group name</a></h4>
- * <p>A capturing group can also be assigned a "name", a <tt>named-capturing group</tt>,
+ * <p>A capturing group can also be assigned a "name", a {@code named-capturing group},
* and then be back-referenced later by the "name". Group names are composed of
- * the following characters. The first character must be a <tt>letter</tt>.
+ * the following characters. The first character must be a {@code letter}.
*
* <ul>
- * <li> The uppercase letters <tt>'A'</tt> through <tt>'Z'</tt>
- * (<tt>'\u0041'</tt> through <tt>'\u005a'</tt>),
- * <li> The lowercase letters <tt>'a'</tt> through <tt>'z'</tt>
- * (<tt>'\u0061'</tt> through <tt>'\u007a'</tt>),
- * <li> The digits <tt>'0'</tt> through <tt>'9'</tt>
- * (<tt>'\u0030'</tt> through <tt>'\u0039'</tt>),
+ * <li> The uppercase letters {@code 'A'} through {@code 'Z'}
+ * (<code>'\u0041'</code> through <code>'\u005a'</code>),
+ * <li> The lowercase letters {@code 'a'} through {@code 'z'}
+ * (<code>'\u0061'</code> through <code>'\u007a'</code>),
+ * <li> The digits {@code '0'} through {@code '9'}
+ * (<code>'\u0030'</code> through <code>'\u0039'</code>),
* </ul>
*
- * <p> A <tt>named-capturing group</tt> is still numbered as described in
+ * <p> A {@code named-capturing group} is still numbered as described in
* <a href="#gnumber">Group number</a>.
*
* <p> The captured input associated with a group is always the subsequence
* that the group most recently matched. If a group is evaluated a second time
* because of quantification then its previously-captured value, if any, will
* be retained if the second evaluation fails. Matching the string
- * <tt>"aba"</tt> against the expression <tt>(a(b)?)+</tt>, for example, leaves
- * group two set to <tt>"b"</tt>. All captured input is discarded at the
+ * {@code "aba"} against the expression {@code (a(b)?)+}, for example, leaves
+ * group two set to {@code "b"}. All captured input is discarded at the
* beginning of each match.
*
- * <p> Groups beginning with <tt>(?</tt> are either pure, <i>non-capturing</i> groups
+ * <p> Groups beginning with {@code (?} are either pure, <i>non-capturing</i> groups
* that do not capture text and do not count towards the group total, or
* <i>named-capturing</i> group.
*
@@ -537,26 +537,26 @@
* Standard #18: Unicode Regular Expression</i></a>, plus RL2.1
* Canonical Equivalents.
* <p>
- * <b>Unicode escape sequences</b> such as <tt>\u2014</tt> in Java source code
+ * <b>Unicode escape sequences</b> such as <code>\u2014</code> in Java source code
* are processed as described in section 3.3 of
* <cite>The Java™ Language Specification</cite>.
* Such escape sequences are also implemented directly by the regular-expression
* parser so that Unicode escapes can be used in expressions that are read from
- * files or from the keyboard. Thus the strings <tt>"\u2014"</tt> and
- * <tt>"\\u2014"</tt>, while not equal, compile into the same pattern, which
- * matches the character with hexadecimal value <tt>0x2014</tt>.
+ * files or from the keyboard. Thus the strings <code>"\u2014"</code> and
+ * {@code "\\u2014"}, while not equal, compile into the same pattern, which
+ * matches the character with hexadecimal value {@code 0x2014}.
* <p>
* A Unicode character can also be represented in a regular-expression by
* using its <b>Hex notation</b>(hexadecimal code point value) directly as described in construct
- * <tt>\x{...}</tt>, for example a supplementary character U+2011F
- * can be specified as <tt>\x{2011F}</tt>, instead of two consecutive
+ * <code>\x{...}</code>, for example a supplementary character U+2011F
+ * can be specified as <code>\x{2011F}</code>, instead of two consecutive
* Unicode escape sequences of the surrogate pair
- * <tt>\uD840</tt><tt>\uDD1F</tt>.
+ * <code>\uD840</code><code>\uDD1F</code>.
* <p>
* Unicode scripts, blocks, categories and binary properties are written with
- * the <tt>\p</tt> and <tt>\P</tt> constructs as in Perl.
- * <tt>\p{</tt><i>prop</i><tt>}</tt> matches if
- * the input has the property <i>prop</i>, while <tt>\P{</tt><i>prop</i><tt>}</tt>
+ * the {@code \p} and {@code \P} constructs as in Perl.
+ * <code>\p{</code><i>prop</i><code>}</code> matches if
+ * the input has the property <i>prop</i>, while <code>\P{</code><i>prop</i><code>}</code>
* does not match if the input has that property.
* <p>
* Scripts, blocks, categories and binary properties can be used both inside
@@ -567,7 +567,7 @@
* {@code IsHiragana}, or by using the {@code script} keyword (or its short
* form {@code sc}) as in {@code script=Hiragana} or {@code sc=Hiragana}.
* <p>
- * The script names supported by <code>Pattern</code> are the valid script names
+ * The script names supported by {@code Pattern} are the valid script names
* accepted and defined by
* {@link java.lang.Character.UnicodeScript#forName(String) UnicodeScript.forName}.
*
@@ -576,7 +576,7 @@
* {@code InMongolian}, or by using the keyword {@code block} (or its short
* form {@code blk}) as in {@code block=Mongolian} or {@code blk=Mongolian}.
* <p>
- * The block names supported by <code>Pattern</code> are the valid block names
+ * The block names supported by {@code Pattern} are the valid block names
* accepted and defined by
* {@link java.lang.Character.UnicodeBlock#forName(String) UnicodeBlock.forName}.
* <p>
@@ -595,7 +595,7 @@
* <p>
*
* <b><a name="ubpc">Binary properties</a></b> are specified with the prefix {@code Is}, as in
- * {@code IsAlphabetic}. The supported binary properties by <code>Pattern</code>
+ * {@code IsAlphabetic}. The supported binary properties by {@code Pattern}
* are
* <ul>
* <li> Alphabetic
@@ -625,88 +625,88 @@
* <th align="left" id="predef_classes">Classes</th>
* <th align="left" id="predef_matches">Matches</th>
*</tr>
- * <tr><td><tt>\p{Lower}</tt></td>
- * <td>A lowercase character:<tt>\p{IsLowercase}</tt></td></tr>
- * <tr><td><tt>\p{Upper}</tt></td>
- * <td>An uppercase character:<tt>\p{IsUppercase}</tt></td></tr>
- * <tr><td><tt>\p{ASCII}</tt></td>
- * <td>All ASCII:<tt>[\x00-\x7F]</tt></td></tr>
- * <tr><td><tt>\p{Alpha}</tt></td>
- * <td>An alphabetic character:<tt>\p{IsAlphabetic}</tt></td></tr>
- * <tr><td><tt>\p{Digit}</tt></td>
- * <td>A decimal digit character:<tt>p{IsDigit}</tt></td></tr>
- * <tr><td><tt>\p{Alnum}</tt></td>
- * <td>An alphanumeric character:<tt>[\p{IsAlphabetic}\p{IsDigit}]</tt></td></tr>
- * <tr><td><tt>\p{Punct}</tt></td>
- * <td>A punctuation character:<tt>p{IsPunctuation}</tt></td></tr>
- * <tr><td><tt>\p{Graph}</tt></td>
- * <td>A visible character: <tt>[^\p{IsWhite_Space}\p{gc=Cc}\p{gc=Cs}\p{gc=Cn}]</tt></td></tr>
- * <tr><td><tt>\p{Print}</tt></td>
+ * <tr><td>{@code \p{Lower}}</td>
+ * <td>A lowercase character:{@code \p{IsLowercase}}</td></tr>
+ * <tr><td>{@code \p{Upper}}</td>
+ * <td>An uppercase character:{@code \p{IsUppercase}}</td></tr>
+ * <tr><td>{@code \p{ASCII}}</td>
+ * <td>All ASCII:{@code [\x00-\x7F]}</td></tr>
+ * <tr><td>{@code \p{Alpha}}</td>
+ * <td>An alphabetic character:{@code \p{IsAlphabetic}}</td></tr>
+ * <tr><td>{@code \p{Digit}}</td>
+ * <td>A decimal digit character:{@code p{IsDigit}}</td></tr>
+ * <tr><td>{@code \p{Alnum}}</td>
+ * <td>An alphanumeric character:{@code [\p{IsAlphabetic}\p{IsDigit}]}</td></tr>
+ * <tr><td>{@code \p{Punct}}</td>
+ * <td>A punctuation character:{@code p{IsPunctuation}}</td></tr>
+ * <tr><td>{@code \p{Graph}}</td>
+ * <td>A visible character: {@code [^\p{IsWhite_Space}\p{gc=Cc}\p{gc=Cs}\p{gc=Cn}]}</td></tr>
+ * <tr><td>{@code \p{Print}}</td>
* <td>A printable character: {@code [\p{Graph}\p{Blank}&&[^\p{Cntrl}]]}</td></tr>
- * <tr><td><tt>\p{Blank}</tt></td>
+ * <tr><td>{@code \p{Blank}}</td>
* <td>A space or a tab: {@code [\p{IsWhite_Space}&&[^\p{gc=Zl}\p{gc=Zp}\x0a\x0b\x0c\x0d\x85]]}</td></tr>
- * <tr><td><tt>\p{Cntrl}</tt></td>
- * <td>A control character: <tt>\p{gc=Cc}</tt></td></tr>
- * <tr><td><tt>\p{XDigit}</tt></td>
- * <td>A hexadecimal digit: <tt>[\p{gc=Nd}\p{IsHex_Digit}]</tt></td></tr>
- * <tr><td><tt>\p{Space}</tt></td>
- * <td>A whitespace character:<tt>\p{IsWhite_Space}</tt></td></tr>
- * <tr><td><tt>\d</tt></td>
- * <td>A digit: <tt>\p{IsDigit}</tt></td></tr>
- * <tr><td><tt>\D</tt></td>
- * <td>A non-digit: <tt>[^\d]</tt></td></tr>
- * <tr><td><tt>\s</tt></td>
- * <td>A whitespace character: <tt>\p{IsWhite_Space}</tt></td></tr>
- * <tr><td><tt>\S</tt></td>
- * <td>A non-whitespace character: <tt>[^\s]</tt></td></tr>
- * <tr><td><tt>\w</tt></td>
- * <td>A word character: <tt>[\p{Alpha}\p{gc=Mn}\p{gc=Me}\p{gc=Mc}\p{Digit}\p{gc=Pc}\p{IsJoin_Control}]</tt></td></tr>
- * <tr><td><tt>\W</tt></td>
- * <td>A non-word character: <tt>[^\w]</tt></td></tr>
+ * <tr><td>{@code \p{Cntrl}}</td>
+ * <td>A control character: {@code \p{gc=Cc}}</td></tr>
+ * <tr><td>{@code \p{XDigit}}</td>
+ * <td>A hexadecimal digit: {@code [\p{gc=Nd}\p{IsHex_Digit}]}</td></tr>
+ * <tr><td>{@code \p{Space}}</td>
+ * <td>A whitespace character:{@code \p{IsWhite_Space}}</td></tr>
+ * <tr><td>{@code \d}</td>
+ * <td>A digit: {@code \p{IsDigit}}</td></tr>
+ * <tr><td>{@code \D}</td>
+ * <td>A non-digit: {@code [^\d]}</td></tr>
+ * <tr><td>{@code \s}</td>
+ * <td>A whitespace character: {@code \p{IsWhite_Space}}</td></tr>
+ * <tr><td>{@code \S}</td>
+ * <td>A non-whitespace character: {@code [^\s]}</td></tr>
+ * <tr><td>{@code \w}</td>
+ * <td>A word character: {@code [\p{Alpha}\p{gc=Mn}\p{gc=Me}\p{gc=Mc}\p{Digit}\p{gc=Pc}\p{IsJoin_Control}]}</td></tr>
+ * <tr><td>{@code \W}</td>
+ * <td>A non-word character: {@code [^\w]}</td></tr>
* </table>
* <p>
* <a name="jcc">
* Categories that behave like the java.lang.Character
* boolean is<i>methodname</i> methods (except for the deprecated ones) are
- * available through the same <tt>\p{</tt><i>prop</i><tt>}</tt> syntax where
- * the specified property has the name <tt>java<i>methodname</i></tt></a>.
+ * available through the same <code>\p{</code><i>prop</i><code>}</code> syntax where
+ * the specified property has the name <code>java<i>methodname</i></code></a>.
*
* <h3> Comparison to Perl 5 </h3>
*
- * <p>The <code>Pattern</code> engine performs traditional NFA-based matching
+ * <p>The {@code Pattern} engine performs traditional NFA-based matching
* with ordered alternation as occurs in Perl 5.
*
* <p> Perl constructs not supported by this class: </p>
*
* <ul>
* <li><p> Predefined character classes (Unicode character)
- * <p><tt>\X </tt>Match Unicode
+ * <p><code>\X </code>Match Unicode
* <a href="http://www.unicode.org/reports/tr18/#Default_Grapheme_Clusters">
* <i>extended grapheme cluster</i></a>
* </p></li>
*
- * <li><p> The backreference constructs, <tt>\g{</tt><i>n</i><tt>}</tt> for
+ * <li><p> The backreference constructs, <code>\g{</code><i>n</i><code>}</code> for
* the <i>n</i><sup>th</sup><a href="#cg">capturing group</a> and
- * <tt>\g{</tt><i>name</i><tt>}</tt> for
+ * <code>\g{</code><i>name</i><code>}</code> for
* <a href="#groupname">named-capturing group</a>.
* </p></li>
*
- * <li><p> The named character construct, <tt>\N{</tt><i>name</i><tt>}</tt>
+ * <li><p> The named character construct, <code>\N{</code><i>name</i><code>}</code>
* for a Unicode character by its name.
* </p></li>
*
* <li><p> The conditional constructs
- * <tt>(?(</tt><i>condition</i><tt>)</tt><i>X</i><tt>)</tt> and
- * <tt>(?(</tt><i>condition</i><tt>)</tt><i>X</i><tt>|</tt><i>Y</i><tt>)</tt>,
+ * {@code (?(}<i>condition</i>{@code )}<i>X</i>{@code )} and
+ * {@code (?(}<i>condition</i>{@code )}<i>X</i>{@code |}<i>Y</i>{@code )},
* </p></li>
*
- * <li><p> The embedded code constructs <tt>(?{</tt><i>code</i><tt>})</tt>
- * and <tt>(??{</tt><i>code</i><tt>})</tt>,</p></li>
+ * <li><p> The embedded code constructs <code>(?{</code><i>code</i><code>})</code>
+ * and <code>(??{</code><i>code</i><code>})</code>,</p></li>
*
- * <li><p> The embedded comment syntax <tt>(?#comment)</tt>, and </p></li>
+ * <li><p> The embedded comment syntax {@code (?#comment)}, and </p></li>
*
- * <li><p> The preprocessing operations <tt>\l</tt> <tt>\u</tt>,
- * <tt>\L</tt>, and <tt>\U</tt>. </p></li>
+ * <li><p> The preprocessing operations {@code \l} <code>\u</code>,
+ * {@code \L}, and {@code \U}. </p></li>
*
* </ul>
*
@@ -723,19 +723,19 @@
*
* <ul>
*
- * <li><p> In Perl, <tt>\1</tt> through <tt>\9</tt> are always interpreted
- * as back references; a backslash-escaped number greater than <tt>9</tt> is
+ * <li><p> In Perl, {@code \1} through {@code \9} are always interpreted
+ * as back references; a backslash-escaped number greater than {@code 9} is
* treated as a back reference if at least that many subexpressions exist,
* otherwise it is interpreted, if possible, as an octal escape. In this
* class octal escapes must always begin with a zero. In this class,
- * <tt>\1</tt> through <tt>\9</tt> are always interpreted as back
+ * {@code \1} through {@code \9} are always interpreted as back
* references, and a larger number is accepted as a back reference if at
* least that many subexpressions exist at that point in the regular
* expression, otherwise the parser will drop digits until the number is
* smaller or equal to the existing number of groups or it is one digit.
* </p></li>
*
- * <li><p> Perl uses the <tt>g</tt> flag to request a match that resumes
+ * <li><p> Perl uses the {@code g} flag to request a match that resumes
* where the last match left off. This functionality is provided implicitly
* by the {@link Matcher} class: Repeated invocations of the {@link
* Matcher#find find} method will resume where the last match left off,
@@ -786,11 +786,11 @@
/**
* Enables Unix lines mode.
*
- * <p> In this mode, only the <tt>'\n'</tt> line terminator is recognized
- * in the behavior of <tt>.</tt>, <tt>^</tt>, and <tt>$</tt>.
+ * <p> In this mode, only the {@code '\n'} line terminator is recognized
+ * in the behavior of {@code .}, {@code ^}, and {@code $}.
*
* <p> Unix lines mode can also be enabled via the embedded flag
- * expression <tt>(?d)</tt>.
+ * expression {@code (?d)}.
*/
public static final int UNIX_LINES = 0x01;
@@ -803,7 +803,7 @@
* #UNICODE_CASE} flag in conjunction with this flag.
*
* <p> Case-insensitive matching can also be enabled via the embedded flag
- * expression <tt>(?i)</tt>.
+ * expression {@code (?i)}.
*
* <p> Specifying this flag may impose a slight performance penalty. </p>
*/
@@ -813,23 +813,23 @@
* Permits whitespace and comments in pattern.
*
* <p> In this mode, whitespace is ignored, and embedded comments starting
- * with <tt>#</tt> are ignored until the end of a line.
+ * with {@code #} are ignored until the end of a line.
*
* <p> Comments mode can also be enabled via the embedded flag
- * expression <tt>(?x)</tt>.
+ * expression {@code (?x)}.
*/
public static final int COMMENTS = 0x04;
/**
* Enables multiline mode.
*
- * <p> In multiline mode the expressions <tt>^</tt> and <tt>$</tt> match
+ * <p> In multiline mode the expressions {@code ^} and {@code $} match
* just after or just before, respectively, a line terminator or the end of
* the input sequence. By default these expressions only match at the
* beginning and the end of the entire input sequence.
*
* <p> Multiline mode can also be enabled via the embedded flag
- * expression <tt>(?m)</tt>. </p>
+ * expression {@code (?m)}. </p>
*/
public static final int MULTILINE = 0x08;
@@ -853,12 +853,12 @@
/**
* Enables dotall mode.
*
- * <p> In dotall mode, the expression <tt>.</tt> matches any character,
+ * <p> In dotall mode, the expression {@code .} matches any character,
* including a line terminator. By default this expression does not match
* line terminators.
*
* <p> Dotall mode can also be enabled via the embedded flag
- * expression <tt>(?s)</tt>. (The <tt>s</tt> is a mnemonic for
+ * expression {@code (?s)}. (The {@code s} is a mnemonic for
* "single-line" mode, which is what this is called in Perl.) </p>
*/
public static final int DOTALL = 0x20;
@@ -873,7 +873,7 @@
* matched.
*
* <p> Unicode-aware case folding can also be enabled via the embedded flag
- * expression <tt>(?u)</tt>.
+ * expression {@code (?u)}.
*
* <p> Specifying this flag may impose a performance penalty. </p>
*/
@@ -884,8 +884,8 @@
*
* <p> When this flag is specified then two characters will be considered
* to match if, and only if, their full canonical decompositions match.
- * The expression <tt>"a\u030A"</tt>, for example, will match the
- * string <tt>"\u00E5"</tt> when this flag is specified. By default,
+ * The expression <code>"a\u030A"</code>, for example, will match the
+ * string <code>"\u00E5"</code> when this flag is specified. By default,
* matching does not take canonical equivalence into account.
*
* <p> There is no embedded flag character for enabling canonical
@@ -907,7 +907,7 @@
* <i>Annex C: Compatibility Properties</i>.
* <p>
* The UNICODE_CHARACTER_CLASS mode can also be enabled via the embedded
- * flag expression <tt>(?U)</tt>.
+ * flag expression {@code (?U)}.
* <p>
* The flag implies UNICODE_CASE, that is, it enables Unicode-aware case
* folding.
@@ -1052,7 +1052,7 @@
* @return the given regular expression compiled into a pattern with the given flags
* @throws IllegalArgumentException
* If bit values other than those corresponding to the defined
- * match flags are set in <tt>flags</tt>
+ * match flags are set in {@code flags}
*
* @throws PatternSyntaxException
* If the expression's syntax is invalid
@@ -1158,7 +1158,7 @@
* of the resulting array. A zero-width match at the beginning however
* never produces such empty leading substring.
*
- * <p> The <tt>limit</tt> parameter controls the number of times the
+ * <p> The {@code limit} parameter controls the number of times the
* pattern is applied and therefore affects the length of the resulting
* array. If the limit <i>n</i> is greater than zero then the pattern
* will be applied at most <i>n</i> - 1 times, the array's
@@ -1169,7 +1169,7 @@
* the pattern will be applied as many times as possible, the array can
* have any length, and trailing empty strings will be discarded.
*
- * <p> The input <tt>"boo:and:foo"</tt>, for example, yields the following
+ * <p> The input {@code "boo:and:foo"}, for example, yields the following
* results with these parameters:
*
* <blockquote><table cellpadding=1 cellspacing=0
@@ -1179,22 +1179,22 @@
* <th align="left"><i>Result </i></th></tr>
* <tr><td align=center>:</td>
* <td align=center>2</td>
- * <td><tt>{ "boo", "and:foo" }</tt></td></tr>
+ * <td>{@code { "boo", "and:foo" }}</td></tr>
* <tr><td align=center>:</td>
* <td align=center>5</td>
- * <td><tt>{ "boo", "and", "foo" }</tt></td></tr>
+ * <td>{@code { "boo", "and", "foo" }}</td></tr>
* <tr><td align=center>:</td>
* <td align=center>-2</td>
- * <td><tt>{ "boo", "and", "foo" }</tt></td></tr>
+ * <td>{@code { "boo", "and", "foo" }}</td></tr>
* <tr><td align=center>o</td>
* <td align=center>5</td>
- * <td><tt>{ "b", "", ":and:f", "", "" }</tt></td></tr>
+ * <td>{@code { "b", "", ":and:f", "", "" }}</td></tr>
* <tr><td align=center>o</td>
* <td align=center>-2</td>
- * <td><tt>{ "b", "", ":and:f", "", "" }</tt></td></tr>
+ * <td>{@code { "b", "", ":and:f", "", "" }}</td></tr>
* <tr><td align=center>o</td>
* <td align=center>0</td>
- * <td><tt>{ "b", "", ":and:f" }</tt></td></tr>
+ * <td>{@code { "b", "", ":and:f" }}</td></tr>
* </table></blockquote>
*
* @param input
@@ -1256,7 +1256,7 @@
* sequence and a limit argument of zero. Trailing empty strings are
* therefore not included in the resulting array. </p>
*
- * <p> The input <tt>"boo:and:foo"</tt>, for example, yields the following
+ * <p> The input {@code "boo:and:foo"}, for example, yields the following
* results with these expressions:
*
* <blockquote><table cellpadding=1 cellspacing=0
@@ -1264,9 +1264,9 @@
* <tr><th align="left"><i>Regex </i></th>
* <th align="left"><i>Result</i></th></tr>
* <tr><td align=center>:</td>
- * <td><tt>{ "boo", "and", "foo" }</tt></td></tr>
+ * <td>{@code { "boo", "and", "foo" }}</td></tr>
* <tr><td align=center>o</td>
- * <td><tt>{ "b", "", ":and:f" }</tt></td></tr>
+ * <td>{@code { "b", "", ":and:f" }}</td></tr>
* </table></blockquote>
*
*
@@ -1281,12 +1281,12 @@
}
/**
- * Returns a literal pattern <code>String</code> for the specified
- * <code>String</code>.
+ * Returns a literal pattern {@code String} for the specified
+ * {@code String}.
*
- * <p>This method produces a <code>String</code> that can be used to
- * create a <code>Pattern</code> that would match the string
- * <code>s</code> as if it were a literal pattern.</p> Metacharacters
+ * <p>This method produces a {@code String} that can be used to
+ * create a {@code Pattern} that would match the string
+ * {@code s} as if it were a literal pattern.</p> Metacharacters
* or escape sequences in the input sequence will be given no special
* meaning.
*
diff --git a/jdk/src/java.base/share/classes/java/util/regex/PatternSyntaxException.java b/jdk/src/java.base/share/classes/java/util/regex/PatternSyntaxException.java
index f7b767a..94d7abc 100644
--- a/jdk/src/java.base/share/classes/java/util/regex/PatternSyntaxException.java
+++ b/jdk/src/java.base/share/classes/java/util/regex/PatternSyntaxException.java
@@ -57,7 +57,7 @@
*
* @param index
* The approximate index in the pattern of the error,
- * or <tt>-1</tt> if the index is not known
+ * or {@code -1} if the index is not known
*/
public PatternSyntaxException(String desc, String regex, int index) {
this.desc = desc;
@@ -69,7 +69,7 @@
* Retrieves the error index.
*
* @return The approximate index in the pattern of the error,
- * or <tt>-1</tt> if the index is not known
+ * or {@code -1} if the index is not known
*/
public int getIndex() {
return index;
diff --git a/jdk/src/java.base/share/classes/java/util/regex/package-info.java b/jdk/src/java.base/share/classes/java/util/regex/package-info.java
index 2907f10..8613663 100644
--- a/jdk/src/java.base/share/classes/java/util/regex/package-info.java
+++ b/jdk/src/java.base/share/classes/java/util/regex/package-info.java
@@ -37,7 +37,7 @@
* interface in order to support matching against characters from a
* wide variety of input sources. </p>
*
- * <p> Unless otherwise noted, passing a <tt>null</tt> argument to a
+ * <p> Unless otherwise noted, passing a <code>null</code> argument to a
* method in any class or interface in this package will cause a
* {@link java.lang.NullPointerException NullPointerException} to be
* thrown.
diff --git a/jdk/src/java.base/share/classes/javax/security/auth/AuthPermission.java b/jdk/src/java.base/share/classes/javax/security/auth/AuthPermission.java
index 49f5148..889d14a 100644
--- a/jdk/src/java.base/share/classes/javax/security/auth/AuthPermission.java
+++ b/jdk/src/java.base/share/classes/javax/security/auth/AuthPermission.java
@@ -26,18 +26,17 @@
package javax.security.auth;
/**
- * This class is for authentication permissions.
- * An AuthPermission contains a name
- * (also referred to as a "target name")
- * but no actions list; you either have the named permission
- * or you don't.
+ * This class is for authentication permissions. An {@code AuthPermission}
+ * contains a name (also referred to as a "target name") but no actions
+ * list; you either have the named permission or you don't.
*
* <p> The target name is the name of a security configuration parameter
- * (see below). Currently the AuthPermission object is used to
- * guard access to the Policy, Subject, LoginContext,
- * and Configuration objects.
+ * (see below). Currently the {@code AuthPermission} object is used to
+ * guard access to the {@link Policy}, {@link Subject},
+ * {@link javax.security.auth.login.LoginContext}, and
+ * {@link javax.security.auth.login.Configuration} objects.
*
- * <p> The possible target names for an Authentication Permission are:
+ * <p> The standard target names for an Authentication Permission are:
*
* <pre>
* doAs - allow the caller to invoke the
@@ -125,6 +124,9 @@
* Subject-based access control policy.
* </pre>
*
+ * @implNote
+ * Implementations may define additional target names, but should use naming
+ * conventions such as reverse domain name notation to avoid name clashes.
*/
public final class AuthPermission extends
java.security.BasicPermission {
diff --git a/jdk/src/java.base/share/classes/sun/nio/ByteBuffered.java b/jdk/src/java.base/share/classes/sun/nio/ByteBuffered.java
index a09621b..6a01641 100644
--- a/jdk/src/java.base/share/classes/sun/nio/ByteBuffered.java
+++ b/jdk/src/java.base/share/classes/sun/nio/ByteBuffered.java
@@ -29,11 +29,11 @@
import java.io.IOException;
/** This is an interface to adapt existing APIs to use {@link java.nio.ByteBuffer
- * <tt>ByteBuffers</tt>} as the underlying
+ * ByteBuffers} as the underlying
* data format. Only the initial producer and final consumer have to be changed.<p>
*
- * For example, the Zip/Jar code supports {@link java.io.InputStream <tt>InputStreams</tt>}.
- * To make the Zip code use {@link java.nio.MappedByteBuffer <tt>MappedByteBuffers</tt>} as
+ * For example, the Zip/Jar code supports {@link java.io.InputStream InputStreams}.
+ * To make the Zip code use {@link java.nio.MappedByteBuffer MappedByteBuffers} as
* the underlying data structure, it can create a class of InputStream that wraps the ByteBuffer,
* and implements the ByteBuffered interface. A co-operating class several layers
* away can ask the InputStream if it is an instance of ByteBuffered, then
@@ -42,12 +42,12 @@
public interface ByteBuffered {
/**
- * Returns the <tt>ByteBuffer</tt> behind this object, if this particular
- * instance has one. An implementation of <tt>getByteBuffer()</tt> is allowed
- * to return <tt>null</tt> for any reason.
+ * Returns the {@code ByteBuffer} behind this object, if this particular
+ * instance has one. An implementation of {@code getByteBuffer()} is allowed
+ * to return {@code null} for any reason.
*
- * @return The <tt>ByteBuffer</tt>, if this particular instance has one,
- * or <tt>null</tt> otherwise.
+ * @return The {@code ByteBuffer}, if this particular instance has one,
+ * or {@code null} otherwise.
*
* @throws IOException
* If the ByteBuffer is no longer valid.
diff --git a/jdk/src/java.base/share/classes/sun/nio/ch/AllocatedNativeObject.java b/jdk/src/java.base/share/classes/sun/nio/ch/AllocatedNativeObject.java
index 2406cb8..6709ce1 100644
--- a/jdk/src/java.base/share/classes/sun/nio/ch/AllocatedNativeObject.java
+++ b/jdk/src/java.base/share/classes/sun/nio/ch/AllocatedNativeObject.java
@@ -36,14 +36,14 @@
{
/**
- * Allocates a memory area of at least <tt>size</tt> bytes outside of the
+ * Allocates a memory area of at least {@code size} bytes outside of the
* Java heap and creates a native object for that area.
*
* @param size
* Number of bytes to allocate
*
* @param pageAligned
- * If <tt>true</tt> then the area will be aligned on a hardware
+ * If {@code true} then the area will be aligned on a hardware
* page boundary
*
* @throws OutOfMemoryError
diff --git a/jdk/src/java.base/share/conf/security/java.policy b/jdk/src/java.base/share/conf/security/java.policy
index aef0017..968cc4f 100644
--- a/jdk/src/java.base/share/conf/security/java.policy
+++ b/jdk/src/java.base/share/conf/security/java.policy
@@ -23,6 +23,14 @@
permission java.security.AllPermission;
};
+grant codeBase "jrt:/jdk.scripting.nashorn.shell" {
+ permission java.security.AllPermission;
+};
+
+grant codeBase "jrt:/jdk.internal.le" {
+ permission java.security.AllPermission;
+};
+
grant codeBase "jrt:/jdk.crypto.ucrypto" {
permission java.lang.RuntimePermission "accessClassInPackage.sun.security.*";
permission java.lang.RuntimePermission "accessClassInPackage.sun.nio.ch";
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/DocumentExtFunc.java b/jdk/src/java.base/share/native/libnio/nio_util.c
similarity index 66%
copy from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/DocumentExtFunc.java
copy to jdk/src/java.base/share/native/libnio/nio_util.c
index 44976ed..f61c652 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/DocumentExtFunc.java
+++ b/jdk/src/java.base/share/native/libnio/nio_util.c
@@ -4,7 +4,9 @@
*
* 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.
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -21,15 +23,18 @@
* questions.
*/
-package javax.xml.transform;
+#include "jni.h"
+#include "jvm.h"
+#include "jni_util.h"
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
+JNIEXPORT jint JNICALL
+JNI_OnLoad(JavaVM *vm, void *reserved)
+{
+ JNIEnv *env;
-public class DocumentExtFunc {
-
- public static String test(NodeList list) {
- Node node = list.item(0);
- return "["+node.getNodeName() + ":" + node.getTextContent()+"]";
+ if ((*vm)->GetEnv(vm, (void**) &env, JNI_VERSION_1_2) != JNI_OK) {
+ return JNI_EVERSION; /* JNI version not supported */
}
+
+ return JNI_VERSION_1_2;
}
diff --git a/jdk/src/java.base/unix/classes/sun/nio/fs/GnomeFileTypeDetector.java b/jdk/src/java.base/unix/classes/sun/nio/fs/GnomeFileTypeDetector.java
index 7d120e4..88c6839 100644
--- a/jdk/src/java.base/unix/classes/sun/nio/fs/GnomeFileTypeDetector.java
+++ b/jdk/src/java.base/unix/classes/sun/nio/fs/GnomeFileTypeDetector.java
@@ -67,7 +67,7 @@
// GIO
private static native boolean initializeGio();
- private static native byte[] probeGio(long pathAddress);
+ private static synchronized native byte[] probeGio(long pathAddress);
static {
AccessController.doPrivileged(new PrivilegedAction<>() {
diff --git a/jdk/src/java.base/unix/classes/sun/nio/fs/MimeTypesFileTypeDetector.java b/jdk/src/java.base/unix/classes/sun/nio/fs/MimeTypesFileTypeDetector.java
index 20e077c..9eb683b 100644
--- a/jdk/src/java.base/unix/classes/sun/nio/fs/MimeTypesFileTypeDetector.java
+++ b/jdk/src/java.base/unix/classes/sun/nio/fs/MimeTypesFileTypeDetector.java
@@ -159,7 +159,7 @@
final String EXTEQUAL = "exts=";
String extRegex = "\\b" + EXTEQUAL +
- "(\"[\\p{Graph}|\\p{Blank}]+?\"|\\p{Graph}+\\b)";
+ "(\"[\\p{Graph}\\p{Blank}]+?\"|\\p{Graph}+\\b)";
Pattern extPattern = Pattern.compile(extRegex);
Matcher extMatcher = extPattern.matcher(entry);
@@ -169,7 +169,7 @@
if (exts.charAt(0) == '"') {
exts = exts.substring(1, exts.length() - 1);
}
- String[] extList = exts.split("[\\p{Blank}|\\p{Punct}]+");
+ String[] extList = exts.split("[\\p{Blank}\\p{Punct}]+");
for (String ext : extList) {
putIfAbsent(ext, type);
}
diff --git a/jdk/src/java.base/windows/native/libjava/WinNTFileSystem_md.c b/jdk/src/java.base/windows/native/libjava/WinNTFileSystem_md.c
index 3c280c0..1e29fd2 100644
--- a/jdk/src/java.base/windows/native/libjava/WinNTFileSystem_md.c
+++ b/jdk/src/java.base/windows/native/libjava/WinNTFileSystem_md.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2015, 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
@@ -233,10 +233,13 @@
if (GetFileAttributesExW(path, GetFileExInfoStandard, &wfad)) {
attr = getFinalAttributesIfReparsePoint(path, wfad.dwFileAttributes);
- } else if (GetLastError() == ERROR_SHARING_VIOLATION &&
- (h = FindFirstFileW(path, &wfd)) != INVALID_HANDLE_VALUE) {
- attr = getFinalAttributesIfReparsePoint(path, wfd.dwFileAttributes);
- FindClose(h);
+ } else {
+ DWORD lerr = GetLastError();
+ if ((lerr == ERROR_SHARING_VIOLATION || lerr == ERROR_ACCESS_DENIED) &&
+ (h = FindFirstFileW(path, &wfd)) != INVALID_HANDLE_VALUE) {
+ attr = getFinalAttributesIfReparsePoint(path, wfd.dwFileAttributes);
+ FindClose(h);
+ }
}
return attr;
}
diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CFRetainedResource.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CFRetainedResource.m
index 1371189..b5650cd 100644
--- a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CFRetainedResource.m
+++ b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CFRetainedResource.m
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, 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
@@ -40,10 +40,17 @@
if (releaseOnAppKitThread) {
// Releasing resources on the main AppKit message loop only
// Releasing resources on the nested loops may cause dangling
- // pointers after the nested loop is exited
- [NSApp postRunnableEvent:^(){
- CFRelease(jlong_to_ptr(ptr));
- }];
+ // pointers after the nested loop is exited
+ if ([NSApp respondsToSelector:@selector(postRunnableEvent:)]) {
+ [NSApp postRunnableEvent:^() {
+ CFRelease(jlong_to_ptr(ptr));
+ }];
+ } else {
+ // could happen if we are embedded inside SWT/FX application,
+ [JNFRunLoop performOnMainThreadWaiting:NO withBlock:^() {
+ CFRelease(jlong_to_ptr(ptr));
+ }];
+ }
} else {
JNF_COCOA_ENTER(env);
diff --git a/jdk/src/java.desktop/share/classes/com/sun/beans/introspect/PropertyInfo.java b/jdk/src/java.desktop/share/classes/com/sun/beans/introspect/PropertyInfo.java
index 44d6a1f..3bda169 100644
--- a/jdk/src/java.desktop/share/classes/com/sun/beans/introspect/PropertyInfo.java
+++ b/jdk/src/java.desktop/share/classes/com/sun/beans/introspect/PropertyInfo.java
@@ -40,7 +40,7 @@
import static com.sun.beans.finder.ClassFinder.findClass;
public final class PropertyInfo {
- public enum Name {bound, expert, hidden, preferred, visualUpdate, description, enumerationValues}
+ public enum Name {bound, expert, hidden, preferred, required, visualUpdate, description, enumerationValues}
private static final String VETO_EXCEPTION_NAME = "java.beans.PropertyVetoException";
private static final Class<?> VETO_EXCEPTION;
@@ -120,6 +120,7 @@
put(Name.bound, Boolean.FALSE);
}
put(Name.expert, annotation.expert());
+ put(Name.required, annotation.required());
put(Name.hidden, annotation.hidden());
put(Name.preferred, annotation.preferred());
put(Name.visualUpdate, annotation.visualUpdate());
diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/AiffFileReader.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/AiffFileReader.java
index 6d91be4..8c9dc3c 100644
--- a/jdk/src/java.desktop/share/classes/com/sun/media/sound/AiffFileReader.java
+++ b/jdk/src/java.desktop/share/classes/com/sun/media/sound/AiffFileReader.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2015, 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
@@ -27,19 +27,14 @@
import java.io.DataInputStream;
import java.io.DataOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.net.URL;
import javax.sound.sampled.AudioFileFormat;
import javax.sound.sampled.AudioFormat;
-import javax.sound.sampled.AudioInputStream;
import javax.sound.sampled.AudioSystem;
import javax.sound.sampled.UnsupportedAudioFileException;
-
/**
* AIFF file reader and writer.
*
@@ -49,177 +44,10 @@
*/
public final class AiffFileReader extends SunFileReader {
- private static final int MAX_READ_LENGTH = 8;
-
- // METHODS TO IMPLEMENT AudioFileReader
-
- /**
- * Obtains the audio file format of the input stream provided. The stream must
- * point to valid audio file data. In general, audio file providers may
- * need to read some data from the stream before determining whether they
- * support it. These parsers must
- * be able to mark the stream, read enough data to determine whether they
- * support the stream, and, if not, reset the stream's read pointer to its original
- * position. If the input stream does not support this, this method may fail
- * with an IOException.
- * @param stream the input stream from which file format information should be
- * extracted
- * @return an <code>AudioFileFormat</code> object describing the audio file format
- * @throws UnsupportedAudioFileException if the stream does not point to valid audio
- * file data recognized by the system
- * @throws IOException if an I/O exception occurs
- * @see InputStream#markSupported
- * @see InputStream#mark
- */
- public AudioFileFormat getAudioFileFormat(InputStream stream) throws UnsupportedAudioFileException, IOException {
- // fix for 4489272: AudioSystem.getAudioFileFormat() fails for InputStream, but works for URL
- AudioFileFormat aff = getCOMM(stream, true);
- // the following is not strictly necessary - but was implemented like that in 1.3.0 - 1.4.1
- // so I leave it as it was. May remove this for 1.5.0
- stream.reset();
- return aff;
- }
-
-
- /**
- * Obtains the audio file format of the URL provided. The URL must
- * point to valid audio file data.
- * @param url the URL from which file format information should be
- * extracted
- * @return an <code>AudioFileFormat</code> object describing the audio file format
- * @throws UnsupportedAudioFileException if the URL does not point to valid audio
- * file data recognized by the system
- * @throws IOException if an I/O exception occurs
- */
- public AudioFileFormat getAudioFileFormat(URL url) throws UnsupportedAudioFileException, IOException {
- AudioFileFormat fileFormat = null;
- InputStream urlStream = url.openStream(); // throws IOException
- try {
- fileFormat = getCOMM(urlStream, false);
- } finally {
- urlStream.close();
- }
- return fileFormat;
- }
-
-
- /**
- * Obtains the audio file format of the File provided. The File must
- * point to valid audio file data.
- * @param file the File from which file format information should be
- * extracted
- * @return an <code>AudioFileFormat</code> object describing the audio file format
- * @throws UnsupportedAudioFileException if the File does not point to valid audio
- * file data recognized by the system
- * @throws IOException if an I/O exception occurs
- */
- public AudioFileFormat getAudioFileFormat(File file) throws UnsupportedAudioFileException, IOException {
- AudioFileFormat fileFormat = null;
- FileInputStream fis = new FileInputStream(file); // throws IOException
- // part of fix for 4325421
- try {
- fileFormat = getCOMM(fis, false);
- } finally {
- fis.close();
- }
-
- return fileFormat;
- }
-
-
-
-
- /**
- * Obtains an audio stream from the input stream provided. The stream must
- * point to valid audio file data. In general, audio file providers may
- * need to read some data from the stream before determining whether they
- * support it. These parsers must
- * be able to mark the stream, read enough data to determine whether they
- * support the stream, and, if not, reset the stream's read pointer to its original
- * position. If the input stream does not support this, this method may fail
- * with an IOException.
- * @param stream the input stream from which the <code>AudioInputStream</code> should be
- * constructed
- * @return an <code>AudioInputStream</code> object based on the audio file data contained
- * in the input stream.
- * @throws UnsupportedAudioFileException if the stream does not point to valid audio
- * file data recognized by the system
- * @throws IOException if an I/O exception occurs
- * @see InputStream#markSupported
- * @see InputStream#mark
- */
- public AudioInputStream getAudioInputStream(InputStream stream) throws UnsupportedAudioFileException, IOException {
- // getCOMM leaves the input stream at the beginning of the audio data
- AudioFileFormat fileFormat = getCOMM(stream, true); // throws UnsupportedAudioFileException, IOException
-
- // we've got everything, and the stream is at the
- // beginning of the audio data, so return an AudioInputStream.
- return new AudioInputStream(stream, fileFormat.getFormat(), fileFormat.getFrameLength());
- }
-
-
- /**
- * Obtains an audio stream from the URL provided. The URL must
- * point to valid audio file data.
- * @param url the URL for which the <code>AudioInputStream</code> should be
- * constructed
- * @return an <code>AudioInputStream</code> object based on the audio file data pointed
- * to by the URL
- * @throws UnsupportedAudioFileException if the URL does not point to valid audio
- * file data recognized by the system
- * @throws IOException if an I/O exception occurs
- */
- public AudioInputStream getAudioInputStream(URL url) throws UnsupportedAudioFileException, IOException {
- InputStream urlStream = url.openStream(); // throws IOException
- AudioFileFormat fileFormat = null;
- try {
- fileFormat = getCOMM(urlStream, false);
- } finally {
- if (fileFormat == null) {
- urlStream.close();
- }
- }
- return new AudioInputStream(urlStream, fileFormat.getFormat(), fileFormat.getFrameLength());
- }
-
-
- /**
- * Obtains an audio stream from the File provided. The File must
- * point to valid audio file data.
- * @param file the File for which the <code>AudioInputStream</code> should be
- * constructed
- * @return an <code>AudioInputStream</code> object based on the audio file data pointed
- * to by the File
- * @throws UnsupportedAudioFileException if the File does not point to valid audio
- * file data recognized by the system
- * @throws IOException if an I/O exception occurs
- */
- public AudioInputStream getAudioInputStream(File file)
- throws UnsupportedAudioFileException, IOException {
-
- FileInputStream fis = new FileInputStream(file); // throws IOException
- AudioFileFormat fileFormat = null;
- // part of fix for 4325421
- try {
- fileFormat = getCOMM(fis, false);
- } finally {
- if (fileFormat == null) {
- fis.close();
- }
- }
- return new AudioInputStream(fis, fileFormat.getFormat(), fileFormat.getFrameLength());
- }
-
- //--------------------------------------------------------------------
-
- private AudioFileFormat getCOMM(InputStream is, boolean doReset)
- throws UnsupportedAudioFileException, IOException {
-
- DataInputStream dis = new DataInputStream(is);
-
- if (doReset) {
- dis.mark(MAX_READ_LENGTH);
- }
+ @Override
+ AudioFileFormat getAudioFileFormatImpl(final InputStream stream)
+ throws UnsupportedAudioFileException, IOException {
+ DataInputStream dis = new DataInputStream(stream);
// assumes a stream at the beginning of the file which has already
// passed the magic number test...
@@ -234,9 +62,6 @@
// $$fb: fix for 4369044: javax.sound.sampled.AudioSystem.getAudioInputStream() works wrong with Cp037
if (magic != AiffFileFormat.AIFF_MAGIC) {
// not AIFF, throw exception
- if (doReset) {
- dis.reset();
- }
throw new UnsupportedAudioFileException("not an AIFF file");
}
diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/AuFileReader.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/AuFileReader.java
index a12e461..7e83180 100644
--- a/jdk/src/java.desktop/share/classes/com/sun/media/sound/AuFileReader.java
+++ b/jdk/src/java.desktop/share/classes/com/sun/media/sound/AuFileReader.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2015, 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
@@ -25,21 +25,15 @@
package com.sun.media.sound;
-import java.io.BufferedInputStream;
import java.io.DataInputStream;
-import java.io.File;
-import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.net.URL;
import javax.sound.sampled.AudioFileFormat;
import javax.sound.sampled.AudioFormat;
-import javax.sound.sampled.AudioInputStream;
import javax.sound.sampled.AudioSystem;
import javax.sound.sampled.UnsupportedAudioFileException;
-
/**
* AU file reader.
*
@@ -49,33 +43,10 @@
*/
public final class AuFileReader extends SunFileReader {
- // METHODS TO IMPLEMENT AudioFileReader
-
- /**
- * Obtains the audio file format of the input stream provided. The stream must
- * point to valid audio file data. In general, audio file providers may
- * need to read some data from the stream before determining whether they
- * support it. These parsers must
- * be able to mark the stream, read enough data to determine whether they
- * support the stream, and, if not, reset the stream's read pointer to its original
- * position. If the input stream does not support this, this method may fail
- * with an IOException.
- * @param stream the input stream from which file format information should be
- * extracted
- * @return an <code>AudioFileFormat</code> object describing the audio file format
- * @throws UnsupportedAudioFileException if the stream does not point to valid audio
- * file data recognized by the system
- * @throws IOException if an I/O exception occurs
- * @see InputStream#markSupported
- * @see InputStream#mark
- */
- public AudioFileFormat getAudioFileFormat(InputStream stream) throws UnsupportedAudioFileException, IOException {
-
- AudioFormat format = null;
- AuFileFormat fileFormat = null;
- int maxReadLength = 28;
+ @Override
+ public AudioFileFormat getAudioFileFormatImpl(final InputStream stream)
+ throws UnsupportedAudioFileException, IOException {
boolean bigendian = false;
- int magic = -1;
int headerSize = -1;
int dataSize = -1;
int encoding_local = -1;
@@ -90,15 +61,12 @@
DataInputStream dis = new DataInputStream( stream );
- dis.mark(maxReadLength);
-
- magic = dis.readInt();
+ final int magic = dis.readInt(); nread += 4;
if (! (magic == AuFileFormat.AU_SUN_MAGIC) || (magic == AuFileFormat.AU_DEC_MAGIC) ||
(magic == AuFileFormat.AU_SUN_INV_MAGIC) || (magic == AuFileFormat.AU_DEC_INV_MAGIC) ) {
- // not AU, reset the stream, place into exception, throw exception
- dis.reset();
+ // not AU, throw exception
throw new UnsupportedAudioFileException("not an AU file");
}
@@ -112,7 +80,6 @@
sampleRate = (bigendian==true ? dis.readInt() : rllong(dis) ); nread += 4;
channels = (bigendian==true ? dis.readInt() : rllong(dis) ); nread += 4;
if (channels <= 0) {
- dis.reset();
throw new UnsupportedAudioFileException("Invalid number of channels");
}
@@ -172,7 +139,6 @@
*/
default:
// unsupported filetype, throw exception
- dis.reset();
throw new UnsupportedAudioFileException("not a valid AU file");
}
@@ -184,189 +150,13 @@
//$$fb 2003-10-20: fix for 4940459: AudioInputStream.getFrameLength() returns 0 instead of NOT_SPECIFIED
length = dataSize / frameSize;
}
-
- format = new AudioFormat( encoding, (float)sampleRate, sampleSizeInBits,
- channels, frameSize, (float)frameRate, bigendian);
-
- fileFormat = new AuFileFormat( AudioFileFormat.Type.AU, dataSize+headerSize,
- format, length);
-
- dis.reset(); // Throws IOException
- return fileFormat;
-
- }
-
-
- /**
- * Obtains the audio file format of the URL provided. The URL must
- * point to valid audio file data.
- * @param url the URL from which file format information should be
- * extracted
- * @return an <code>AudioFileFormat</code> object describing the audio file format
- * @throws UnsupportedAudioFileException if the URL does not point to valid audio
- * file data recognized by the system
- * @throws IOException if an I/O exception occurs
- */
- public AudioFileFormat getAudioFileFormat(URL url) throws UnsupportedAudioFileException, IOException {
-
- InputStream urlStream = null;
- BufferedInputStream bis = null;
- AudioFileFormat fileFormat = null;
- AudioFormat format = null;
-
- urlStream = url.openStream(); // throws IOException
-
- try {
- bis = new BufferedInputStream( urlStream, bisBufferSize );
-
- fileFormat = getAudioFileFormat( bis ); // throws UnsupportedAudioFileException
- } finally {
- urlStream.close();
- }
-
- return fileFormat;
- }
-
-
- /**
- * Obtains the audio file format of the File provided. The File must
- * point to valid audio file data.
- * @param file the File from which file format information should be
- * extracted
- * @return an <code>AudioFileFormat</code> object describing the audio file format
- * @throws UnsupportedAudioFileException if the File does not point to valid audio
- * file data recognized by the system
- * @throws IOException if an I/O exception occurs
- */
- public AudioFileFormat getAudioFileFormat(File file) throws UnsupportedAudioFileException, IOException {
-
- FileInputStream fis = null;
- BufferedInputStream bis = null;
- AudioFileFormat fileFormat = null;
- AudioFormat format = null;
-
- fis = new FileInputStream( file ); // throws IOException
- // part of fix for 4325421
- try {
- bis = new BufferedInputStream( fis, bisBufferSize );
- fileFormat = getAudioFileFormat( bis ); // throws UnsupportedAudioFileException
- } finally {
- fis.close();
- }
-
- return fileFormat;
- }
-
-
- /**
- * Obtains an audio stream from the input stream provided. The stream must
- * point to valid audio file data. In general, audio file providers may
- * need to read some data from the stream before determining whether they
- * support it. These parsers must
- * be able to mark the stream, read enough data to determine whether they
- * support the stream, and, if not, reset the stream's read pointer to its original
- * position. If the input stream does not support this, this method may fail
- * with an IOException.
- * @param stream the input stream from which the <code>AudioInputStream</code> should be
- * constructed
- * @return an <code>AudioInputStream</code> object based on the audio file data contained
- * in the input stream.
- * @throws UnsupportedAudioFileException if the stream does not point to valid audio
- * file data recognized by the system
- * @throws IOException if an I/O exception occurs
- * @see InputStream#markSupported
- * @see InputStream#mark
- */
- public AudioInputStream getAudioInputStream(InputStream stream) throws UnsupportedAudioFileException, IOException {
-
- DataInputStream dis = null;
- int headerSize;
- AudioFileFormat fileFormat = null;
- AudioFormat format = null;
-
-
- fileFormat = getAudioFileFormat( stream ); // throws UnsupportedAudioFileException, IOException
-
- // if we passed this call, we have an AU file.
-
- format = fileFormat.getFormat();
-
- dis = new DataInputStream(stream);
-
// now seek past the header
-
- dis.readInt(); // magic
- headerSize = (format.isBigEndian()==true ? dis.readInt() : rllong(dis) );
- dis.skipBytes( headerSize - 8 );
-
-
- // we've got everything, and the stream should be at the
- // beginning of the data chunk, so return an AudioInputStream.
-
- return new AudioInputStream(dis, format, fileFormat.getFrameLength());
- }
-
-
- /**
- * Obtains an audio stream from the URL provided. The URL must
- * point to valid audio file data.
- * @param url the URL for which the <code>AudioInputStream</code> should be
- * constructed
- * @return an <code>AudioInputStream</code> object based on the audio file data pointed
- * to by the URL
- * @throws UnsupportedAudioFileException if the URL does not point to valid audio
- * file data recognized by the system
- * @throws IOException if an I/O exception occurs
- */
- public AudioInputStream getAudioInputStream(URL url) throws UnsupportedAudioFileException, IOException {
-
- InputStream urlStream = null;
- BufferedInputStream bis = null;
- AudioFileFormat fileFormat = null;
-
- urlStream = url.openStream(); // throws IOException
- AudioInputStream result = null;
- try {
- bis = new BufferedInputStream( urlStream, bisBufferSize );
- result = getAudioInputStream( (InputStream)bis );
- } finally {
- if (result == null) {
- urlStream.close();
- }
- }
- return result;
- }
-
-
- /**
- * Obtains an audio stream from the File provided. The File must
- * point to valid audio file data.
- * @param file the File for which the <code>AudioInputStream</code> should be
- * constructed
- * @return an <code>AudioInputStream</code> object based on the audio file data pointed
- * to by the File
- * @throws UnsupportedAudioFileException if the File does not point to valid audio
- * file data recognized by the system
- * @throws IOException if an I/O exception occurs
- */
- public AudioInputStream getAudioInputStream(File file) throws UnsupportedAudioFileException, IOException {
-
- FileInputStream fis = null;
- BufferedInputStream bis = null;
- AudioFileFormat fileFormat = null;
-
- fis = new FileInputStream( file ); // throws IOException
- AudioInputStream result = null;
- // part of fix for 4325421
- try {
- bis = new BufferedInputStream( fis, bisBufferSize );
- result = getAudioInputStream( (InputStream)bis );
- } finally {
- if (result == null) {
- fis.close();
- }
- }
-
- return result;
+ dis.skipBytes(headerSize - nread);
+ AudioFormat format = new AudioFormat(encoding, sampleRate,
+ sampleSizeInBits, channels,
+ frameSize, (float) frameRate,
+ bigendian);
+ return new AuFileFormat(AudioFileFormat.Type.AU, dataSize + headerSize,
+ format, length);
}
}
diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SunFileReader.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SunFileReader.java
index 7e59125..06b9ff0 100644
--- a/jdk/src/java.desktop/share/classes/com/sun/media/sound/SunFileReader.java
+++ b/jdk/src/java.desktop/share/classes/com/sun/media/sound/SunFileReader.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2015, 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
@@ -25,10 +25,12 @@
package com.sun.media.sound;
-import java.io.File;
-import java.io.InputStream;
-import java.io.IOException;
+import java.io.BufferedInputStream;
import java.io.DataInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
import java.net.URL;
import javax.sound.sampled.AudioFileFormat;
@@ -36,8 +38,6 @@
import javax.sound.sampled.UnsupportedAudioFileException;
import javax.sound.sampled.spi.AudioFileReader;
-
-
/**
* Abstract File Reader class.
*
@@ -45,118 +45,109 @@
*/
abstract class SunFileReader extends AudioFileReader {
- // buffer size for temporary input streams
- protected static final int bisBufferSize = 4096;
-
- /**
- * Constructs a new SunFileReader object.
- */
- SunFileReader() {
+ @Override
+ public final AudioFileFormat getAudioFileFormat(final InputStream stream)
+ throws UnsupportedAudioFileException, IOException {
+ stream.mark(200); // The biggest value which was historically used
+ try {
+ return getAudioFileFormatImpl(stream);
+ } finally {
+ // According to specification the following is not strictly
+ // necessary, if we got correct format. But it was implemented like
+ // that in 1.3.0 - 1.8. So I leave it as it was, but it seems
+ // specification should be updated.
+ stream.reset();
+ }
}
+ @Override
+ public final AudioFileFormat getAudioFileFormat(final URL url)
+ throws UnsupportedAudioFileException, IOException {
+ try (InputStream is = url.openStream()) {
+ return getAudioFileFormatImpl(new BufferedInputStream(is));
+ }
+ }
- // METHODS TO IMPLEMENT AudioFileReader
+ @Override
+ public final AudioFileFormat getAudioFileFormat(final File file)
+ throws UnsupportedAudioFileException, IOException {
+ try (InputStream is = new FileInputStream(file)) {
+ return getAudioFileFormatImpl(new BufferedInputStream(is));
+ }
+ }
+
+ @Override
+ public AudioInputStream getAudioInputStream(final InputStream stream)
+ throws UnsupportedAudioFileException, IOException {
+ stream.mark(200); // The biggest value which was historically used
+ try {
+ final AudioFileFormat fileFormat = getAudioFileFormatImpl(stream);
+ // we've got everything, the stream is supported and it is at the
+ // beginning of the audio data, so return an AudioInputStream
+ return new AudioInputStream(stream, fileFormat.getFormat(),
+ fileFormat.getFrameLength());
+ } catch (final UnsupportedAudioFileException e) {
+ stream.reset();
+ throw e;
+ }
+ }
+
+ @Override
+ public final AudioInputStream getAudioInputStream(final URL url)
+ throws UnsupportedAudioFileException, IOException {
+ final InputStream urlStream = url.openStream();
+ try {
+ return getAudioInputStream(new BufferedInputStream(urlStream));
+ } catch (final Throwable e) {
+ closeSilently(urlStream);
+ throw e;
+ }
+ }
+
+ @Override
+ public final AudioInputStream getAudioInputStream(final File file)
+ throws UnsupportedAudioFileException, IOException {
+ final InputStream fileStream = new FileInputStream(file);
+ try {
+ return getAudioInputStream(new BufferedInputStream(fileStream));
+ } catch (final Throwable e) {
+ closeSilently(fileStream);
+ throw e;
+ }
+ }
/**
- * Obtains the audio file format of the input stream provided. The stream must
- * point to valid audio file data. In general, audio file providers may
- * need to read some data from the stream before determining whether they
- * support it. These parsers must
- * be able to mark the stream, read enough data to determine whether they
- * support the stream, and, if not, reset the stream's read pointer to its original
- * position. If the input stream does not support this, this method may fail
- * with an IOException.
- * @param stream the input stream from which file format information should be
- * extracted
- * @return an <code>AudioFileFormat</code> object describing the audio file format
- * @throws UnsupportedAudioFileException if the stream does not point to valid audio
- * file data recognized by the system
- * @throws IOException if an I/O exception occurs
- * @see InputStream#markSupported
- * @see InputStream#mark
- */
- abstract public AudioFileFormat getAudioFileFormat(InputStream stream) throws UnsupportedAudioFileException, IOException;
-
-
- /**
- * Obtains the audio file format of the URL provided. The URL must
- * point to valid audio file data.
- * @param url the URL from which file format information should be
- * extracted
- * @return an <code>AudioFileFormat</code> object describing the audio file format
- * @throws UnsupportedAudioFileException if the URL does not point to valid audio
- * file data recognized by the system
+ * Obtains the audio file format of the input stream provided. The stream
+ * must point to valid audio file data. Note that default implementation of
+ * {@link #getAudioInputStream(InputStream)} assume that this method leaves
+ * the input stream at the beginning of the audio data.
+ *
+ * @param stream the input stream from which file format information should
+ * be extracted
+ * @return an {@code AudioFileFormat} object describing the audio file
+ * format
+ * @throws UnsupportedAudioFileException if the stream does not point to
+ * valid audio file data recognized by the system
* @throws IOException if an I/O exception occurs
*/
- abstract public AudioFileFormat getAudioFileFormat(URL url) throws UnsupportedAudioFileException, IOException;
-
-
- /**
- * Obtains the audio file format of the File provided. The File must
- * point to valid audio file data.
- * @param file the File from which file format information should be
- * extracted
- * @return an <code>AudioFileFormat</code> object describing the audio file format
- * @throws UnsupportedAudioFileException if the File does not point to valid audio
- * file data recognized by the system
- * @throws IOException if an I/O exception occurs
- */
- abstract public AudioFileFormat getAudioFileFormat(File file) throws UnsupportedAudioFileException, IOException;
-
-
- /**
- * Obtains an audio stream from the input stream provided. The stream must
- * point to valid audio file data. In general, audio file providers may
- * need to read some data from the stream before determining whether they
- * support it. These parsers must
- * be able to mark the stream, read enough data to determine whether they
- * support the stream, and, if not, reset the stream's read pointer to its original
- * position. If the input stream does not support this, this method may fail
- * with an IOException.
- * @param stream the input stream from which the <code>AudioInputStream</code> should be
- * constructed
- * @return an <code>AudioInputStream</code> object based on the audio file data contained
- * in the input stream.
- * @throws UnsupportedAudioFileException if the stream does not point to valid audio
- * file data recognized by the system
- * @throws IOException if an I/O exception occurs
- * @see InputStream#markSupported
- * @see InputStream#mark
- */
- abstract public AudioInputStream getAudioInputStream(InputStream stream) throws UnsupportedAudioFileException, IOException;
-
-
- /**
- * Obtains an audio stream from the URL provided. The URL must
- * point to valid audio file data.
- * @param url the URL for which the <code>AudioInputStream</code> should be
- * constructed
- * @return an <code>AudioInputStream</code> object based on the audio file data pointed
- * to by the URL
- * @throws UnsupportedAudioFileException if the URL does not point to valid audio
- * file data recognized by the system
- * @throws IOException if an I/O exception occurs
- */
- abstract public AudioInputStream getAudioInputStream(URL url) throws UnsupportedAudioFileException, IOException;
-
-
- /**
- * Obtains an audio stream from the File provided. The File must
- * point to valid audio file data.
- * @param file the File for which the <code>AudioInputStream</code> should be
- * constructed
- * @return an <code>AudioInputStream</code> object based on the audio file data pointed
- * to by the File
- * @throws UnsupportedAudioFileException if the File does not point to valid audio
- * file data recognized by the system
- * @throws IOException if an I/O exception occurs
- */
- abstract public AudioInputStream getAudioInputStream(File file) throws UnsupportedAudioFileException, IOException;
-
+ abstract AudioFileFormat getAudioFileFormatImpl(InputStream stream)
+ throws UnsupportedAudioFileException, IOException;
// HELPER METHODS
-
+ /**
+ * Closes the InputStream when we have read all necessary data from it, and
+ * ignores an IOException.
+ *
+ * @param is the InputStream which should be closed
+ */
+ private static void closeSilently(final InputStream is) {
+ try {
+ is.close();
+ } catch (final IOException ignored) {
+ // IOException is ignored
+ }
+ }
/**
* rllong
diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/WaveExtensibleFileReader.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/WaveExtensibleFileReader.java
index 2dbcab8..b238e9d 100644
--- a/jdk/src/java.desktop/share/classes/com/sun/media/sound/WaveExtensibleFileReader.java
+++ b/jdk/src/java.desktop/share/classes/com/sun/media/sound/WaveExtensibleFileReader.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, 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
@@ -22,55 +22,40 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
+
package com.sun.media.sound;
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.net.URL;
import java.util.HashMap;
import java.util.Map;
import javax.sound.sampled.AudioFileFormat;
import javax.sound.sampled.AudioFormat;
+import javax.sound.sampled.AudioFormat.Encoding;
import javax.sound.sampled.AudioInputStream;
import javax.sound.sampled.AudioSystem;
import javax.sound.sampled.UnsupportedAudioFileException;
-import javax.sound.sampled.AudioFormat.Encoding;
-import javax.sound.sampled.spi.AudioFileReader;
/**
* WAVE file reader for files using format WAVE_FORMAT_EXTENSIBLE (0xFFFE).
*
* @author Karl Helgason
*/
-public final class WaveExtensibleFileReader extends AudioFileReader {
+public final class WaveExtensibleFileReader extends SunFileReader {
- static private class GUID {
- long i1;
-
- int s1;
-
- int s2;
-
- int x1;
-
- int x2;
-
- int x3;
-
- int x4;
-
- int x5;
-
- int x6;
-
- int x7;
-
- int x8;
-
+ private static class GUID {
+ private long i1;
+ private int s1;
+ private int s2;
+ private int x1;
+ private int x2;
+ private int x3;
+ private int x4;
+ private int x5;
+ private int x6;
+ private int x7;
+ private int x8;
private GUID() {
}
@@ -105,10 +90,12 @@
return d;
}
+ @Override
public int hashCode() {
return (int) i1;
}
+ @Override
public boolean equals(Object obj) {
if (!(obj instanceof GUID))
return false;
@@ -161,7 +148,7 @@
private static final GUID SUBTYPE_IEEE_FLOAT = new GUID(0x00000003, 0x0000,
0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
- private String decodeChannelMask(long channelmask) {
+ private static String decodeChannelMask(long channelmask) {
StringBuilder sb = new StringBuilder();
long m = 1;
for (int i = 0; i < allchannelnames.length; i++) {
@@ -180,20 +167,8 @@
}
- public AudioFileFormat getAudioFileFormat(InputStream stream)
- throws UnsupportedAudioFileException, IOException {
-
- stream.mark(200);
- AudioFileFormat format;
- try {
- format = internal_getAudioFileFormat(stream);
- } finally {
- stream.reset();
- }
- return format;
- }
-
- private AudioFileFormat internal_getAudioFileFormat(InputStream stream)
+ @Override
+ AudioFileFormat getAudioFileFormatImpl(final InputStream stream)
throws UnsupportedAudioFileException, IOException {
RIFFReader riffiterator = new RIFFReader(stream);
@@ -244,12 +219,9 @@
break;
}
}
-
- if (!fmt_found)
+ if (!fmt_found || !data_found) {
throw new UnsupportedAudioFileException();
- if (!data_found)
- throw new UnsupportedAudioFileException();
-
+ }
Map<String, Object> p = new HashMap<String, Object>();
String s_channelmask = decodeChannelMask(channelMask);
if (s_channelmask != null)
@@ -273,24 +245,22 @@
} else if (subFormat.equals(SUBTYPE_IEEE_FLOAT)) {
audioformat = new AudioFormat(Encoding.PCM_FLOAT,
samplerate, bits, channels, framesize, samplerate, false, p);
- } else
+ } else {
throw new UnsupportedAudioFileException();
-
- AudioFileFormat fileformat = new AudioFileFormat(
- AudioFileFormat.Type.WAVE, audioformat,
- AudioSystem.NOT_SPECIFIED);
- return fileformat;
+ }
+ return new AudioFileFormat(AudioFileFormat.Type.WAVE, audioformat,
+ AudioSystem.NOT_SPECIFIED);
}
- public AudioInputStream getAudioInputStream(InputStream stream)
+ @Override
+ public AudioInputStream getAudioInputStream(final InputStream stream)
throws UnsupportedAudioFileException, IOException {
AudioFileFormat format = getAudioFileFormat(stream);
+ // we've got everything, the stream is supported and it is at the
+ // beginning of the header, so find the data chunk again and return an
+ // AudioInputStream
RIFFReader riffiterator = new RIFFReader(stream);
- if (!riffiterator.getFormat().equals("RIFF"))
- throw new UnsupportedAudioFileException();
- if (!riffiterator.getType().equals("WAVE"))
- throw new UnsupportedAudioFileException();
while (riffiterator.hasNextChunk()) {
RIFFReader chunk = riffiterator.nextChunk();
if (chunk.getFormat().equals("data")) {
@@ -300,40 +270,4 @@
}
throw new UnsupportedAudioFileException();
}
-
- public AudioFileFormat getAudioFileFormat(URL url)
- throws UnsupportedAudioFileException, IOException {
- InputStream stream = url.openStream();
- AudioFileFormat format;
- try {
- format = getAudioFileFormat(new BufferedInputStream(stream));
- } finally {
- stream.close();
- }
- return format;
- }
-
- public AudioFileFormat getAudioFileFormat(File file)
- throws UnsupportedAudioFileException, IOException {
- InputStream stream = new FileInputStream(file);
- AudioFileFormat format;
- try {
- format = getAudioFileFormat(new BufferedInputStream(stream));
- } finally {
- stream.close();
- }
- return format;
- }
-
- public AudioInputStream getAudioInputStream(URL url)
- throws UnsupportedAudioFileException, IOException {
- return getAudioInputStream(new BufferedInputStream(url.openStream()));
- }
-
- public AudioInputStream getAudioInputStream(File file)
- throws UnsupportedAudioFileException, IOException {
- return getAudioInputStream(new BufferedInputStream(new FileInputStream(
- file)));
- }
-
}
diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/WaveFileReader.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/WaveFileReader.java
index 3599fdf..96a4bd7 100644
--- a/jdk/src/java.desktop/share/classes/com/sun/media/sound/WaveFileReader.java
+++ b/jdk/src/java.desktop/share/classes/com/sun/media/sound/WaveFileReader.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2015, 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
@@ -27,20 +27,14 @@
import java.io.DataInputStream;
import java.io.EOFException;
-import java.io.File;
-import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.net.URL;
import javax.sound.sampled.AudioFileFormat;
import javax.sound.sampled.AudioFormat;
-import javax.sound.sampled.AudioInputStream;
import javax.sound.sampled.AudioSystem;
import javax.sound.sampled.UnsupportedAudioFileException;
-
-
/**
* WAVE file reader.
*
@@ -50,170 +44,12 @@
*/
public final class WaveFileReader extends SunFileReader {
- private static final int MAX_READ_LENGTH = 12;
-
- /**
- * Obtains the audio file format of the input stream provided. The stream must
- * point to valid audio file data. In general, audio file providers may
- * need to read some data from the stream before determining whether they
- * support it. These parsers must
- * be able to mark the stream, read enough data to determine whether they
- * support the stream, and, if not, reset the stream's read pointer to its original
- * position. If the input stream does not support this, this method may fail
- * with an IOException.
- * @param stream the input stream from which file format information should be
- * extracted
- * @return an <code>AudioFileFormat</code> object describing the audio file format
- * @throws UnsupportedAudioFileException if the stream does not point to valid audio
- * file data recognized by the system
- * @throws IOException if an I/O exception occurs
- * @see InputStream#markSupported
- * @see InputStream#mark
- */
- public AudioFileFormat getAudioFileFormat(InputStream stream) throws UnsupportedAudioFileException, IOException {
- // fix for 4489272: AudioSystem.getAudioFileFormat() fails for InputStream, but works for URL
- AudioFileFormat aff = getFMT(stream, true);
- // the following is not strictly necessary - but was implemented like that in 1.3.0 - 1.4.1
- // so I leave it as it was. May remove this for 1.5.0
- stream.reset();
- return aff;
- }
-
-
- /**
- * Obtains the audio file format of the URL provided. The URL must
- * point to valid audio file data.
- * @param url the URL from which file format information should be
- * extracted
- * @return an <code>AudioFileFormat</code> object describing the audio file format
- * @throws UnsupportedAudioFileException if the URL does not point to valid audio
- * file data recognized by the system
- * @throws IOException if an I/O exception occurs
- */
- public AudioFileFormat getAudioFileFormat(URL url) throws UnsupportedAudioFileException, IOException {
- InputStream urlStream = url.openStream(); // throws IOException
- AudioFileFormat fileFormat = null;
- try {
- fileFormat = getFMT(urlStream, false);
- } finally {
- urlStream.close();
- }
- return fileFormat;
- }
-
-
- /**
- * Obtains the audio file format of the File provided. The File must
- * point to valid audio file data.
- * @param file the File from which file format information should be
- * extracted
- * @return an <code>AudioFileFormat</code> object describing the audio file format
- * @throws UnsupportedAudioFileException if the File does not point to valid audio
- * file data recognized by the system
- * @throws IOException if an I/O exception occurs
- */
- public AudioFileFormat getAudioFileFormat(File file) throws UnsupportedAudioFileException, IOException {
- AudioFileFormat fileFormat = null;
- FileInputStream fis = new FileInputStream(file); // throws IOException
- // part of fix for 4325421
- try {
- fileFormat = getFMT(fis, false);
- } finally {
- fis.close();
- }
-
- return fileFormat;
- }
-
-
- /**
- * Obtains an audio stream from the input stream provided. The stream must
- * point to valid audio file data. In general, audio file providers may
- * need to read some data from the stream before determining whether they
- * support it. These parsers must
- * be able to mark the stream, read enough data to determine whether they
- * support the stream, and, if not, reset the stream's read pointer to its original
- * position. If the input stream does not support this, this method may fail
- * with an IOException.
- * @param stream the input stream from which the <code>AudioInputStream</code> should be
- * constructed
- * @return an <code>AudioInputStream</code> object based on the audio file data contained
- * in the input stream.
- * @throws UnsupportedAudioFileException if the stream does not point to valid audio
- * file data recognized by the system
- * @throws IOException if an I/O exception occurs
- * @see InputStream#markSupported
- * @see InputStream#mark
- */
- public AudioInputStream getAudioInputStream(InputStream stream) throws UnsupportedAudioFileException, IOException {
- // getFMT leaves the input stream at the beginning of the audio data
- AudioFileFormat fileFormat = getFMT(stream, true); // throws UnsupportedAudioFileException, IOException
-
- // we've got everything, and the stream is at the
- // beginning of the audio data, so return an AudioInputStream.
- return new AudioInputStream(stream, fileFormat.getFormat(), fileFormat.getFrameLength());
- }
-
-
- /**
- * Obtains an audio stream from the URL provided. The URL must
- * point to valid audio file data.
- * @param url the URL for which the <code>AudioInputStream</code> should be
- * constructed
- * @return an <code>AudioInputStream</code> object based on the audio file data pointed
- * to by the URL
- * @throws UnsupportedAudioFileException if the URL does not point to valid audio
- * file data recognized by the system
- * @throws IOException if an I/O exception occurs
- */
- public AudioInputStream getAudioInputStream(URL url) throws UnsupportedAudioFileException, IOException {
- InputStream urlStream = url.openStream(); // throws IOException
- AudioFileFormat fileFormat = null;
- try {
- fileFormat = getFMT(urlStream, false);
- } finally {
- if (fileFormat == null) {
- urlStream.close();
- }
- }
- return new AudioInputStream(urlStream, fileFormat.getFormat(), fileFormat.getFrameLength());
- }
-
-
- /**
- * Obtains an audio stream from the File provided. The File must
- * point to valid audio file data.
- * @param file the File for which the <code>AudioInputStream</code> should be
- * constructed
- * @return an <code>AudioInputStream</code> object based on the audio file data pointed
- * to by the File
- * @throws UnsupportedAudioFileException if the File does not point to valid audio
- * file data recognized by the system
- * @throws IOException if an I/O exception occurs
- */
- public AudioInputStream getAudioInputStream(File file) throws UnsupportedAudioFileException, IOException {
- FileInputStream fis = new FileInputStream(file); // throws IOException
- AudioFileFormat fileFormat = null;
- // part of fix for 4325421
- try {
- fileFormat = getFMT(fis, false);
- } finally {
- if (fileFormat == null) {
- fis.close();
- }
- }
- return new AudioInputStream(fis, fileFormat.getFormat(), fileFormat.getFrameLength());
- }
-
-
- //--------------------------------------------------------------------
-
-
- private AudioFileFormat getFMT(InputStream stream, boolean doReset) throws UnsupportedAudioFileException, IOException {
+ @Override
+ AudioFileFormat getAudioFileFormatImpl(final InputStream stream)
+ throws UnsupportedAudioFileException, IOException {
// assumes sream is rewound
- int bytesRead;
int nread = 0;
int fmt;
int length = 0;
@@ -227,10 +63,6 @@
DataInputStream dis = new DataInputStream( stream );
- if (doReset) {
- dis.mark(MAX_READ_LENGTH);
- }
-
int magic = dis.readInt();
int fileLength = rllong(dis);
int waveMagic = dis.readInt();
@@ -244,9 +76,6 @@
if ((magic != WaveFileFormat.RIFF_MAGIC) || (waveMagic != WaveFileFormat.WAVE_MAGIC)) {
// not WAVE, throw UnsupportedAudioFileException
- if (doReset) {
- dis.reset();
- }
throw new UnsupportedAudioFileException("not a WAVE file");
}
diff --git a/jdk/src/java.desktop/share/classes/com/sun/media/sound/WaveFloatFileReader.java b/jdk/src/java.desktop/share/classes/com/sun/media/sound/WaveFloatFileReader.java
index 280196e..3fe278f 100644
--- a/jdk/src/java.desktop/share/classes/com/sun/media/sound/WaveFloatFileReader.java
+++ b/jdk/src/java.desktop/share/classes/com/sun/media/sound/WaveFloatFileReader.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, 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
@@ -22,14 +22,11 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
+
package com.sun.media.sound;
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.net.URL;
import javax.sound.sampled.AudioFileFormat;
import javax.sound.sampled.AudioFormat;
@@ -37,29 +34,16 @@
import javax.sound.sampled.AudioInputStream;
import javax.sound.sampled.AudioSystem;
import javax.sound.sampled.UnsupportedAudioFileException;
-import javax.sound.sampled.spi.AudioFileReader;
/**
* Floating-point encoded (format 3) WAVE file loader.
*
* @author Karl Helgason
*/
-public final class WaveFloatFileReader extends AudioFileReader {
+public final class WaveFloatFileReader extends SunFileReader {
- public AudioFileFormat getAudioFileFormat(InputStream stream)
- throws UnsupportedAudioFileException, IOException {
-
- stream.mark(200);
- AudioFileFormat format;
- try {
- format = internal_getAudioFileFormat(stream);
- } finally {
- stream.reset();
- }
- return format;
- }
-
- private AudioFileFormat internal_getAudioFileFormat(InputStream stream)
+ @Override
+ AudioFileFormat getAudioFileFormatImpl(final InputStream stream)
throws UnsupportedAudioFileException, IOException {
RIFFReader riffiterator = new RIFFReader(stream);
@@ -96,30 +80,25 @@
break;
}
}
-
- if (!fmt_found)
+ if (!fmt_found || !data_found) {
throw new UnsupportedAudioFileException();
- if (!data_found)
- throw new UnsupportedAudioFileException();
-
+ }
AudioFormat audioformat = new AudioFormat(
Encoding.PCM_FLOAT, samplerate, bits, channels,
framesize, samplerate, false);
- AudioFileFormat fileformat = new AudioFileFormat(
- AudioFileFormat.Type.WAVE, audioformat,
- AudioSystem.NOT_SPECIFIED);
- return fileformat;
+ return new AudioFileFormat(AudioFileFormat.Type.WAVE, audioformat,
+ AudioSystem.NOT_SPECIFIED);
}
- public AudioInputStream getAudioInputStream(InputStream stream)
+ @Override
+ public AudioInputStream getAudioInputStream(final InputStream stream)
throws UnsupportedAudioFileException, IOException {
AudioFileFormat format = getAudioFileFormat(stream);
+ // we've got everything, the stream is supported and it is at the
+ // beginning of the header, so find the data chunk again and return an
+ // AudioInputStream
RIFFReader riffiterator = new RIFFReader(stream);
- if (!riffiterator.getFormat().equals("RIFF"))
- throw new UnsupportedAudioFileException();
- if (!riffiterator.getType().equals("WAVE"))
- throw new UnsupportedAudioFileException();
while (riffiterator.hasNextChunk()) {
RIFFReader chunk = riffiterator.nextChunk();
if (chunk.getFormat().equals("data")) {
@@ -129,39 +108,4 @@
}
throw new UnsupportedAudioFileException();
}
-
- public AudioFileFormat getAudioFileFormat(URL url)
- throws UnsupportedAudioFileException, IOException {
- InputStream stream = url.openStream();
- AudioFileFormat format;
- try {
- format = getAudioFileFormat(new BufferedInputStream(stream));
- } finally {
- stream.close();
- }
- return format;
- }
-
- public AudioFileFormat getAudioFileFormat(File file)
- throws UnsupportedAudioFileException, IOException {
- InputStream stream = new FileInputStream(file);
- AudioFileFormat format;
- try {
- format = getAudioFileFormat(new BufferedInputStream(stream));
- } finally {
- stream.close();
- }
- return format;
- }
-
- public AudioInputStream getAudioInputStream(URL url)
- throws UnsupportedAudioFileException, IOException {
- return getAudioInputStream(new BufferedInputStream(url.openStream()));
- }
-
- public AudioInputStream getAudioInputStream(File file)
- throws UnsupportedAudioFileException, IOException {
- return getAudioInputStream(new BufferedInputStream(new FileInputStream(
- file)));
- }
}
diff --git a/jdk/src/java.desktop/share/classes/java/awt/MenuBar.java b/jdk/src/java.desktop/share/classes/java/awt/MenuBar.java
index 5ba87f6..b8bb64d 100644
--- a/jdk/src/java.desktop/share/classes/java/awt/MenuBar.java
+++ b/jdk/src/java.desktop/share/classes/java/awt/MenuBar.java
@@ -229,9 +229,11 @@
if (m.peer == null) {
m.addNotify();
}
+ menus.addElement(m);
peer.addMenu(m);
+ } else {
+ menus.addElement(m);
}
- menus.addElement(m);
return m;
}
}
diff --git a/jdk/src/java.desktop/share/classes/java/awt/Toolkit.java b/jdk/src/java.desktop/share/classes/java/awt/Toolkit.java
index e48d28e..b8769a1 100644
--- a/jdk/src/java.desktop/share/classes/java/awt/Toolkit.java
+++ b/jdk/src/java.desktop/share/classes/java/awt/Toolkit.java
@@ -519,13 +519,7 @@
* <p>
* If a system property named {@code "java.awt.headless"} is set
* to {@code true} then the headless implementation
- * of {@code Toolkit} is used.
- * <p>
- * If there is no {@code "java.awt.headless"} or it is set to
- * {@code false} and there is a system property named
- * {@code "awt.toolkit"},
- * that property is treated as the name of a class that is a subclass
- * of {@code Toolkit};
+ * of {@code Toolkit} is used,
* otherwise the default platform-specific implementation of
* {@code Toolkit} is used.
* <p>
diff --git a/jdk/src/java.desktop/share/classes/java/beans/PropertyDescriptor.java b/jdk/src/java.desktop/share/classes/java/beans/PropertyDescriptor.java
index 96c29e4..bf465a1 100644
--- a/jdk/src/java.desktop/share/classes/java/beans/PropertyDescriptor.java
+++ b/jdk/src/java.desktop/share/classes/java/beans/PropertyDescriptor.java
@@ -160,21 +160,23 @@
setPropertyType(info.getPropertyType());
setConstrained(info.isConstrained());
setBound(bound && info.is(PropertyInfo.Name.bound));
- if (info.is(PropertyInfo.Name.expert)) {
- setValue(PropertyInfo.Name.expert.name(), Boolean.TRUE); // compatibility
- setExpert(true);
- }
- if (info.is(PropertyInfo.Name.hidden)) {
- setValue(PropertyInfo.Name.hidden.name(), Boolean.TRUE); // compatibility
- setHidden(true);
- }
- if (info.is(PropertyInfo.Name.preferred)) {
- setPreferred(true);
- }
- Object visual = info.get(PropertyInfo.Name.visualUpdate);
- if (visual != null) {
- setValue(PropertyInfo.Name.visualUpdate.name(), visual);
- }
+
+ boolean isExpert = info.is(PropertyInfo.Name.expert);
+ setValue(PropertyInfo.Name.expert.name(), isExpert); // compatibility
+ setExpert(isExpert);
+
+ boolean isHidden = info.is(PropertyInfo.Name.hidden);
+ setValue(PropertyInfo.Name.hidden.name(), isHidden); // compatibility
+ setHidden(isHidden);
+
+ setPreferred(info.is(PropertyInfo.Name.preferred));
+
+ boolean isRequired = info.is(PropertyInfo.Name.required);
+ setValue(PropertyInfo.Name.required.name(), isRequired);
+
+ boolean visual = info.is(PropertyInfo.Name.visualUpdate);
+ setValue(PropertyInfo.Name.visualUpdate.name(), visual);
+
Object description = info.get(PropertyInfo.Name.description);
if (description != null) {
setShortDescription(description.toString());
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JInternalFrame.java b/jdk/src/java.desktop/share/classes/javax/swing/JInternalFrame.java
index 8549e13..06aff62 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/JInternalFrame.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/JInternalFrame.java
@@ -1247,6 +1247,7 @@
*
* @param layer an <code>Integer</code> object specifying this
* frame's desktop layer
+ * @throws NullPointerException if {@code layer} is {@code null}
* @see JLayeredPane
* @beaninfo
* expert: true
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/TimerQueue.java b/jdk/src/java.desktop/share/classes/javax/swing/TimerQueue.java
index d221929..e2ac940 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/TimerQueue.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/TimerQueue.java
@@ -94,6 +94,9 @@
void startIfNeeded() {
if (! running) {
runningLock.lock();
+ if (running) {
+ return;
+ }
try {
final ThreadGroup threadGroup = AppContext.getAppContext().getThreadGroup();
AccessController.doPrivileged((PrivilegedAction<Object>) () -> {
@@ -166,15 +169,17 @@
try {
while (running) {
try {
- Timer timer = queue.take().getTimer();
+ DelayedTimer runningTimer = queue.take();
+ Timer timer = runningTimer.getTimer();
timer.getLock().lock();
try {
DelayedTimer delayedTimer = timer.delayedTimer;
- if (delayedTimer != null) {
+ if (delayedTimer == runningTimer) {
/*
- * Timer is not removed after we get it from
- * the queue and before the lock on the timer is
- * acquired
+ * Timer is not removed (delayedTimer != null)
+ * or not removed and added (runningTimer == delayedTimer)
+ * after we get it from the queue and before the
+ * lock on the timer is acquired
*/
timer.post(); // have timer post an event
timer.delayedTimer = null;
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextFieldUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextFieldUI.java
index 5a5f119..1db0d09 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextFieldUI.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextFieldUI.java
@@ -97,12 +97,7 @@
String kind = elem.getName();
if (kind != null) {
if (kind.equals(AbstractDocument.ContentElementName)) {
- return new GlyphView(elem) {
- @Override
- public int getResizeWeight(int axis) {
- return 0;
- }
- };
+ return new GlyphView(elem);
} else if (kind.equals(AbstractDocument.ParagraphElementName)) {
return new I18nFieldView(elem);
}
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextUI.java
index 4058c91..2941cc9 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextUI.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextUI.java
@@ -940,7 +940,7 @@
rootView.setSize(d.width - i.left - i.right -
caretMargin, d.height - i.top - i.bottom);
}
- else if (d.width == 0 || d.height == 0) {
+ else if (d.width <= 0 || d.height <= 0) {
// Probably haven't been layed out yet, force some sort of
// initial sizing.
rootView.setSize(Integer.MAX_VALUE, Integer.MAX_VALUE);
diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/GlyphView.java b/jdk/src/java.desktop/share/classes/javax/swing/text/GlyphView.java
index ccd88f1..31eb62d 100644
--- a/jdk/src/java.desktop/share/classes/javax/swing/text/GlyphView.java
+++ b/jdk/src/java.desktop/share/classes/javax/swing/text/GlyphView.java
@@ -538,17 +538,6 @@
}
/**
- * {@inheritDoc}
- */
- @Override
- public int getResizeWeight(int axis) {
- if (axis == View.X_AXIS) {
- return 1;
- }
- return 0;
- }
-
- /**
* Determines the minimum span for this view along an axis.
*
* <p>This implementation returns the longest non-breakable area within
@@ -561,11 +550,13 @@
*/
@Override
public float getMinimumSpan(int axis) {
+ int w = getResizeWeight(axis);
+ if (w == 0) {
+ // can't resize
+ return getPreferredSpan(axis);
+ }
switch (axis) {
case View.X_AXIS:
- if (getResizeWeight(X_AXIS) == 0) {
- return getPreferredSpan(X_AXIS);
- }
if (minimumSpan < 0) {
minimumSpan = 0;
int p0 = getStartOffset();
diff --git a/jdk/src/java.desktop/share/classes/sun/applet/AppletPanel.java b/jdk/src/java.desktop/share/classes/sun/applet/AppletPanel.java
index a262864..14023fc 100644
--- a/jdk/src/java.desktop/share/classes/sun/applet/AppletPanel.java
+++ b/jdk/src/java.desktop/share/classes/sun/applet/AppletPanel.java
@@ -687,12 +687,7 @@
if (toFocus != null) {
if (parent instanceof EmbeddedFrame) {
- // JDK-8056915: Try to request focus to the embedder first and
- // activate the embedded frame through it
- if (!((EmbeddedFrame) parent).requestFocusToEmbedder()) {
- // Otherwise activate the embedded frame directly
- ((EmbeddedFrame) parent).synthesizeWindowActivation(true);
- }
+ ((EmbeddedFrame) parent).synthesizeWindowActivation(true);
}
// EmbeddedFrame might have focus before the applet was added.
// Thus after its activation the most recent focus owner will be
diff --git a/jdk/src/java.desktop/share/classes/sun/awt/EmbeddedFrame.java b/jdk/src/java.desktop/share/classes/sun/awt/EmbeddedFrame.java
index d90132e..affe2bc 100644
--- a/jdk/src/java.desktop/share/classes/sun/awt/EmbeddedFrame.java
+++ b/jdk/src/java.desktop/share/classes/sun/awt/EmbeddedFrame.java
@@ -357,15 +357,6 @@
public void synthesizeWindowActivation(boolean doActivate) {}
/**
- * Requests the focus to the embedder.
- *
- * @return {@code true} if focus request was successful, and {@code false} otherwise.
- */
- public boolean requestFocusToEmbedder() {
- return false;
- }
-
- /**
* Moves this embedded frame to a new location. The top-left corner of
* the new location is specified by the <code>x</code> and <code>y</code>
* parameters relative to the native parent component.
diff --git a/jdk/src/java.desktop/share/classes/sun/awt/image/MultiResolutionCachedImage.java b/jdk/src/java.desktop/share/classes/sun/awt/image/MultiResolutionCachedImage.java
index b1c6dae..84d3db8 100644
--- a/jdk/src/java.desktop/share/classes/sun/awt/image/MultiResolutionCachedImage.java
+++ b/jdk/src/java.desktop/share/classes/sun/awt/image/MultiResolutionCachedImage.java
@@ -86,19 +86,24 @@
@Override
public int getWidth(ImageObserver observer) {
updateInfo(observer, ImageObserver.WIDTH);
- return super.getWidth(observer);
+ return baseImageWidth;
}
@Override
public int getHeight(ImageObserver observer) {
updateInfo(observer, ImageObserver.HEIGHT);
- return super.getHeight(observer);
+ return baseImageHeight;
}
@Override
public Object getProperty(String name, ImageObserver observer) {
updateInfo(observer, ImageObserver.PROPERTIES);
- return super.getProperty(name, observer);
+ return Image.UndefinedProperty;
+ }
+
+ @Override
+ public Image getScaledInstance(int width, int height, int hints) {
+ return getResolutionVariant(width, height);
}
@Override
diff --git a/jdk/src/java.desktop/share/native/libjsound/PortMixer.c b/jdk/src/java.desktop/share/native/libjsound/PortMixer.c
index 8213598..c7f35b3 100644
--- a/jdk/src/java.desktop/share/native/libjsound/PortMixer.c
+++ b/jdk/src/java.desktop/share/native/libjsound/PortMixer.c
@@ -272,7 +272,7 @@
}
void* PORT_NewFloatControl(void* creatorV, void* controlID, char* type,
- float min, float max, float precision, char* units) {
+ float min, float max, float precision, const char* units) {
ControlCreatorJNI* creator = (ControlCreatorJNI*) creatorV;
jobject ctrl = NULL;
jstring unitsString;
diff --git a/jdk/src/java.desktop/share/native/libjsound/Ports.h b/jdk/src/java.desktop/share/native/libjsound/Ports.h
index f58ea00..5de8930 100644
--- a/jdk/src/java.desktop/share/native/libjsound/Ports.h
+++ b/jdk/src/java.desktop/share/native/libjsound/Ports.h
@@ -93,7 +93,7 @@
* returns an opaque pointer to the created control
*/
typedef void* (*PORT_NewFloatControlPtr)(void* creator, void* controlID, char* type,
- float min, float max, float precision, char* units);
+ float min, float max, float precision, const char* units);
/* control: The control to add to current port
* creator: pointer to the creator struct provided by PORT_GetControls
diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/GtkFileDialogPeer.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/GtkFileDialogPeer.java
index db2f2dc..d6ef132 100644
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/GtkFileDialogPeer.java
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/GtkFileDialogPeer.java
@@ -42,6 +42,8 @@
// A pointer to the native GTK FileChooser widget
private volatile long widget = 0L;
+ private long standaloneWindow;
+ private volatile boolean quit;
GtkFileDialogPeer(FileDialog fd) {
super(fd);
@@ -111,9 +113,11 @@
public void setVisible(boolean b) {
XToolkit.awtLock();
try {
+ quit = !b;
if (b) {
Runnable task = () -> {
showNativeDialog();
+ standaloneWindow = 0;
fd.setVisible(false);
};
new ManagedLocalsThread(task).start();
@@ -128,7 +132,14 @@
@Override
public void dispose() {
- quit();
+ XToolkit.awtLock();
+ try {
+ quit = true;
+ quit();
+ }
+ finally {
+ XToolkit.awtUnlock();
+ }
super.dispose();
}
@@ -144,6 +155,17 @@
// have delegated to FileDialog#setFile
}
+ protected void requestXFocus(long time, boolean timeProvided) {
+ if(standaloneWindow == 0) {
+ super.requestXFocus(time, timeProvided);
+ return;
+ }
+ XNETProtocol net_protocol = XWM.getWM().getNETProtocol();
+ if (net_protocol != null) {
+ net_protocol.setActiveWindow(standaloneWindow);
+ }
+ }
+
@Override
public void setFilenameFilter(FilenameFilter filter) {
// We do not implement this method because we
@@ -170,7 +192,21 @@
dirname = file.getParent();
}
}
- run(fd.getTitle(), fd.getMode(), dirname, filename,
- fd.getFilenameFilter(), fd.isMultipleMode(), fd.getX(), fd.getY());
+ if (!quit) {
+ run(fd.getTitle(), fd.getMode(), dirname, filename,
+ fd.getFilenameFilter(), fd.isMultipleMode(), fd.getX(), fd.getY());
+ }
+ }
+
+ /**
+ * Called by native code when GTK dialog is created.
+ */
+ boolean setWindow(long xid) {
+ if (!quit && widget != 0) {
+ standaloneWindow = xid;
+ requestXFocus();
+ return true;
+ }
+ return false;
}
}
diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XFramePeer.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XFramePeer.java
index ea60094..aa1bc2d 100644
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XFramePeer.java
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XFramePeer.java
@@ -289,7 +289,7 @@
XNETProtocol net_protocol = XWM.getWM().getNETProtocol();
if (net_protocol != null) {
- net_protocol.setActiveWindow(this);
+ net_protocol.setActiveWindow(getWindow());
}
xSetVisible(true);
}
diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XNETProtocol.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XNETProtocol.java
index a9122c8..5ba80bb 100644
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XNETProtocol.java
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XNETProtocol.java
@@ -326,7 +326,7 @@
return res;
}
- public void setActiveWindow(XWindow window) {
+ public void setActiveWindow(long window) {
if (!active() || !checkProtocol(XA_NET_SUPPORTED, XA_NET_ACTIVE_WINDOW)) {
return;
}
@@ -336,7 +336,7 @@
msg.set_type(XConstants.ClientMessage);
msg.set_message_type(XA_NET_ACTIVE_WINDOW.getAtom());
msg.set_display(XToolkit.getDisplay());
- msg.set_window(window.getWindow());
+ msg.set_window(window);
msg.set_format(32);
msg.set_data(0, 1);
msg.set_data(1, XToolkit.getCurrentServerTime());
diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11GraphicsDevice.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11GraphicsDevice.java
index f24df1f..56b4252 100644
--- a/jdk/src/java.desktop/unix/classes/sun/awt/X11GraphicsDevice.java
+++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11GraphicsDevice.java
@@ -316,6 +316,7 @@
@Override
public boolean isDisplayChangeSupported() {
return (isFullScreenSupported()
+ && (getFullScreenWindow() != null)
&& !((X11GraphicsEnvironment) GraphicsEnvironment
.getLocalGraphicsEnvironment()).runningXinerama());
}
diff --git a/jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRDrawImage.java b/jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRDrawImage.java
index ea8edbb..69502f2 100644
--- a/jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRDrawImage.java
+++ b/jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRDrawImage.java
@@ -46,24 +46,28 @@
SurfaceData dstData = sg.surfaceData;
SurfaceData srcData = dstData.getSourceSurfaceData(img,
SunGraphics2D.TRANSFORM_GENERIC, sg.imageComp, bgColor);
- int compRule = ((AlphaComposite) sg.composite).getRule();
- float extraAlpha = ((AlphaComposite) sg.composite).getAlpha();
- if (srcData != null && !isBgOperation(srcData, bgColor)
+ if (sg.composite instanceof AlphaComposite) {
+ int compRule = ((AlphaComposite) sg.composite).getRule();
+ float extraAlpha = ((AlphaComposite) sg.composite).getAlpha();
+
+ if (srcData != null && !isBgOperation(srcData, bgColor)
&& interpType <= AffineTransformOp.TYPE_BILINEAR
&& (XRUtils.isMaskEvaluated(XRUtils.j2dAlphaCompToXR(compRule))
- || (XRUtils.isTransformQuadrantRotated(tx)) && extraAlpha == 1.0f))
- {
- SurfaceType srcType = srcData.getSurfaceType();
- SurfaceType dstType = dstData.getSurfaceType();
+ || (XRUtils.isTransformQuadrantRotated(tx))
+ && extraAlpha == 1.0f))
+ {
+ SurfaceType srcType = srcData.getSurfaceType();
+ SurfaceType dstType = dstData.getSurfaceType();
- TransformBlit blit = TransformBlit.getFromCache(srcType,
- sg.imageComp, dstType);
- if (blit != null) {
- blit.Transform(srcData, dstData, sg.composite,
- sg.getCompClip(), tx, interpType, sx1, sy1, 0, 0, sx2
+ TransformBlit blit = TransformBlit.getFromCache(srcType,
+ sg.imageComp, dstType);
+ if (blit != null) {
+ blit.Transform(srcData, dstData, sg.composite,
+ sg.getCompClip(), tx, interpType, sx1, sy1, 0, 0, sx2
- sx1, sy2 - sy1);
return;
+ }
}
}
diff --git a/jdk/src/java.desktop/unix/native/common/awt/awt.h b/jdk/src/java.desktop/unix/native/common/awt/awt.h
index df5f603..0dacab9 100644
--- a/jdk/src/java.desktop/unix/native/common/awt/awt.h
+++ b/jdk/src/java.desktop/unix/native/common/awt/awt.h
@@ -82,7 +82,12 @@
} while (0)
#define AWT_LOCK_IMPL() \
- (*env)->CallStaticVoidMethod(env, tkClass, awtLockMID)
+ do { \
+ (*env)->CallStaticVoidMethod(env, tkClass, awtLockMID); \
+ if ((*env)->ExceptionCheck(env)) { \
+ (*env)->ExceptionClear(env); \
+ } \
+ } while(0)
#define AWT_NOFLUSH_UNLOCK_IMPL() \
do { \
@@ -91,11 +96,10 @@
(*env)->ExceptionClear(env); \
} \
(*env)->CallStaticVoidMethod(env, tkClass, awtUnlockMID); \
+ if ((*env)->ExceptionCheck(env)) { \
+ (*env)->ExceptionClear(env); \
+ } \
if (pendingException) { \
- if ((*env)->ExceptionCheck(env)) { \
- (*env)->ExceptionDescribe(env); \
- (*env)->ExceptionClear(env); \
- } \
(*env)->Throw(env, pendingException); \
} \
} while (0)
diff --git a/jdk/src/java.desktop/unix/native/libawt/awt/awt_LoadLibrary.c b/jdk/src/java.desktop/unix/native/libawt/awt/awt_LoadLibrary.c
index 5948302..3f79aa3 100644
--- a/jdk/src/java.desktop/unix/native/libawt/awt/awt_LoadLibrary.c
+++ b/jdk/src/java.desktop/unix/native/libawt/awt/awt_LoadLibrary.c
@@ -71,6 +71,10 @@
}
isHeadless = (*env)->CallStaticBooleanMethod(env, graphicsEnvClass,
headlessFn);
+ if ((*env)->ExceptionCheck(env)) {
+ (*env)->ExceptionClear(env);
+ return JNI_TRUE;
+ }
}
return isHeadless;
}
diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/awt/HPkeysym.h b/jdk/src/java.desktop/unix/native/libawt_xawt/awt/HPkeysym.h
index 2f0447b..f736e75 100644
--- a/jdk/src/java.desktop/unix/native/libawt_xawt/awt/HPkeysym.h
+++ b/jdk/src/java.desktop/unix/native/libawt_xawt/awt/HPkeysym.h
@@ -58,7 +58,7 @@
#ifndef _HPKEYSYM_H
-#define _HPKEYSYM
+#define _HPKEYSYM_H
#define hpXK_ClearLine 0x1000FF6F
#define hpXK_InsertLine 0x1000FF70
diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_Event.h b/jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_Event.h
index 21e1db9..06659ef 100644
--- a/jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_Event.h
+++ b/jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_Event.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2015, 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
@@ -28,7 +28,7 @@
***
***/
#ifndef _AWT_EVENT_H_
-#define _AWT_EVENT_H
+#define _AWT_EVENT_H_
#include "jni_util.h"
diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_GraphicsEnv.c b/jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_GraphicsEnv.c
index 1a20b40..a1c9fc2 100644
--- a/jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_GraphicsEnv.c
+++ b/jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_GraphicsEnv.c
@@ -1564,6 +1564,9 @@
for (i = 0; i < visScreenInfo->count; i++) {
XdbeVisualInfo* visInfo = visScreenInfo->visinfo;
(*env)->CallVoidMethod(env, this, midAddVisual, (visInfo[i]).visual);
+ if ((*env)->ExceptionCheck(env)) {
+ break;
+ }
}
#endif /* !HEADLESS */
}
diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_util.c b/jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_util.c
index 13ba377..261986f 100644
--- a/jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_util.c
+++ b/jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_util.c
@@ -98,5 +98,8 @@
(*env)->CallStaticVoidMethod(env, threadClass, yieldMethodID);
DASSERT(!((*env)->ExceptionOccurred(env)));
+ if ((*env)->ExceptionCheck(env)) {
+ return JNI_FALSE;
+ }
return JNI_TRUE;
} /* awtJNI_ThreadYield() */
diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/awt/gtk2_interface.c b/jdk/src/java.desktop/unix/native/libawt_xawt/awt/gtk2_interface.c
index e5711df..84e2df3 100644
--- a/jdk/src/java.desktop/unix/native/libawt_xawt/awt/gtk2_interface.c
+++ b/jdk/src/java.desktop/unix/native/libawt_xawt/awt/gtk2_interface.c
@@ -576,6 +576,7 @@
fp_gtk_file_chooser_get_filenames = dl_symbol(
"gtk_file_chooser_get_filenames");
fp_gtk_g_slist_length = dl_symbol("g_slist_length");
+ fp_gdk_x11_drawable_get_xid = dl_symbol("gdk_x11_drawable_get_xid");
}
gboolean gtk2_load(JNIEnv *env)
@@ -904,6 +905,10 @@
// Init the thread system to use GLib in a thread-safe mode
(*env)->CallStaticVoidMethod(env, clazz, mid_lock);
+ if ((*env)->ExceptionCheck(env)) {
+ AWT_UNLOCK();
+ return FALSE;
+ }
// Calling g_thread_init() multiple times leads to crash on GLib < 2.24
// We can use g_thread_get_initialized () but it is available only for
@@ -922,7 +927,22 @@
//called before gtk_init() or gtk_init_check()
fp_gdk_threads_init();
}
+ jthrowable pendExcpn = NULL;
+ // Exception raised during mid_getAndSetInitializationNeededFlag
+ // call is saved and error handling is done
+ // after unlock method is called
+ if ((pendExcpn = (*env)->ExceptionOccurred(env)) != NULL) {
+ (*env)->ExceptionClear(env);
+ }
(*env)->CallStaticVoidMethod(env, clazz, mid_unlock);
+ if (pendExcpn != NULL) {
+ (*env)->Throw(env, pendExcpn);
+ }
+ // check if any exception occured during mid_unlock call
+ if ((*env)->ExceptionCheck(env)) {
+ AWT_UNLOCK();
+ return FALSE;
+ }
}
result = (*fp_gtk_init_check)(NULL, NULL);
diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/awt/gtk2_interface.h b/jdk/src/java.desktop/unix/native/libawt_xawt/awt/gtk2_interface.h
index 5891a66d5..0150f93 100644
--- a/jdk/src/java.desktop/unix/native/libawt_xawt/awt/gtk2_interface.h
+++ b/jdk/src/java.desktop/unix/native/libawt_xawt/awt/gtk2_interface.h
@@ -27,6 +27,7 @@
#include <stdlib.h>
#include <jni.h>
+#include <X11/X.h>
#define _G_TYPE_CIC(ip, gt, ct) ((ct*) ip)
#define G_TYPE_CHECK_INSTANCE_CAST(instance, g_type, c_type) (_G_TYPE_CIC ((instance), (g_type), c_type))
@@ -820,6 +821,7 @@
void (*fp_gtk_main)(void);
guint (*fp_gtk_main_level)(void);
gchar* (*fp_g_path_get_dirname) (const gchar *file_name);
+XID (*fp_gdk_x11_drawable_get_xid) (GdkWindow *drawable);
/**
* This function is available for GLIB > 2.20, so it MUST be
diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/awt/sun_awt_X11_GtkFileDialogPeer.c b/jdk/src/java.desktop/unix/native/libawt_xawt/awt/sun_awt_X11_GtkFileDialogPeer.c
index 6801926..97fbcc6 100644
--- a/jdk/src/java.desktop/unix/native/libawt_xawt/awt/sun_awt_X11_GtkFileDialogPeer.c
+++ b/jdk/src/java.desktop/unix/native/libawt_xawt/awt/sun_awt_X11_GtkFileDialogPeer.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, 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
@@ -27,6 +27,7 @@
#include <stdio.h>
#include <jni_util.h>
#include <string.h>
+#include <X11/X.h>
#include "gtk2_interface.h"
#include "sun_awt_X11_GtkFileDialogPeer.h"
#include "java_awt_FileDialog.h"
@@ -38,6 +39,7 @@
static jmethodID filenameFilterCallbackMethodID = NULL;
static jmethodID setFileInternalMethodID = NULL;
static jfieldID widgetFieldID = NULL;
+static jmethodID setWindowMethodID = NULL;
JNIEXPORT void JNICALL Java_sun_awt_X11_GtkFileDialogPeer_initIDs
(JNIEnv *env, jclass cx)
@@ -54,6 +56,10 @@
widgetFieldID = (*env)->GetFieldID(env, cx, "widget", "J");
DASSERT(widgetFieldID != NULL);
+ CHECK_NULL(widgetFieldID);
+
+ setWindowMethodID = (*env)->GetMethodID(env, cx, "setWindow", "(J)Z");
+ DASSERT(setWindowMethodID != NULL);
}
static gboolean filenameFilterCallback(const GtkFileFilterInfo * filter_info, gpointer obj)
@@ -401,7 +407,11 @@
fp_gtk_widget_show(dialog);
- fp_gtk_main();
+ XID xid = fp_gdk_x11_drawable_get_xid(dialog->window);
+ if( (*env)->CallBooleanMethod(env, jpeer, setWindowMethodID, xid) ) {
+ fp_gtk_main();
+ }
+
fp_gdk_threads_leave();
}
diff --git a/jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_Ports.c b/jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_Ports.c
index 1542ad0..47f3c3f 100644
--- a/jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_Ports.c
+++ b/jdk/src/java.desktop/unix/native/libjsound/PLATFORM_API_LinuxOS_ALSA_Ports.c
@@ -431,8 +431,8 @@
}
} else { // more than two channels, each channels has its own control.
for (channel = SND_MIXER_SCHN_FRONT_LEFT; channel <= SND_MIXER_SCHN_LAST; channel++) {
- if (isPlayback && snd_mixer_selem_has_playback_channel(elem, channel) ||
- !isPlayback && snd_mixer_selem_has_capture_channel(elem, channel)) {
+ if ((isPlayback && snd_mixer_selem_has_playback_channel(elem, channel)) ||
+ (!isPlayback && snd_mixer_selem_has_capture_channel(elem, channel))) {
if (getControlSlot(portMixer, &portControl)) {
portControl->elem = elem;
portControl->portType = portMixer->types[portIndex];
diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WEmbeddedFrame.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WEmbeddedFrame.java
index 0576930..a2cac44 100644
--- a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WEmbeddedFrame.java
+++ b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WEmbeddedFrame.java
@@ -251,15 +251,6 @@
}
}
- public boolean requestFocusToEmbedder() {
- if (isEmbeddedInIE) {
- final WEmbeddedFramePeer peer = AWTAccessor.getComponentAccessor()
- .getPeer(this);
- return peer.requestFocusToEmbedder();
- }
- return false;
- }
-
public void registerAccelerator(AWTKeyStroke stroke) {}
public void unregisterAccelerator(AWTKeyStroke stroke) {}
diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WEmbeddedFramePeer.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WEmbeddedFramePeer.java
index 4cc3a4d..c0ef8a7 100644
--- a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WEmbeddedFramePeer.java
+++ b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WEmbeddedFramePeer.java
@@ -79,10 +79,4 @@
return !Win32GraphicsEnvironment.isDWMCompositionEnabled();
}
- /**
- * Sets the focus to plugin control window, the parent of embedded frame.
- * Eventually, it will synthesizeWindowActivation to activate the embedded frame,
- * if plugin control window gets the focus.
- */
- public native boolean requestFocusToEmbedder();
}
diff --git a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WListPeer.java b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WListPeer.java
index e89aaae..9429a9f 100644
--- a/jdk/src/java.desktop/windows/classes/sun/awt/windows/WListPeer.java
+++ b/jdk/src/java.desktop/windows/classes/sun/awt/windows/WListPeer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2015, 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
@@ -39,10 +39,9 @@
// ListPeer implementation
@Override
- @SuppressWarnings("deprecation")
public int[] getSelectedIndexes() {
List l = (List)target;
- int len = l.countItems();
+ int len = l.getItemCount();
int sel[] = new int[len];
int nsel = 0;
for (int i = 0 ; i < len ; i++) {
@@ -93,10 +92,9 @@
@Override
public native void delItems(int start, int end);
- @SuppressWarnings("deprecation")
public void clear() {
List l = (List)target;
- delItems(0, l.countItems());
+ delItems(0, l.getItemCount());
}
@Override
public native void select(int index);
@@ -131,7 +129,6 @@
native void create(WComponentPeer parent);
@Override
- @SuppressWarnings("deprecation")
void initialize() {
List li = (List)target;
@@ -144,7 +141,7 @@
}
// add any items that were already inserted in the target.
- int nitems = li.countItems();
+ int nitems = li.getItemCount();
if (nitems > 0) {
String[] items = new String[nitems];
int maxWidth = 0;
@@ -160,7 +157,7 @@
}
// set whether this list should allow multiple selections.
- setMultipleSelections(li.allowsMultipleSelections());
+ setMultipleSelections(li.isMultipleMode());
// select the item if necessary.
int sel[] = li.getSelectedIndexes();
diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Frame.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Frame.cpp
index 2c25e97..53f6a50 100644
--- a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Frame.cpp
+++ b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Frame.cpp
@@ -1961,29 +1961,6 @@
CATCH_BAD_ALLOC;
}
-JNIEXPORT jboolean JNICALL
-Java_sun_awt_windows_WEmbeddedFramePeer_requestFocusToEmbedder(JNIEnv *env, jobject self)
-{
- jboolean result = JNI_FALSE;
-
- TRY;
-
- AwtFrame *frame = NULL;
-
- PDATA pData;
- JNI_CHECK_PEER_GOTO(self, ret);
- frame = (AwtFrame *)pData;
-
- // JDK-8056915: During initial applet activation, set focus to plugin control window
- HWND hwndParent = ::GetParent(frame->GetHWnd());
-
- result = SetFocusToPluginControl(hwndParent);
-
- CATCH_BAD_ALLOC_RET(JNI_FALSE);
-ret:
- return result;
-}
-
} /* extern "C" */
static bool SetFocusToPluginControl(HWND hwndPlugin)
diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/Introspector.java b/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/Introspector.java
index e3c2733..92dc59c 100644
--- a/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/Introspector.java
+++ b/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/Introspector.java
@@ -552,8 +552,10 @@
// Java Beans introspection
//
Class<?> clazz = complex.getClass();
- Method readMethod = JavaBeansAccessor.getReadMethod(clazz, element);
- if (readMethod == null) {
+ Method readMethod;
+ if (JavaBeansAccessor.isAvailable()) {
+ readMethod = JavaBeansAccessor.getReadMethod(clazz, element);
+ } else {
// Java Beans not available so use simple introspection
// to locate method
readMethod = SimpleIntrospector.getReadMethod(clazz, element);
@@ -676,7 +678,12 @@
* {@code null} if no method is found.
*/
static Method getReadMethod(Class<?> clazz, String property) {
- // first character in uppercase (compatibility with JavaBeans)
+ if (Character.isUpperCase(property.charAt(0))) {
+ // the property name must start with a lower-case letter
+ return null;
+ }
+ // first character after 'get/is' prefix must be in uppercase
+ // (compatibility with JavaBeans)
property = property.substring(0, 1).toUpperCase(Locale.ENGLISH) +
property.substring(1);
String getMethod = GET_METHOD_PREFIX + property;
diff --git a/jdk/src/jdk.accessibility/windows/native/libjavaaccessbridge/AccessBridgeATInstance.cpp b/jdk/src/jdk.accessibility/windows/native/libjavaaccessbridge/AccessBridgeATInstance.cpp
index 092c4a0..e62eb1c 100644
--- a/jdk/src/jdk.accessibility/windows/native/libjavaaccessbridge/AccessBridgeATInstance.cpp
+++ b/jdk/src/jdk.accessibility/windows/native/libjavaaccessbridge/AccessBridgeATInstance.cpp
@@ -87,7 +87,7 @@
AccessBridgeATInstance::initiateIPC() {
DWORD errorCode;
- PrintDebugString("\r\nin AccessBridgeATInstance::initiateIPC()");
+ PrintDebugString("\r\nIn AccessBridgeATInstance::initiateIPC()");
// open Windows-initiated IPC filemap & map it to a ptr
diff --git a/jdk/src/jdk.accessibility/windows/native/libjavaaccessbridge/AccessBridgeJavaEntryPoints.cpp b/jdk/src/jdk.accessibility/windows/native/libjavaaccessbridge/AccessBridgeJavaEntryPoints.cpp
index 952df4f..9131f36 100644
--- a/jdk/src/jdk.accessibility/windows/native/libjavaaccessbridge/AccessBridgeJavaEntryPoints.cpp
+++ b/jdk/src/jdk.accessibility/windows/native/libjavaaccessbridge/AccessBridgeJavaEntryPoints.cpp
@@ -40,7 +40,7 @@
jobject bridgeObject) {
jniEnv = jniEnvironment;
accessBridgeObject = (jobject)bridgeObject;
- PrintDebugString("AccessBridgeJavaEntryPoints(%X, %X) called", jniEnv, accessBridgeObject);
+ PrintDebugString("AccessBridgeJavaEntryPoints(%p, %p) called", jniEnv, accessBridgeObject);
}
diff --git a/jdk/src/jdk.accessibility/windows/native/libjavaaccessbridge/JavaAccessBridge.cpp b/jdk/src/jdk.accessibility/windows/native/libjavaaccessbridge/JavaAccessBridge.cpp
index 5231687..40aba7c 100644
--- a/jdk/src/jdk.accessibility/windows/native/libjavaaccessbridge/JavaAccessBridge.cpp
+++ b/jdk/src/jdk.accessibility/windows/native/libjavaaccessbridge/JavaAccessBridge.cpp
@@ -89,53 +89,31 @@
theJavaAccessBridge->javaRun(env, obj);
}
-#if 0 // SetDlgItemText has caused problems with JAWS
- /**
- * Append debug info to dialog
- *
- */
- void AppendToCallInfo(char *s) {
- char buffer[4096];
-
- PrintDebugString(s);
-
- GetDlgItemText(theDialogWindow, cCallInfo, buffer, sizeof(buffer));
- if (strlen(buffer) < (sizeof(buffer) - strlen(s))) {
- strncat(buffer, s, sizeof(buffer));
- SetDlgItemText(theDialogWindow, cCallInfo, buffer);
- } else {
- SetDlgItemText(theDialogWindow, cCallInfo, s);
- }
- }
-#endif
-
-
/**
* Our window proc
*
*/
- BOOL APIENTRY AccessBridgeDialogProc (HWND hDlg, UINT message, UINT wParam, LONG lParam) {
+ BOOL APIENTRY AccessBridgeDialogProc (HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) {
int command;
COPYDATASTRUCT *sentToUs;
char *package;
- //DEBUG_CODE(char buffer[256]);
switch (message) {
case WM_INITDIALOG:
- //DEBUG_CODE(SetDlgItemText(theDialogWindow, cStatusText, "Initializing"));
+ PrintDebugString("In AccessBridgeDialog - Initializing");
break;
case WM_COMMAND:
command = LOWORD (wParam);
+ PrintDebugString("In AccessBridgeDialog - Got WM_COMMAND, command: %X", command);
break;
// call from Java with data for us to deliver
case WM_COPYDATA:
if (theDialogWindow == (HWND) wParam) {
- //DEBUG_CODE(SetDlgItemText(theDialogWindow, cStatusText, "Got WM_COPYDATA from ourselves"));
+ PrintDebugString("In AccessBridgeDialog - Got WM_COPYDATA from ourselves");
} else {
- //DEBUG_CODE(sprintf(buffer, "Got WM_COPYDATA from HWND %p", wParam));
- //DEBUG_CODE(SetDlgItemText(theDialogWindow, cStatusText, buffer));
+ PrintDebugString("In AccessBridgeDialog - Got WM_COPYDATA from HWND %p", wParam);
sentToUs = (COPYDATASTRUCT *) lParam;
package = (char *) sentToUs->lpData;
theJavaAccessBridge->processPackage(package, sentToUs->cbData);
@@ -147,18 +125,16 @@
// wParam == sourceHwnd
// lParam == buffer size in shared memory
if (theDialogWindow == (HWND) wParam) {
- //DEBUG_CODE(SetDlgItemText(theDialogWindow, cStatusText, "Got AB_MESSAGE_WAITING from ourselves"));
+ PrintDebugString("In AccessBridgeDialog - Got AB_MESSAGE_WAITING from ourselves");
} else {
- //DEBUG_CODE(sprintf(buffer, "Got AB_MESSAGE_WAITING from HWND %p", wParam));
- //DEBUG_CODE(SetDlgItemText(theDialogWindow, cStatusText, buffer));
- LRESULT returnVal = theJavaAccessBridge->receiveMemoryPackage((HWND) wParam, lParam);
+ PrintDebugString("In AccessBridgeDialog - Got AB_MESSAGE_WAITING from HWND %p", wParam);
+ LRESULT returnVal = theJavaAccessBridge->receiveMemoryPackage((HWND) wParam, (long) lParam);
}
break;
// a JavaAccessBridge DLL is going away
case AB_DLL_GOING_AWAY:
- // wParam == sourceHwnd
- //DEBUG_CODE(SetDlgItemText(theDialogWindow, cStatusText, "Got AB_DLL_GOING_AWAY message"));
+ PrintDebugString("In AccessBridgeDialog - Got AB_DLL_GOING_AWAY message");
theJavaAccessBridge->WindowsATDestroyed((HWND) wParam);
break;
@@ -169,6 +145,7 @@
// A new Windows AT just said "hi";
// say "hi" back so it can mate up with us
// otherwise don't do anything (e.g. don't set up data structures yet)
+ PrintDebugString("In AccessBridgeDialog - Got theFromWindowsHelloMsgID message");
theJavaAccessBridge->postHelloToWindowsDLLMsg((HWND) wParam);
}
}
@@ -324,9 +301,9 @@
*/
void
JavaAccessBridge::postHelloToWindowsDLLMsg(HWND destHwnd) {
- PrintDebugString("\r\nin JavaAccessBridge::postHelloToWindowsDLLMsg");
+ PrintDebugString("\r\nIn JavaAccessBridge::postHelloToWindowsDLLMsg");
PrintDebugString(" calling PostMessage(%p, %X, %p, %p)",
- destHwnd, theFromJavaHelloMsgID, dialogWindow, javaVM);
+ destHwnd, theFromJavaHelloMsgID, dialogWindow, dialogWindow);
PostMessage(destHwnd, theFromJavaHelloMsgID, (WPARAM) dialogWindow, (LPARAM) dialogWindow);
}
@@ -2493,7 +2470,7 @@
jobject eventObj, jobject source) { \
\
PrintDebugString("\r\nFiring event id = %d(%p, %p, %p, %p); vmID = %X", \
- eventConstant, env, callingObj, eventObj, source, javaVM); \
+ eventConstant, env, callingObj, eventObj, source, dialogWindow); \
\
/* sanity check */ \
if (ATs == (AccessBridgeATInstance *) 0) { \
@@ -2531,7 +2508,7 @@
void JavaAccessBridge::javaShutdown(JNIEnv *env, jobject callingObj) {
PrintDebugString("\r\nFiring event id = %d(%p, %p); vmID = %X",
- cJavaShutdownEvent, env, callingObj, javaVM);
+ cJavaShutdownEvent, env, callingObj, dialogWindow);
/* sanity check */
if (ATs == (AccessBridgeATInstance *) 0) {
diff --git a/jdk/src/jdk.accessibility/windows/native/libjavaaccessbridge/JavaAccessBridge.h b/jdk/src/jdk.accessibility/windows/native/libjavaaccessbridge/JavaAccessBridge.h
index d03960f..9340f81 100644
--- a/jdk/src/jdk.accessibility/windows/native/libjavaaccessbridge/JavaAccessBridge.h
+++ b/jdk/src/jdk.accessibility/windows/native/libjavaaccessbridge/JavaAccessBridge.h
@@ -44,7 +44,7 @@
LPVOID lpvReserved);
void AppendToCallOutput(char *s);
BOOL APIENTRY AccessBridgeDialogProc(HWND hDlg, UINT message,
- UINT wParam, LONG lParam);
+ WPARAM wParam, LPARAM lParam);
}
/**
diff --git a/jdk/src/jdk.accessibility/windows/native/libwindowsaccessbridge/AccessBridgeJavaVMInstance.cpp b/jdk/src/jdk.accessibility/windows/native/libwindowsaccessbridge/AccessBridgeJavaVMInstance.cpp
index 7294a3e..129cf14 100644
--- a/jdk/src/jdk.accessibility/windows/native/libwindowsaccessbridge/AccessBridgeJavaVMInstance.cpp
+++ b/jdk/src/jdk.accessibility/windows/native/libwindowsaccessbridge/AccessBridgeJavaVMInstance.cpp
@@ -188,7 +188,7 @@
* with the Java AccessBridge DLL
*
* NOTE: WM_COPYDATA is only for one-way IPC; there
- * is now way to return parameters (especially big ones)
+ * is no way to return parameters (especially big ones)
* Use sendMemoryPackage() to do that!
*/
LRESULT
diff --git a/jdk/src/jdk.accessibility/windows/native/libwindowsaccessbridge/AccessBridgeWindowsEntryPoints.cpp b/jdk/src/jdk.accessibility/windows/native/libwindowsaccessbridge/AccessBridgeWindowsEntryPoints.cpp
index afd5677..2200443 100644
--- a/jdk/src/jdk.accessibility/windows/native/libwindowsaccessbridge/AccessBridgeWindowsEntryPoints.cpp
+++ b/jdk/src/jdk.accessibility/windows/native/libwindowsaccessbridge/AccessBridgeWindowsEntryPoints.cpp
@@ -51,7 +51,6 @@
// open our window
if (theWindowsAccessBridge != (WinAccessBridge *) 0) {
theWindowsAccessBridge->initWindow();
- DEBUG_CODE(SetDlgItemText(theDialogWindow, cInvokedByText, "Windows"));
}
}
diff --git a/jdk/src/jdk.accessibility/windows/native/libwindowsaccessbridge/WinAccessBridge.cpp b/jdk/src/jdk.accessibility/windows/native/libwindowsaccessbridge/WinAccessBridge.cpp
index a24e8fa..17412f9 100644
--- a/jdk/src/jdk.accessibility/windows/native/libwindowsaccessbridge/WinAccessBridge.cpp
+++ b/jdk/src/jdk.accessibility/windows/native/libwindowsaccessbridge/WinAccessBridge.cpp
@@ -366,7 +366,7 @@
WinAccessBridge::rendezvousWithNewJavaDLL(HWND JavaBridgeDLLwindow, long vmID) {
LRESULT returnVal;
- PrintDebugString("in JavaAccessBridge::rendezvousWithNewJavaDLL(%p, %X)",
+ PrintDebugString("in WinAccessBridge::rendezvousWithNewJavaDLL(%p, %X)",
JavaBridgeDLLwindow, vmID);
isVMInstanceChainInUse = true;
@@ -880,7 +880,7 @@
return FALSE;
}
- PrintDebugString(" in WinAccessBridge::isJavaWindow");
+ PrintDebugString("In WinAccessBridge::isJavaWindow");
diff --git a/jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_convert.c b/jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_convert.c
index 8984258..78e52a2 100644
--- a/jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_convert.c
+++ b/jdk/src/jdk.crypto.pkcs11/share/native/libj2pkcs11/p11_convert.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
*/
/* Copyright (c) 2002 Graz University of Technology. All rights reserved.
@@ -474,6 +474,7 @@
jfieldID fieldID;
jclass jSsl3RandomDataClass;
jobject jRandomInfo, jRIClientRandom, jRIServerRandom, jVersion;
+ memset(&ckParam, 0, sizeof(CK_SSL3_MASTER_KEY_DERIVE_PARAMS));
/* get RandomInfo */
jSsl3MasterKeyDeriveParamsClass = (*env)->FindClass(env, CLASS_SSL3_MASTER_KEY_DERIVE_PARAMS);
@@ -527,6 +528,7 @@
CK_TLS_PRF_PARAMS ckParam;
jfieldID fieldID;
jobject jSeed, jLabel, jOutput;
+ memset(&ckParam, 0, sizeof(CK_TLS_PRF_PARAMS));
// TBD: what if jParam == NULL?!
@@ -592,6 +594,7 @@
jobject jRandomInfo, jRIClientRandom, jRIServerRandom;
jobject jReturnedKeyMaterial, jRMIvClient, jRMIvServer;
CK_ULONG ckTemp;
+ memset(&ckParam, 0, sizeof(CK_SSL3_KEY_MAT_PARAMS));
/* get ulMacSizeInBits */
jSsl3KeyMatParamsClass = (*env)->FindClass(env, CLASS_SSL3_KEY_MAT_PARAMS);
@@ -1355,6 +1358,7 @@
jlong jHashAlg, jMgf, jSource;
jobject jSourceData;
CK_BYTE_PTR ckpByte;
+ memset(&ckParam, 0, sizeof(CK_RSA_PKCS_OAEP_PARAMS));
/* get hashAlg */
jRsaPkcsOaepParamsClass = (*env)->FindClass(env, CLASS_RSA_PKCS_OAEP_PARAMS);
@@ -1404,6 +1408,7 @@
jlong jIteration;
jobject jInitVector, jPassword, jSalt;
CK_ULONG ckTemp;
+ memset(&ckParam, 0, sizeof(CK_PBE_PARAMS));
/* get pInitVector */
jPbeParamsClass = (*env)->FindClass(env, CLASS_PBE_PARAMS);
@@ -1522,6 +1527,7 @@
jfieldID fieldID;
jlong jSaltSource, jIteration, jPrf;
jobject jSaltSourceData, jPrfData;
+ memset(&ckParam, 0, sizeof(CK_PKCS5_PBKD2_PARAMS));
/* get saltSource */
jPkcs5Pbkd2ParamsClass = (*env)->FindClass(env, CLASS_PKCS5_PBKD2_PARAMS);
@@ -1734,6 +1740,7 @@
jfieldID fieldID;
jlong jKdf;
jobject jOtherInfo, jPublicData;
+ memset(&ckParam, 0, sizeof(CK_X9_42_DH1_DERIVE_PARAMS));
/* get kdf */
jX942Dh1DeriveParamsClass = (*env)->FindClass(env, CLASS_X9_42_DH1_DERIVE_PARAMS);
@@ -1779,6 +1786,7 @@
jfieldID fieldID;
jlong jKdf, jPrivateDataLen, jPrivateData;
jobject jOtherInfo, jPublicData, jPublicData2;
+ memset(&ckParam, 0, sizeof(CK_X9_42_DH2_DERIVE_PARAMS));
/* get kdf */
jX942Dh2DeriveParamsClass = (*env)->FindClass(env, CLASS_X9_42_DH2_DERIVE_PARAMS);
diff --git a/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/SctpChannel.java b/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/SctpChannel.java
index 445b755..065b130 100644
--- a/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/SctpChannel.java
+++ b/jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp/SctpChannel.java
@@ -538,11 +538,11 @@
* {@link java.io.IOException} to be thrown.
*
* <P> If this channel is already connected then this method will not block
- * and will immediately return <tt>true</tt>. If this channel is in
- * non-blocking mode then this method will return <tt>false</tt> if the
+ * and will immediately return {@code true}. If this channel is in
+ * non-blocking mode then this method will return {@code false} if the
* connection process is not yet complete. If this channel is in blocking
* mode then this method will block until the connection either completes
- * or fails, and will always either return <tt>true</tt> or throw a checked
+ * or fails, and will always either return {@code true} or throw a checked
* exception describing the failure.
*
* <P> This method may be invoked at any time. If a {@link #send send} or {@link #receive receive}
@@ -711,9 +711,9 @@
* Returns an operation set identifying this channel's supported operations.
*
* <P> SCTP channels support connecting, reading, and writing, so this
- * method returns <tt>(</tt>{@link SelectionKey#OP_CONNECT}
- * <tt>|</tt> {@link SelectionKey#OP_READ} <tt>|</tt> {@link
- * SelectionKey#OP_WRITE}<tt>)</tt>. </p>
+ * method returns {@code (}{@link SelectionKey#OP_CONNECT}
+ * {@code |} {@link SelectionKey#OP_READ} {@code |} {@link
+ * SelectionKey#OP_WRITE}{@code )}.
*
* @return The valid-operation set
*/
diff --git a/jdk/test/ProblemList.txt b/jdk/test/ProblemList.txt
index 10be3c6..6772453 100644
--- a/jdk/test/ProblemList.txt
+++ b/jdk/test/ProblemList.txt
@@ -353,6 +353,10 @@
# 8062512
java/util/spi/ResourceBundleControlProvider/UserDefaultControlTest.java generic-all
+# 8029453
+java/util/concurrent/locks/ReentrantLock/TimeoutLockLoops.java linux-all
+
+
############################################################################
# jdk_instrument
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/DocumentExtFunc.java b/jdk/test/com/sun/jmx/mbeanserver/introspector/BeanClass.java
similarity index 75%
copy from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/DocumentExtFunc.java
copy to jdk/test/com/sun/jmx/mbeanserver/introspector/BeanClass.java
index 44976ed..06746f6 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/DocumentExtFunc.java
+++ b/jdk/test/com/sun/jmx/mbeanserver/introspector/BeanClass.java
@@ -4,7 +4,9 @@
*
* 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.
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -20,16 +22,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
-
-package javax.xml.transform;
-
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public class DocumentExtFunc {
-
- public static String test(NodeList list) {
- Node node = list.item(0);
- return "["+node.getNodeName() + ":" + node.getTextContent()+"]";
- }
+public class BeanClass {
+ public int getNumber() {return 1;}
+ public boolean isAvailable() {return false;}
}
diff --git a/jdk/test/com/sun/jmx/mbeanserver/introspector/SimpleIntrospectorTest.java b/jdk/test/com/sun/jmx/mbeanserver/introspector/SimpleIntrospectorTest.java
new file mode 100644
index 0000000..1b463f5
--- /dev/null
+++ b/jdk/test/com/sun/jmx/mbeanserver/introspector/SimpleIntrospectorTest.java
@@ -0,0 +1,104 @@
+
+/*
+ * Copyright (c) 2015, 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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.lang.reflect.Method;
+
+/*
+ * @test
+ * @bug 8129215
+ * @summary The test checks whether the SimpleIntrospector is honoring the
+ * the JavaBeans property naming convention of always starting
+ * with a lower-case letter
+ *
+ * @author Jaroslav Bachorik
+ * @modules java.management
+ * @run clean SimpleIntrospectorTest
+ * @run build SimpleIntrospectorTest BeanClass
+ * @run main SimpleIntrospectorTest
+ */
+public class SimpleIntrospectorTest {
+ private static Method INTROSPECT_GETTER;
+
+ public static void main(String ... args) throws Exception {
+ Class clz = Class.forName(
+ "com.sun.jmx.mbeanserver.Introspector$SimpleIntrospector"
+ );
+ INTROSPECT_GETTER = clz.getDeclaredMethod(
+ "getReadMethod",
+ Class.class,
+ String.class
+ );
+ INTROSPECT_GETTER.setAccessible(true);
+ boolean result = true;
+ result &= checkNumberValid();
+ result &= checkNumberInvalid();
+ result &= checkAvailableValid();
+ result &= checkAvailableInvalid();
+
+ if (!result) {
+ throw new Error();
+ }
+ }
+
+ private static boolean checkNumberValid() throws Exception {
+ return checkGetter(false, "number");
+ }
+
+ private static boolean checkNumberInvalid() throws Exception {
+ return checkGetter(true, "Number");
+ }
+
+ private static boolean checkAvailableValid() throws Exception {
+ return checkGetter(false, "available");
+ }
+
+ private static boolean checkAvailableInvalid() throws Exception {
+ return checkGetter(true, "Available");
+ }
+
+ private static boolean checkGetter(boolean nullExpected, String name)
+ throws Exception {
+ Method m = getReadMethod(BeanClass.class, name);
+ boolean result = (m != null);
+ if (nullExpected) result = !result;
+
+ if (result) {
+ return true;
+ }
+ if (nullExpected) {
+ System.err.println("SimpleIntrospector resolved an unknown getter " +
+ "for attribute '"+ name +"'");
+ } else {
+ System.err.println("SimpleIntrospector fails to resolve getter " +
+ "for attribute '"+ name +"'");
+ }
+ return false;
+ }
+
+ private static Method getReadMethod(Class clz, String attr)
+ throws Exception {
+ return (Method)INTROSPECT_GETTER.invoke(null, clz, attr);
+ }
+}
diff --git a/jdk/test/java/awt/FileDialog/ModalFocus/FileDialogModalFocusTest.java b/jdk/test/java/awt/FileDialog/ModalFocus/FileDialogModalFocusTest.java
new file mode 100644
index 0000000..aa8b229
--- /dev/null
+++ b/jdk/test/java/awt/FileDialog/ModalFocus/FileDialogModalFocusTest.java
@@ -0,0 +1,137 @@
+/*
+ * Copyright (c) 2015, 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 8025815
+ @summary Child FileDialog of modal dialog does not get focus on Gnome
+ @author Semyon Sadetsky
+ */
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.*;
+import java.awt.image.BufferedImage;
+import java.lang.reflect.InvocationTargetException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.ReentrantLock;
+
+public class FileDialogModalFocusTest {
+ public static void main(String[] args) throws Exception {
+ Frame frame = new Frame();
+ FileDialog fileDialog = new FileDialog((Frame) null);
+ test(frame, fileDialog);
+ frame = new Frame();
+ fileDialog = new FileDialog(frame);
+ test(frame, fileDialog);
+ System.out.println("ok");
+ }
+
+ private static void test(final Frame frame, final FileDialog fileDialog)
+ throws InterruptedException, InvocationTargetException,
+ AWTException {
+ Button button = new Button();
+ button.setBackground(Color.RED);
+ button.addActionListener(new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ fileDialog.setVisible(true);
+ }
+ });
+ frame.add(button);
+ frame.setSize(200, 200);
+ EventQueue.invokeAndWait(new Runnable() {
+ @Override
+ public void run() {
+ frame.setVisible(true);
+ }
+ });
+ Robot robot = new Robot();
+ robot.setAutoDelay(200);
+ robot.waitForIdle();
+ Point point = button.getLocationOnScreen();
+ point.translate(100, 100);
+ robot.mouseMove(point.x, point.y);
+ robot.mousePress(InputEvent.BUTTON1_MASK);
+ robot.mouseRelease(InputEvent.BUTTON1_MASK);
+ int delay = 0;
+ while (frame.isFocused() && delay < 2000) {
+ robot.delay(50);
+ delay += 50;
+ }
+ ReentrantLock lock = new ReentrantLock();
+ Condition condition = lock.newCondition();
+ button.addComponentListener(new ComponentAdapter() {
+ @Override
+ public void componentResized(ComponentEvent e) {
+ lock.lock();
+ condition.signal();
+ lock.unlock();
+ }
+ });
+ lock.lock();
+ EventQueue.invokeLater(new Runnable() {
+ @Override
+ public void run() {
+ frame.setExtendedState(JFrame.MAXIMIZED_BOTH);
+ }
+ });
+ condition.await(5, TimeUnit.SECONDS);
+ lock.unlock();
+ robot.delay(200);
+ robot.waitForIdle();
+ EventQueue.invokeAndWait(new Runnable() {
+ @Override
+ public void run() {
+ button.requestFocus();
+ Point p = new Point(button.getWidth() - 10, button.getHeight() - 10);
+ SwingUtilities.convertPointToScreen(p, button);
+ robot.mouseMove(p.x, p.y);
+ robot.mousePress(InputEvent.BUTTON1_MASK);
+ robot.mouseRelease(InputEvent.BUTTON1_MASK);
+ }
+ });
+ robot.waitForIdle();
+ Point p = new Point(100, 100);
+ SwingUtilities.convertPointToScreen(p, button);
+ BufferedImage image = robot.createScreenCapture(
+ new Rectangle(p,
+ new Dimension(button.getWidth() - 200,
+ button.getHeight() - 200)));
+ boolean found = false;
+ for (int x = 0; x < image.getWidth(); x+=50) {
+ for (int y = 0; y < image.getHeight(); y+=50) {
+ if( (image.getRGB(x, y) & 0x00FFFF) != 0 ) {
+ found = true;
+ break;
+ };
+ }
+ }
+ frame.dispose();
+ robot.waitForIdle();
+ fileDialog.dispose();
+ if(!found) {
+ throw new RuntimeException("file chooser is underneath");
+ }
+ }
+}
\ No newline at end of file
diff --git a/jdk/test/java/awt/event/KeyEvent/KeyTyped/CtrlASCII.java b/jdk/test/java/awt/event/KeyEvent/KeyTyped/CtrlASCII.java
index cf3f1e3..1c63ea8 100644
--- a/jdk/test/java/awt/event/KeyEvent/KeyTyped/CtrlASCII.java
+++ b/jdk/test/java/awt/event/KeyEvent/KeyTyped/CtrlASCII.java
@@ -257,8 +257,12 @@
}// start()
public void punchCtrlKey( Robot ro, int keyCode ) {
ro.keyPress(KeyEvent.VK_CONTROL);
- ro.keyPress(keyCode);
- ro.keyRelease(keyCode);
+ try {
+ ro.keyPress(keyCode);
+ ro.keyRelease(keyCode);
+ }catch(IllegalArgumentException iae) {
+ System.err.println("skip probably invalid keyCode "+keyCode);
+ }
ro.keyRelease(KeyEvent.VK_CONTROL);
ro.delay(200);
}
diff --git a/jdk/test/java/awt/image/DrawImage/IncorrectClipXorModeSurface2Surface.java b/jdk/test/java/awt/image/DrawImage/IncorrectClipXorModeSurface2Surface.java
index 8a9b1bd..c23a1cf 100644
--- a/jdk/test/java/awt/image/DrawImage/IncorrectClipXorModeSurface2Surface.java
+++ b/jdk/test/java/awt/image/DrawImage/IncorrectClipXorModeSurface2Surface.java
@@ -40,7 +40,7 @@
/**
* @test
- * @bug 8061831
+ * @bug 8061831 8130400
* @summary Tests drawing volatile image to volatile image using different
* clips + xor mode. Results of the blit compatibleImage to
* compatibleImage is used for comparison.
diff --git a/jdk/test/java/awt/image/multiresolution/MultiResolutionCachedImageTest.java b/jdk/test/java/awt/image/multiresolution/MultiResolutionCachedImageTest.java
new file mode 100644
index 0000000..9b4a52e
--- /dev/null
+++ b/jdk/test/java/awt/image/multiresolution/MultiResolutionCachedImageTest.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright (c) 2015, 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.Color;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Image;
+import java.awt.geom.Dimension2D;
+import java.awt.image.BufferedImage;
+import sun.awt.image.MultiResolutionCachedImage;
+
+/**
+ * @test
+ * @bug 8132123
+ * @author Alexander Scherbatiy
+ * @summary MultiResolutionCachedImage unnecessarily creates base image to get
+ * its size
+ * @modules java.desktop/sun.awt.image
+ * @run main MultiResolutionCachedImageTest
+ */
+public class MultiResolutionCachedImageTest {
+
+ private static final Color TEST_COLOR = Color.BLUE;
+
+ public static void main(String[] args) {
+
+ Image image = new TestMultiResolutionCachedImage(100);
+
+ image.getWidth(null);
+ image.getHeight(null);
+ image.getProperty("comment", null);
+
+ int scaledSize = 50;
+ Image scaledImage = image.getScaledInstance(scaledSize, scaledSize,
+ Image.SCALE_SMOOTH);
+
+ if (!(scaledImage instanceof BufferedImage)) {
+ throw new RuntimeException("Wrong scaled image!");
+ }
+
+ BufferedImage buffScaledImage = (BufferedImage) scaledImage;
+
+ if (buffScaledImage.getWidth() != scaledSize
+ || buffScaledImage.getHeight() != scaledSize) {
+ throw new RuntimeException("Wrong scaled image!");
+ }
+
+ if (buffScaledImage.getRGB(scaledSize / 2, scaledSize / 2) != TEST_COLOR.getRGB()) {
+ throw new RuntimeException("Wrong scaled image!");
+ }
+ }
+
+ private static Dimension2D getDimension(int size) {
+ return new Dimension(size, size);
+ }
+
+ private static Dimension2D[] getSizes(int size) {
+ return new Dimension2D[]{getDimension(size), getDimension(2 * size)};
+ }
+
+ private static Image createImage(int width, int height) {
+ BufferedImage buffImage = new BufferedImage(width, height,
+ BufferedImage.TYPE_INT_RGB);
+ Graphics g = buffImage.createGraphics();
+ g.setColor(TEST_COLOR);
+ g.fillRect(0, 0, width, height);
+ return buffImage;
+ }
+
+ private static class TestMultiResolutionCachedImage
+ extends MultiResolutionCachedImage {
+
+ private final int size;
+
+ public TestMultiResolutionCachedImage(int size) {
+ super(size, size, getSizes(size), (w, h) -> createImage(w, h));
+ this.size = size;
+ }
+
+ @Override
+ public Image getResolutionVariant(int width, int height) {
+ if (width == size || height == size) {
+ throw new RuntimeException("Base image is requested!");
+ }
+ return super.getResolutionVariant(width, height);
+ }
+
+ @Override
+ protected Image getBaseImage() {
+ throw new RuntimeException("Base image is used");
+ }
+ }
+}
diff --git a/jdk/test/java/beans/Introspector/4058433/TestBeanInfoPriority.java b/jdk/test/java/beans/Introspector/4058433/TestBeanInfoPriority.java
new file mode 100644
index 0000000..589e9c0
--- /dev/null
+++ b/jdk/test/java/beans/Introspector/4058433/TestBeanInfoPriority.java
@@ -0,0 +1,294 @@
+/*
+ * Copyright (c) 2015, 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.event.ActionListener;
+import java.awt.event.MouseListener;
+import java.beans.BeanDescriptor;
+import java.beans.BeanInfo;
+import java.beans.BeanProperty;
+import java.beans.EventSetDescriptor;
+import java.beans.IntrospectionException;
+import java.beans.Introspector;
+import java.beans.JavaBean;
+import java.beans.MethodDescriptor;
+import java.beans.PropertyDescriptor;
+import java.beans.SimpleBeanInfo;
+import javax.swing.SwingContainer;
+import java.util.Arrays;
+
+/**
+ * @test
+ * @bug 4058433 8131055
+ * @summary Check if the user-defined bean info
+ * is not overridden with the annotated one.
+ * @author a.stepanov
+ */
+
+
+public class TestBeanInfoPriority {
+
+ // ========== test bean (annotations must be ignored!) ==========
+
+ @JavaBean(
+ description = "annotation-description",
+ defaultProperty = "other",
+ defaultEventSet = "mouse")
+ @SwingContainer(value = false)
+ public static class TestClass {
+
+ private int value;
+ private double other;
+
+ @BeanProperty(
+ bound = false,
+ expert = false,
+ hidden = false,
+ preferred = false,
+ required = false,
+ visualUpdate = false,
+ description = "annotation-value",
+ enumerationValues = {
+ "javax.swing.SwingConstants.NORTH"}
+ )
+ public void setValue(int v) { value = v; }
+ public int getValue() { return value; }
+
+
+ @BeanProperty(
+ bound = true,
+ expert = true,
+ hidden = true,
+ preferred = true,
+ required = true,
+ visualUpdate = true,
+ description = "annotation-other",
+ enumerationValues = {
+ "javax.swing.SwingConstants.LEFT",
+ "javax.swing.SwingConstants.RIGHT",
+ "javax.swing.SwingConstants.CENTER"}
+ )
+ public void setOther(double o) { other = o; }
+ public double getOther() { return other; }
+
+ public void addActionListener(ActionListener l) {}
+ public void removeActionListener(ActionListener l) {}
+
+ public void addMouseListener(MouseListener l) {}
+ public void removeMouseListener(MouseListener l) {}
+ }
+
+ // ========== user-defined bean info ==========
+
+ public static class TestClassBeanInfo extends SimpleBeanInfo {
+
+ private static final int iOther = 0;
+ private static final int iValue = 1;
+
+ private static final int iAction = 0;
+ private static final int iMouse = 1;
+
+
+ @Override
+ public BeanDescriptor getBeanDescriptor() {
+
+ BeanDescriptor bd = new BeanDescriptor(TestClass.class, null);
+ bd.setShortDescription("user-defined-description");
+ bd.setValue("isContainer", true);
+ bd.setValue("containerDelegate", "user-defined-delegate");
+
+ return bd;
+ }
+
+ @Override
+ public PropertyDescriptor[] getPropertyDescriptors() {
+
+ PropertyDescriptor[] p = new PropertyDescriptor[2];
+
+ try {
+
+ // value
+ PropertyDescriptor pdValue = new PropertyDescriptor(
+ "value", TestClass.class, "getValue", "setValue");
+ pdValue.setBound(true);
+ pdValue.setConstrained(true);
+ pdValue.setExpert(true);
+ pdValue.setHidden(true);
+ pdValue.setPreferred(true);
+ pdValue.setValue("required", true);
+ pdValue.setValue("visualUpdate", true);
+ pdValue.setShortDescription("user-defined-value");
+ pdValue.setValue("enumerationValues", new Object[]{
+ "EAST", 3, "javax.swing.SwingConstants.EAST",
+ "WEST", 7, "javax.swing.SwingConstants.WEST"});
+ p[iValue] = pdValue;
+
+ // other
+ PropertyDescriptor pdOther = new PropertyDescriptor(
+ "other", TestClass.class, "getOther", "setOther");
+ pdOther.setBound(false);
+ pdOther.setConstrained(false);
+ pdOther.setExpert(false);
+ pdOther.setHidden(false);
+ pdOther.setPreferred(false);
+ pdOther.setValue("required", false);
+ pdOther.setValue("visualUpdate", false);
+ pdOther.setShortDescription("user-defined-other");
+ pdOther.setValue("enumerationValues", new Object[]{
+ "TOP", 1, "javax.swing.SwingConstants.TOP"});
+ p[iOther] = pdOther;
+
+ } catch(IntrospectionException e) {
+ e.printStackTrace();
+ }
+
+ return p;
+ }
+
+ @Override
+ public EventSetDescriptor[] getEventSetDescriptors() {
+ EventSetDescriptor[] es = new EventSetDescriptor[2];
+ try {
+ es[iAction] = new EventSetDescriptor(
+ TestClass.class,
+ "actionListener",
+ java.awt.event.ActionListener.class,
+ new String[] {"actionPerformed"},
+ "addActionListener",
+ "removeActionListener");
+ es[iMouse] = new EventSetDescriptor(
+ TestClass.class,
+ "mouseListener",
+ java.awt.event.MouseListener.class,
+ new String[] {"mouseClicked", "mousePressed", "mouseReleased", "mouseEntered", "mouseExited"},
+ "addMouseListener",
+ "removeMouseListener");
+ } catch(IntrospectionException e) {
+ e.printStackTrace();
+ }
+ return es;
+ }
+
+ @Override
+ public MethodDescriptor[] getMethodDescriptors() {
+ MethodDescriptor[] m = new MethodDescriptor[0];
+ return m;
+ }
+
+ @Override
+ public int getDefaultPropertyIndex() { return iValue; } // default: value
+
+ @Override
+ public int getDefaultEventIndex() { return iAction; } // default: action
+
+ @Override
+ public java.awt.Image getIcon(int iconKind) { return null; }
+ }
+
+ // ========== auxiliary functions ==========
+
+ static void checkEq(String what, Object v, Object ref) throws Exception {
+
+ if ((v != null) && v.equals(ref)) {
+ System.out.println(what + ": ok (" + ref.toString() + ")");
+ } else {
+ throw new Exception(
+ "invalid " + what + ", expected: \"" + ref + "\", got: \"" + v + "\"");
+ }
+ }
+
+ static void checkEnumEq(String what, Object v, Object ref[]) throws Exception {
+
+ what = "\"" + what + "\"";
+ if (v == null) {
+ throw new Exception("null " + what + " enumeration values");
+ }
+
+ String msg = "invalid " + what + " enumeration values";
+ if (!(v instanceof Object[])) { throw new Exception(msg); }
+
+ if (Arrays.equals((Object []) v, ref)) {
+ System.out.println(what + " enumeration values: ok");
+ } else { throw new Exception(msg); }
+ }
+
+
+ // ========== test ==========
+
+
+ public static void main(String[] args) throws Exception {
+
+ BeanInfo i = Introspector.getBeanInfo(TestClass.class, Object.class);
+ BeanDescriptor bd = i.getBeanDescriptor();
+
+ checkEq("description", bd.getShortDescription(), "user-defined-description");
+ checkEq("default property index", i.getDefaultPropertyIndex(), 1);
+ checkEq("default event index", i.getDefaultEventIndex(), 0);
+
+ checkEq("isContainer", i.getBeanDescriptor().getValue("isContainer"), true);
+ checkEq("containerDelegate",
+ i.getBeanDescriptor().getValue("containerDelegate"), "user-defined-delegate");
+ System.out.println("");
+
+ PropertyDescriptor[] pds = i.getPropertyDescriptors();
+ for (PropertyDescriptor pd: pds) {
+ String name = pd.getName();
+ switch (name) {
+ case "value":
+ checkEq("\"value\" isBound", pd.isBound(), true);
+ checkEq("\"value\" isConstrained", pd.isConstrained(), true);
+ checkEq("\"value\" isExpert", pd.isExpert(), true);
+ checkEq("\"value\" isHidden", pd.isHidden(), true);
+ checkEq("\"value\" isPreferred", pd.isPreferred(), true);
+ checkEq("\"value\" required", pd.getValue("required"), true);
+ checkEq("\"value\" visualUpdate", pd.getValue("visualUpdate"), true);
+
+ checkEq("\"value\" description", pd.getShortDescription(), "user-defined-value");
+
+ checkEnumEq(pd.getName(), pd.getValue("enumerationValues"),
+ new Object[]{
+ "EAST", 3, "javax.swing.SwingConstants.EAST",
+ "WEST", 7, "javax.swing.SwingConstants.WEST"});
+ System.out.println("");
+ break;
+ case "other":
+ checkEq("\"other\" isBound", pd.isBound(), false);
+ checkEq("\"other\" isConstrained", pd.isConstrained(), false);
+ checkEq("\"other\" isExpert", pd.isExpert(), false);
+ checkEq("\"other\" isHidden", pd.isHidden(), false);
+ checkEq("\"other\" isPreferred", pd.isPreferred(), false);
+ checkEq("\"other\" required", pd.getValue("required"), false);
+ checkEq("\"other\" visualUpdate", pd.getValue("visualUpdate"), false);
+
+ checkEq("\"other\" description", pd.getShortDescription(), "user-defined-other");
+
+ checkEnumEq(pd.getName(), pd.getValue("enumerationValues"),
+ new Object[]{"TOP", 1, "javax.swing.SwingConstants.TOP"});
+ System.out.println("");
+ break;
+ default:
+ throw new Exception("invalid property descriptor: " + name);
+ }
+ }
+ }
+}
diff --git a/jdk/test/java/beans/Introspector/8130937/TestBooleanBeanProperties.java b/jdk/test/java/beans/Introspector/8130937/TestBooleanBeanProperties.java
new file mode 100644
index 0000000..494985c
--- /dev/null
+++ b/jdk/test/java/beans/Introspector/8130937/TestBooleanBeanProperties.java
@@ -0,0 +1,380 @@
+/*
+ * Copyright (c) 2015, 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.BeanProperty;
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyChangeSupport;
+import java.beans.PropertyDescriptor;
+
+/**
+ * @test
+ * @bug 8130937
+ * @summary Tests the booleans properties of the BeanProperty annotation
+ * @library ..
+ */
+public final class TestBooleanBeanProperties {
+
+ public static void main(final String[] args) {
+ test(Empty.class, false, false, false, false, false, false);
+ test(BoundTrue.class, false, false, false, false, false, false);
+ test(BoundFalse.class, false, false, false, false, false, false);
+ test(BoundListener.class, true, false, false, false, false, false);
+ test(BoundFalseListener.class, false, false, false, false, false, false);
+ test(BoundTrueListener.class, true, false, false, false, false, false);
+ test(ExpertTrue.class, false, true, false, false, false, false);
+ test(ExpertFalse.class, false, false, false, false, false, false);
+ test(HiddenTrue.class, false, false, true, false, false, false);
+ test(HiddenFalse.class, false, false, false, false, false, false);
+ test(PreferredTrue.class, false, false, false, true, false, false);
+ test(PreferredFalse.class, false, false, false, false, false, false);
+ test(RequiredTrue.class, false, false, false, false, true, false);
+ test(RequiredFalse.class, false, false, false, false, false, false);
+ test(VisualUpdateTrue.class, false, false, false, false, false, true);
+ test(VisualUpdateFalse.class, false, false, false, false, false, false);
+ test(All.class, true, true, true, true, true, true);
+ }
+
+ private static void test(Class<?> cls, boolean isBound, boolean isExpert,
+ boolean isHidden, boolean isPref, boolean isReq,
+ boolean isVS) {
+ PropertyDescriptor pd = BeanUtils.getPropertyDescriptor(cls, "value");
+ if (pd.isBound() != isBound) {
+ throw new RuntimeException("isBound should be: " + isBound);
+ }
+ if (pd.isExpert() != isExpert || getValue(pd, "expert") != isExpert) {
+ throw new RuntimeException("isExpert should be:" + isExpert);
+ }
+ if (pd.isHidden() != isHidden || getValue(pd, "hidden") != isHidden) {
+ throw new RuntimeException("isHidden should be: " + isHidden);
+ }
+ if (pd.isPreferred() != isPref) {
+ throw new RuntimeException("isPreferred should be: " + isPref);
+ }
+ if (getValue(pd, "required") != isReq) {
+ throw new RuntimeException("required should be: " + isReq);
+ }
+ if (getValue(pd, "visualUpdate") != isVS) {
+ throw new RuntimeException("required should be: " + isVS);
+ }
+ }
+
+ private static boolean getValue(PropertyDescriptor pd, String value) {
+ return (boolean) pd.getValue(value);
+ }
+ ////////////////////////////////////////////////////////////////////////////
+
+ public static final class Empty {
+
+ private int value;
+
+ public int getValue() {
+ return value;
+ }
+
+ public void setValue(int value) {
+ this.value = value;
+ }
+ }
+
+ public static final class All {
+
+ private int value;
+
+ private PropertyChangeSupport pcs = new PropertyChangeSupport(this);
+
+ public int getValue() {
+ return value;
+ }
+
+ @BeanProperty(bound = true, expert = true, hidden = true,
+ preferred = true, required = true, visualUpdate = true)
+ public void setValue(int value) {
+ this.value = value;
+ }
+
+ public void addPropertyChangeListener(PropertyChangeListener l) {
+ pcs.addPropertyChangeListener(l);
+ }
+
+ public void removePropertyChangeListener(PropertyChangeListener l) {
+ pcs.removePropertyChangeListener(l);
+ }
+ }
+ ////////////////////////////////////////////////////////////////////////////
+ // bound property
+ ////////////////////////////////////////////////////////////////////////////
+
+ public static final class BoundTrue {
+
+ private int value;
+
+ public int getValue() {
+ return value;
+ }
+
+ @BeanProperty(bound = true)
+ public void setValue(int value) {
+ this.value = value;
+ }
+ }
+
+ public static final class BoundFalse {
+
+ private int value;
+
+ public int getValue() {
+ return value;
+ }
+
+ @BeanProperty(bound = false)
+ public void setValue(int value) {
+ this.value = value;
+ }
+ }
+
+ public static final class BoundListener {
+
+ private PropertyChangeSupport pcs = new PropertyChangeSupport(this);
+
+ private int value;
+
+ public int getValue() {
+ return value;
+ }
+
+ public void setValue(int value) {
+ this.value = value;
+ }
+
+ public void addPropertyChangeListener(PropertyChangeListener l) {
+ pcs.addPropertyChangeListener(l);
+ }
+
+ public void removePropertyChangeListener(PropertyChangeListener l) {
+ pcs.removePropertyChangeListener(l);
+ }
+ }
+
+ public static final class BoundFalseListener {
+
+ private PropertyChangeSupport pcs = new PropertyChangeSupport(this);
+
+ private int value;
+
+ public int getValue() {
+ return value;
+ }
+
+ @BeanProperty(bound = false)
+ public void setValue(int value) {
+ this.value = value;
+ }
+
+ public void addPropertyChangeListener(PropertyChangeListener l) {
+ pcs.addPropertyChangeListener(l);
+ }
+
+ public void removePropertyChangeListener(PropertyChangeListener l) {
+ pcs.removePropertyChangeListener(l);
+ }
+ }
+
+ public static final class BoundTrueListener {
+
+ private PropertyChangeSupport pcs = new PropertyChangeSupport(this);
+
+ private int value;
+
+ public int getValue() {
+ return value;
+ }
+
+ @BeanProperty(bound = true)
+ public void setValue(int value) {
+ this.value = value;
+ }
+
+ public void addPropertyChangeListener(PropertyChangeListener l) {
+ pcs.addPropertyChangeListener(l);
+ }
+
+ public void removePropertyChangeListener(PropertyChangeListener l) {
+ pcs.removePropertyChangeListener(l);
+ }
+ }
+ ////////////////////////////////////////////////////////////////////////////
+ // expert property
+ ////////////////////////////////////////////////////////////////////////////
+
+ public static final class ExpertTrue {
+
+ private int value;
+
+ public int getValue() {
+ return value;
+ }
+
+ @BeanProperty(expert = true)
+ public void setValue(int value) {
+ this.value = value;
+ }
+ }
+
+ public static final class ExpertFalse {
+
+ private int value;
+
+ public int getValue() {
+ return value;
+ }
+
+ @BeanProperty(expert = false)
+ public void setValue(int value) {
+ this.value = value;
+ }
+ }
+ ////////////////////////////////////////////////////////////////////////////
+ // hidden property
+ ////////////////////////////////////////////////////////////////////////////
+
+ public static final class HiddenTrue {
+
+ private int value;
+
+ public int getValue() {
+ return value;
+ }
+
+ @BeanProperty(hidden = true)
+ public void setValue(int value) {
+ this.value = value;
+ }
+ }
+
+ public static final class HiddenFalse {
+
+ private int value;
+
+ public int getValue() {
+ return value;
+ }
+
+ @BeanProperty(hidden = false)
+ public void setValue(int value) {
+ this.value = value;
+ }
+ }
+ ////////////////////////////////////////////////////////////////////////////
+ // preferred property
+ ////////////////////////////////////////////////////////////////////////////
+
+ public static final class PreferredTrue {
+
+ private int value;
+
+ public int getValue() {
+ return value;
+ }
+
+ @BeanProperty(preferred = true)
+ public void setValue(int value) {
+ this.value = value;
+ }
+ }
+
+ public static final class PreferredFalse {
+
+ private int value;
+
+ public int getValue() {
+ return value;
+ }
+
+ @BeanProperty(preferred = false)
+ public void setValue(int value) {
+ this.value = value;
+ }
+ }
+ ////////////////////////////////////////////////////////////////////////////
+ // required property
+ ////////////////////////////////////////////////////////////////////////////
+
+ public static final class RequiredTrue {
+
+ private int value;
+
+ public int getValue() {
+ return value;
+ }
+
+ @BeanProperty(required = true)
+ public void setValue(int value) {
+ this.value = value;
+ }
+ }
+
+ public static final class RequiredFalse {
+
+ private int value;
+
+ public int getValue() {
+ return value;
+ }
+
+ @BeanProperty(required = false)
+ public void setValue(int value) {
+ this.value = value;
+ }
+ }
+ ////////////////////////////////////////////////////////////////////////////
+ // visualUpdate property
+ ////////////////////////////////////////////////////////////////////////////
+
+ public static final class VisualUpdateTrue {
+
+ private int value;
+
+ public int getValue() {
+ return value;
+ }
+
+ @BeanProperty(visualUpdate = true)
+ public void setValue(int value) {
+ this.value = value;
+ }
+ }
+
+ public static final class VisualUpdateFalse {
+
+ private int value;
+
+ public int getValue() {
+ return value;
+ }
+
+ @BeanProperty(visualUpdate = false)
+ public void setValue(int value) {
+ this.value = value;
+ }
+ }
+}
diff --git a/jdk/test/java/beans/Performance/Test4058433.java b/jdk/test/java/beans/Performance/Test4058433.java
index 71f6cc8..bba0e3b 100644
--- a/jdk/test/java/beans/Performance/Test4058433.java
+++ b/jdk/test/java/beans/Performance/Test4058433.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, 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,6 +33,14 @@
import java.beans.PropertyDescriptor;
import java.lang.reflect.Array;
import java.lang.reflect.Method;
+import java.net.URI;
+import java.nio.file.FileSystem;
+import java.nio.file.FileSystems;
+import java.nio.file.FileVisitResult;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.SimpleFileVisitor;
+import java.nio.file.attribute.BasicFileAttributes;
import java.util.Arrays;
import java.util.Comparator;
import java.util.Enumeration;
@@ -40,19 +48,13 @@
import java.util.Objects;
import java.util.TreeMap;
import java.util.TreeSet;
-import java.util.jar.JarEntry;
-import java.util.jar.JarFile;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
/*
* @test
* @bug 4058433
* @summary Generates BeanInfo for public classes in AWT, Accessibility, and Swing
* @author Sergey Malenkov
- * @run main/manual Test4058433
*/
-
public class Test4058433 implements Comparator<Object> {
@Override
public int compare(Object one, Object two) {
@@ -76,31 +78,41 @@
}
public static void main(String[] args) throws Exception {
- String resource = ClassLoader.getSystemResource("java/lang/Object.class").toString();
-
- Pattern pattern = Pattern.compile("jar:file:(.*)!.*");
- Matcher matcher = pattern.matcher(resource);
- matcher.matches();
- resource = matcher.group(1);
+ FileSystem fs = FileSystems.getFileSystem(URI.create("jrt:/"));
+ fs.getFileStores();
TreeSet<Class<?>> types = new TreeSet<>(new Test4058433());
- try (JarFile jarFile = new JarFile(resource.replaceAll("%20", " "))) {
- Enumeration<JarEntry> entries = jarFile.entries();
- while (entries.hasMoreElements()) {
- String name = entries.nextElement().getName();
- if (name.startsWith("java/awt/") || name.startsWith("javax/accessibility/") || name.startsWith("javax/swing/")) {
+ Files.walkFileTree(fs.getPath("/modules/java.desktop"), new SimpleFileVisitor<Path>() {
+ @Override
+ public FileVisitResult visitFile(Path file,
+ BasicFileAttributes attrs) {
+ file = file.subpath(2, file.getNameCount());
+ if (file.startsWith("java/awt/")
+ || file.startsWith("javax/accessibility/")
+ || file.startsWith("javax/swing/")) {
+ String name =file.toString();
if (name.endsWith(".class")) {
name = name.substring(0, name.indexOf(".")).replace('/', '.');
- Class<?> type = Class.forName(name);
- if (!type.isInterface() && !type.isEnum() && !type.isAnnotation() && !type.isAnonymousClass()) {
+
+ final Class<?> type;
+ try {
+ type = Class.forName(name);
+ } catch (ClassNotFoundException e) {
+ throw new RuntimeException(e);
+ }
+ if (!BeanInfo.class.isAssignableFrom(type) && !type.isInterface()
+ && !type.isEnum() && !type.isAnnotation()
+ && !type.isAnonymousClass()) {
if (null == type.getDeclaringClass()) {
types.add(type);
}
}
}
}
+ return FileVisitResult.CONTINUE;
}
- }
+ });
+
System.out.println("found " + types.size() + " classes");
long time = -System.currentTimeMillis();
for (Class<?> type : types) {
diff --git a/jdk/test/java/lang/management/MemoryMXBean/LowMemoryTest.java b/jdk/test/java/lang/management/MemoryMXBean/LowMemoryTest.java
index 7c6eb0b..5e8bda4 100644
--- a/jdk/test/java/lang/management/MemoryMXBean/LowMemoryTest.java
+++ b/jdk/test/java/lang/management/MemoryMXBean/LowMemoryTest.java
@@ -33,7 +33,7 @@
* @library /lib/testlibrary/
* @modules java.management
* @build jdk.testlibrary.* LowMemoryTest MemoryUtil RunUtil
- * @run main/timeout=600 LowMemoryTest
+ * @run main/timeout=600 LowMemoryTest
* @requires vm.opt.ExplicitGCInvokesConcurrent != "true"
* @requires vm.opt.ExplicitGCInvokesConcurrentAndUnloadsClasses != "true"
* @requires vm.opt.DisableExplicitGC != "true"
@@ -44,6 +44,9 @@
import java.util.concurrent.Phaser;
import javax.management.*;
import javax.management.openmbean.CompositeData;
+import jdk.testlibrary.ProcessTools;
+import jdk.testlibrary.JDKToolFinder;
+import jdk.testlibrary.Utils;
public class LowMemoryTest {
private static final MemoryMXBean mm = ManagementFactory.getMemoryMXBean();
@@ -56,6 +59,7 @@
private static final int NUM_CHUNKS = 2;
private static final int YOUNG_GEN_SIZE = 8 * 1024 * 1024;
private static long chunkSize;
+ private static final String classMain = "LowMemoryTest$TestMain";
/**
* Run the test multiple times with different GC versions.
@@ -63,7 +67,6 @@
* Then with GC versions specified by the test.
*/
public static void main(String a[]) throws Throwable {
- final String main = "LowMemoryTest$TestMain";
// Use a low young gen size to ensure that the
// allocated objects are put in the old gen.
final String nmFlag = "-Xmn" + YOUNG_GEN_SIZE;
@@ -73,12 +76,75 @@
// Prevent G1 from selecting a large heap region size,
// since that would change the young gen size.
final String g1Flag = "-XX:G1HeapRegionSize=1m";
- RunUtil.runTestClearGcOpts(main, nmFlag, lpFlag, "-XX:+UseSerialGC");
- RunUtil.runTestClearGcOpts(main, nmFlag, lpFlag, "-XX:+UseParallelGC");
- RunUtil.runTestClearGcOpts(main, nmFlag, lpFlag, "-XX:+UseG1GC", g1Flag);
- RunUtil.runTestClearGcOpts(main, nmFlag, lpFlag, "-XX:+UseConcMarkSweepGC");
+
+ // Runs the test collecting subprocess I/O while it's running.
+ traceTest(classMain + ", -XX:+UseSerialGC", nmFlag, lpFlag, "-XX:+UseSerialGC");
+ traceTest(classMain + ", -XX:+UseParallelGC", nmFlag, lpFlag, "-XX:+UseParallelGC");
+ traceTest(classMain + ", -XX:+UseG1GC", nmFlag, lpFlag, "-XX:+UseG1GC", g1Flag);
+ traceTest(classMain + ", -XX:+UseConcMarkSweepGC", nmFlag, lpFlag, "-XX:+UseConcMarkSweepGC");
}
+ /*
+ * Creating command-line for running subprocess JVM:
+ *
+ * JVM command line is like:
+ * {test_jdk}/bin/java {defaultopts} -cp {test.class.path} {testopts} main
+ *
+ * {defaultopts} are the default java options set by the framework.
+ *
+ * @param testOpts java options specified by the test.
+ */
+ private static List<String> buildCommandLine(String... testOpts) {
+ List<String> opts = new ArrayList<>();
+ opts.add(JDKToolFinder.getJDKTool("java"));
+ opts.addAll(Arrays.asList(Utils.getTestJavaOpts()));
+ opts.add("-cp");
+ opts.add(System.getProperty("test.class.path", "test.class.path"));
+ opts.add("-XX:+PrintGCDetails");
+ opts.addAll(Arrays.asList(testOpts));
+ opts.add(classMain);
+
+ return opts;
+ }
+
+ /**
+ * Runs LowMemoryTest$TestMain with the passed options and redirects subprocess
+ * standard I/O to the current (parent) process. This provides a trace of what
+ * happens in the subprocess while it is runnning (and before it terminates).
+ *
+ * @param prefixName the prefix string for redirected outputs
+ * @param testOpts java options specified by the test.
+ */
+ private static void traceTest(String prefixName,
+ String... testOpts)
+ throws Throwable {
+
+ // Building command-line
+ List<String> opts = buildCommandLine(testOpts);
+
+ // We activate all tracing in subprocess
+ opts.add("trace");
+
+ // Launch separate JVM subprocess
+ String[] optsArray = opts.toArray(new String[0]);
+ ProcessBuilder pb = new ProcessBuilder(optsArray);
+ System.out.println("\n========= Tracing of subprocess " + prefixName + " =========");
+ Process p = ProcessTools.startProcess(prefixName, pb);
+
+ // Handling end of subprocess
+ try {
+ int exitCode = p.waitFor();
+ if (exitCode != 0) {
+ throw new RuntimeException(
+ "Subprocess unexpected exit value of [" + exitCode + "]. Expected 0.\n");
+ }
+ } catch (InterruptedException e) {
+ throw new RuntimeException("Parent process interrupted with exception : \n " + e + " :" );
+ }
+
+
+ }
+
private static volatile boolean listenerInvoked = false;
static class SensorListener implements NotificationListener {
@Override
@@ -204,6 +270,7 @@
System.out.println("Setting threshold for " + mpool.getName() +
" from " + mpool.getUsageThreshold() + " to " + newThreshold +
". Current used = " + mu.getUsed());
+
mpool.setUsageThreshold(newThreshold);
if (mpool.getUsageThreshold() != newThreshold) {
@@ -236,7 +303,6 @@
throw new RuntimeException("TEST FAILED.");
System.out.println(RunUtil.successMessage);
-
}
}
@@ -298,28 +364,42 @@
static class SweeperThread extends Thread {
private void doTask() {
+ int iterations = 0;
+ if (trace) {
+ System.out.println("SweeperThread clearing allocated objects.");
+ }
+
for (; mpool.getUsage().getUsed() >=
mpool.getUsageThreshold();) {
// clear all allocated objects and invoke GC
objectPool.clear();
mm.gc();
+
+ if (trace) {
+ iterations++;
+ System.out.println("SweeperThread called " + iterations +
+ " time(s) MemoryMXBean.gc().");
+ }
+
goSleep(100);
}
}
+
@Override
public void run() {
for (int i = 1; i <= NUM_TRIGGERS; i++) {
// Sync with AllocatorThread's first phase.
phaser.arriveAndAwaitAdvance();
- System.out.println("SweepThread is doing task " + i +
+ System.out.println("SweeperThread is doing task " + i +
" phase " + phaser.getPhase());
+
doTask();
listenerInvoked = false;
// Sync with AllocatorThread's second phase.
phaser.arriveAndAwaitAdvance();
- System.out.println("SweepThread done task " + i +
+ System.out.println("SweeperThread done task " + i +
" phase " + phaser.getPhase());
if (testFailed) return;
}
diff --git a/jdk/test/java/lang/ref/FinalizerHistogramTest.java b/jdk/test/java/lang/ref/FinalizerHistogramTest.java
new file mode 100644
index 0000000..a201331
--- /dev/null
+++ b/jdk/test/java/lang/ref/FinalizerHistogramTest.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2015, 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.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.ReentrantLock;
+
+import java.lang.reflect.Method;
+import java.lang.reflect.Field;
+
+/*
+ * @test
+ * @summary Unit test for FinalizerHistogram
+ * @run main FinalizerHistogramTest
+ */
+
+public class FinalizerHistogramTest {
+ static ReentrantLock lock = new ReentrantLock();
+ static volatile int wasInitialized = 0;
+ static volatile int wasTrapped = 0;
+ static final int objectsCount = 1000;
+
+ static class MyObject {
+ public MyObject() {
+ // Make sure object allocation/deallocation is not optimized out
+ wasInitialized += 1;
+ }
+
+ protected void finalize() {
+ // Trap the object in a finalization queue
+ wasTrapped += 1;
+ lock.lock();
+ }
+ }
+
+ public static void main(String[] argvs) {
+ try {
+ lock.lock();
+ for(int i = 0; i < objectsCount; ++i) {
+ new MyObject();
+ }
+ System.out.println("Objects intialized: " + objectsCount);
+ System.gc();
+ while(wasTrapped < 1);
+
+ Class<?> klass = Class.forName("java.lang.ref.FinalizerHistogram");
+
+ Method m = klass.getDeclaredMethod("getFinalizerHistogram");
+ m.setAccessible(true);
+ Object entries[] = (Object[]) m.invoke(null);
+
+ Class<?> entryKlass = Class.forName("java.lang.ref.FinalizerHistogram$Entry");
+ Field name = entryKlass.getDeclaredField("className");
+ name.setAccessible(true);
+ Field count = entryKlass.getDeclaredField("instanceCount");
+ count.setAccessible(true);
+
+ System.out.println("Unreachable instances waiting for finalization");
+ System.out.println("#instances class name");
+ System.out.println("-----------------------");
+
+ boolean found = false;
+ for (Object entry : entries) {
+ Object e = entryKlass.cast(entry);
+ System.out.printf("%10d %s\n", count.get(e), name.get(e));
+ if (((String) name.get(e)).indexOf("MyObject") != -1 ) {
+ found = true;
+ }
+ }
+
+ if (!found) {
+ throw new RuntimeException("MyObject is not found in test output");
+ }
+
+ System.out.println("Test PASSED");
+ } catch(Exception e) {
+ System.err.println("Test failed with " + e);
+ e.printStackTrace(System.err);
+ throw new RuntimeException("Test failed");
+ } finally {
+ lock.unlock();
+ }
+ }
+}
diff --git a/jdk/test/java/nio/file/FileSystem/Basic.java b/jdk/test/java/nio/file/FileSystem/Basic.java
index 8990361..4813929 100644
--- a/jdk/test/java/nio/file/FileSystem/Basic.java
+++ b/jdk/test/java/nio/file/FileSystem/Basic.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, 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
@@ -22,17 +22,23 @@
*/
/* @test
- * @bug 4313887 6838333
+ * @bug 4313887 6838333 8132497
* @summary Unit test for java.nio.file.FileSystem
- * @library ..
+ * @library .. /lib/testlibrary
+ * @build jdk.testlibrary.FileUtils
+ * @run main/othervm Basic
*/
+import java.io.File;
import java.nio.file.*;
-import java.nio.file.attribute.*;
import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.HashMap;
+import jdk.testlibrary.FileUtils;
/**
- * Simple santity checks for java.nio.file.FileSystem
+ * Simple sanity checks for java.nio.file.FileSystem
*/
public class Basic {
@@ -48,7 +54,25 @@
}
}
- public static void main(String[] args) throws IOException {
+ static void checkNoUOE() throws IOException, URISyntaxException {
+ String dir = System.getProperty("test.dir", ".");
+ String fileName = dir + File.separator + "foo.bar";
+ Path path = Paths.get(fileName);
+ Path file = Files.createFile(path);
+ try {
+ URI uri = new URI("jar", file.toUri().toString(), null);
+ System.out.println(uri);
+ FileSystem fs = FileSystems.newFileSystem(uri, new HashMap());
+ fs.close();
+ } catch (ProviderNotFoundException pnfe) {
+ System.out.println("Expected ProviderNotFoundException caught: "
+ + "\"" + pnfe.getMessage() + "\"");
+ } finally {
+ FileUtils.deleteFileWithRetry(path);
+ }
+ }
+
+ public static void main(String[] args) throws IOException, URISyntaxException {
FileSystem fs = FileSystems.getDefault();
// close should throw UOE
@@ -80,5 +104,9 @@
checkSupported(fs, "posix", "unix", "owner");
if (os.equals("Windows"))
checkSupported(fs, "owner", "dos", "acl", "user");
+
+ // sanity check non-throwing of UnsupportedOperationException by
+ // FileSystems.newFileSystem(URI, ..)
+ checkNoUOE();
}
}
diff --git a/jdk/test/java/nio/file/Files/StreamTest.java b/jdk/test/java/nio/file/Files/StreamTest.java
index 0259fac..c21faf9 100644
--- a/jdk/test/java/nio/file/Files/StreamTest.java
+++ b/jdk/test/java/nio/file/Files/StreamTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, 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
@@ -22,7 +22,7 @@
*/
/* @test
- * @bug 8006884 8019526
+ * @bug 8006884 8019526 8132539
* @library ..
* @build PassThroughFileSystem FaultyFileSystem
* @run testng StreamTest
@@ -685,4 +685,18 @@
// expected
}
}
+
+ public void testProcFile() throws IOException {
+ if (System.getProperty("os.name").equals("Linux")) {
+ Path path = Paths.get("/proc/cpuinfo");
+ if (Files.exists(path)) {
+ String NEW_LINE = System.getProperty("line.separator");
+ String s =
+ Files.lines(path).collect(Collectors.joining(NEW_LINE));
+ if (s.length() == 0) {
+ fail("Files.lines(\"" + path + "\") returns no data");
+ }
+ }
+ }
+ }
}
diff --git a/jdk/test/java/nio/file/Files/probeContentType/ParallelProbes.java b/jdk/test/java/nio/file/Files/probeContentType/ParallelProbes.java
new file mode 100644
index 0000000..afed44e
--- /dev/null
+++ b/jdk/test/java/nio/file/Files/probeContentType/ParallelProbes.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2015, 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.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+
+/* @test
+ * @summary Test probing content type simultaneously from multiple threads.
+ * @requires (os.family == "linux") | (os.family == "solaris")
+ * @build ParallelProbes SimpleFileTypeDetector
+ * @run main/othervm ParallelProbes 10
+ */
+public class ParallelProbes {
+
+ private static final int REPEATS = 1000;
+
+ private int numThreads = 0;
+ private ArrayList<Thread> threads;
+
+ public ParallelProbes(int numThreads) {
+ System.out.println("Using <" + numThreads + "> threads.");
+ this.numThreads = numThreads;
+ this.threads = new ArrayList<Thread>(numThreads);
+ }
+
+ private Path createTmpFile() throws IOException {
+ final Path p = Files.createTempFile("prefix", ".json");
+ Files.write(p, "{\"test\"}".getBytes());
+ System.out.println("Write test file <" + p + ">");
+ return p;
+ }
+
+ private Runnable createRunnable(final Path p) {
+ Runnable r = new Runnable() {
+ public void run() {
+ for (int i = 0; i < REPEATS; i++) {
+ try {
+ System.out.println(Thread.currentThread().getName()
+ + " -> " + Files.probeContentType(p));
+ } catch (IOException ioException) {
+ ioException.printStackTrace();
+ }
+ }
+ }
+ };
+ return r;
+ }
+
+ public void start() throws IOException {
+ for (int i = 0; i < numThreads; i++) {
+ final Path p = createTmpFile();
+ Runnable r = createRunnable(p);
+ Thread thread = new Thread(r, "thread-" + i);
+ thread.start();
+ threads.add(thread);
+ }
+ }
+
+ public void join() {
+ for (Thread thread : threads) {
+ try {
+ thread.join();
+ } catch (InterruptedException e) {
+ // ignore it and proceed to the next one
+ }
+ }
+ }
+
+ public static void main(String[] args) throws Exception {
+ ParallelProbes probes =
+ new ParallelProbes(args.length < 1 ? 1 : Integer.parseInt(args[0]));
+ probes.start();
+ probes.join();
+ }
+}
diff --git a/jdk/test/java/util/TimeZone/CLDRDisplayNamesTest.java b/jdk/test/java/util/TimeZone/CLDRDisplayNamesTest.java
index aae1c63..b6038ac 100644
--- a/jdk/test/java/util/TimeZone/CLDRDisplayNamesTest.java
+++ b/jdk/test/java/util/TimeZone/CLDRDisplayNamesTest.java
@@ -109,9 +109,6 @@
fmtROOT.parse("Thu Nov 13 04:35:51 AKST 2008");
fmtUS.parse("Thu Nov 13 04:35:51 AKST 2008");
fmtUK.parse("Thu Nov 13 04:35:51 GMT-09:00 2008");
- String dateString = new Date().toString();
- System.out.println("Date: "+dateString);
- System.out.println("Parsed Date: "+new Date(Date.parse(dateString)).toString());
} catch (ParseException pe) {
System.err.println(pe);
errors++;
diff --git a/jdk/test/java/util/concurrent/locks/ReentrantLock/TimeoutLockLoops.java b/jdk/test/java/util/concurrent/locks/ReentrantLock/TimeoutLockLoops.java
index 575a7bf..464f1f8 100644
--- a/jdk/test/java/util/concurrent/locks/ReentrantLock/TimeoutLockLoops.java
+++ b/jdk/test/java/util/concurrent/locks/ReentrantLock/TimeoutLockLoops.java
@@ -35,6 +35,7 @@
* @test
* @bug 4486658 5031862
* @run main TimeoutLockLoops
+ * @key intermittent
* @summary Checks for responsiveness of locks to timeouts.
* Runs under the assumption that ITERS computations require more than
* TIMEOUT msecs to complete, which seems to be a safe assumption for
diff --git a/jdk/test/javax/crypto/SealedObject/TestSealedObjectNull.java b/jdk/test/javax/crypto/SealedObject/TestSealedObjectNull.java
new file mode 100644
index 0000000..4b6eff2
--- /dev/null
+++ b/jdk/test/javax/crypto/SealedObject/TestSealedObjectNull.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2015, 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.io.IOException;
+import javax.crypto.BadPaddingException;
+import javax.crypto.Cipher;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.NullCipher;
+import javax.crypto.SealedObject;
+
+/*
+ * @test
+ * @bug 8048624
+ * @summary This test instantiate a NullCipher, seal and unseal a String
+ * object using the SealedObject with the initialized NullCipher,
+ * and then compare the String content.
+ */
+public class TestSealedObjectNull {
+
+ private static final String SEAL_STR = "Any String!@#$%^";
+
+ public static void main(String[] args) throws IOException,
+ IllegalBlockSizeException, ClassNotFoundException,
+ BadPaddingException {
+ Cipher nullCipher = new NullCipher();
+
+ // Seal
+ SealedObject so = new SealedObject(SEAL_STR, nullCipher);
+
+ // Unseal and compare
+ if (!(SEAL_STR.equals(so.getObject(nullCipher)))) {
+ throw new RuntimeException("Unseal and compare failed.");
+ }
+
+ System.out.println("Test passed.");
+ }
+}
diff --git a/jdk/test/javax/sound/sampled/FileReader/AudioFileClose.java b/jdk/test/javax/sound/sampled/FileReader/AudioFileClose.java
new file mode 100644
index 0000000..3655f9e
--- /dev/null
+++ b/jdk/test/javax/sound/sampled/FileReader/AudioFileClose.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2015, 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.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+
+import javax.sound.sampled.AudioSystem;
+import javax.sound.sampled.UnsupportedAudioFileException;
+
+/**
+ * @test
+ * @bug 8013586
+ * @author Sergey Bylokhov
+ */
+public final class AudioFileClose {
+
+ public static void main(final String[] args) throws Exception {
+ final File file = Files.createTempFile("JavaSound", "Test").toFile();
+ try (OutputStream fos = new FileOutputStream(file)) {
+ fos.write(new byte[200]);
+ }
+ try {
+ final InputStream stream = AudioSystem.getAudioInputStream(file);
+ stream.close();
+ } catch (final IOException | UnsupportedAudioFileException ignored) {
+ }
+ Files.delete(Paths.get(file.getAbsolutePath()));
+ }
+}
diff --git a/jdk/test/javax/sound/sampled/FileReader/ReadersExceptions.java b/jdk/test/javax/sound/sampled/FileReader/ReadersExceptions.java
index e0a386e..604c703 100644
--- a/jdk/test/javax/sound/sampled/FileReader/ReadersExceptions.java
+++ b/jdk/test/javax/sound/sampled/FileReader/ReadersExceptions.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, 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
@@ -21,17 +21,19 @@
* questions.
*/
-
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import javax.sound.sampled.AudioSystem;
import javax.sound.sampled.UnsupportedAudioFileException;
+import javax.sound.sampled.spi.AudioFileReader;
+
+import static java.util.ServiceLoader.load;
/**
* @test
- * @bug 7058662 7058666 7058672
+ * @bug 7058662 7058666 7058672 8130305
* @author Sergey Bylokhov
*/
public final class ReadersExceptions {
@@ -111,16 +113,18 @@
0, 0, 0, 0, // dataLength
};
+ static byte[][] data = {wrongAIFFCh, wrongAIFFSSL, wrongAIFFSSH, wrongAUCh,
+ wrongWAVCh, wrongWAVSSB};
+
public static void main(final String[] args) throws IOException {
- test(wrongAIFFCh);
- test(wrongAIFFSSL);
- test(wrongAIFFSSH);
- test(wrongAUCh);
- test(wrongWAVCh);
- test(wrongWAVSSB);
+ for (final byte[] bytes : data) {
+ testAS(bytes);
+ testAFR(bytes);
+ }
}
- private static void test(final byte[] buffer) throws IOException {
+ private static void testAS(final byte[] buffer) throws IOException {
+ // AudioSystem API
final InputStream is = new ByteArrayInputStream(buffer);
try {
AudioSystem.getAudioFileFormat(is);
@@ -130,4 +134,19 @@
}
throw new RuntimeException("Test Failed");
}
+
+ private static void testAFR(final byte[] buffer) throws IOException {
+ // AudioFileReader API
+ final InputStream is = new ByteArrayInputStream(buffer);
+ for (final AudioFileReader afr : load(AudioFileReader.class)) {
+ for (int i = 0; i < 10; ++i) {
+ try {
+ afr.getAudioFileFormat(is);
+ throw new RuntimeException("UAFE expected");
+ } catch (final UnsupportedAudioFileException ignored) {
+ // Expected.
+ }
+ }
+ }
+ }
}
diff --git a/jdk/test/javax/swing/JInternalFrame/SetLayerNPE/SetLayerNPE.java b/jdk/test/javax/swing/JInternalFrame/SetLayerNPE/SetLayerNPE.java
new file mode 100644
index 0000000..728c560
--- /dev/null
+++ b/jdk/test/javax/swing/JInternalFrame/SetLayerNPE/SetLayerNPE.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2015, 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 javax.swing.JDesktopPane;
+import javax.swing.JInternalFrame;
+
+/**
+ * @test
+ * @bug 6206439
+ */
+public final class SetLayerNPE {
+
+ public static void main(final String[] args) throws Exception {
+ EventQueue.invokeAndWait(() -> {
+ try {
+ // JInternalFrame without parent
+ new JInternalFrame("My Frame").setLayer(null);
+ throw new AssertionError("expected NPE was not thrown");
+ } catch (final NullPointerException ignored) {
+ }
+ });
+ EventQueue.invokeAndWait(() -> {
+ try {
+ // JInternalFrame with parent
+ JInternalFrame jif = new JInternalFrame("My Frame");
+ new JDesktopPane().add(jif);
+ jif.setLayer(null);
+ throw new AssertionError("expected NPE was not thrown");
+ } catch (final NullPointerException ignored) {
+ }
+ });
+ }
+}
diff --git a/jdk/test/javax/swing/JSplitPane/8132123/bug8132123.html b/jdk/test/javax/swing/JSplitPane/8132123/bug8132123.html
new file mode 100644
index 0000000..d65bd7b
--- /dev/null
+++ b/jdk/test/javax/swing/JSplitPane/8132123/bug8132123.html
@@ -0,0 +1,38 @@
+<!--
+ Copyright (c) 2015, 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.
+-->
+
+<html>
+<body>
+Verify that JSplitPane uses high-resolution system icons for the one-touch expanding
+buttons on HiDPI displays.
+
+If the display does not support HiDPI mode press PASS.
+
+1. Run the test on HiDPI Display.
+2. Check that the one-touch expanding buttons on the JSplitPane are painted
+correctly. If so, press PASS, else press FAIL.
+
+<applet code="bug8132123.class" width=250 height=250></applet>
+
+</body>
+</html>
diff --git a/jdk/test/javax/swing/JSplitPane/8132123/bug8132123.java b/jdk/test/javax/swing/JSplitPane/8132123/bug8132123.java
new file mode 100644
index 0000000..75b651d
--- /dev/null
+++ b/jdk/test/javax/swing/JSplitPane/8132123/bug8132123.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2015, 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.Color;
+import javax.swing.JApplet;
+import javax.swing.JPanel;
+import javax.swing.JSplitPane;
+import javax.swing.SwingUtilities;
+
+/* @test
+ * @bug 8132123
+ * @summary MultiResolutionCachedImage unnecessarily creates base image
+ * to get its size
+ * @author Alexander Scherbatiy
+ * @run applet/manual=yesno bug8132123.html
+ */
+public class bug8132123 extends JApplet {
+
+ @Override
+ public void init() {
+ SwingUtilities.invokeLater(() -> {
+ JPanel left = new JPanel();
+ left.setBackground(Color.GRAY);
+ JPanel right = new JPanel();
+ right.setBackground(Color.GRAY);
+ JSplitPane splitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT,
+ left, right);
+ splitPane.setOneTouchExpandable(true);
+ getContentPane().add(splitPane);
+ });
+ }
+}
diff --git a/jdk/test/javax/swing/JTextPane/JTextPaneDocumentAlignment.java b/jdk/test/javax/swing/JTextPane/JTextPaneDocumentAlignment.java
new file mode 100644
index 0000000..f75d1c0
--- /dev/null
+++ b/jdk/test/javax/swing/JTextPane/JTextPaneDocumentAlignment.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) 2015, 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 8132136
+ @summary [PIT] RTL orientation in JEditorPane is broken
+ @author Semyon Sadetsky
+ */
+
+import javax.swing.*;
+import javax.swing.text.BadLocationException;
+import javax.swing.text.SimpleAttributeSet;
+import javax.swing.text.StyleConstants;
+import java.awt.*;
+
+public class JTextPaneDocumentAlignment {
+
+ private static JFrame frame;
+ private static JTextPane jTextPane;
+ private static int position;
+
+ public static void main(String[] args) throws Exception{
+ SwingUtilities.invokeAndWait(new Runnable() {
+ @Override
+ public void run() {
+ frame = new JFrame();
+ frame.setUndecorated(true);
+ frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
+ frame.setSize(200, 200);
+ jTextPane = new JTextPane();
+ jTextPane.setContentType("text/html");
+ jTextPane.setText(
+ "<html><body><b id='test'>Test</b></body></html>");
+ SimpleAttributeSet right = new SimpleAttributeSet();
+ StyleConstants.setAlignment(right, StyleConstants.ALIGN_RIGHT);
+ jTextPane.getStyledDocument()
+ .setParagraphAttributes(0, 10, right, true);
+ frame.getContentPane().add(jTextPane);
+ frame.setVisible(true);
+ }
+ });
+ Robot robot = new Robot();
+ robot.waitForIdle();
+ robot.delay(200);
+ SwingUtilities.invokeAndWait(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ position = jTextPane.modelToView(1).x;
+ SimpleAttributeSet center = new SimpleAttributeSet();
+ StyleConstants.setAlignment(center,
+ StyleConstants.ALIGN_CENTER);
+ jTextPane.getStyledDocument()
+ .setParagraphAttributes(0, 10, center, true);
+ } catch (BadLocationException e) {
+ e.printStackTrace();
+ }
+ }
+ });
+ if(position < 100) {
+ throw new RuntimeException("Text is not right aligned " + position);
+ }
+ SwingUtilities.invokeAndWait(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ position = jTextPane.modelToView(1).x;
+ } catch (BadLocationException e) {
+ e.printStackTrace();
+ }
+ frame.dispose();
+ }
+ });
+ if(position < 20) {
+ throw new RuntimeException("Text is not center aligned " + position);
+ }
+ System.out.println("ok");
+ }
+}
diff --git a/jdk/test/sun/security/pkcs11/PKCS11Test.java b/jdk/test/sun/security/pkcs11/PKCS11Test.java
index 14238ac..1b4c281 100644
--- a/jdk/test/sun/security/pkcs11/PKCS11Test.java
+++ b/jdk/test/sun/security/pkcs11/PKCS11Test.java
@@ -630,4 +630,18 @@
return algorithms;
}
+ /**
+ * Get the identifier for the operating system distribution
+ */
+ public String getDistro() {
+
+ try (BufferedReader in =
+ new BufferedReader(new InputStreamReader(
+ Runtime.getRuntime().exec("uname -v").getInputStream()))) {
+
+ return in.readLine();
+ } catch (Exception e) {
+ return "";
+ }
+ }
}
diff --git a/jdk/test/sun/security/pkcs11/Signature/ByteBuffers.java b/jdk/test/sun/security/pkcs11/Signature/ByteBuffers.java
index 8a76866..d45063a 100644
--- a/jdk/test/sun/security/pkcs11/Signature/ByteBuffers.java
+++ b/jdk/test/sun/security/pkcs11/Signature/ByteBuffers.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -42,6 +42,22 @@
}
public void main(Provider p) throws Exception {
+
+ /*
+ * Use Solaris SPARC 11.2 or later to avoid an intermittent failure
+ * when running SunPKCS11-Solaris provider (8044554)
+ */
+ if (p.getName().equals("SunPKCS11-Solaris") &&
+ System.getProperty("os.name").equals("SunOS") &&
+ System.getProperty("os.arch").equals("sparcv9") &&
+ System.getProperty("os.version").compareTo("5.11") <= 0 &&
+ getDistro().compareTo("11.2") < 0) {
+
+ System.out.println("SunPKCS11-Solaris provider requires " +
+ "Solaris SPARC 11.2 or later, skipping");
+ return;
+ }
+
Random random = new Random();
int n = 10 * 1024;
byte[] t = new byte[n];
diff --git a/jdk/test/sun/security/pkcs11/Signature/ReinitSignature.java b/jdk/test/sun/security/pkcs11/Signature/ReinitSignature.java
index d5ace8b..0f51ffa 100644
--- a/jdk/test/sun/security/pkcs11/Signature/ReinitSignature.java
+++ b/jdk/test/sun/security/pkcs11/Signature/ReinitSignature.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -28,6 +28,306 @@
* @author Andreas Sterbenz
* @library ..
* @key randomness
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
+ * @run main ReinitSignature
*/
import java.util.*;
@@ -41,6 +341,22 @@
}
public void main(Provider p) throws Exception {
+
+ /*
+ * Use Solaris SPARC 11.2 or later to avoid an intermittent failure
+ * when running SunPKCS11-Solaris (8044554)
+ */
+ if (p.getName().equals("SunPKCS11-Solaris") &&
+ System.getProperty("os.name").equals("SunOS") &&
+ System.getProperty("os.arch").equals("sparcv9") &&
+ System.getProperty("os.version").compareTo("5.11") <= 0 &&
+ getDistro().compareTo("11.2") < 0) {
+
+ System.out.println("SunPKCS11-Solaris provider requires " +
+ "Solaris SPARC 11.2 or later, skipping");
+ return;
+ }
+
KeyPairGenerator kpg = KeyPairGenerator.getInstance("RSA", p);
kpg.initialize(512);
KeyPair kp = kpg.generateKeyPair();
diff --git a/jdk/test/sun/security/pkcs11/Signature/TestDSA.java b/jdk/test/sun/security/pkcs11/Signature/TestDSA.java
index 9f8c099..2b81bb3 100644
--- a/jdk/test/sun/security/pkcs11/Signature/TestDSA.java
+++ b/jdk/test/sun/security/pkcs11/Signature/TestDSA.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -110,6 +110,21 @@
System.out.println("Testing provider " + provider + "...");
+ /*
+ * Use Solaris SPARC 11.2 or later to avoid an intermittent failure
+ * when running SunPKCS11-Solaris (8044554)
+ */
+ if (provider.getName().equals("SunPKCS11-Solaris") &&
+ System.getProperty("os.name").equals("SunOS") &&
+ System.getProperty("os.arch").equals("sparcv9") &&
+ System.getProperty("os.version").compareTo("5.11") <= 0 &&
+ getDistro().compareTo("11.2") < 0) {
+
+ System.out.println("SunPKCS11-Solaris provider requires " +
+ "Solaris SPARC 11.2 or later, skipping");
+ return;
+ }
+
if (provider.getService("Signature", "SHA1withDSA") == null) {
System.out.println("DSA not supported, skipping");
return;
diff --git a/jdk/test/sun/security/pkcs11/Signature/TestDSAKeyLength.java b/jdk/test/sun/security/pkcs11/Signature/TestDSAKeyLength.java
index 0287e7d..efe9707 100644
--- a/jdk/test/sun/security/pkcs11/Signature/TestDSAKeyLength.java
+++ b/jdk/test/sun/security/pkcs11/Signature/TestDSAKeyLength.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, 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
@@ -46,6 +46,21 @@
return;
}
+ /*
+ * Use Solaris SPARC 11.2 or later to avoid an intermittent failure
+ * when running SunPKCS11-Solaris (8044554)
+ */
+ if (provider.getName().equals("SunPKCS11-Solaris") &&
+ System.getProperty("os.name").equals("SunOS") &&
+ System.getProperty("os.arch").equals("sparcv9") &&
+ System.getProperty("os.version").compareTo("5.11") <= 0 &&
+ getDistro().compareTo("11.2") < 0) {
+
+ System.out.println("SunPKCS11-Solaris provider requires " +
+ "Solaris SPARC 11.2 or later, skipping");
+ return;
+ }
+
KeyPairGenerator kpg = KeyPairGenerator.getInstance("DSA", "SUN");
kpg.initialize(2048, new SecureRandom());
KeyPair pair = kpg.generateKeyPair();
diff --git a/jdk/test/sun/security/pkcs11/Signature/TestRSAKeyLength.java b/jdk/test/sun/security/pkcs11/Signature/TestRSAKeyLength.java
index 9d6f62a..0b79e68 100644
--- a/jdk/test/sun/security/pkcs11/Signature/TestRSAKeyLength.java
+++ b/jdk/test/sun/security/pkcs11/Signature/TestRSAKeyLength.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, 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
@@ -36,6 +36,22 @@
main(new TestRSAKeyLength());
}
public void main(Provider p) throws Exception {
+
+ /*
+ * Use Solaris SPARC 11.2 or later to avoid an intermittent failure
+ * when running SunPKCS11-Solaris (8044554)
+ */
+ if (p.getName().equals("SunPKCS11-Solaris") &&
+ System.getProperty("os.name").equals("SunOS") &&
+ System.getProperty("os.arch").equals("sparcv9") &&
+ System.getProperty("os.version").compareTo("5.11") <= 0 &&
+ getDistro().compareTo("11.2") < 0) {
+
+ System.out.println("SunPKCS11-Solaris provider requires " +
+ "Solaris SPARC 11.2 or later, skipping");
+ return;
+ }
+
boolean isValidKeyLength[] = { true, true, true, false, false };
String algos[] = { "SHA1withRSA", "SHA224withRSA", "SHA256withRSA",
"SHA384withRSA", "SHA512withRSA" };
diff --git a/jdk/test/sun/security/pkcs11/ec/TestCurves.java b/jdk/test/sun/security/pkcs11/ec/TestCurves.java
index 6451e41..3ada778 100644
--- a/jdk/test/sun/security/pkcs11/ec/TestCurves.java
+++ b/jdk/test/sun/security/pkcs11/ec/TestCurves.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2015, 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
@@ -58,6 +58,21 @@
return;
}
+ /*
+ * Use Solaris SPARC 11.2 or later to avoid an intermittent failure
+ * when running SunPKCS11-Solaris (8044554)
+ */
+ if (p.getName().equals("SunPKCS11-Solaris") &&
+ System.getProperty("os.name").equals("SunOS") &&
+ System.getProperty("os.arch").equals("sparcv9") &&
+ System.getProperty("os.version").compareTo("5.11") <= 0 &&
+ getDistro().compareTo("11.2") < 0) {
+
+ System.out.println("SunPKCS11-Solaris provider requires " +
+ "Solaris SPARC 11.2 or later, skipping");
+ return;
+ }
+
// Check if this is sparc for later failure avoidance.
boolean sparc = false;
if (System.getProperty("os.arch").equals("sparcv9")) {
diff --git a/jdk/test/sun/security/pkcs11/ec/TestECDSA.java b/jdk/test/sun/security/pkcs11/ec/TestECDSA.java
index b811b44..b1bd35f 100644
--- a/jdk/test/sun/security/pkcs11/ec/TestECDSA.java
+++ b/jdk/test/sun/security/pkcs11/ec/TestECDSA.java
@@ -124,6 +124,21 @@
}
/*
+ * Use Solaris SPARC 11.2 or later to avoid an intermittent failure
+ * when running SunPKCS11-Solaris (8044554)
+ */
+ if (provider.getName().equals("SunPKCS11-Solaris") &&
+ System.getProperty("os.name").equals("SunOS") &&
+ System.getProperty("os.arch").equals("sparcv9") &&
+ System.getProperty("os.version").compareTo("5.11") <= 0 &&
+ getDistro().compareTo("11.2") < 0) {
+
+ System.out.println("SunPKCS11-Solaris provider requires " +
+ "Solaris SPARC 11.2 or later, skipping");
+ return;
+ }
+
+ /*
* PKCS11Test.main will remove this provider if needed
*/
Providers.setAt(provider, 1);
diff --git a/jdk/test/sun/security/pkcs11/rsa/TestCACerts.java b/jdk/test/sun/security/pkcs11/rsa/TestCACerts.java
index 32f3a46..cd845c6 100644
--- a/jdk/test/sun/security/pkcs11/rsa/TestCACerts.java
+++ b/jdk/test/sun/security/pkcs11/rsa/TestCACerts.java
@@ -47,6 +47,22 @@
}
public void main(Provider p) throws Exception {
+
+ /*
+ * Use Solaris SPARC 11.2 or later to avoid an intermittent failure
+ * when running SunPKCS11-Solaris (8044554)
+ */
+ if (p.getName().equals("SunPKCS11-Solaris") &&
+ System.getProperty("os.name").equals("SunOS") &&
+ System.getProperty("os.arch").equals("sparcv9") &&
+ System.getProperty("os.version").compareTo("5.11") <= 0 &&
+ getDistro().compareTo("11.2") < 0) {
+
+ System.out.println("SunPKCS11-Solaris provider requires " +
+ "Solaris SPARC 11.2 or later, skipping");
+ return;
+ }
+
long start = System.currentTimeMillis();
Providers.setAt(p, 1);
try {
diff --git a/jdk/test/sun/security/pkcs11/rsa/TestSignatures.java b/jdk/test/sun/security/pkcs11/rsa/TestSignatures.java
index b27de0a..a6070ea 100644
--- a/jdk/test/sun/security/pkcs11/rsa/TestSignatures.java
+++ b/jdk/test/sun/security/pkcs11/rsa/TestSignatures.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2015, 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
@@ -97,6 +97,22 @@
}
public void main(Provider p) throws Exception {
+
+ /*
+ * Use Solaris SPARC 11.2 or later to avoid an intermittent failure
+ * when running SunPKCS11-Solaris (8044554)
+ */
+ if (p.getName().equals("SunPKCS11-Solaris") &&
+ System.getProperty("os.name").equals("SunOS") &&
+ System.getProperty("os.arch").equals("sparcv9") &&
+ System.getProperty("os.version").compareTo("5.11") <= 0 &&
+ getDistro().compareTo("11.2") < 0) {
+
+ System.out.println("SunPKCS11-Solaris provider requires " +
+ "Solaris SPARC 11.2 or later, skipping");
+ return;
+ }
+
long start = System.currentTimeMillis();
provider = p;
data = new byte[2048];
diff --git a/jdk/test/tools/pack200/PackTestZip64.java b/jdk/test/tools/pack200/PackTestZip64.java
index 2c7d1a9..d952549 100644
--- a/jdk/test/tools/pack200/PackTestZip64.java
+++ b/jdk/test/tools/pack200/PackTestZip64.java
@@ -37,10 +37,13 @@
* @compile -XDignore.symbol.file Utils.java PackTestZip64.java
* @run main PackTestZip64
* @author kizune
- * @key intermittent
*/
public class PackTestZip64 {
+
+ private static final boolean bigJarEnabled
+ = Boolean.getBoolean("PackTestZip64.enableBigJar");
+
public static void main(String... args) throws Exception {
testPacking();
Utils.cleanup();
@@ -50,10 +53,14 @@
private static final byte[] BUFFER = new byte[1024];
static void testPacking() throws IOException {
- // make a copy of the test specimen to local directory
File testFile = new File("tools_java.jar");
- // Add a large number of small files to the golden jar
- generateLargeJar(testFile, Utils.getGoldenJar());
+ if (bigJarEnabled) {
+ // Add a large number of small files to the golden jar
+ generateLargeJar(testFile, Utils.getGoldenJar());
+ } else {
+ // make a copy of the test specimen to local directory
+ Utils.copyFile(Utils.getGoldenJar(), testFile);
+ }
List<String> cmdsList = new ArrayList<>();
diff --git a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/DocumentExtFunc.java b/jdk/test/tools/pack200/PackTestZip64Manual.java
similarity index 78%
copy from jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/DocumentExtFunc.java
copy to jdk/test/tools/pack200/PackTestZip64Manual.java
index 44976ed..38e4101 100644
--- a/jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/DocumentExtFunc.java
+++ b/jdk/test/tools/pack200/PackTestZip64Manual.java
@@ -21,15 +21,13 @@
* questions.
*/
-package javax.xml.transform;
+/*
+ * @test
+ * @bug 8029646
+ * @summary tests that native unpacker produces the same result as Java one
+ * @compile -XDignore.symbol.file Utils.java PackTestZip64.java
+ * @run main/manual/othervm -DPackTestZip64.enableBigJar=true PackTestZip64
+ */
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public class DocumentExtFunc {
-
- public static String test(NodeList list) {
- Node node = list.item(0);
- return "["+node.getNodeName() + ":" + node.getTextContent()+"]";
- }
+public class PackTestZip64Manual {
}
diff --git a/langtools/.hgtags b/langtools/.hgtags
index f59929a..8660ee4 100644
--- a/langtools/.hgtags
+++ b/langtools/.hgtags
@@ -319,3 +319,4 @@
02681b7c4232ba5d43ccba794492db9502211ff0 jdk9-b74
827915d1e55eac4f2e138f9b8c79d154862c2284 jdk9-b75
80ab772222fb6b85f8174bf97261178ee4026620 jdk9-b76
+6ec3d5cb1bfcfba135c8d18866e567f1b1ada861 jdk9-b77
diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
index 49dbb49..d381042 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
@@ -3686,10 +3686,6 @@
Env<AttrContext> env,
VarSymbol v,
boolean onlyWarning) {
-// System.err.println(v + " " + ((v.flags() & STATIC) != 0) + " " +
-// tree.pos + " " + v.pos + " " +
-// Resolve.isStatic(env));//DEBUG
-
// A forward reference is diagnosed if the declaration position
// of the variable is greater than the current tree position
// and the tree and variable definition occur in the same class
@@ -3697,14 +3693,15 @@
// This check applies only to class and instance
// variables. Local variables follow different scope rules,
// and are subject to definite assignment checking.
- if ((env.info.enclVar == v || v.pos > tree.pos) &&
+ Env<AttrContext> initEnv = enclosingInitEnv(env);
+ if (initEnv != null &&
+ (initEnv.info.enclVar == v || v.pos > tree.pos) &&
v.owner.kind == TYP &&
- enclosingInitEnv(env) != null &&
v.owner == env.info.scope.owner.enclClass() &&
((v.flags() & STATIC) != 0) == Resolve.isStatic(env) &&
(!env.tree.hasTag(ASSIGN) ||
TreeInfo.skipParens(((JCAssign) env.tree).lhs) != tree)) {
- String suffix = (env.info.enclVar == v) ?
+ String suffix = (initEnv.info.enclVar == v) ?
"self.ref" : "forward.ref";
if (!onlyWarning || isStaticEnumField(v)) {
log.error(tree.pos(), "illegal." + suffix);
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/JavadocTool.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/JavadocTool.java
index ae5b7c6..617d4cd 100644
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/JavadocTool.java
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/JavadocTool.java
@@ -31,9 +31,12 @@
import java.util.EnumSet;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
import java.util.Map;
import java.util.Set;
+import javax.tools.JavaFileManager;
import javax.tools.JavaFileManager.Location;
import javax.tools.JavaFileObject;
import javax.tools.StandardJavaFileManager;
@@ -124,7 +127,7 @@
public RootDocImpl getRootDocImpl(String doclocale,
String encoding,
ModifierFilter filter,
- List<String> javaNames,
+ List<String> args,
List<String[]> options,
Iterable<? extends JavaFileObject> fileObjects,
boolean breakiterator,
@@ -144,61 +147,79 @@
javadocFinder.sourceCompleter = docClasses ? Completer.NULL_COMPLETER : sourceCompleter;
- ListBuffer<String> names = new ListBuffer<>();
+ if (docClasses) {
+ // If -Xclasses is set, the args should be a series of class names
+ for (String arg: args) {
+ if (!isValidPackageName(arg)) // checks
+ docenv.error(null, "main.illegal_class_name", arg);
+ }
+ if (messager.nerrors() != 0) {
+ return null;
+ }
+ return new RootDocImpl(docenv, args, options);
+ }
+
ListBuffer<JCCompilationUnit> classTrees = new ListBuffer<>();
- ListBuffer<JCCompilationUnit> packTrees = new ListBuffer<>();
+ Set<String> includedPackages = new LinkedHashSet<>();
try {
StandardJavaFileManager fm = docenv.fileManager instanceof StandardJavaFileManager
? (StandardJavaFileManager) docenv.fileManager : null;
- for (List<String> it = javaNames; it.nonEmpty(); it = it.tail) {
- String name = it.head;
- if (!docClasses && fm != null && name.endsWith(".java") && new File(name).exists()) {
- JavaFileObject fo = fm.getJavaFileObjects(name).iterator().next();
- parse(fo, classTrees, true);
- } else if (isValidPackageName(name)) {
- names = names.append(name);
- } else if (name.endsWith(".java")) {
+ Set<String> packageNames = new LinkedHashSet<>();
+ // Normally, the args should be a series of package names or file names.
+ // Parse the files and collect the package names.
+ for (String arg: args) {
+ if (fm != null && arg.endsWith(".java") && new File(arg).exists()) {
+ parse(fm.getJavaFileObjects(arg), classTrees, true);
+ } else if (isValidPackageName(arg)) {
+ packageNames.add(arg);
+ } else if (arg.endsWith(".java")) {
if (fm == null)
throw new IllegalArgumentException();
else
- docenv.error(null, "main.file_not_found", name);
+ docenv.error(null, "main.file_not_found", arg);
} else {
- docenv.error(null, "main.illegal_package_name", name);
+ docenv.error(null, "main.illegal_package_name", arg);
}
}
- for (JavaFileObject fo: fileObjects) {
- parse(fo, classTrees, true);
+
+ // Parse file objects provide via the DocumentationTool API
+ parse(fileObjects, classTrees, true);
+
+ // Build up the complete list of any packages to be documented
+ Location location = docenv.fileManager.hasLocation(StandardLocation.SOURCE_PATH)
+ ? StandardLocation.SOURCE_PATH : StandardLocation.CLASS_PATH;
+
+ PackageTable t = new PackageTable(docenv.fileManager, location)
+ .packages(packageNames)
+ .subpackages(subPackages, excludedPackages);
+
+ includedPackages = t.getIncludedPackages();
+
+ // Parse the files in the packages to be documented
+ ListBuffer<JCCompilationUnit> packageTrees = new ListBuffer<>();
+ for (String packageName: includedPackages) {
+ List<JavaFileObject> files = t.getFiles(packageName);
+ docenv.notice("main.Loading_source_files_for_package", packageName);
+
+ if (files.isEmpty())
+ messager.warning(Messager.NOPOS, "main.no_source_files_for_package", packageName);
+ parse(files, packageTrees, false);
}
- if (!docClasses) {
- // Recursively search given subpackages. If any packages
- //are found, add them to the list.
- Map<String,List<JavaFileObject>> packageFiles =
- searchSubPackages(subPackages, names, excludedPackages);
-
- // Parse the packages
- for (List<String> packs = names.toList(); packs.nonEmpty(); packs = packs.tail) {
- // Parse sources ostensibly belonging to package.
- String packageName = packs.head;
- parsePackageClasses(packageName, packageFiles.get(packageName), packTrees, excludedPackages);
- }
-
- if (messager.nerrors() != 0) return null;
-
- // Enter symbols for all files
- docenv.notice("main.Building_tree");
- javadocEnter.main(classTrees.toList().appendList(packTrees.toList()));
+ if (messager.nerrors() != 0) {
+ return null;
}
+
+ // Enter symbols for all files
+ docenv.notice("main.Building_tree");
+ javadocEnter.main(classTrees.toList().appendList(packageTrees.toList()));
} catch (Abort ex) {}
if (messager.nerrors() != 0)
return null;
- if (docClasses)
- return new RootDocImpl(docenv, javaNames, options);
- else
- return new RootDocImpl(docenv, listClasses(classTrees.toList()), names.toList(), options);
+ return new RootDocImpl(docenv, listClasses(classTrees.toList()), List.from(includedPackages), options);
}
/** Is the given string a valid package name? */
@@ -211,185 +232,17 @@
return isValidClassName(s);
}
- /**
- * search all directories in path for subdirectory name. Add all
- * .java files found in such a directory to args.
- */
- private void parsePackageClasses(String name,
- List<JavaFileObject> files,
- ListBuffer<JCCompilationUnit> trees,
- List<String> excludedPackages)
- throws IOException {
- if (excludedPackages.contains(name)) {
- return;
- }
-
- docenv.notice("main.Loading_source_files_for_package", name);
-
- if (files == null) {
- Location location = docenv.fileManager.hasLocation(StandardLocation.SOURCE_PATH)
- ? StandardLocation.SOURCE_PATH : StandardLocation.CLASS_PATH;
- ListBuffer<JavaFileObject> lb = new ListBuffer<>();
- for (JavaFileObject fo: docenv.fileManager.list(
- location, name, EnumSet.of(JavaFileObject.Kind.SOURCE), false)) {
- String binaryName = docenv.fileManager.inferBinaryName(location, fo);
- String simpleName = getSimpleName(binaryName);
- if (isValidClassName(simpleName)) {
- lb.append(fo);
- }
- }
- files = lb.toList();
- }
- if (files.nonEmpty()) {
- for (JavaFileObject fo : files) {
- parse(fo, trees, false);
- }
- } else {
- messager.warning(Messager.NOPOS, "main.no_source_files_for_package",
- name.replace(File.separatorChar, '.'));
- }
- }
-
- private void parse(JavaFileObject fo, ListBuffer<JCCompilationUnit> trees,
+ private void parse(Iterable<? extends JavaFileObject> files, ListBuffer<JCCompilationUnit> trees,
boolean trace) {
- if (uniquefiles.add(fo)) { // ignore duplicates
- if (trace)
- docenv.notice("main.Loading_source_file", fo.getName());
- trees.append(parse(fo));
- }
- }
-
- /**
- * Recursively search all directories in path for subdirectory name.
- * Add all packages found in such a directory to packages list.
- */
- private Map<String,List<JavaFileObject>> searchSubPackages(
- List<String> subPackages,
- ListBuffer<String> packages,
- List<String> excludedPackages)
- throws IOException {
- Map<String,List<JavaFileObject>> packageFiles = new HashMap<>();
-
- Map<String,Boolean> includedPackages = new HashMap<>();
- includedPackages.put("", true);
- for (String p: excludedPackages)
- includedPackages.put(p, false);
-
- StandardLocation path = docenv.fileManager.hasLocation(StandardLocation.SOURCE_PATH)
- ? StandardLocation.SOURCE_PATH : StandardLocation.CLASS_PATH;
-
- searchSubPackages(subPackages,
- includedPackages,
- packages, packageFiles,
- path,
- EnumSet.of(JavaFileObject.Kind.SOURCE));
-
- return packageFiles;
- }
-
- private void searchSubPackages(List<String> subPackages,
- Map<String,Boolean> includedPackages,
- ListBuffer<String> packages,
- Map<String, List<JavaFileObject>> packageFiles,
- StandardLocation location, Set<JavaFileObject.Kind> kinds)
- throws IOException {
- for (String subPackage: subPackages) {
- if (!isIncluded(subPackage, includedPackages))
- continue;
-
- for (JavaFileObject fo: docenv.fileManager.list(location, subPackage, kinds, true)) {
- String binaryName = docenv.fileManager.inferBinaryName(location, fo);
- String packageName = getPackageName(binaryName);
- String simpleName = getSimpleName(binaryName);
- if (isIncluded(packageName, includedPackages) && isValidClassName(simpleName)) {
- List<JavaFileObject> list = packageFiles.get(packageName);
- list = (list == null ? List.of(fo) : list.prepend(fo));
- packageFiles.put(packageName, list);
- if (!packages.contains(packageName))
- packages.add(packageName);
- }
+ for (JavaFileObject fo: files) {
+ if (uniquefiles.add(fo)) { // ignore duplicates
+ if (trace)
+ docenv.notice("main.Loading_source_file", fo.getName());
+ trees.append(parse(fo));
}
}
}
- private String getPackageName(String name) {
- int lastDot = name.lastIndexOf(".");
- return (lastDot == -1 ? "" : name.substring(0, lastDot));
- }
-
- private String getSimpleName(String name) {
- int lastDot = name.lastIndexOf(".");
- return (lastDot == -1 ? name : name.substring(lastDot + 1));
- }
-
- private boolean isIncluded(String packageName, Map<String,Boolean> includedPackages) {
- Boolean b = includedPackages.get(packageName);
- if (b == null) {
- b = isIncluded(getPackageName(packageName), includedPackages);
- includedPackages.put(packageName, b);
- }
- return b;
- }
-
- /**
- * Recursively search all directories in path for subdirectory name.
- * Add all packages found in such a directory to packages list.
- */
- private void searchSubPackage(String packageName,
- ListBuffer<String> packages,
- List<String> excludedPackages,
- Collection<File> pathnames) {
- if (excludedPackages.contains(packageName))
- return;
-
- String packageFilename = packageName.replace('.', File.separatorChar);
- boolean addedPackage = false;
- for (File pathname : pathnames) {
- File f = new File(pathname, packageFilename);
- String filenames[] = f.list();
- // if filenames not null, then found directory
- if (filenames != null) {
- for (String filename : filenames) {
- if (!addedPackage
- && (isValidJavaSourceFile(filename) ||
- isValidJavaClassFile(filename))
- && !packages.contains(packageName)) {
- packages.append(packageName);
- addedPackage = true;
- } else if (isValidClassName(filename) &&
- (new File(f, filename)).isDirectory()) {
- searchSubPackage(packageName + "." + filename,
- packages, excludedPackages, pathnames);
- }
- }
- }
- }
- }
-
- /**
- * Return true if given file name is a valid class file name.
- * @param file the name of the file to check.
- * @return true if given file name is a valid class file name
- * and false otherwise.
- */
- private static boolean isValidJavaClassFile(String file) {
- if (!file.endsWith(".class")) return false;
- String clazzName = file.substring(0, file.length() - ".class".length());
- return isValidClassName(clazzName);
- }
-
- /**
- * Return true if given file name is a valid Java source file name.
- * @param file the name of the file to check.
- * @return true if given file name is a valid Java source file name
- * and false otherwise.
- */
- private static boolean isValidJavaSourceFile(String file) {
- if (!file.endsWith(".java")) return false;
- String clazzName = file.substring(0, file.length() - ".java".length());
- return isValidClassName(clazzName);
- }
-
/** Are surrogates supported?
*/
final static boolean surrogatesSupported = surrogatesSupported();
@@ -445,4 +298,118 @@
return result.toList();
}
+ /**
+ * A table to manage included and excluded packages.
+ */
+ static class PackageTable {
+ private final Map<String, Entry> entries = new LinkedHashMap<>();
+ private final Set<String> includedPackages = new LinkedHashSet<>();
+ private final JavaFileManager fm;
+ private final Location location;
+ private final Set<JavaFileObject.Kind> sourceKinds = EnumSet.of(JavaFileObject.Kind.SOURCE);
+
+ /**
+ * Creates a table to manage included and excluded packages.
+ * @param fm The file manager used to locate source files
+ * @param locn the location used to locate source files
+ */
+ PackageTable(JavaFileManager fm, Location locn) {
+ this.fm = fm;
+ this.location = locn;
+ getEntry("").excluded = false;
+ }
+
+ PackageTable packages(Collection<String> packageNames) {
+ includedPackages.addAll(packageNames);
+ return this;
+ }
+
+ PackageTable subpackages(Collection<String> packageNames, Collection<String> excludePackageNames)
+ throws IOException {
+ for (String p: excludePackageNames) {
+ getEntry(p).excluded = true;
+ }
+
+ for (String packageName: packageNames) {
+ for (JavaFileObject fo: fm.list(location, packageName, sourceKinds, true)) {
+ String binaryName = fm.inferBinaryName(location, fo);
+ String pn = getPackageName(binaryName);
+ String simpleName = getSimpleName(binaryName);
+ Entry e = getEntry(pn);
+ if (!e.isExcluded() && isValidClassName(simpleName)) {
+ includedPackages.add(pn);
+ e.files = (e.files == null ? List.of(fo) : e.files.prepend(fo));
+ }
+ }
+ }
+ return this;
+ }
+
+ /**
+ * Returns the aggregate set of included packages.
+ * @return the aggregate set of included packages
+ */
+ Set<String> getIncludedPackages() {
+ return includedPackages;
+ }
+
+ /**
+ * Returns the set of source files for a package.
+ * @param packageName the specified package
+ * @return the set of file objects for the specified package
+ * @throws IOException if an error occurs while accessing the files
+ */
+ List<JavaFileObject> getFiles(String packageName) throws IOException {
+ Entry e = getEntry(packageName);
+ // The files may have been found as a side effect of searching for subpackages
+ if (e.files != null)
+ return e.files;
+
+ ListBuffer<JavaFileObject> lb = new ListBuffer<>();
+ for (JavaFileObject fo: fm.list(location, packageName, sourceKinds, false)) {
+ String binaryName = fm.inferBinaryName(location, fo);
+ String simpleName = getSimpleName(binaryName);
+ if (isValidClassName(simpleName)) {
+ lb.append(fo);
+ }
+ }
+
+ return lb.toList();
+ }
+
+
+ private Entry getEntry(String name) {
+ Entry e = entries.get(name);
+ if (e == null)
+ entries.put(name, e = new Entry(name));
+ return e;
+ }
+
+ private String getPackageName(String name) {
+ int lastDot = name.lastIndexOf(".");
+ return (lastDot == -1 ? "" : name.substring(0, lastDot));
+ }
+
+ private String getSimpleName(String name) {
+ int lastDot = name.lastIndexOf(".");
+ return (lastDot == -1 ? name : name.substring(lastDot + 1));
+ }
+
+ class Entry {
+ final String name;
+ Boolean excluded;
+ List<JavaFileObject> files;
+
+ Entry(String name) {
+ this.name = name;
+ }
+
+ boolean isExcluded() {
+ if (excluded == null)
+ excluded = getEntry(getPackageName(name)).isExcluded();
+ return excluded;
+ }
+ }
+ }
+
}
diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/resources/javadoc.properties b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/resources/javadoc.properties
index 29604be..105ab1c 100644
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/resources/javadoc.properties
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/resources/javadoc.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1997, 2015, 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
@@ -91,6 +91,7 @@
main.illegal_locale_name=Locale not available: {0}
main.malformed_locale_name=Malformed locale name: {0}
main.file_not_found=File not found: "{0}"
+main.illegal_class_name=Illegal class name: "{0}"
main.illegal_package_name=Illegal package name: "{0}"
main.release.bootclasspath.conflict=option {0} cannot be used together with -release
main.unsupported.release.version=release version {0} not supported
diff --git a/langtools/test/tools/javac/lambda/T8024809/SelfInitializerInLambdaTesta.java b/langtools/test/tools/javac/lambda/T8024809/SelfInitializerInLambdaTesta.java
deleted file mode 100644
index 408f7b8..0000000
--- a/langtools/test/tools/javac/lambda/T8024809/SelfInitializerInLambdaTesta.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2013, 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 8024809
- * @summary javac, some lambda programs are rejected by flow analysis
- * @compile/fail/ref=SelfInitializerInLambdaTesta.out -XDrawDiagnostics SelfInitializerInLambdaTesta.java
- */
-
-public class SelfInitializerInLambdaTesta {
-
- final Runnable r1 = ()->System.out.println(r1);
-
- final Object lock = new Object();
-
- final Runnable r2 = ()->{
- System.out.println(r2);
- synchronized (lock){}
- };
-
- final Runnable r3 = ()->{
- synchronized (lock){
- System.out.println(r3);
- }
- };
-
- final Runnable r4 = ()->{
- System.out.println(r4);
- };
-
- interface SAM {
- int m(String s);
- }
-
- final SAM s1 = (String s)->{
- System.out.println(s + s1.toString());
- return 0;
- };
-
- final SAM s2 = (s)->{
- System.out.println(s + s2.toString());
- return 0;
- };
-}
diff --git a/langtools/test/tools/javac/lambda/T8024809/SelfInitializerInLambdaTesta.out b/langtools/test/tools/javac/lambda/T8024809/SelfInitializerInLambdaTesta.out
deleted file mode 100644
index fcf50e8..0000000
--- a/langtools/test/tools/javac/lambda/T8024809/SelfInitializerInLambdaTesta.out
+++ /dev/null
@@ -1,7 +0,0 @@
-SelfInitializerInLambdaTesta.java:33:48: compiler.err.illegal.self.ref
-SelfInitializerInLambdaTesta.java:38:28: compiler.err.illegal.self.ref
-SelfInitializerInLambdaTesta.java:44:32: compiler.err.illegal.self.ref
-SelfInitializerInLambdaTesta.java:49:28: compiler.err.illegal.self.ref
-SelfInitializerInLambdaTesta.java:57:32: compiler.err.illegal.self.ref
-SelfInitializerInLambdaTesta.java:62:32: compiler.err.illegal.self.ref
-6 errors
diff --git a/langtools/test/tools/javac/lambda/T8024809/SelfInitializerInLambdaTestb.java b/langtools/test/tools/javac/lambda/T8024809/SelfInitializerInLambdaTestb.java
deleted file mode 100644
index 87c254f..0000000
--- a/langtools/test/tools/javac/lambda/T8024809/SelfInitializerInLambdaTestb.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2013, 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 8024809
- * @summary javac, some lambda programs are rejected by flow analysis
- * @compile/fail/ref=SelfInitializerInLambdaTestb.out -XDrawDiagnostics SelfInitializerInLambdaTestb.java
- */
-
-public class SelfInitializerInLambdaTestb {
-
- final Runnable r1;
-
- final Runnable r2 = ()-> System.out.println(r1);
-
- SelfInitializerInLambdaTestb() {
- r1 = ()->System.out.println(r1);
- }
-}
diff --git a/langtools/test/tools/javac/lambda/T8024809/SelfInitializerInLambdaTestb.out b/langtools/test/tools/javac/lambda/T8024809/SelfInitializerInLambdaTestb.out
deleted file mode 100644
index ebbdcab..0000000
--- a/langtools/test/tools/javac/lambda/T8024809/SelfInitializerInLambdaTestb.out
+++ /dev/null
@@ -1,3 +0,0 @@
-SelfInitializerInLambdaTestb.java:35:49: compiler.err.var.might.not.have.been.initialized: r1
-SelfInitializerInLambdaTestb.java:38:37: compiler.err.var.might.not.have.been.initialized: r1
-2 errors
diff --git a/langtools/test/tools/javac/lambda/self_initializer/T8024809/SelfInitializerInLambdaTesta.java b/langtools/test/tools/javac/lambda/self_initializer/T8024809/SelfInitializerInLambdaTesta.java
new file mode 100644
index 0000000..50d1495
--- /dev/null
+++ b/langtools/test/tools/javac/lambda/self_initializer/T8024809/SelfInitializerInLambdaTesta.java
@@ -0,0 +1,42 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 8024809
+ * @summary javac, some lambda programs are rejected by flow analysis
+ * @compile/fail/ref=SelfInitializerInLambdaTesta.out -XDrawDiagnostics SelfInitializerInLambdaTesta.java
+ */
+
+public class SelfInitializerInLambdaTesta {
+
+ final Runnable r1 = ()->System.out.println(r1);
+
+ final Object lock = new Object();
+
+ final Runnable r2 = ()->{
+ System.out.println(r2);
+ synchronized (lock){}
+ };
+
+ final Runnable r3 = ()->{
+ synchronized (lock){
+ System.out.println(r3);
+ }
+ };
+
+ final Runnable r4 = ()->{
+ System.out.println(r4);
+ };
+
+ interface SAM {
+ int m(String s);
+ }
+
+ final SAM s1 = (String s)->{
+ System.out.println(s + s1.toString());
+ return 0;
+ };
+
+ final SAM s2 = (s)->{
+ System.out.println(s + s2.toString());
+ return 0;
+ };
+}
diff --git a/langtools/test/tools/javac/lambda/self_initializer/T8024809/SelfInitializerInLambdaTesta.out b/langtools/test/tools/javac/lambda/self_initializer/T8024809/SelfInitializerInLambdaTesta.out
new file mode 100644
index 0000000..9c0a835
--- /dev/null
+++ b/langtools/test/tools/javac/lambda/self_initializer/T8024809/SelfInitializerInLambdaTesta.out
@@ -0,0 +1,7 @@
+SelfInitializerInLambdaTesta.java:10:48: compiler.err.illegal.self.ref
+SelfInitializerInLambdaTesta.java:15:28: compiler.err.illegal.self.ref
+SelfInitializerInLambdaTesta.java:21:32: compiler.err.illegal.self.ref
+SelfInitializerInLambdaTesta.java:26:28: compiler.err.illegal.self.ref
+SelfInitializerInLambdaTesta.java:34:32: compiler.err.illegal.self.ref
+SelfInitializerInLambdaTesta.java:39:32: compiler.err.illegal.self.ref
+6 errors
diff --git a/langtools/test/tools/javac/lambda/self_initializer/T8024809/SelfInitializerInLambdaTestb.java b/langtools/test/tools/javac/lambda/self_initializer/T8024809/SelfInitializerInLambdaTestb.java
new file mode 100644
index 0000000..e68e42a
--- /dev/null
+++ b/langtools/test/tools/javac/lambda/self_initializer/T8024809/SelfInitializerInLambdaTestb.java
@@ -0,0 +1,17 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 8024809
+ * @summary javac, some lambda programs are rejected by flow analysis
+ * @compile/fail/ref=SelfInitializerInLambdaTestb.out -XDrawDiagnostics SelfInitializerInLambdaTestb.java
+ */
+
+public class SelfInitializerInLambdaTestb {
+
+ final Runnable r1;
+
+ final Runnable r2 = ()-> System.out.println(r1);
+
+ SelfInitializerInLambdaTestb() {
+ r1 = ()->System.out.println(r1);
+ }
+}
diff --git a/langtools/test/tools/javac/lambda/self_initializer/T8024809/SelfInitializerInLambdaTestb.out b/langtools/test/tools/javac/lambda/self_initializer/T8024809/SelfInitializerInLambdaTestb.out
new file mode 100644
index 0000000..61a2e61
--- /dev/null
+++ b/langtools/test/tools/javac/lambda/self_initializer/T8024809/SelfInitializerInLambdaTestb.out
@@ -0,0 +1,3 @@
+SelfInitializerInLambdaTestb.java:12:49: compiler.err.var.might.not.have.been.initialized: r1
+SelfInitializerInLambdaTestb.java:15:37: compiler.err.var.might.not.have.been.initialized: r1
+2 errors
diff --git a/langtools/test/tools/javac/lambda/self_initializer/T8053906/SelfInitializerInLambdaTestc.java b/langtools/test/tools/javac/lambda/self_initializer/T8053906/SelfInitializerInLambdaTestc.java
new file mode 100644
index 0000000..9e3e806
--- /dev/null
+++ b/langtools/test/tools/javac/lambda/self_initializer/T8053906/SelfInitializerInLambdaTestc.java
@@ -0,0 +1,26 @@
+/*
+ * @test /nodynamiccopyright/
+ * @bug 8053906
+ * @summary javac, some lambda programs are rejected by flow analysis
+ * @compile/fail/ref=SelfInitializerInLambdaTestc.out -XDrawDiagnostics SelfInitializerInLambdaTestc.java
+ */
+
+public class SelfInitializerInLambdaTestc {
+ interface SAM {
+ void foo();
+ }
+
+ final SAM notInitialized = ()-> {
+ SAM simpleVariable = () -> notInitialized.foo();
+ };
+
+ final SAM notInitialized2 = ()-> {
+ SAM simpleVariable1 = () -> {
+ SAM simpleVariable2 = () -> {
+ SAM simpleVariable3 = () -> {
+ SAM simpleVariable4 = () -> notInitialized2.foo();
+ };
+ };
+ };
+ };
+}
diff --git a/langtools/test/tools/javac/lambda/self_initializer/T8053906/SelfInitializerInLambdaTestc.out b/langtools/test/tools/javac/lambda/self_initializer/T8053906/SelfInitializerInLambdaTestc.out
new file mode 100644
index 0000000..a220914
--- /dev/null
+++ b/langtools/test/tools/javac/lambda/self_initializer/T8053906/SelfInitializerInLambdaTestc.out
@@ -0,0 +1,3 @@
+SelfInitializerInLambdaTestc.java:14:36: compiler.err.illegal.self.ref
+SelfInitializerInLambdaTestc.java:21:49: compiler.err.illegal.self.ref
+2 errors
diff --git a/make/CompileJavaModules.gmk b/make/CompileJavaModules.gmk
index ea48c7f..a68908c 100644
--- a/make/CompileJavaModules.gmk
+++ b/make/CompileJavaModules.gmk
@@ -491,6 +491,7 @@
$(CORBA_TOPDIR)/src/$1/share/classes \
$(JAXP_TOPDIR)/src/$1/share/classes \
$(JAXWS_TOPDIR)/src/$1/share/classes \
+ $(NASHORN_TOPDIR)/src/$1/share/classes \
#
ALL_SRC_DIRS = \
@@ -512,8 +513,8 @@
JDK_USER_DEFINED_FILTER := $(strip $(subst $(COMMA),$(SPACE), $(JDK_FILTER)))
# Create an empty directory to set the bootclasspath to.
-EMPTY_BOOTCLASSPATH := $(SUPPORT_OUTPUTDIR)/empty-dir
-$(call MakeDir, $(EMPTY_BOOTCLASSPATH))
+EMPTY_DIR := $(SUPPORT_OUTPUTDIR)/empty-dir
+$(call MakeDir, $(EMPTY_DIR))
# This macro sets up compilation of a module and declares dependencies for it.
# Param 1 - module name
@@ -534,7 +535,7 @@
$1_CLASSPATH := $$($1_CLASSPATH) $$(addprefix $(JDK_OUTPUTDIR)/modules/,jdk.hotspot.agent)
endif
$1_CLASSPATH := $$(subst $$(SPACE),$$(PATH_SEP),$$($1_CLASSPATH))
- $1_JAVAC_FLAGS := -bootclasspath $(EMPTY_BOOTCLASSPATH) -classpath "$$($1_CLASSPATH)" $$($1_ADD_JAVAC_FLAGS)
+ $1_JAVAC_FLAGS := -bootclasspath $(EMPTY_DIR) -extdirs $(EMPTY_DIR) -endorseddirs $(EMPTY_DIR) -classpath "$$($1_CLASSPATH)" $$($1_ADD_JAVAC_FLAGS)
$$(eval $$(call SetupJavaCompilation,$1, \
SETUP := $$(if $$($1_SETUP), $$($1_SETUP), GENERATE_JDKBYTECODE), \
diff --git a/make/Images.gmk b/make/Images.gmk
index 0dfba0f..d3b60a2 100644
--- a/make/Images.gmk
+++ b/make/Images.gmk
@@ -46,9 +46,9 @@
jdk.naming.dns jdk.naming.rmi jdk.scripting.nashorn jdk.zipfs
# tools
-TOOLS_MODULES += jdk.attach jdk.compiler jdk.dev jdk.internal.le jdk.javadoc jdk.jcmd jdk.jconsole \
- jdk.hotspot.agent jdk.hprof.agent jdk.jartool jdk.jdeps jdk.jdi jdk.jdwp.agent \
- jdk.policytool jdk.rmic jdk.xml.bind jdk.xml.ws
+TOOLS_MODULES += jdk.attach jdk.compiler jdk.dev jdk.internal.le jdk.scripting.nashorn.shell \
+ jdk.javadoc jdk.jcmd jdk.jconsole jdk.hotspot.agent jdk.hprof.agent jdk.jartool \
+ jdk.jdeps jdk.jdi jdk.jdwp.agent jdk.policytool jdk.rmic jdk.xml.bind jdk.xml.ws
ifeq ($(OPENJDK_TARGET_OS), windows)
PROVIDER_MODULES += jdk.crypto.mscapi
diff --git a/modules.xml b/modules.xml
index 5188fd4..0445602 100644
--- a/modules.xml
+++ b/modules.xml
@@ -1799,6 +1799,25 @@
<depend>java.base</depend>
<depend>java.logging</depend>
<depend>java.scripting</depend>
+ <export>
+ <name>jdk.nashorn.internal.runtime</name>
+ <to>jdk.scripting.nashorn.shell</to>
+ </export>
+ <export>
+ <name>jdk.nashorn.internal.objects</name>
+ <to>jdk.scripting.nashorn.shell</to>
+ </export>
+ <export>
+ <name>jdk.nashorn.tools</name>
+ <to>jdk.scripting.nashorn.shell</to>
+ </export>
+ </module>
+ <module>
+ <name>jdk.scripting.nashorn.shell</name>
+ <depend>java.base</depend>
+ <depend>java.prefs</depend>
+ <depend>jdk.scripting.nashorn</depend>
+ <depend>jdk.internal.le</depend>
</module>
<module>
<name>jdk.sctp</name>
diff --git a/nashorn/.hgtags b/nashorn/.hgtags
index bd520db..c929021 100644
--- a/nashorn/.hgtags
+++ b/nashorn/.hgtags
@@ -310,3 +310,4 @@
2e8bb16872d7b15dc0a4f8e45c6ad65f762c1b04 jdk9-b74
f884dff432a7ac349153f3d1ea1eb222f3764c6c jdk9-b75
ab231613d7206431ba31917a02e7cedd70e88e70 jdk9-b76
+33cecbc59f2ad78ac0934cbc3e014d346077e848 jdk9-b77
diff --git a/nashorn/make/BuildNashorn.gmk b/nashorn/make/BuildNashorn.gmk
index 044ee4e..45b8f27 100644
--- a/nashorn/make/BuildNashorn.gmk
+++ b/nashorn/make/BuildNashorn.gmk
@@ -53,7 +53,10 @@
SERVER_JVM := $(SJAVAC_SERVER_JAVA)))
# Build nashorn into intermediate directory
-$(eval $(call SetupJavaCompilation,BUILD_NASHORN, \
+# Name the compilation setup the same as the module, as is done in the global
+# CompileJavaModules.gmk, to make dependency checking with other modules work
+# seamlessly.
+$(eval $(call SetupJavaCompilation,jdk.scripting.nashorn, \
SETUP := GENERATE_NEWBYTECODE_DEBUG, \
SRC := $(NASHORN_TOPDIR)/src/jdk.scripting.nashorn/share/classes, \
EXCLUDE_FILES := META-INF/MANIFEST.MF, \
@@ -71,7 +74,7 @@
ADD_JAVAC_FLAGS := -Xbootclasspath/p:"$(SUPPORT_OUTPUTDIR)/special_classes/jdk.scripting.nashorn/classes"))
# Nasgen needs nashorn classes
-$(BUILD_NASGEN): $(BUILD_NASHORN)
+$(BUILD_NASGEN): $(jdk.scripting.nashorn)
NASHORN_CLASSES_DIR := $(JDK_OUTPUTDIR)/modules/jdk.scripting.nashorn
NASGEN_RUN_FILE := $(NASHORN_CLASSES_DIR)/_the.nasgen.run
diff --git a/nashorn/make/build.xml b/nashorn/make/build.xml
index b3190b0..f8f8e7f 100644
--- a/nashorn/make/build.xml
+++ b/nashorn/make/build.xml
@@ -147,16 +147,16 @@
<fileset dir="${meta.inf.dir}/services/"/>
</copy>
<copy todir="${build.classes.dir}/jdk/nashorn/api/scripting/resources">
- <fileset dir="${src.dir}/jdk/nashorn/api/scripting/resources/"/>
+ <fileset dir="${nashorn.module.src.dir}/jdk/nashorn/api/scripting/resources/"/>
</copy>
<copy todir="${build.classes.dir}/jdk/nashorn/internal/runtime/resources">
- <fileset dir="${src.dir}/jdk/nashorn/internal/runtime/resources/"/>
+ <fileset dir="${nashorn.module.src.dir}/jdk/nashorn/internal/runtime/resources/"/>
</copy>
<copy todir="${build.classes.dir}/jdk/nashorn/tools/resources">
- <fileset dir="${src.dir}/jdk/nashorn/tools/resources/"/>
+ <fileset dir="${nashorn.module.src.dir}/jdk/nashorn/tools/resources/"/>
</copy>
- <copy file="${src.dir}/jdk/internal/dynalink/support/messages.properties" todir="${build.classes.dir}/jdk/internal/dynalink/support"/>
- <copy file="${src.dir}/jdk/nashorn/internal/codegen/anchor.properties" todir="${build.classes.dir}/jdk/nashorn/internal/codegen"/>
+ <copy file="${nashorn.module.src.dir}/jdk/internal/dynalink/support/messages.properties" todir="${build.classes.dir}/jdk/internal/dynalink/support"/>
+ <copy file="${nashorn.module.src.dir}/jdk/nashorn/internal/codegen/anchor.properties" todir="${build.classes.dir}/jdk/nashorn/internal/codegen"/>
<echo message="full=${nashorn.fullversion}" file="${build.classes.dir}/jdk/nashorn/internal/runtime/resources/version.properties"/>
<echo file="${build.classes.dir}/jdk/nashorn/internal/runtime/resources/version.properties" append="true">${line.separator}</echo>
@@ -165,7 +165,14 @@
<target name="jar" depends="compile, run-nasgen, generate-cc-template" description="Creates nashorn.jar" unless="compile.suppress.jar">
<jar jarfile="${dist.jar}" manifest="${meta.inf.dir}/MANIFEST.MF" index="true" filesetmanifest="merge">
- <fileset dir="${build.classes.dir}"/>
+ <!--
+ Exclude jjs classes from nashorn.jar to avoid desktop dependency.
+ We have a test to make sure basic nashorn code has only "compact1"
+ dependency - except for jjs shell code which has desktop dependency.
+ -->
+ <fileset dir="${build.classes.dir}">
+ <exclude name="**/jdk/nashorn/tools/jjs/*"/>
+ </fileset>
<manifest>
<attribute name="Archiver-Version" value="n/a"/>
<attribute name="Build-Jdk" value="${java.runtime.version}"/>
@@ -230,13 +237,14 @@
<!-- generate javadoc for Nashorn classes -->
<target name="javadocnh" depends="jar">
- <javadoc destdir="${dist.javadoc.dir}" use="yes" overview="${src.dir}/overview.html"
+ <javadoc destdir="${dist.javadoc.dir}" use="yes" overview="${nashorn.module.src.dir}/overview.html"
extdirs="${nashorn.ext.path}" windowtitle="${nashorn.product.name} ${nashorn.version}"
additionalparam="-quiet" failonerror="true" useexternalfile="true">
<classpath>
<pathelement location="${build.classes.dir}"/>
</classpath>
- <fileset dir="${src.dir}" includes="**/*.java"/>
+ <fileset dir="${nashorn.module.src.dir}" includes="**/*.java"/>
+ <fileset dir="${nashorn.shell.module.src.dir}" includes="**/*.java"/>
<link href="http://docs.oracle.com/javase/8/docs/api/"/>
</javadoc>
</target>
diff --git a/nashorn/make/project.properties b/nashorn/make/project.properties
index aab32c6..d3730d8 100644
--- a/nashorn/make/project.properties
+++ b/nashorn/make/project.properties
@@ -26,6 +26,9 @@
# location of JDK embedded ASM sources
jdk.asm.src.dir=../jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm
+# location of JDK embedded jline sources
+jdk.jline.src.dir=../jdk/src/jdk.internal.le/share/classes
+
# source and target levels
build.compiler=modern
javac.source=1.8
@@ -112,7 +115,7 @@
${build.test.classes.dir}${path.separator}\
${file.reference.testng.jar}
-meta.inf.dir=${src.dir}/META-INF
+meta.inf.dir=${nashorn.module.src.dir}/META-INF
run.classpath=\
${build.classes.dir}
@@ -266,7 +269,13 @@
${nashorn.internal.tests.jar}${path.separator}\
${nashorn.api.tests.jar}
-src.dir=src/jdk.scripting.nashorn/share/classes
+nashorn.module.src.dir=src/jdk.scripting.nashorn/share/classes
+nashorn.shell.module.src.dir=src/jdk.scripting.nashorn.shell/share/classes
+
+src.dir=${nashorn.module.src.dir}${path.separator}\
+ ${nashorn.shell.module.src.dir}${path.separator}\
+ ${jdk.jline.src.dir}
+
test.src.dir=test/src
# -Xmx is used for all tests, -Xms only for octane benchmark
diff --git a/nashorn/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/Console.java b/nashorn/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/Console.java
new file mode 100644
index 0000000..932eb7a
--- /dev/null
+++ b/nashorn/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/Console.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) 2015, 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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 jdk.nashorn.tools.jjs;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PrintStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.prefs.BackingStoreException;
+import java.util.prefs.Preferences;
+import jdk.internal.jline.console.ConsoleReader;
+import jdk.internal.jline.console.history.History.Entry;
+import jdk.internal.jline.console.history.MemoryHistory;
+
+class Console implements AutoCloseable {
+ private final ConsoleReader in;
+ private final PersistentHistory history;
+
+ Console(InputStream cmdin, PrintStream cmdout, Preferences prefs) throws IOException {
+ in = new ConsoleReader(cmdin, cmdout);
+ in.setExpandEvents(false);
+ in.setHandleUserInterrupt(true);
+ in.setHistory(history = new PersistentHistory(prefs));
+ Runtime.getRuntime().addShutdownHook(new Thread(()->close()));
+ }
+
+ String readLine(String prompt) throws IOException {
+ return in.readLine(prompt);
+ }
+
+
+ @Override
+ public void close() {
+ history.save();
+ }
+
+ public static class PersistentHistory extends MemoryHistory {
+
+ private final Preferences prefs;
+
+ protected PersistentHistory(Preferences prefs) {
+ this.prefs = prefs;
+ load();
+ }
+
+ private static final String HISTORY_LINE_PREFIX = "HISTORY_LINE_";
+
+ public final void load() {
+ try {
+ List<String> keys = new ArrayList<>(Arrays.asList(prefs.keys()));
+ Collections.sort(keys);
+ for (String key : keys) {
+ if (!key.startsWith(HISTORY_LINE_PREFIX))
+ continue;
+ CharSequence line = prefs.get(key, "");
+ add(line);
+ }
+ } catch (BackingStoreException ex) {
+ throw new IllegalStateException(ex);
+ }
+ }
+
+ public void save() {
+ Iterator<Entry> entries = iterator();
+ if (entries.hasNext()) {
+ int len = (int) Math.ceil(Math.log10(size()+1));
+ String format = HISTORY_LINE_PREFIX + "%0" + len + "d";
+ while (entries.hasNext()) {
+ Entry entry = entries.next();
+ prefs.put(String.format(format, entry.index()), entry.value().toString());
+ }
+ }
+ }
+
+ }
+}
diff --git a/nashorn/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/Main.java b/nashorn/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/Main.java
new file mode 100644
index 0000000..9bc4b56
--- /dev/null
+++ b/nashorn/src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/Main.java
@@ -0,0 +1,150 @@
+/*
+ * Copyright (c) 2015, 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. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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 jdk.nashorn.tools.jjs;
+
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.util.prefs.Preferences;
+import jdk.nashorn.internal.objects.Global;
+import jdk.nashorn.internal.runtime.Context;
+import jdk.nashorn.internal.runtime.ErrorManager;
+import jdk.nashorn.internal.runtime.JSType;
+import jdk.nashorn.internal.runtime.ScriptEnvironment;
+import jdk.nashorn.internal.runtime.ScriptRuntime;
+import jdk.nashorn.tools.Shell;
+import jdk.internal.jline.console.UserInterruptException;
+
+/**
+ * Interactive command line Shell for Nashorn.
+ */
+public final class Main extends Shell {
+ private Main() {}
+
+ static final Preferences PREFS = Preferences.userRoot().node("tool/jjs");
+
+ /**
+ * Main entry point with the default input, output and error streams.
+ *
+ * @param args The command line arguments
+ */
+ public static void main(final String[] args) {
+ try {
+ final int exitCode = main(System.in, System.out, System.err, args);
+ if (exitCode != SUCCESS) {
+ System.exit(exitCode);
+ }
+ } catch (final IOException e) {
+ System.err.println(e); //bootstrapping, Context.err may not exist
+ System.exit(IO_ERROR);
+ }
+ }
+
+ /**
+ * Starting point for executing a {@code Shell}. Starts a shell with the
+ * given arguments and streams and lets it run until exit.
+ *
+ * @param in input stream for Shell
+ * @param out output stream for Shell
+ * @param err error stream for Shell
+ * @param args arguments to Shell
+ *
+ * @return exit code
+ *
+ * @throws IOException if there's a problem setting up the streams
+ */
+ public static int main(final InputStream in, final OutputStream out, final OutputStream err, final String[] args) throws IOException {
+ return new Main().run(in, out, err, args);
+ }
+
+ /**
+ * read-eval-print loop for Nashorn shell.
+ *
+ * @param context the nashorn context
+ * @param global global scope object to use
+ * @return return code
+ */
+ protected int readEvalPrint(final Context context, final Global global) {
+ final ScriptEnvironment env = context.getEnv();
+ final String prompt = bundle.getString("shell.prompt");
+ final PrintWriter err = context.getErr();
+ final Global oldGlobal = Context.getGlobal();
+ final boolean globalChanged = (oldGlobal != global);
+
+ try (final Console in = new Console(System.in, System.out, PREFS)) {
+ if (globalChanged) {
+ Context.setGlobal(global);
+ }
+
+ global.addShellBuiltins();
+
+ while (true) {
+ String source = "";
+ try {
+ source = in.readLine(prompt);
+ } catch (final IOException ioe) {
+ err.println(ioe.toString());
+ if (env._dump_on_error) {
+ ioe.printStackTrace(err);
+ }
+ return IO_ERROR;
+ } catch (final UserInterruptException ex) {
+ break;
+ }
+
+ if (source.isEmpty()) {
+ continue;
+ }
+
+ try {
+ final Object res = context.eval(global, source, global, "<shell>");
+ if (res != ScriptRuntime.UNDEFINED) {
+ err.println(JSType.toString(res));
+ }
+ } catch (final Exception e) {
+ err.println(e);
+ if (env._dump_on_error) {
+ e.printStackTrace(err);
+ }
+ }
+ }
+ } catch (final Exception e) {
+ err.println(e);
+ if (env._dump_on_error) {
+ e.printStackTrace(err);
+ }
+ } finally {
+ if (globalChanged) {
+ Context.setGlobal(oldGlobal);
+ }
+ }
+
+ return SUCCESS;
+ }
+}
diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/tools/Shell.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/tools/Shell.java
index 3d2a671..ec0397a 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/tools/Shell.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/tools/Shell.java
@@ -68,7 +68,7 @@
/**
* Shell message bundle.
*/
- private static final ResourceBundle bundle = ResourceBundle.getBundle(MESSAGE_RESOURCE, Locale.getDefault());
+ protected static final ResourceBundle bundle = ResourceBundle.getBundle(MESSAGE_RESOURCE, Locale.getDefault());
/**
* Exit code for command line tool - successful
@@ -403,7 +403,7 @@
* @param global global scope object to use
* @return return code
*/
- private static int readEvalPrint(final Context context, final Global global) {
+ protected int readEvalPrint(final Context context, final Global global) {
final String prompt = bundle.getString("shell.prompt");
final BufferedReader in = new BufferedReader(new InputStreamReader(System.in));
final PrintWriter err = context.getErr();
