0xf0000000 bit identifies "
"the field as synthetic, if the synthetic attribute "
"capability is available.")
@@ -706,7 +706,7 @@ JDWP "Java(tm) Debug Wire Protocol"
"which provide additional information on the "
"method declaration. Individual flag values are "
"defined in Chapter 4 of "
- "The Java™ Virtual Machine Specification. "
+ "The Java Virtual Machine Specification. "
"In addition, The 0xf0000000 bit identifies "
"the method as synthetic, if the synthetic attribute "
"capability is available.")
@@ -793,7 +793,7 @@ JDWP "Java(tm) Debug Wire Protocol"
"Returns the current status of the reference type. The status "
"indicates the extent to which the reference type has been "
"initialized, as described in section 2.1.6 of "
- "The Java™ Virtual Machine Specification. "
+ "The Java Virtual Machine Specification. "
"If the class is linked the PREPARED and VERIFIED bits in the returned status bits "
"will be set. If the class is initialized the INITIALIZED bit in the returned "
"status bits will be set. If an error occured during initialization then the "
@@ -872,7 +872,7 @@ JDWP "Java(tm) Debug Wire Protocol"
"generic signature if there is one. "
"Generic signatures are described in the signature attribute "
"section in "
- "The Java™ Virtual Machine Specification. "
+ "The Java Virtual Machine Specification. "
"Since JDWP version 1.5."
(Out
(referenceType refType "The reference type ID.")
@@ -900,7 +900,7 @@ JDWP "Java(tm) Debug Wire Protocol"
"Fields are returned in the order they occur in the class file. "
"Generic signatures are described in the signature attribute "
"section in "
- "The Java™ Virtual Machine Specification. "
+ "The Java Virtual Machine Specification. "
"Since JDWP version 1.5."
(Out
(referenceType refType "The reference type ID.")
@@ -917,7 +917,7 @@ JDWP "Java(tm) Debug Wire Protocol"
"which provide additional information on the "
"field declaration. Individual flag values are "
"defined in Chapter 4 of "
- "The Java™ Virtual Machine Specification. "
+ "The Java Virtual Machine Specification. "
"In addition, The 0xf0000000 bit identifies "
"the field as synthetic, if the synthetic attribute "
"capability is available.")
@@ -942,7 +942,7 @@ JDWP "Java(tm) Debug Wire Protocol"
"Methods are returned in the order they occur in the class file. "
"Generic signatures are described in the signature attribute "
"section in "
- "The Java™ Virtual Machine Specification. "
+ "The Java Virtual Machine Specification. "
"Since JDWP version 1.5."
(Out
(referenceType refType "The reference type ID.")
@@ -959,7 +959,7 @@ JDWP "Java(tm) Debug Wire Protocol"
"which provide additional information on the "
"method declaration. Individual flag values are "
"defined in Chapter 4 of "
- "The Java™ Virtual Machine Specification. "
+ "The Java Virtual Machine Specification. "
"In addition, The 0xf0000000 bit identifies "
"the method as synthetic, if the synthetic attribute "
"capability is available.")
@@ -1022,7 +1022,7 @@ JDWP "Java(tm) Debug Wire Protocol"
(Command ConstantPool=18
"Return the raw bytes of the constant pool in the format of the "
"constant_pool item of the Class File Format in "
- "The Java™ Virtual Machine Specification. "
+ "The Java Virtual Machine Specification. "
"Since JDWP version 1.6. Requires canGetConstantPool capability - see " "CapabilitiesNew."" (Out @@ -1032,7 +1032,7 @@ JDWP "Java(tm) Debug Wire Protocol" (int count "Total number of constant pool entries plus one. This " "corresponds to the constant_pool_count item of the " "Class File Format in " - "The Java™ Virtual Machine Specification. ") + "The Java Virtual Machine Specification. ") (Repeat bytes (byte cpbytes "Raw bytes of constant pool") ) @@ -1435,7 +1435,7 @@ JDWP "Java(tm) Debug Wire Protocol" ) (Command Bytecodes=3 "Retrieve the method's bytecodes as defined in " - "The Java™ Virtual Machine Specification. " + "The Java Virtual Machine Specification. " "Requires canGetBytecodes capability - see " "CapabilitiesNew." (Out @@ -1491,7 +1491,7 @@ JDWP "Java(tm) Debug Wire Protocol" "table. Also, synthetic variables may be present. " "Generic signatures are described in the signature attribute " "section in " - "The Java™ Virtual Machine Specification. " + "The Java Virtual Machine Specification. " "Since JDWP version 1.5." (Out (referenceType refType "The class.") @@ -2082,7 +2082,7 @@ JDWP "Java(tm) Debug Wire Protocol" "The method which will return early is referred to as the " "called method. The called method is the current method (as " "defined by the Frames section in " - "The Java™ Virtual Machine Specification) " + "The Java Virtual Machine Specification) " "for the specified thread at the time this command " "is received. " "
"
diff --git a/src/hotspot/share/jvmci/jvmciEnv.cpp b/src/hotspot/share/jvmci/jvmciEnv.cpp
index b8deb73913d..bbcbaeefdde 100644
--- a/src/hotspot/share/jvmci/jvmciEnv.cpp
+++ b/src/hotspot/share/jvmci/jvmciEnv.cpp
@@ -568,26 +568,13 @@ const char* JVMCIEnv::as_utf8_string(JVMCIObject str) {
} else {
JNIAccessMark jni(this);
int length = jni()->GetStringLength(str.as_jstring());
- char* result = NEW_RESOURCE_ARRAY(char, length + 1);
+ int utf8_length = jni()->GetStringUTFLength(str.as_jstring());
+ char* result = NEW_RESOURCE_ARRAY(char, utf8_length + 1);
jni()->GetStringUTFRegion(str.as_jstring(), 0, length, result);
return result;
}
}
-char* JVMCIEnv::as_utf8_string(JVMCIObject str, char* buf, int buflen) {
- if (is_hotspot()) {
- return java_lang_String::as_utf8_string(HotSpotJVMCI::resolve(str), buf, buflen);
- } else {
- JNIAccessMark jni(this);
- int length = jni()->GetStringLength(str.as_jstring());
- if (length >= buflen) {
- length = buflen;
- }
- jni()->GetStringUTFRegion(str.as_jstring(), 0, length, buf);
- return buf;
- }
-}
-
#define DO_THROW(name) \
void JVMCIEnv::throw_##name(const char* msg) { \
if (is_hotspot()) { \
diff --git a/src/hotspot/share/jvmci/jvmciEnv.hpp b/src/hotspot/share/jvmci/jvmciEnv.hpp
index a29e122f6bc..333525d5d69 100644
--- a/src/hotspot/share/jvmci/jvmciEnv.hpp
+++ b/src/hotspot/share/jvmci/jvmciEnv.hpp
@@ -255,7 +255,6 @@ public:
JVMCIObject create_box(BasicType type, jvalue* value, JVMCI_TRAPS);
const char* as_utf8_string(JVMCIObject str);
- char* as_utf8_string(JVMCIObject str, char* buf, int buflen);
JVMCIObject create_string(Symbol* str, JVMCI_TRAPS) {
JVMCIObject s = create_string(str->as_C_string(), JVMCI_CHECK_(JVMCIObject()));
diff --git a/src/hotspot/share/opto/classes.hpp b/src/hotspot/share/opto/classes.hpp
index f0a12ef1dfd..e609851772f 100644
--- a/src/hotspot/share/opto/classes.hpp
+++ b/src/hotspot/share/opto/classes.hpp
@@ -234,6 +234,8 @@ macro(NegF)
macro(NeverBranch)
macro(OnSpinWait)
macro(Opaque1)
+macro(OpaqueLoopInit)
+macro(OpaqueLoopStride)
macro(Opaque2)
macro(Opaque3)
macro(Opaque4)
diff --git a/src/hotspot/share/opto/compile.cpp b/src/hotspot/share/opto/compile.cpp
index 9cd4b980fa8..7961cfbc3e6 100644
--- a/src/hotspot/share/opto/compile.cpp
+++ b/src/hotspot/share/opto/compile.cpp
@@ -1800,7 +1800,17 @@ void Compile::remove_opaque4_nodes(PhaseIterGVN &igvn) {
for (int i = opaque4_count(); i > 0; i--) {
Node* opaq = opaque4_node(i-1);
assert(opaq->Opcode() == Op_Opaque4, "Opaque4 only");
+ // With Opaque4 nodes, the expectation is that the test of input 1
+ // is always equal to the constant value of input 2. So we can
+ // remove the Opaque4 and replace it by input 2. In debug builds,
+ // leave the non constant test in instead to sanity check that it
+ // never fails (if it does, that subgraph was constructed so, at
+ // runtime, a Halt node is executed).
+#ifdef ASSERT
+ igvn.replace_node(opaq, opaq->in(1));
+#else
igvn.replace_node(opaq, opaq->in(2));
+#endif
}
assert(opaque4_count() == 0, "should be empty");
}
diff --git a/src/hotspot/share/opto/loopPredicate.cpp b/src/hotspot/share/opto/loopPredicate.cpp
index c15c278231c..91aad8cad84 100644
--- a/src/hotspot/share/opto/loopPredicate.cpp
+++ b/src/hotspot/share/opto/loopPredicate.cpp
@@ -1255,8 +1255,9 @@ ProjNode* PhaseIdealLoop::insert_initial_skeleton_predicate(IfNode* iff, IdealLo
Node* init, Node* limit, jint stride,
Node* rng, bool &overflow,
Deoptimization::DeoptReason reason) {
+ // First predicate for the initial value on first loop iteration
assert(proj->_con && predicate_proj->_con, "not a range check?");
- Node* opaque_init = new Opaque1Node(C, init);
+ Node* opaque_init = new OpaqueLoopInitNode(C, init);
register_new_node(opaque_init, upper_bound_proj);
BoolNode* bol = rc_predicate(loop, upper_bound_proj, scale, offset, opaque_init, limit, stride, rng, (stride > 0) != (scale > 0), overflow);
Node* opaque_bol = new Opaque4Node(C, bol, _igvn.intcon(1)); // This will go away once loop opts are over
@@ -1264,6 +1265,24 @@ ProjNode* PhaseIdealLoop::insert_initial_skeleton_predicate(IfNode* iff, IdealLo
ProjNode* new_proj = create_new_if_for_predicate(predicate_proj, NULL, reason, overflow ? Op_If : iff->Opcode());
_igvn.replace_input_of(new_proj->in(0), 1, opaque_bol);
assert(opaque_init->outcnt() > 0, "should be used");
+
+ // Second predicate for init + (current stride - initial stride)
+ // This is identical to the previous predicate initially but as
+ // unrolling proceeds current stride is updated.
+ Node* init_stride = loop->_head->as_CountedLoop()->stride();
+ Node* opaque_stride = new OpaqueLoopStrideNode(C, init_stride);
+ register_new_node(opaque_stride, new_proj);
+ Node* max_value = new SubINode(opaque_stride, init_stride);
+ register_new_node(max_value, new_proj);
+ max_value = new AddINode(opaque_init, max_value);
+ register_new_node(max_value, new_proj);
+ bol = rc_predicate(loop, new_proj, scale, offset, max_value, limit, stride, rng, (stride > 0) != (scale > 0), overflow);
+ opaque_bol = new Opaque4Node(C, bol, _igvn.intcon(1));
+ register_new_node(opaque_bol, new_proj);
+ new_proj = create_new_if_for_predicate(predicate_proj, NULL, reason, overflow ? Op_If : iff->Opcode());
+ _igvn.replace_input_of(new_proj->in(0), 1, opaque_bol);
+ assert(max_value->outcnt() > 0, "should be used");
+
return new_proj;
}
diff --git a/src/hotspot/share/opto/loopTransform.cpp b/src/hotspot/share/opto/loopTransform.cpp
index 19af0c9e8b5..133d47a06e6 100644
--- a/src/hotspot/share/opto/loopTransform.cpp
+++ b/src/hotspot/share/opto/loopTransform.cpp
@@ -1141,7 +1141,7 @@ void PhaseIdealLoop::ensure_zero_trip_guard_proj(Node* node, bool is_main_loop)
// CastII/ConvI2L nodes cause some data paths to die. For consistency,
// the control paths must die too but the range checks were removed by
// predication. The range checks that we add here guarantee that they do.
-void PhaseIdealLoop::copy_skeleton_predicates_to_main_loop_helper(Node* predicate, Node* start, Node* end,
+void PhaseIdealLoop::copy_skeleton_predicates_to_main_loop_helper(Node* predicate, Node* init, Node* stride,
IdealLoopTree* outer_loop, LoopNode* outer_main_head,
uint dd_main_head, const uint idx_before_pre_post,
const uint idx_after_post_before_pre, Node* zero_trip_guard_proj_main,
@@ -1159,6 +1159,11 @@ void PhaseIdealLoop::copy_skeleton_predicates_to_main_loop_helper(Node* predicat
predicate = iff->in(0);
Node* current_proj = outer_main_head->in(LoopNode::EntryControl);
Node* prev_proj = current_proj;
+ Node* opaque_init = new OpaqueLoopInitNode(C, init);
+ register_new_node(opaque_init, outer_main_head->in(LoopNode::EntryControl));
+ Node* opaque_stride = new OpaqueLoopStrideNode(C, stride);
+ register_new_node(opaque_stride, outer_main_head->in(LoopNode::EntryControl));
+
while (predicate != NULL && predicate->is_Proj() && predicate->in(0)->is_If()) {
iff = predicate->in(0)->as_If();
uncommon_proj = iff->proj_out(1 - predicate->as_Proj()->_con);
@@ -1169,10 +1174,11 @@ void PhaseIdealLoop::copy_skeleton_predicates_to_main_loop_helper(Node* predicat
// Clone the skeleton predicate twice and initialize one with the initial
// value of the loop induction variable. Leave the other predicate
// to be initialized when increasing the stride during loop unrolling.
- prev_proj = clone_skeleton_predicate(iff, start, predicate, uncommon_proj, current_proj, outer_loop, prev_proj);
- assert(skeleton_predicate_has_opaque(prev_proj->in(0)->as_If()) == (start->Opcode() == Op_Opaque1), "");
- prev_proj = clone_skeleton_predicate(iff, end, predicate, uncommon_proj, current_proj, outer_loop, prev_proj);
- assert(skeleton_predicate_has_opaque(prev_proj->in(0)->as_If()) == (end->Opcode() == Op_Opaque1), "");
+ prev_proj = clone_skeleton_predicate(iff, opaque_init, NULL, predicate, uncommon_proj, current_proj, outer_loop, prev_proj);
+ assert(skeleton_predicate_has_opaque(prev_proj->in(0)->as_If()), "");
+
+ prev_proj = clone_skeleton_predicate(iff, init, stride, predicate, uncommon_proj, current_proj, outer_loop, prev_proj);
+ assert(!skeleton_predicate_has_opaque(prev_proj->in(0)->as_If()), "");
// Rewire any control inputs from the cloned skeleton predicates down to the main and post loop for data nodes that are part of the
// main loop (and were cloned to the pre and post loop).
@@ -1238,14 +1244,14 @@ bool PhaseIdealLoop::skeleton_predicate_has_opaque(IfNode* iff) {
}
continue;
}
- if (op == Op_Opaque1) {
+ if (n->is_Opaque1()) {
return true;
}
}
return false;
}
-Node* PhaseIdealLoop::clone_skeleton_predicate(Node* iff, Node* value, Node* predicate, Node* uncommon_proj,
+Node* PhaseIdealLoop::clone_skeleton_predicate(Node* iff, Node* new_init, Node* new_stride, Node* predicate, Node* uncommon_proj,
Node* current_proj, IdealLoopTree* outer_loop, Node* prev_proj) {
Node_Stack to_clone(2);
to_clone.push(iff->in(1), 1);
@@ -1265,12 +1271,19 @@ Node* PhaseIdealLoop::clone_skeleton_predicate(Node* iff, Node* value, Node* pre
to_clone.push(m, 1);
continue;
}
- if (op == Op_Opaque1) {
+ if (m->is_Opaque1()) {
if (n->_idx < current) {
n = n->clone();
+ register_new_node(n, current_proj);
+ }
+ if (op == Op_OpaqueLoopInit) {
+ n->set_req(i, new_init);
+ } else {
+ assert(op == Op_OpaqueLoopStride, "unexpected opaque node");
+ if (new_stride != NULL) {
+ n->set_req(i, new_stride);
+ }
}
- n->set_req(i, value);
- register_new_node(n, current_proj);
to_clone.set_node(n);
}
for (;;) {
@@ -1320,7 +1333,7 @@ Node* PhaseIdealLoop::clone_skeleton_predicate(Node* iff, Node* value, Node* pre
return proj;
}
-void PhaseIdealLoop::copy_skeleton_predicates_to_main_loop(CountedLoopNode* pre_head, Node* start, Node* end,
+void PhaseIdealLoop::copy_skeleton_predicates_to_main_loop(CountedLoopNode* pre_head, Node* init, Node* stride,
IdealLoopTree* outer_loop, LoopNode* outer_main_head,
uint dd_main_head, const uint idx_before_pre_post,
const uint idx_after_post_before_pre, Node* zero_trip_guard_proj_main,
@@ -1340,10 +1353,10 @@ void PhaseIdealLoop::copy_skeleton_predicates_to_main_loop(CountedLoopNode* pre_
}
}
predicate = find_predicate_insertion_point(entry, Deoptimization::Reason_predicate);
- copy_skeleton_predicates_to_main_loop_helper(predicate, start, end, outer_loop, outer_main_head, dd_main_head,
+ copy_skeleton_predicates_to_main_loop_helper(predicate, init, stride, outer_loop, outer_main_head, dd_main_head,
idx_before_pre_post, idx_after_post_before_pre, zero_trip_guard_proj_main,
zero_trip_guard_proj_post, old_new);
- copy_skeleton_predicates_to_main_loop_helper(profile_predicate, start, end, outer_loop, outer_main_head, dd_main_head,
+ copy_skeleton_predicates_to_main_loop_helper(profile_predicate, init, stride, outer_loop, outer_main_head, dd_main_head,
idx_before_pre_post, idx_after_post_before_pre, zero_trip_guard_proj_main,
zero_trip_guard_proj_post, old_new);
}
@@ -1493,10 +1506,8 @@ void PhaseIdealLoop::insert_pre_post_loops(IdealLoopTree *loop, Node_List &old_n
// CastII for the main loop:
Node* castii = cast_incr_before_loop(pre_incr, min_taken, main_head);
assert(castii != NULL, "no castII inserted");
- Node* opaque_castii = new Opaque1Node(C, castii);
- register_new_node(opaque_castii, outer_main_head->in(LoopNode::EntryControl));
assert(post_head->in(1)->is_IfProj(), "must be zero-trip guard If node projection of the post loop");
- copy_skeleton_predicates_to_main_loop(pre_head, castii, opaque_castii, outer_loop, outer_main_head, dd_main_head,
+ copy_skeleton_predicates_to_main_loop(pre_head, castii, stride, outer_loop, outer_main_head, dd_main_head,
idx_before_pre_post, idx_after_post_before_pre, min_taken, post_head->in(1), old_new);
// Step B4: Shorten the pre-loop to run only 1 iteration (for now).
@@ -1788,6 +1799,13 @@ void PhaseIdealLoop::update_main_loop_skeleton_predicates(Node* ctrl, CountedLoo
Node* prev_proj = ctrl;
LoopNode* outer_loop_head = loop_head->skip_strip_mined();
IdealLoopTree* outer_loop = get_loop(outer_loop_head);
+
+ // Compute the value of the loop induction variable at the end of the
+ // first iteration of the unrolled loop: init + new_stride_con - init_inc
+ int new_stride_con = stride_con * 2;
+ Node* max_value = _igvn.intcon(new_stride_con);
+ set_ctrl(max_value, C->root());
+
while (entry != NULL && entry->is_Proj() && entry->in(0)->is_If()) {
IfNode* iff = entry->in(0)->as_If();
ProjNode* proj = iff->proj_out(1 - entry->as_Proj()->_con);
@@ -1803,18 +1821,8 @@ void PhaseIdealLoop::update_main_loop_skeleton_predicates(Node* ctrl, CountedLoo
// tell. Kill it in any case.
_igvn.replace_input_of(iff, 1, iff->in(1)->in(2));
} else {
- // Add back the predicate for the value at the beginning of the first entry
- prev_proj = clone_skeleton_predicate(iff, init, entry, proj, ctrl, outer_loop, prev_proj);
- assert(!skeleton_predicate_has_opaque(prev_proj->in(0)->as_If()), "unexpected");
- // Compute the value of the loop induction variable at the end of the
- // first iteration of the unrolled loop: init + new_stride_con - init_inc
- int init_inc = stride_con/loop_head->unrolled_count();
- assert(init_inc != 0, "invalid loop increment");
- int new_stride_con = stride_con * 2;
- Node* max_value = _igvn.intcon(new_stride_con - init_inc);
- max_value = new AddINode(init, max_value);
- register_new_node(max_value, get_ctrl(iff->in(1)));
- prev_proj = clone_skeleton_predicate(iff, max_value, entry, proj, ctrl, outer_loop, prev_proj);
+ // Add back predicates updated for the new stride.
+ prev_proj = clone_skeleton_predicate(iff, init, max_value, entry, proj, ctrl, outer_loop, prev_proj);
assert(!skeleton_predicate_has_opaque(prev_proj->in(0)->as_If()), "unexpected");
}
}
@@ -2667,22 +2675,26 @@ int PhaseIdealLoop::do_range_check(IdealLoopTree *loop, Node_List &old_new) {
// (0-offset)/scale could be outside of loop iterations range.
conditional_rc = true;
Node* init = cl->init_trip();
- Node* opaque_init = new Opaque1Node(C, init);
+ Node* opaque_init = new OpaqueLoopInitNode(C, init);
register_new_node(opaque_init, predicate_proj);
- // template predicate so it can be updated on next unrolling
- predicate_proj = add_range_check_predicate(loop, cl, predicate_proj, scale_con, offset, limit, stride_con, opaque_init);
- assert(skeleton_predicate_has_opaque(predicate_proj->in(0)->as_If()), "unexpected");
+
// predicate on first value of first iteration
predicate_proj = add_range_check_predicate(loop, cl, predicate_proj, scale_con, offset, limit, stride_con, init);
assert(!skeleton_predicate_has_opaque(predicate_proj->in(0)->as_If()), "unexpected");
- int init_inc = stride_con/cl->unrolled_count();
- assert(init_inc != 0, "invalid loop increment");
- Node* max_value = _igvn.intcon(stride_con - init_inc);
- max_value = new AddINode(init, max_value);
+
+ // template predicate so it can be updated on next unrolling
+ predicate_proj = add_range_check_predicate(loop, cl, predicate_proj, scale_con, offset, limit, stride_con, opaque_init);
+ assert(skeleton_predicate_has_opaque(predicate_proj->in(0)->as_If()), "unexpected");
+
+ Node* opaque_stride = new OpaqueLoopStrideNode(C, cl->stride());
+ register_new_node(opaque_stride, predicate_proj);
+ Node* max_value = new SubINode(opaque_stride, cl->stride());
+ register_new_node(max_value, predicate_proj);
+ max_value = new AddINode(opaque_init, max_value);
register_new_node(max_value, predicate_proj);
- // predicate on last value of first iteration (in case unrolling has already happened)
predicate_proj = add_range_check_predicate(loop, cl, predicate_proj, scale_con, offset, limit, stride_con, max_value);
- assert(!skeleton_predicate_has_opaque(predicate_proj->in(0)->as_If()), "unexpected");
+ assert(skeleton_predicate_has_opaque(predicate_proj->in(0)->as_If()), "unexpected");
+
} else {
if (PrintOpto) {
tty->print_cr("missed RCE opportunity");
diff --git a/src/hotspot/share/opto/loopnode.cpp b/src/hotspot/share/opto/loopnode.cpp
index 2ae128d2c1b..920d1bb1919 100644
--- a/src/hotspot/share/opto/loopnode.cpp
+++ b/src/hotspot/share/opto/loopnode.cpp
@@ -2580,7 +2580,7 @@ uint IdealLoopTree::est_loop_clone_sz(uint factor) const {
uint const bc = 13;
uint const cc = 17;
- uint const sz = _body.size() + (_body.size() + 7) / 8;
+ uint const sz = _body.size() + (_body.size() + 7) / 2;
uint estimate = factor * (sz + bc) + cc;
assert((estimate - cc) / factor == sz + bc, "overflow");
diff --git a/src/hotspot/share/opto/loopnode.hpp b/src/hotspot/share/opto/loopnode.hpp
index 97a97ff8290..2fbeb04d5f9 100644
--- a/src/hotspot/share/opto/loopnode.hpp
+++ b/src/hotspot/share/opto/loopnode.hpp
@@ -788,13 +788,13 @@ private:
#ifdef ASSERT
void ensure_zero_trip_guard_proj(Node* node, bool is_main_loop);
#endif
- void copy_skeleton_predicates_to_main_loop_helper(Node* predicate, Node* start, Node* end, IdealLoopTree* outer_loop, LoopNode* outer_main_head,
+ void copy_skeleton_predicates_to_main_loop_helper(Node* predicate, Node* init, Node* stride, IdealLoopTree* outer_loop, LoopNode* outer_main_head,
uint dd_main_head, const uint idx_before_pre_post, const uint idx_after_post_before_pre,
Node* zero_trip_guard_proj_main, Node* zero_trip_guard_proj_post, const Node_List &old_new);
- void copy_skeleton_predicates_to_main_loop(CountedLoopNode* pre_head, Node* start, Node* end, IdealLoopTree* outer_loop, LoopNode* outer_main_head,
+ void copy_skeleton_predicates_to_main_loop(CountedLoopNode* pre_head, Node* init, Node* stride, IdealLoopTree* outer_loop, LoopNode* outer_main_head,
uint dd_main_head, const uint idx_before_pre_post, const uint idx_after_post_before_pre,
Node* zero_trip_guard_proj_main, Node* zero_trip_guard_proj_post, const Node_List &old_new);
- Node* clone_skeleton_predicate(Node* iff, Node* value, Node* predicate, Node* uncommon_proj,
+ Node* clone_skeleton_predicate(Node* iff, Node* new_init, Node* new_stride, Node* predicate, Node* uncommon_proj,
Node* current_proj, IdealLoopTree* outer_loop, Node* prev_proj);
bool skeleton_predicate_has_opaque(IfNode* iff);
void update_main_loop_skeleton_predicates(Node* ctrl, CountedLoopNode* loop_head, Node* init, int stride_con);
diff --git a/src/hotspot/share/opto/loopopts.cpp b/src/hotspot/share/opto/loopopts.cpp
index 35f97826e42..e519305eeea 100644
--- a/src/hotspot/share/opto/loopopts.cpp
+++ b/src/hotspot/share/opto/loopopts.cpp
@@ -952,29 +952,43 @@ void PhaseIdealLoop::try_move_store_after_loop(Node* n) {
Node *PhaseIdealLoop::split_if_with_blocks_pre( Node *n ) {
// Cloning these guys is unlikely to win
int n_op = n->Opcode();
- if( n_op == Op_MergeMem ) return n;
- if( n->is_Proj() ) return n;
+ if (n_op == Op_MergeMem) {
+ return n;
+ }
+ if (n->is_Proj()) {
+ return n;
+ }
// Do not clone-up CmpFXXX variations, as these are always
// followed by a CmpI
- if( n->is_Cmp() ) return n;
- // Attempt to use a conditional move instead of a phi/branch
- if( ConditionalMoveLimit > 0 && n_op == Op_Region ) {
- Node *cmov = conditional_move( n );
- if( cmov ) return cmov;
- }
- if( n->is_CFG() || n->is_LoadStore() )
+ if (n->is_Cmp()) {
return n;
- if( n_op == Op_Opaque1 || // Opaque nodes cannot be mod'd
- n_op == Op_Opaque2 ) {
- if( !C->major_progress() ) // If chance of no more loop opts...
+ }
+ // Attempt to use a conditional move instead of a phi/branch
+ if (ConditionalMoveLimit > 0 && n_op == Op_Region) {
+ Node *cmov = conditional_move( n );
+ if (cmov) {
+ return cmov;
+ }
+ }
+ if (n->is_CFG() || n->is_LoadStore()) {
+ return n;
+ }
+ if (n->is_Opaque1() || // Opaque nodes cannot be mod'd
+ n_op == Op_Opaque2) {
+ if (!C->major_progress()) { // If chance of no more loop opts...
_igvn._worklist.push(n); // maybe we'll remove them
+ }
return n;
}
- if( n->is_Con() ) return n; // No cloning for Con nodes
+ if (n->is_Con()) {
+ return n; // No cloning for Con nodes
+ }
Node *n_ctrl = get_ctrl(n);
- if( !n_ctrl ) return n; // Dead node
+ if (!n_ctrl) {
+ return n; // Dead node
+ }
Node* res = try_move_store_before_loop(n, n_ctrl);
if (res != NULL) {
diff --git a/src/hotspot/share/opto/macro.cpp b/src/hotspot/share/opto/macro.cpp
index 19b75b81d62..b82a36ea891 100644
--- a/src/hotspot/share/opto/macro.cpp
+++ b/src/hotspot/share/opto/macro.cpp
@@ -2636,9 +2636,10 @@ void PhaseMacroExpand::eliminate_macro_nodes() {
break;
case Node::Class_SubTypeCheck:
break;
+ case Node::Class_Opaque1:
+ break;
default:
assert(n->Opcode() == Op_LoopLimit ||
- n->Opcode() == Op_Opaque1 ||
n->Opcode() == Op_Opaque2 ||
n->Opcode() == Op_Opaque3 ||
BarrierSet::barrier_set()->barrier_set_c2()->is_gc_barrier_node(n),
@@ -2674,7 +2675,7 @@ bool PhaseMacroExpand::expand_macro_nodes() {
C->remove_macro_node(n);
_igvn._worklist.push(n);
success = true;
- } else if (n->Opcode() == Op_Opaque1 || n->Opcode() == Op_Opaque2) {
+ } else if (n->is_Opaque1() || n->Opcode() == Op_Opaque2) {
_igvn.replace_node(n, n->in(1));
success = true;
#if INCLUDE_RTM_OPT
diff --git a/src/hotspot/share/opto/node.hpp b/src/hotspot/share/opto/node.hpp
index f7a2e0d4d7f..6c40abc1576 100644
--- a/src/hotspot/share/opto/node.hpp
+++ b/src/hotspot/share/opto/node.hpp
@@ -116,6 +116,7 @@ class MulNode;
class MultiNode;
class MultiBranchNode;
class NeverBranchNode;
+class Opaque1Node;
class OuterStripMinedLoopNode;
class OuterStripMinedLoopEndNode;
class Node;
@@ -609,9 +610,9 @@ public:
// This enum is used only for C2 ideal and mach nodes with is_
* If the specified object is an instance of {@code Throwable}, it
* becomes the cause of the newly constructed assertion error.
@@ -81,7 +81,7 @@ public class AssertionError extends Error {
* Constructs an AssertionError with its detail message derived
* from the specified {@code boolean}, which is converted to
* a string as defined in section 15.18.1.1 of
- * The Java™ Language Specification.
+ * The Java Language Specification.
*
* @param detailMessage value to be used in constructing detail message
*/
@@ -93,7 +93,7 @@ public class AssertionError extends Error {
* Constructs an AssertionError with its detail message derived
* from the specified {@code char}, which is converted to a
* string as defined in section 15.18.1.1 of
- * The Java™ Language Specification.
+ * The Java Language Specification.
*
* @param detailMessage value to be used in constructing detail message
*/
@@ -105,7 +105,7 @@ public class AssertionError extends Error {
* Constructs an AssertionError with its detail message derived
* from the specified {@code int}, which is converted to a
* string as defined in section 15.18.1.1 of
- * The Java™ Language Specification.
+ * The Java Language Specification.
*
* @param detailMessage value to be used in constructing detail message
*/
@@ -117,7 +117,7 @@ public class AssertionError extends Error {
* Constructs an AssertionError with its detail message derived
* from the specified {@code long}, which is converted to a
* string as defined in section 15.18.1.1 of
- * The Java™ Language Specification.
+ * The Java Language Specification.
*
* @param detailMessage value to be used in constructing detail message
*/
@@ -129,7 +129,7 @@ public class AssertionError extends Error {
* Constructs an AssertionError with its detail message derived
* from the specified {@code float}, which is converted to a
* string as defined in section 15.18.1.1 of
- * The Java™ Language Specification.
+ * The Java Language Specification.
*
* @param detailMessage value to be used in constructing detail message
*/
@@ -141,7 +141,7 @@ public class AssertionError extends Error {
* Constructs an AssertionError with its detail message derived
* from the specified {@code double}, which is converted to a
* string as defined in section 15.18.1.1 of
- * The Java™ Language Specification.
+ * The Java Language Specification.
*
* @param detailMessage value to be used in constructing detail message
*/
diff --git a/src/java.base/share/classes/java/lang/Byte.java b/src/java.base/share/classes/java/lang/Byte.java
index c43b319c9e7..98c2ef422d4 100644
--- a/src/java.base/share/classes/java/lang/Byte.java
+++ b/src/java.base/share/classes/java/lang/Byte.java
@@ -290,7 +290,7 @@ public final class Byte extends Number implements Comparable The sequence of characters following an optional
diff --git a/src/java.base/share/classes/java/lang/Class.java b/src/java.base/share/classes/java/lang/Class.java
index 05d2415ed8a..1fabad43738 100644
--- a/src/java.base/share/classes/java/lang/Class.java
+++ b/src/java.base/share/classes/java/lang/Class.java
@@ -413,7 +413,7 @@ public final class Class Specifically, this method tests whether the type represented by the
* specified {@code Class} parameter can be converted to the type
* represented by this {@code Class} object via an identity conversion
- * or via a widening reference conversion. See The Java™ Language
+ * or via a widening reference conversion. See The Java Language
* Specification, sections {@jls 5.1.1} and {@jls 5.1.4},
* for details.
*
@@ -952,7 +952,7 @@ public final class Class The modifier encodings are defined in section {@jvms 4.1}
- * of The Java™ Virtual Machine Specification.
+ * of The Java Virtual Machine Specification.
*
* @return the {@code int} representing the modifiers for this class
* @see java.lang.reflect.Modifier
@@ -1678,7 +1678,7 @@ public final class Class See The Java™ Language Specification,
+ * See The Java Language Specification,
* section {@jls 8.2}.
*
* @return the array of {@code Constructor} objects representing all the
diff --git a/src/java.base/share/classes/java/lang/ClassLoader.java b/src/java.base/share/classes/java/lang/ClassLoader.java
index 6f3eb264c44..d8bd0ee66bd 100644
--- a/src/java.base/share/classes/java/lang/ClassLoader.java
+++ b/src/java.base/share/classes/java/lang/ClassLoader.java
@@ -207,7 +207,7 @@ import sun.security.util.SecurityConstants;
*
* Any class name provided as a {@code String} parameter to methods in
* {@code ClassLoader} must be a binary name as defined by
- * The Java™ Language Specification.
+ * The Java Language Specification.
*
* Examples of valid class names include:
* Any package name provided as a {@code String} parameter to methods in
* {@code ClassLoader} must be either the empty string (denoting an unnamed package)
* or a fully qualified name as defined by
- * The Java™ Language Specification.
+ * The Java Language Specification.
*
* @jls 6.7 Fully Qualified Names
* @jls 13.1 The Form of a Binary
@@ -765,7 +765,7 @@ public abstract class ClassLoader {
* The bytes that make up the class data. The bytes in positions
* {@code off} through {@code off+len-1} should have the format
* of a valid class file as defined by
- * The Java™ Virtual Machine Specification.
+ * The Java Virtual Machine Specification.
*
* @param off
* The start offset in {@code b} of the class data
@@ -838,7 +838,7 @@ public abstract class ClassLoader {
* The bytes that make up the class data. The bytes in positions
* {@code off} through {@code off+len-1} should have the format
* of a valid class file as defined by
- * The Java™ Virtual Machine Specification.
+ * The Java Virtual Machine Specification.
*
* @param off
* The start offset in {@code b} of the class data
@@ -972,7 +972,7 @@ public abstract class ClassLoader {
* The bytes that make up the class data. The bytes in positions
* {@code off} through {@code off+len-1} should have the format
* of a valid class file as defined by
- * The Java™ Virtual Machine Specification.
+ * The Java Virtual Machine Specification.
*
* @param off
* The start offset in {@code b} of the class data
@@ -1056,7 +1056,7 @@ public abstract class ClassLoader {
* The bytes that make up the class data. The bytes from positions
* {@code b.position()} through {@code b.position() + b.limit() -1
* } should have the format of a valid class file as defined by
- * The Java™ Virtual Machine Specification.
+ * The Java Virtual Machine Specification.
*
* @param protectionDomain
* The {@code ProtectionDomain} of the class, or {@code null}.
@@ -1213,7 +1213,7 @@ public abstract class ClassLoader {
* used by a class loader to link a class. If the class {@code c} has
* already been linked, then this method simply returns. Otherwise, the
* class is linked as described in the "Execution" chapter of
- * The Java™ Language Specification.
+ * The Java Language Specification.
*
* @param c
* The class to link
@@ -2532,7 +2532,7 @@ public abstract class ClassLoader {
* is to be set. A {@code null} value indicates the unnamed
* package that is "current"
* (see section 7.4.2 of
- * The Java™ Language Specification.)
+ * The Java Language Specification.)
*
* @param enabled
* {@code true} if classes loaded by this classloader and
diff --git a/src/java.base/share/classes/java/lang/Double.java b/src/java.base/share/classes/java/lang/Double.java
index 121126c5356..eca7e892311 100644
--- a/src/java.base/share/classes/java/lang/Double.java
+++ b/src/java.base/share/classes/java/lang/Double.java
@@ -403,7 +403,7 @@ public final class Double extends Number
* HexNumeral, HexDigits, SignedInteger and
* FloatTypeSuffix are as defined in the lexical structure
* sections of
- * The Java™ Language Specification,
+ * The Java Language Specification,
* except that underscores are not accepted between digits.
* If {@code s} does not have the form of
* a FloatValue, then a {@code NumberFormatException}
diff --git a/src/java.base/share/classes/java/lang/Enum.java b/src/java.base/share/classes/java/lang/Enum.java
index 21cb3f5f6b3..4e6b582bb57 100644
--- a/src/java.base/share/classes/java/lang/Enum.java
+++ b/src/java.base/share/classes/java/lang/Enum.java
@@ -44,7 +44,7 @@ import static java.util.Objects.requireNonNull;
*
* More information about enums, including descriptions of the
* implicitly declared methods synthesized by the compiler, can be
- * found in section {@jls 8.9} of The Java™ Language
+ * found in section {@jls 8.9} of The Java Language
* Specification.
*
* Enumeration types are all serializable and receive special handling
diff --git a/src/java.base/share/classes/java/lang/Float.java b/src/java.base/share/classes/java/lang/Float.java
index e66244e54ef..f21eca098cf 100644
--- a/src/java.base/share/classes/java/lang/Float.java
+++ b/src/java.base/share/classes/java/lang/Float.java
@@ -362,7 +362,7 @@ public final class Float extends Number
* HexNumeral, HexDigits, SignedInteger and
* FloatTypeSuffix are as defined in the lexical structure
* sections of
- * The Java™ Language Specification,
+ * The Java Language Specification,
* except that underscores are not accepted between digits.
* If {@code s} does not have the form of
* a FloatValue, then a {@code NumberFormatException}
diff --git a/src/java.base/share/classes/java/lang/Integer.java b/src/java.base/share/classes/java/lang/Integer.java
index 03629099971..6f6b845ce96 100644
--- a/src/java.base/share/classes/java/lang/Integer.java
+++ b/src/java.base/share/classes/java/lang/Integer.java
@@ -1377,7 +1377,7 @@ public final class Integer extends Number
*
* DecimalNumeral, HexDigits, and OctalDigits
* are as defined in section 3.10.1 of
- * The Java™ Language Specification,
+ * The Java Language Specification,
* except that underscores are not accepted between digits.
*
* The sequence of characters following an optional
diff --git a/src/java.base/share/classes/java/lang/Long.java b/src/java.base/share/classes/java/lang/Long.java
index 9d0ca53c7b6..4a51ae20b22 100644
--- a/src/java.base/share/classes/java/lang/Long.java
+++ b/src/java.base/share/classes/java/lang/Long.java
@@ -1229,7 +1229,7 @@ public final class Long extends Number
*
* DecimalNumeral, HexDigits, and OctalDigits
* are as defined in section 3.10.1 of
- * The Java™ Language Specification,
+ * The Java Language Specification,
* except that underscores are not accepted between digits.
*
* The sequence of characters following an optional
diff --git a/src/java.base/share/classes/java/lang/Module.java b/src/java.base/share/classes/java/lang/Module.java
index 9d708f6337c..32279ba4c2c 100644
--- a/src/java.base/share/classes/java/lang/Module.java
+++ b/src/java.base/share/classes/java/lang/Module.java
@@ -85,7 +85,7 @@ import sun.security.util.SecurityConstants;
*
* The package names that are parameters or returned by methods defined in
* this class are the fully-qualified names of the packages as defined in
- * section 6.5.3 of The Java™ Language Specification, for
+ * section 6.5.3 of The Java Language Specification, for
* example, {@code "java.lang"}. Unless otherwise specified, passing a {@code null} argument to a method
@@ -672,7 +672,7 @@ public final class Module implements AnnotatedElement {
* This method has no effect if the package is already exported (or
* open) to the given module.
* The general contract of {@code finalize} is that it is invoked
- * if and when the Java™ virtual
+ * if and when the Java virtual
* machine has determined that there is no longer any
* means by which this object can be accessed by any thread that has
* not yet died, except as a result of an action taken by the
diff --git a/src/java.base/share/classes/java/lang/Package.java b/src/java.base/share/classes/java/lang/Package.java
index 334d0b4b791..e359881d874 100644
--- a/src/java.base/share/classes/java/lang/Package.java
+++ b/src/java.base/share/classes/java/lang/Package.java
@@ -122,7 +122,7 @@ public class Package extends NamedPackage implements java.lang.reflect.Annotated
* Return the name of this package.
*
* @return The fully-qualified name of this package as defined in section 6.5.3 of
- * The Java™ Language Specification,
+ * The Java Language Specification,
* for example, {@code java.lang}
*/
public String getName() {
diff --git a/src/java.base/share/classes/java/lang/Record.java b/src/java.base/share/classes/java/lang/Record.java
index 6c81f09f282..4d568e8baa0 100644
--- a/src/java.base/share/classes/java/lang/Record.java
+++ b/src/java.base/share/classes/java/lang/Record.java
@@ -38,10 +38,10 @@ package java.lang;
* More information about records, including descriptions of the
* implicitly declared methods synthesized by the compiler, can be
* found in section 8.10 of
- * The Java™ Language Specification.
+ * The Java Language Specification.
*
* A record class is a shallowly immutable, transparent carrier for
- * a fixed set of values, called the record components. The Java™
+ * a fixed set of values, called the record components. The Java
* language provides concise syntax for declaring record classes, whereby the
* record components are declared in the record header. The list of record
* components declared in the record header form the record descriptor.
diff --git a/src/java.base/share/classes/java/lang/Short.java b/src/java.base/share/classes/java/lang/Short.java
index de3e738bd8d..2824c2dc8d3 100644
--- a/src/java.base/share/classes/java/lang/Short.java
+++ b/src/java.base/share/classes/java/lang/Short.java
@@ -295,7 +295,7 @@ public final class Short extends Number implements Comparable The sequence of characters following an optional
diff --git a/src/java.base/share/classes/java/lang/String.java b/src/java.base/share/classes/java/lang/String.java
index 33992cad98e..8ed94e7aa31 100644
--- a/src/java.base/share/classes/java/lang/String.java
+++ b/src/java.base/share/classes/java/lang/String.java
@@ -90,7 +90,7 @@ import static java.util.function.Predicate.not;
* The Java language provides special support for the string
* concatenation operator ( + ), and for conversion of
* other objects to strings. For additional information on string
- * concatenation and conversion, see The Java™ Language Specification.
+ * concatenation and conversion, see The Java Language Specification.
*
* Unless otherwise noted, passing a {@code null} argument to a constructor
* or method in this class will cause a {@link NullPointerException} to be
@@ -113,7 +113,7 @@ import static java.util.function.Predicate.not;
*
* @implNote The implementation of the string concatenation operator is left to
* the discretion of a Java compiler, as long as the compiler ultimately conforms
- * to The Java™ Language Specification. For example, the {@code javac} compiler
+ * to The Java Language Specification. For example, the {@code javac} compiler
* may implement the operator with {@code StringBuffer}, {@code StringBuilder},
* or {@code java.lang.invoke.StringConcatFactory} depending on the JDK version. The
* implementation of string conversion is typically through the method {@code toString},
@@ -3269,7 +3269,7 @@ public final class String
* extra arguments are ignored. The number of arguments is
* variable and may be zero. The maximum number of arguments is
* limited by the maximum dimension of a Java array as defined by
- * The Java™ Virtual Machine Specification.
+ * The Java Virtual Machine Specification.
* The behaviour on a
* {@code null} argument depends on the conversion.
@@ -3310,7 +3310,7 @@ public final class String
* extra arguments are ignored. The number of arguments is
* variable and may be zero. The maximum number of arguments is
* limited by the maximum dimension of a Java array as defined by
- * The Java™ Virtual Machine Specification.
+ * The Java Virtual Machine Specification.
* The behaviour on a
* {@code null} argument depends on the
* conversion.
@@ -3534,7 +3534,7 @@ public final class String
*
* All literal strings and string-valued constant expressions are
* interned. String literals are defined in section 3.10.5 of the
- * The Java™ Language Specification.
+ * The Java Language Specification.
*
* @return a string that has the same contents as this string, but is
* guaranteed to be from a pool of unique strings.
diff --git a/src/java.base/share/classes/java/lang/annotation/Annotation.java b/src/java.base/share/classes/java/lang/annotation/Annotation.java
index d186357b850..cd1ed787ceb 100644
--- a/src/java.base/share/classes/java/lang/annotation/Annotation.java
+++ b/src/java.base/share/classes/java/lang/annotation/Annotation.java
@@ -32,7 +32,7 @@ package java.lang.annotation;
* define an annotation type.
*
* More information about annotation types can be found in section {@jls 9.6} of
- * The Java™ Language Specification.
+ * The Java Language Specification.
*
* The {@link java.lang.reflect.AnnotatedElement} interface discusses
* compatibility concerns when evolving an annotation type from being
diff --git a/src/java.base/share/classes/java/lang/module/ModuleDescriptor.java b/src/java.base/share/classes/java/lang/module/ModuleDescriptor.java
index 895770c1276..e1e1191f3ab 100644
--- a/src/java.base/share/classes/java/lang/module/ModuleDescriptor.java
+++ b/src/java.base/share/classes/java/lang/module/ModuleDescriptor.java
@@ -1489,7 +1489,7 @@ public class ModuleDescriptor
* The module names, package names, and class names that are parameters
* specified to the builder methods are the module names, package names,
* and qualified names of classes (in named packages) as defined in the
- * The Java™ Language Specification. Example usage: This method returns {@code true} if the {@code accessible} flag
* is set to {@code true}, i.e. the checks for Java language access control
* are suppressed, or if the caller can access the member as
- * specified in The Java™ Language Specification,
+ * specified in The Java Language Specification,
* with the variation noted in the class description. If the constructor's declaring class is an inner class in a
* non-static context, the first argument to the constructor needs
* to be the enclosing instance; see section 15.9.3 of
- * The Java™ Language Specification.
+ * The Java Language Specification.
*
* If the required access and argument checks succeed and the
* instantiation will proceed, the constructor's declaring class
diff --git a/src/java.base/share/classes/java/lang/reflect/Executable.java b/src/java.base/share/classes/java/lang/reflect/Executable.java
index def7500f2ad..2b223c5ce6b 100644
--- a/src/java.base/share/classes/java/lang/reflect/Executable.java
+++ b/src/java.base/share/classes/java/lang/reflect/Executable.java
@@ -217,7 +217,7 @@ public abstract class Executable extends AccessibleObject
* @throws GenericSignatureFormatError if the generic
* signature of this generic declaration does not conform to
* the format specified in
- * The Java™ Virtual Machine Specification
+ * The Java Virtual Machine Specification
*/
public abstract TypeVariable[] getTypeParameters();
@@ -276,7 +276,7 @@ public abstract class Executable extends AccessibleObject
* @throws GenericSignatureFormatError
* if the generic method signature does not conform to the format
* specified in
- * The Java™ Virtual Machine Specification
+ * The Java Virtual Machine Specification
* @throws TypeNotPresentException if any of the parameter
* types of the underlying executable refers to a non-existent type
* declaration
@@ -474,7 +474,7 @@ public abstract class Executable extends AccessibleObject
* @throws GenericSignatureFormatError
* if the generic method signature does not conform to the format
* specified in
- * The Java™ Virtual Machine Specification
+ * The Java Virtual Machine Specification
* @throws TypeNotPresentException if the underlying executable's
* {@code throws} clause refers to a non-existent type declaration
* @throws MalformedParameterizedTypeException if
@@ -515,7 +515,7 @@ public abstract class Executable extends AccessibleObject
*
* @return true if and only if this executable is a synthetic
* construct as defined by
- * The Java™ Language Specification.
+ * The Java Language Specification.
* @jls 13.1 The Form of a Binary
*/
public boolean isSynthetic() {
diff --git a/src/java.base/share/classes/java/lang/reflect/Field.java b/src/java.base/share/classes/java/lang/reflect/Field.java
index 75bf314c5e0..4c1e394f78c 100644
--- a/src/java.base/share/classes/java/lang/reflect/Field.java
+++ b/src/java.base/share/classes/java/lang/reflect/Field.java
@@ -255,7 +255,7 @@ class Field extends AccessibleObject implements Member {
* the field represented by this {@code Field} object
* @throws GenericSignatureFormatError if the generic field
* signature does not conform to the format specified in
- * The Java™ Virtual Machine Specification
+ * The Java Virtual Machine Specification
* @throws TypeNotPresentException if the generic type
* signature of the underlying field refers to a non-existent
* type declaration
diff --git a/src/java.base/share/classes/java/lang/reflect/GenericDeclaration.java b/src/java.base/share/classes/java/lang/reflect/GenericDeclaration.java
index 042e359ad6f..c389f407d6e 100644
--- a/src/java.base/share/classes/java/lang/reflect/GenericDeclaration.java
+++ b/src/java.base/share/classes/java/lang/reflect/GenericDeclaration.java
@@ -43,7 +43,7 @@ public interface GenericDeclaration extends AnnotatedElement {
* @throws GenericSignatureFormatError if the generic
* signature of this generic declaration does not conform to
* the format specified in
- * The Java™ Virtual Machine Specification
+ * The Java Virtual Machine Specification
*/
public TypeVariable[] getTypeParameters();
}
diff --git a/src/java.base/share/classes/java/lang/reflect/Method.java b/src/java.base/share/classes/java/lang/reflect/Method.java
index 93dd2f491a7..c86808cf797 100644
--- a/src/java.base/share/classes/java/lang/reflect/Method.java
+++ b/src/java.base/share/classes/java/lang/reflect/Method.java
@@ -277,7 +277,7 @@ public final class Method extends Executable {
* @throws GenericSignatureFormatError
* if the generic method signature does not conform to the format
* specified in
- * The Java™ Virtual Machine Specification
+ * The Java Virtual Machine Specification
* @throws TypeNotPresentException if the underlying method's
* return type refers to a non-existent type declaration
* @throws MalformedParameterizedTypeException if the
diff --git a/src/java.base/share/classes/java/lang/reflect/Modifier.java b/src/java.base/share/classes/java/lang/reflect/Modifier.java
index a0980db5e05..1355a6c664d 100644
--- a/src/java.base/share/classes/java/lang/reflect/Modifier.java
+++ b/src/java.base/share/classes/java/lang/reflect/Modifier.java
@@ -33,7 +33,7 @@ import java.util.StringJoiner;
* modifiers are represented as integers with distinct bit positions
* representing different modifiers. The values for the constants
* representing the modifiers are taken from the tables in sections 4.1, 4.4, 4.5, and 4.7 of
- * The Java™ Virtual Machine Specification.
+ * The Java Virtual Machine Specification.
*
* @see Class#getModifiers()
* @see Member#getModifiers()
@@ -201,7 +201,7 @@ public class Modifier {
* Semantics of arithmetic operations exactly mimic those of Java's integer
- * arithmetic operators, as defined in The Java™ Language Specification.
+ * arithmetic operators, as defined in The Java Language Specification.
* For example, division by zero throws an {@code ArithmeticException}, and
* division of a negative by a positive yields a negative (or zero) remainder.
*
@@ -4152,7 +4152,7 @@ public class BigInteger extends Number implements Comparable The maximum number of arguments is limited by the maximum dimension of a
* Java array as defined by
- * The Java™ Virtual Machine Specification.
+ * The Java Virtual Machine Specification.
* If the argument index does not correspond to an
* available argument, then a {@link MissingFormatArgumentException} is thrown.
*
@@ -2589,7 +2589,7 @@ public final class Formatter implements Closeable, Flushable {
* string. If there are more arguments than format specifiers, the
* extra arguments are ignored. The maximum number of arguments is
* limited by the maximum dimension of a Java array as defined by
- * The Java™ Virtual Machine Specification.
+ * The Java Virtual Machine Specification.
*
* @throws IllegalFormatException
* If a format string contains an illegal syntax, a format
@@ -2628,7 +2628,7 @@ public final class Formatter implements Closeable, Flushable {
* string. If there are more arguments than format specifiers, the
* extra arguments are ignored. The maximum number of arguments is
* limited by the maximum dimension of a Java array as defined by
- * The Java™ Virtual Machine Specification.
+ * The Java Virtual Machine Specification.
*
* @throws IllegalFormatException
* If a format string contains an illegal syntax, a format
diff --git a/src/java.base/share/classes/java/util/Properties.java b/src/java.base/share/classes/java/util/Properties.java
index 9e6fe2e0bc5..2f4bc9d0332 100644
--- a/src/java.base/share/classes/java/util/Properties.java
+++ b/src/java.base/share/classes/java/util/Properties.java
@@ -95,7 +95,7 @@ import jdk.internal.util.xml.PropertiesDefaultHandler;
* the input/output stream is encoded in ISO 8859-1 character encoding.
* Characters that cannot be directly represented in this encoding can be written using
* Unicode escapes as defined in section 3.3 of
- * The Java™ Language Specification;
+ * The Java Language Specification;
* only a single 'u' character is allowed in an escape
* sequence.
*
@@ -337,7 +337,7 @@ public class Properties extends Hashtable
* The specified stream remains open after this method returns.
*
diff --git a/src/java.base/share/classes/java/util/PropertyResourceBundle.java b/src/java.base/share/classes/java/util/PropertyResourceBundle.java
index 48e800369e4..fba731b3bd9 100644
--- a/src/java.base/share/classes/java/util/PropertyResourceBundle.java
+++ b/src/java.base/share/classes/java/util/PropertyResourceBundle.java
@@ -120,7 +120,7 @@ import sun.util.ResourceBundleEnumeration;
* and throws the exception if it encounters an invalid sequence.
* If "ISO-8859-1" is specified, characters that cannot be represented in
* ISO-8859-1 encoding must be represented by Unicode Escapes as defined in section
- * 3.3 of The Java™ Language Specification
+ * 3.3 of The Java Language Specification
* whereas the other constructor which takes a {@code Reader} does not have that limitation.
* Other encoding values are ignored for this system property.
* The system property is read and evaluated when initializing this class.
diff --git a/src/java.base/share/classes/java/util/concurrent/locks/Lock.java b/src/java.base/share/classes/java/util/concurrent/locks/Lock.java
index a59d3ee3d9d..84100e64a13 100644
--- a/src/java.base/share/classes/java/util/concurrent/locks/Lock.java
+++ b/src/java.base/share/classes/java/util/concurrent/locks/Lock.java
@@ -123,7 +123,7 @@ import java.util.concurrent.TimeUnit;
* memory synchronization semantics as provided by the built-in monitor
* lock, as described in
* Chapter 17 of
- * The Java™ Language Specification:
+ * The Java Language Specification:
* Memory Synchronization. Methods with the effect of
* successfully locking in any mode have the same memory
* synchronization effects as a Lock action, as described in
- * Chapter 17 of The Java™ Language Specification.
+ * Chapter 17 of The Java Language Specification.
* Methods successfully unlocking in write mode have the same memory
* synchronization effects as an Unlock action. In optimistic
* read usages, actions prior to the most recent write mode unlock action
diff --git a/src/java.base/share/classes/java/util/concurrent/package-info.java b/src/java.base/share/classes/java/util/concurrent/package-info.java
index 7695b109842..dd0c8f79bc0 100644
--- a/src/java.base/share/classes/java/util/concurrent/package-info.java
+++ b/src/java.base/share/classes/java/util/concurrent/package-info.java
@@ -227,7 +227,7 @@
* The documents in this section are non-normative portions of
-the Java™ Platform, Standard Edition API Specification. Backslashes within string literals in Java source code are interpreted
* as required by
- * The Java™ Language Specification
+ * The Java Language Specification
* as either Unicode escapes (section 3.3) or other character escapes (section 3.10.6)
* It is therefore necessary to double backslashes in string
* literals that represent regular expressions to protect them from
@@ -544,7 +544,7 @@ import jdk.internal.util.ArraysSupport;
*
* Unicode escape sequences such as Note that additional source version constants will be added to
@@ -69,7 +69,7 @@ public enum SourceVersion {
* The original version.
*
* The language described in
- * The Java™ Language Specification, First Edition.
+ * The Java Language Specification, First Edition.
*/
RELEASE_0,
@@ -77,7 +77,7 @@ public enum SourceVersion {
* The version recognized by the Java Platform 1.1.
*
* The language is {@code RELEASE_0} augmented with nested classes as described in the 1.1 update to
- * The Java™ Language Specification, First Edition.
+ * The Java Language Specification, First Edition.
*/
RELEASE_1,
@@ -86,7 +86,7 @@ public enum SourceVersion {
* v 1.2.
*
* The language described in
- * The Java™ Language Specification,
+ * The Java Language Specification,
* Second Edition, which includes the {@code
* strictfp} modifier.
*/
@@ -113,7 +113,7 @@ public enum SourceVersion {
* Edition 5.0.
*
* The language described in
- * The Java™ Language Specification,
+ * The Java Language Specification,
* Third Edition. First release to support
* generics, annotations, autoboxing, var-args, enhanced {@code
* for} loop, and hexadecimal floating-point literals.
diff --git a/src/java.compiler/share/classes/javax/lang/model/element/AnnotationValueVisitor.java b/src/java.compiler/share/classes/javax/lang/model/element/AnnotationValueVisitor.java
index 13dbecb160f..fd730a253df 100644
--- a/src/java.compiler/share/classes/javax/lang/model/element/AnnotationValueVisitor.java
+++ b/src/java.compiler/share/classes/javax/lang/model/element/AnnotationValueVisitor.java
@@ -51,7 +51,7 @@ import javax.lang.model.util.*;
* @apiNote
* WARNING: It is possible that methods will be added
* to this interface to accommodate new, currently unknown, language
- * structures added to future versions of the Java™ programming
+ * structures added to future versions of the Java programming
* language.
*
* Such additions have already occurred in another visitor interface in
diff --git a/src/java.compiler/share/classes/javax/lang/model/element/ElementKind.java b/src/java.compiler/share/classes/javax/lang/model/element/ElementKind.java
index 68f9dfce7f6..deb9f8006c6 100644
--- a/src/java.compiler/share/classes/javax/lang/model/element/ElementKind.java
+++ b/src/java.compiler/share/classes/javax/lang/model/element/ElementKind.java
@@ -30,7 +30,7 @@ package javax.lang.model.element;
*
* Note that it is possible additional element kinds will be added
* to accommodate new, currently unknown, language structures added to
- * future versions of the Java™ programming language.
+ * future versions of the Java programming language.
*
* @author Joseph D. Darcy
* @author Scott Seligman
diff --git a/src/java.compiler/share/classes/javax/lang/model/element/ElementVisitor.java b/src/java.compiler/share/classes/javax/lang/model/element/ElementVisitor.java
index 265bc6947cb..dd37a25db4f 100644
--- a/src/java.compiler/share/classes/javax/lang/model/element/ElementVisitor.java
+++ b/src/java.compiler/share/classes/javax/lang/model/element/ElementVisitor.java
@@ -43,7 +43,7 @@ import javax.lang.model.util.*;
* @apiNote
* WARNING: It is possible that methods will be added
* to this interface to accommodate new, currently unknown, language
- * structures added to future versions of the Java™ programming
+ * structures added to future versions of the Java programming
* language.
*
* Such additions have already occurred to support language features
diff --git a/src/java.compiler/share/classes/javax/lang/model/element/Modifier.java b/src/java.compiler/share/classes/javax/lang/model/element/Modifier.java
index d6a38787397..f8aef53bae3 100644
--- a/src/java.compiler/share/classes/javax/lang/model/element/Modifier.java
+++ b/src/java.compiler/share/classes/javax/lang/model/element/Modifier.java
@@ -107,7 +107,7 @@ public enum Modifier {
/**
* Returns this modifier's name as defined in The
- * Java™ Language Specification.
+ * Java Language Specification Note that it is possible additional directive kinds will be added
* to accommodate new, currently unknown, language structures added to
- * future versions of the Java™ programming language.
+ * future versions of the Java programming language.
*
* @since 9
* @spec JPMS
@@ -213,7 +213,7 @@ public interface ModuleElement extends Element, QualifiedNameable {
*
* WARNING: It is possible that methods will be added to
* this interface to accommodate new, currently unknown, language
- * structures added to future versions of the Java™ programming
+ * structures added to future versions of the Java programming
* language. Methods to accommodate new language constructs will
* be added in a source compatible way using
* default methods.
diff --git a/src/java.compiler/share/classes/javax/lang/model/type/TypeKind.java b/src/java.compiler/share/classes/javax/lang/model/type/TypeKind.java
index 4618757da2e..66696e544b7 100644
--- a/src/java.compiler/share/classes/javax/lang/model/type/TypeKind.java
+++ b/src/java.compiler/share/classes/javax/lang/model/type/TypeKind.java
@@ -31,7 +31,7 @@ package javax.lang.model.type;
*
* Note that it is possible additional type kinds will be added to
* accommodate new, currently unknown, language structures added to
- * future versions of the Java™ programming language.
+ * future versions of the Java programming language.
*
* @author Joseph D. Darcy
* @author Scott Seligman
diff --git a/src/java.compiler/share/classes/javax/lang/model/type/TypeVariable.java b/src/java.compiler/share/classes/javax/lang/model/type/TypeVariable.java
index 1056ad7c356..47d29bd3c0a 100644
--- a/src/java.compiler/share/classes/javax/lang/model/type/TypeVariable.java
+++ b/src/java.compiler/share/classes/javax/lang/model/type/TypeVariable.java
@@ -39,7 +39,7 @@ import javax.lang.model.util.Types;
* A type variable may also be declared implicitly, as by
* the capture conversion of a wildcard type argument
* (see chapter {@jls 5} of
- * The Java™ Language Specification).
+ * The Java Language Specification).
*
* @author Joseph D. Darcy
* @author Scott Seligman
diff --git a/src/java.compiler/share/classes/javax/lang/model/type/TypeVisitor.java b/src/java.compiler/share/classes/javax/lang/model/type/TypeVisitor.java
index fb7310043d4..7172c17a614 100644
--- a/src/java.compiler/share/classes/javax/lang/model/type/TypeVisitor.java
+++ b/src/java.compiler/share/classes/javax/lang/model/type/TypeVisitor.java
@@ -44,7 +44,7 @@ import javax.lang.model.util.*;
* @apiNote
* WARNING: It is possible that methods will be added
* to this interface to accommodate new, currently unknown, language
- * structures added to future versions of the Java™ programming
+ * structures added to future versions of the Java programming
* language.
*
* Such additions have already occurred to support language features
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor6.java b/src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor6.java
index e31b72b5adf..0bf5674a6fb 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor6.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor6.java
@@ -42,7 +42,7 @@ import javax.annotation.processing.SupportedSourceVersion;
* AnnotationValueVisitor} interface implemented by this class may
* have methods added to it in the future to accommodate new,
* currently unknown, language structures added to future versions of
- * the Java™ programming language. Therefore, methods whose
+ * the Java programming language. Therefore, methods whose
* names begin with {@code "visit"} may be added to this class in the
* future; to avoid incompatibilities, classes and subclasses which
* extend this class should not declare any instance methods with
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor6.java b/src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor6.java
index 429f2df3723..c10c0c33c92 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor6.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/AbstractElementVisitor6.java
@@ -41,7 +41,7 @@ import static javax.lang.model.SourceVersion.*;
* ElementVisitor} interface implemented by this class may have
* methods added to it in the future to accommodate new, currently
* unknown, language structures added to future versions of the
- * Java™ programming language. Therefore, methods whose names
+ * Java programming language. Therefore, methods whose names
* begin with {@code "visit"} may be added to this class in the
* future; to avoid incompatibilities, classes and subclasses which
* extend this class should not declare any instance methods with
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitor6.java b/src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitor6.java
index 2dcf1095072..52e2686e055 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitor6.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/AbstractTypeVisitor6.java
@@ -39,7 +39,7 @@ import static javax.lang.model.SourceVersion.*;
* WARNING: The {@code
* TypeVisitor} interface implemented by this class may have methods
* added to it in the future to accommodate new, currently unknown,
- * language structures added to future versions of the Java™
+ * language structures added to future versions of the Java
* programming language. Therefore, methods whose names begin with
* {@code "visit"} may be added to this class in the future; to avoid
* incompatibilities, classes and subclasses which extend this class
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor6.java b/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor6.java
index 4bf1cc705ef..356accba1e0 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor6.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/ElementKindVisitor6.java
@@ -52,7 +52,7 @@ import javax.lang.model.SourceVersion;
* methods added to it or the {@link ElementKind ElementKind enum}
* used in this class may have constants added to it in the future to
* accommodate new, currently unknown, language structures added to
- * future versions of the Java™ programming language.
+ * future versions of the Java programming language.
* Therefore, methods whose names begin with {@code "visit"} may be
* added to this class in the future; to avoid incompatibilities,
* classes and subclasses which extend this class should not declare
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner6.java b/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner6.java
index 98320e98c97..f19fd560772 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner6.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/ElementScanner6.java
@@ -63,7 +63,7 @@ import static javax.lang.model.SourceVersion.*;
* WARNING: The {@code ElementVisitor} interface
* implemented by this class may have methods added to it in the
* future to accommodate new, currently unknown, language structures
- * added to future versions of the Java™ programming language.
+ * added to future versions of the Java programming language.
* Therefore, methods whose names begin with {@code "visit"} may be
* added to this class in the future; to avoid incompatibilities,
* classes which extend this class should not declare any instance
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor6.java b/src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor6.java
index 70328e12bbe..64bbdda4fc4 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor6.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/SimpleAnnotationValueVisitor6.java
@@ -49,7 +49,7 @@ import javax.annotation.processing.SupportedSourceVersion;
* AnnotationValueVisitor} interface implemented by this class may
* have methods added to it in the future to accommodate new,
* currently unknown, language structures added to future versions of
- * the Java™ programming language. Therefore, methods whose
+ * the Java programming language. Therefore, methods whose
* names begin with {@code "visit"} may be added to this class in the
* future; to avoid incompatibilities, classes and subclasses which
* extend this class should not declare any instance methods with
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor6.java b/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor6.java
index 0d851aa49f8..385ace89f5a 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor6.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/SimpleElementVisitor6.java
@@ -52,7 +52,7 @@ import static javax.lang.model.SourceVersion.*;
* ElementVisitor} interface implemented by this class may have
* methods added to it in the future to accommodate new, currently
* unknown, language structures added to future versions of the
- * Java™ programming language. Therefore, methods whose names
+ * Java programming language. Therefore, methods whose names
* begin with {@code "visit"} may be added to this class in the
* future; to avoid incompatibilities, classes and subclasses which
* extend this class should not declare any instance methods with
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor6.java b/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor6.java
index 26e04b567ec..38701ee71fd 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor6.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/SimpleTypeVisitor6.java
@@ -50,7 +50,7 @@ import static javax.lang.model.SourceVersion.*;
* WARNING: The {@code
* TypeVisitor} interface implemented by this class may have methods
* added to it in the future to accommodate new, currently unknown,
- * language structures added to future versions of the Java™
+ * language structures added to future versions of the Java
* programming language. Therefore, methods whose names begin with
* {@code "visit"} may be added to this class in the future; to avoid
* incompatibilities, classes and subclasses which extend this class
diff --git a/src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitor6.java b/src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitor6.java
index 2cad9f82027..661ecdd6e76 100644
--- a/src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitor6.java
+++ b/src/java.compiler/share/classes/javax/lang/model/util/TypeKindVisitor6.java
@@ -50,7 +50,7 @@ import static javax.lang.model.SourceVersion.*;
* added to it or the {@link TypeKind TypeKind enum} used in this
* class may have constants added to it in the future to accommodate
* new, currently unknown, language structures added to future
- * versions of the Java™ programming language. Therefore,
+ * versions of the Java programming language. Therefore,
* methods whose names begin with {@code "visit"} may be added to this
* class in the future; to avoid incompatibilities, classes and
* subclasses which extend this class should not declare any instance
diff --git a/src/java.compiler/share/classes/javax/tools/Diagnostic.java b/src/java.compiler/share/classes/javax/tools/Diagnostic.java
index 4c1e8f8dd4a..2440787b626 100644
--- a/src/java.compiler/share/classes/javax/tools/Diagnostic.java
+++ b/src/java.compiler/share/classes/javax/tools/Diagnostic.java
@@ -71,7 +71,7 @@ public interface Diagnostic The compiler might generate diagnostics during compilation (for
@@ -56,9 +56,9 @@ import javax.annotation.processing.Processor;
* #getStandardFileManager getStandardFileManager}.
*
* An instance implementing this interface must conform to
- * The Java™ Language Specification
+ * The Java Language Specification
* and generate class files conforming to
- * The Java™ Virtual Machine Specification.
+ * The Java Virtual Machine Specification.
* The versions of these
* specifications are defined in the {@linkplain Tool} interface.
*
diff --git a/src/java.compiler/share/classes/javax/tools/JavaFileManager.java b/src/java.compiler/share/classes/javax/tools/JavaFileManager.java
index 8c4e77c0a2b..a6bf36f2cb8 100644
--- a/src/java.compiler/share/classes/javax/tools/JavaFileManager.java
+++ b/src/java.compiler/share/classes/javax/tools/JavaFileManager.java
@@ -35,7 +35,7 @@ import java.util.Set;
import static javax.tools.JavaFileObject.Kind;
/**
- * File manager for tools operating on Java™ programming language
+ * File manager for tools operating on Java programming language
* source and class files. In this context, file means an
* abstraction of regular files and other sources of data.
*
@@ -52,14 +52,14 @@ import static javax.tools.JavaFileObject.Kind;
* fully qualified class and interface names. For convenience '.'
* and '/' are interchangeable. The internal form is defined in
* chapter four of
- * The Java™ Virtual Machine Specification.
+ * The Java Virtual Machine Specification.
*
* Discussion: this means that the names
* "java/lang.package-info", "java/lang/package-info",
* "java.lang.package-info", are valid and equivalent. Compare to
* binary name as defined in
- * The Java™ Language Specification,
+ * The Java Language Specification,
* section 13.1 "The Form of a Binary".
* All methods in this interface might throw a SecurityException if
@@ -94,7 +94,7 @@ public interface JavaFileObject extends FileObject {
* Checks if this file object is compatible with the specified
* simple name and kind. A simple name is a single identifier
* (not qualified) as defined in
- * The Java™ Language Specification,
+ * The Java Language Specification,
* section 6.2 "Names and Identifiers".
*
* @param simpleName a simple name of a class
diff --git a/src/java.compiler/share/classes/javax/tools/Tool.java b/src/java.compiler/share/classes/javax/tools/Tool.java
index 75ec4fe07be..cb9a79d1645 100644
--- a/src/java.compiler/share/classes/javax/tools/Tool.java
+++ b/src/java.compiler/share/classes/javax/tools/Tool.java
@@ -76,7 +76,7 @@ public interface Tool {
int run(InputStream in, OutputStream out, OutputStream err, String... arguments);
/**
- * Returns the source versions of the Java™ programming language
+ * Returns the source versions of the Java programming language
* supported by this tool.
* @return a set of supported source versions
*/
diff --git a/src/java.compiler/share/classes/javax/tools/ToolProvider.java b/src/java.compiler/share/classes/javax/tools/ToolProvider.java
index 8ca5b1ba254..487a6e8963f 100644
--- a/src/java.compiler/share/classes/javax/tools/ToolProvider.java
+++ b/src/java.compiler/share/classes/javax/tools/ToolProvider.java
@@ -51,7 +51,7 @@ public class ToolProvider {
public ToolProvider() {}
/**
- * Returns the Java™ programming language compiler provided
+ * Returns the Java programming language compiler provided
* with this platform.
* The file manager returned by calling
* {@link JavaCompiler#getStandardFileManager getStandardFileManager}
@@ -72,7 +72,7 @@ public class ToolProvider {
private static final String systemDocumentationToolName = "jdk.javadoc.internal.api.JavadocTool";
/**
- * Returns the Java™ programming language documentation tool provided
+ * Returns the Java programming language documentation tool provided
* with this platform.
* The file manager returned by calling
* {@link DocumentationTool#getStandardFileManager getStandardFileManager}
diff --git a/src/java.compiler/share/classes/javax/tools/package-info.java b/src/java.compiler/share/classes/javax/tools/package-info.java
index 52e0704cb64..e7883f9be74 100644
--- a/src/java.compiler/share/classes/javax/tools/package-info.java
+++ b/src/java.compiler/share/classes/javax/tools/package-info.java
@@ -28,7 +28,7 @@
* for example, compilers.
*
* These interfaces and classes are required as part of the
- * Java™ Platform, Standard Edition (Java SE),
+ * Java Platform, Standard Edition (Java SE),
* but there is no requirement to provide any tools implementing them.
*
* Unless explicitly allowed, all methods in this package might
diff --git a/src/java.desktop/share/classes/com/sun/beans/TypeResolver.java b/src/java.desktop/share/classes/com/sun/beans/TypeResolver.java
index 942ed5d8297..25f07947310 100644
--- a/src/java.desktop/share/classes/com/sun/beans/TypeResolver.java
+++ b/src/java.desktop/share/classes/com/sun/beans/TypeResolver.java
@@ -224,7 +224,7 @@ public final class TypeResolver {
* Converts the given {@code type} to the corresponding class.
* This method implements the concept of type erasure,
* that is described in section 4.6 of
- * The Java™ Language Specification.
+ * The Java Language Specification.
*
* @param type the array of types to convert
* @return a corresponding class
diff --git a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKPainter.java b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKPainter.java
index 37dd3ec7772..fb3e005b094 100644
--- a/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKPainter.java
+++ b/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKPainter.java
@@ -185,6 +185,21 @@ class GTKPainter extends SynthPainter {
}
}
+ //This is workaround used to draw the highlight
+ // when the MENU or MenuItem is selected on some platforms
+ //This should be properly fixed by reading color from css
+ private void paintComponentBackground(SynthContext context,
+ Graphics g, int x, int y,
+ int w, int h) {
+ GTKStyle style = (GTKStyle) context.getStyle();
+ Color highlightColor =
+ style.getGTKColor(GTKEngine.WidgetType.TEXT_AREA.ordinal(),
+ GTKLookAndFeel.synthStateToGTKStateType(SynthConstants.SELECTED).ordinal(),
+ ColorType.BACKGROUND.getID());
+ g.setColor(highlightColor);
+ g.fillRect(x, y, w, h);
+ }
+
//
// RADIO_BUTTON_MENU_ITEM
//
@@ -196,6 +211,10 @@ class GTKPainter extends SynthPainter {
int gtkState = GTKLookAndFeel.synthStateToGTKState(
id, context.getComponentState());
if (gtkState == SynthConstants.MOUSE_OVER) {
+ if (GTKLookAndFeel.is3()) {
+ paintComponentBackground(context, g, x, y, w, h);
+ return;
+ }
synchronized (UNIXToolkit.GTK_LOCK) {
if (! ENGINE.paintCachedImage(g, x, y, w, h, id)) {
ShadowType shadow = (GTKLookAndFeel.is2_2() ?
@@ -535,34 +554,6 @@ class GTKPainter extends SynthPainter {
}
}
- private int getBrightness(Color c) {
- return Math.max(c.getRed(), Math.max(c.getGreen(), c.getBlue()));
- }
-
- private int getMaxColorDiff(Color c1, Color c2) {
- return Math.max(Math.abs(c1.getRed() - c2.getRed()),
- Math.max(Math.abs(c1.getGreen() - c2.getGreen()),
- Math.abs(c1.getBlue() - c2.getBlue())));
- }
-
- private int scaleColorComponent(int color, double scaleFactor) {
- return (int)(color + color * scaleFactor);
- }
- private Color deriveColor(Color originalColor, int originalBrightness,
- int targetBrightness) {
- int r, g, b;
- if (originalBrightness == 0) {
- r = g = b = targetBrightness;
- } else {
- double scaleFactor = (targetBrightness - originalBrightness)
- / originalBrightness ;
- r = scaleColorComponent(originalColor.getRed(), scaleFactor);
- g = scaleColorComponent(originalColor.getGreen(), scaleFactor);
- b = scaleColorComponent(originalColor.getBlue(), scaleFactor);
- }
- return new Color(r, g, b);
- }
-
//
// MENU
//
@@ -579,56 +570,9 @@ class GTKPainter extends SynthPainter {
int gtkState = GTKLookAndFeel.synthStateToGTKState(
context.getRegion(), context.getComponentState());
if (gtkState == SynthConstants.MOUSE_OVER) {
- if (GTKLookAndFeel.is3() && context.getRegion() == Region.MENU) {
- GTKStyle style = (GTKStyle)context.getStyle();
- Color highlightColor = style.getGTKColor(
- GTKEngine.WidgetType.MENU_ITEM.ordinal(),
- gtkState, ColorType.BACKGROUND.getID());
- Color backgroundColor = style.getGTKColor(
- GTKEngine.WidgetType.MENU_BAR.ordinal(),
- SynthConstants.ENABLED, ColorType.BACKGROUND.getID());
-
- int minBrightness = 0, maxBrightness = 255;
- int minBrightnessDifference = 100;
- int actualBrightnessDifference =
- getMaxColorDiff(highlightColor, backgroundColor);
- if (actualBrightnessDifference < minBrightnessDifference) {
- int highlightBrightness =
- getBrightness(highlightColor);
- int backgroundBrightness =
- getBrightness(backgroundColor);
- int originalHighlightBrightness =
- highlightBrightness;
- if (highlightBrightness >= backgroundBrightness) {
- if (backgroundBrightness + minBrightnessDifference <=
- maxBrightness) {
- highlightBrightness =
- backgroundBrightness +
- minBrightnessDifference;
- } else {
- highlightBrightness =
- backgroundBrightness -
- minBrightnessDifference;
- }
- } else {
- if (backgroundBrightness - minBrightnessDifference >=
- minBrightness) {
- highlightBrightness =
- backgroundBrightness -
- minBrightnessDifference;
- } else {
- highlightBrightness =
- backgroundBrightness +
- minBrightnessDifference;
- }
- }
-
- g.setColor(deriveColor(highlightColor,
- originalHighlightBrightness,
- highlightBrightness));
- g.fillRect(x, y, w, h);
- return;
- }
+ if (GTKLookAndFeel.is3()) {
+ paintComponentBackground(context, g, x, y, w, h);
+ return;
}
Region id = Region.MENU_ITEM;
synchronized (UNIXToolkit.GTK_LOCK) {
diff --git a/src/java.desktop/share/classes/java/awt/GraphicsDevice.java b/src/java.desktop/share/classes/java/awt/GraphicsDevice.java
index 6e3ddf01e62..d878f610fca 100644
--- a/src/java.desktop/share/classes/java/awt/GraphicsDevice.java
+++ b/src/java.desktop/share/classes/java/awt/GraphicsDevice.java
@@ -160,7 +160,7 @@ public abstract class GraphicsDevice {
* {@code GraphicsEnvironment}. Although there is
* no public method to set this {@code String}, a programmer can
* use the {@code String} for debugging purposes. Vendors of
- * the Java™ Runtime Environment can
+ * the Java Runtime Environment can
* format the return value of the {@code String}. To determine
* how to interpret the value of the {@code String}, contact the
* vendor of your Java Runtime. To find out who the vendor is, from
diff --git a/src/java.desktop/share/classes/java/awt/doc-files/AWTThreadIssues.html b/src/java.desktop/share/classes/java/awt/doc-files/AWTThreadIssues.html
index 95beae4590a..75ff54a7ffa 100644
--- a/src/java.desktop/share/classes/java/awt/doc-files/AWTThreadIssues.html
+++ b/src/java.desktop/share/classes/java/awt/doc-files/AWTThreadIssues.html
@@ -47,7 +47,7 @@ newly added listener is only notified on subsequent key events.
* The key assumptions are that the class has a nullary constructor
diff --git a/src/java.desktop/share/classes/java/beans/DesignMode.java b/src/java.desktop/share/classes/java/beans/DesignMode.java
index 55d99ea7dd5..bcc9f756848 100644
--- a/src/java.desktop/share/classes/java/beans/DesignMode.java
+++ b/src/java.desktop/share/classes/java/beans/DesignMode.java
@@ -31,7 +31,7 @@ package java.beans;
* of java.beans.beancontext.BeanContext, in order to propagate to its nested hierarchy
* of java.beans.beancontext.BeanContextChild instances, the current "designTime" property.
*
- * The JavaBeans™ specification defines the notion of design time as is a
+ * The JavaBeans specification defines the notion of design time as is a
* mode in which JavaBeans instances should function during their composition
* and customization in a interactive design, composition or construction tool,
* as opposed to runtime when the JavaBean is part of an applet, application,
diff --git a/src/java.desktop/share/classes/java/beans/IndexedPropertyChangeEvent.java b/src/java.desktop/share/classes/java/beans/IndexedPropertyChangeEvent.java
index 40d4f9d7cd5..6a96d7dc996 100644
--- a/src/java.desktop/share/classes/java/beans/IndexedPropertyChangeEvent.java
+++ b/src/java.desktop/share/classes/java/beans/IndexedPropertyChangeEvent.java
@@ -26,7 +26,7 @@ package java.beans;
/**
* An "IndexedPropertyChange" event gets delivered whenever a component that
- * conforms to the JavaBeans™ specification (a "bean") changes a bound
+ * conforms to the JavaBeans specification (a "bean") changes a bound
* indexed property. This class is an extension of {@code PropertyChangeEvent}
* but contains the index of the property that has changed.
*
diff --git a/src/java.desktop/share/classes/java/beans/Introspector.java b/src/java.desktop/share/classes/java/beans/Introspector.java
index b0013e9ce4d..1faaf47be67 100644
--- a/src/java.desktop/share/classes/java/beans/Introspector.java
+++ b/src/java.desktop/share/classes/java/beans/Introspector.java
@@ -87,7 +87,7 @@ import sun.reflect.misc.ReflectUtil;
*
* For more information about introspection and design patterns, please
* consult the
- * JavaBeans™ specification.
+ * JavaBeans specification.
*
* @since 1.1
*/
@@ -1122,7 +1122,7 @@ public class Introspector {
try {
type = ClassFinder.findClass(name, type.getClassLoader());
// Each customizer should inherit java.awt.Component and implement java.beans.Customizer
- // according to the section 9.3 of JavaBeans™ specification
+ // according to the section 9.3 of JavaBeans specification
if (Component.class.isAssignableFrom(type) && Customizer.class.isAssignableFrom(type)) {
return type;
}
diff --git a/src/java.desktop/share/classes/java/beans/PropertyChangeSupport.java b/src/java.desktop/share/classes/java/beans/PropertyChangeSupport.java
index cf7e34ebb4c..0a1a0377dbe 100644
--- a/src/java.desktop/share/classes/java/beans/PropertyChangeSupport.java
+++ b/src/java.desktop/share/classes/java/beans/PropertyChangeSupport.java
@@ -41,7 +41,7 @@ import java.util.Map.Entry;
* or for a property specified by name.
*
* Here is an example of {@code PropertyChangeSupport} usage that follows
- * the rules and recommendations laid out in the JavaBeans™ specification:
+ * the rules and recommendations laid out in the JavaBeans specification:
*
* Here is an example of {@code VetoableChangeSupport} usage that follows
- * the rules and recommendations laid out in the JavaBeans™ specification:
+ * the rules and recommendations laid out in the JavaBeans specification:
*
* The MIDI standard expresses MIDI data in bytes.
- * However, because Java™ uses signed bytes, the Java Sound API uses
+ * However, because Java uses signed bytes, the Java Sound API uses
* integers instead of bytes when expressing MIDI data. For example, the
* {@link #getStatus()} method of {@code MidiMessage} returns MIDI status bytes
* as integers. If you are processing MIDI data that originated outside Java
diff --git a/src/java.desktop/share/classes/javax/swing/AbstractAction.java b/src/java.desktop/share/classes/javax/swing/AbstractAction.java
index 5c8f6e6626f..b831b6bc089 100644
--- a/src/java.desktop/share/classes/javax/swing/AbstractAction.java
+++ b/src/java.desktop/share/classes/javax/swing/AbstractAction.java
@@ -49,7 +49,7 @@ import sun.security.action.GetPropertyAction;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the
@@ -2883,7 +2883,7 @@ public class JList
@@ -502,7 +502,7 @@ public class JMenuBar extends JComponent implements Accessible,MenuElement
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the
* Note the term class file is used as defined in section 3.1 of
- * The Java™ Virtual Machine Specification, to mean a
+ * The Java Virtual Machine Specification, to mean a
* sequence of bytes in class file format, whether or not they reside in a
* file.
*
diff --git a/src/java.instrument/share/classes/java/lang/instrument/Instrumentation.java b/src/java.instrument/share/classes/java/lang/instrument/Instrumentation.java
index 06a5bc6bc7a..cd57f0188e1 100644
--- a/src/java.instrument/share/classes/java/lang/instrument/Instrumentation.java
+++ b/src/java.instrument/share/classes/java/lang/instrument/Instrumentation.java
@@ -450,7 +450,7 @@ public interface Instrumentation {
* instrumentation classes.
*
*
- * The Java™ Virtual Machine Specification
+ * The Java Virtual Machine Specification
* specifies that a subsequent attempt to resolve a symbolic
* reference that the Java virtual machine has previously unsuccessfully attempted
* to resolve always fails with the same error that was thrown as a result of the
@@ -504,7 +504,7 @@ public interface Instrumentation {
* parameter to the
- * The Java™ Virtual Machine Specification
+ * The Java Virtual Machine Specification
* specifies that a subsequent attempt to resolve a symbolic
* reference that the Java virtual machine has previously unsuccessfully attempted
* to resolve always fails with the same error that was thrown as a result of the
@@ -697,7 +697,7 @@ public interface Instrumentation {
* to export. The {@code extraOpens} parameter is the map of additional
* packages to open. In both cases, the map key is the fully-qualified name
* of the package as defined in section 6.5.3 of
- * The Java™ Language Specification , for example, {@code
+ * The Java Language Specification , for example, {@code
* "java.lang"}. The map value is the non-empty set of modules that the
* package should be exported or opened to. Provides the core classes for the Java Management Extensions. The Java Management Extensions
- (JMX™) API is a standard
+ (JMX) API is a standard
API for management and monitoring. Typical uses include:
@@ -2478,7 +2478,7 @@ public final class Class
* The modifier names are returned in an order consistent with the
* suggested modifier orderings given in sections 8.1.1, 8.3.1, 8.4.3, 8.8.3, and 9.1.1 of
- * The Java™ Language Specification.
+ * The Java Language Specification.
* The full modifier ordering used by this method is:
*
@@ -220,7 +220,7 @@ import sun.security.util.SecurityConstants;
*
{@code ModuleDescriptor descriptor = ModuleDescriptor.newModule("stats.core")
diff --git a/src/java.base/share/classes/java/lang/ref/Reference.java b/src/java.base/share/classes/java/lang/ref/Reference.java
index bcfb73fcd07..9e41aac327b 100644
--- a/src/java.base/share/classes/java/lang/ref/Reference.java
+++ b/src/java.base/share/classes/java/lang/ref/Reference.java
@@ -419,7 +419,7 @@ public abstract class Reference {@code
* public protected private abstract static final transient
@@ -247,7 +247,7 @@ public class Modifier {
/*
* Access modifier flag constants from tables 4.1, 4.4, 4.5, and 4.7 of
- * The Java™ Virtual Machine Specification
+ * The Java Virtual Machine Specification
*/
/**
diff --git a/src/java.base/share/classes/java/lang/reflect/Parameter.java b/src/java.base/share/classes/java/lang/reflect/Parameter.java
index dfa43112300..71056ea1f3d 100644
--- a/src/java.base/share/classes/java/lang/reflect/Parameter.java
+++ b/src/java.base/share/classes/java/lang/reflect/Parameter.java
@@ -112,7 +112,7 @@ public final class Parameter implements AnnotatedElement {
/**
* Returns a string describing this parameter. The format is the
* modifiers for the parameter, if any, in canonical order as
- * recommended by The Java™ Language
+ * recommended by The Java Language
* Specification, followed by the fully-qualified type of
* the parameter (excluding the last [] if the parameter is
* variable arity), followed by "..." if the parameter is variable
@@ -247,7 +247,7 @@ public final class Parameter implements AnnotatedElement {
* in source code; returns {@code false} otherwise.
*
* @return true if and only if this parameter is implicitly
- * declared as defined by The Java™ Language
+ * declared as defined by The Java Language
* Specification.
*/
public boolean isImplicit() {
@@ -262,7 +262,7 @@ public final class Parameter implements AnnotatedElement {
* @jls 13.1 The Form of a Binary
* @return true if and only if this parameter is a synthetic
* construct as defined by
- * The Java™ Language Specification.
+ * The Java Language Specification.
*/
public boolean isSynthetic() {
return Modifier.isSynthetic(getModifiers());
diff --git a/src/java.base/share/classes/java/lang/reflect/RecordComponent.java b/src/java.base/share/classes/java/lang/reflect/RecordComponent.java
index 7f5b01fb640..225a0999f17 100644
--- a/src/java.base/share/classes/java/lang/reflect/RecordComponent.java
+++ b/src/java.base/share/classes/java/lang/reflect/RecordComponent.java
@@ -120,7 +120,7 @@ public final class RecordComponent implements AnnotatedElement {
* this record component
* @throws GenericSignatureFormatError if the generic record component
* signature does not conform to the format specified in
- * The Java™ Virtual Machine Specification
+ * The Java Virtual Machine Specification
* @throws TypeNotPresentException if the generic type
* signature of the underlying record component refers to a non-existent
* type declaration
diff --git a/src/java.base/share/classes/java/lang/runtime/ObjectMethods.java b/src/java.base/share/classes/java/lang/runtime/ObjectMethods.java
index f7b5816d571..f1115b6c36d 100644
--- a/src/java.base/share/classes/java/lang/runtime/ObjectMethods.java
+++ b/src/java.base/share/classes/java/lang/runtime/ObjectMethods.java
@@ -48,7 +48,7 @@ import java.util.Objects;
* Bootstrap methods for state-driven implementations of core methods,
* including {@link Object#equals(Object)}, {@link Object#hashCode()}, and
* {@link Object#toString()}. These methods may be used, for example, by
- * Java™ compiler implementations to implement the bodies of {@link Object}
+ * Java compiler implementations to implement the bodies of {@link Object}
* methods for record classes.
*
* @since 14
diff --git a/src/java.base/share/classes/java/math/BigDecimal.java b/src/java.base/share/classes/java/math/BigDecimal.java
index a90f3315348..531f736d363 100644
--- a/src/java.base/share/classes/java/math/BigDecimal.java
+++ b/src/java.base/share/classes/java/math/BigDecimal.java
@@ -3455,7 +3455,7 @@ public class BigDecimal extends Number implements Comparable
*
* where TypeName and ModuleName are as defined in
- * The Java™ Language Specification
+ * The Java Language Specification
* ({@jls 6.5 Determining the Meaning of a Name}).
*
* @apiNote When running in an environment which supports modules,
diff --git a/src/java.compiler/share/classes/javax/lang/model/AnnotatedConstruct.java b/src/java.compiler/share/classes/javax/lang/model/AnnotatedConstruct.java
index 6f9220edf7b..196387062cb 100644
--- a/src/java.compiler/share/classes/javax/lang/model/AnnotatedConstruct.java
+++ b/src/java.compiler/share/classes/javax/lang/model/AnnotatedConstruct.java
@@ -39,7 +39,7 @@ import javax.lang.model.type.*;
* are on a declaration, whereas annotations on a type are on
* a specific use of a type name.
*
- * As defined by The Java™ Language Specification
+ * As defined by The Java Language Specification
* section {@jls 9.7.4}, an annotation on an element is a
* declaration annotation and an annotation on a type is a
* type annotation.
@@ -74,7 +74,7 @@ import javax.lang.model.type.*;
* down to affiliated mandated members. Type annotations modifying the
* type of a record component can be also propagated to mandated
* members. Propagation of the annotations to mandated members is
- * governed by rules given in the The Java™ Language
+ * governed by rules given in the The Java Language
* Specification.
*
* If there are multiple annotations of type AT present on
diff --git a/src/java.compiler/share/classes/javax/lang/model/SourceVersion.java b/src/java.compiler/share/classes/javax/lang/model/SourceVersion.java
index ba1f4d9f124..6900bf7280c 100644
--- a/src/java.compiler/share/classes/javax/lang/model/SourceVersion.java
+++ b/src/java.compiler/share/classes/javax/lang/model/SourceVersion.java
@@ -30,10 +30,10 @@ import java.util.Set;
import java.util.HashSet;
/**
- * Source versions of the Java™ programming language.
+ * Source versions of the Java programming language.
*
* See the appropriate edition of
- * The Java™ Language Specification
+ * The Java Language Specification
* for information about a particular source version.
*
*
*
Memory Consistency Properties
*
* Chapter 17 of
- * The Java™ Language Specification defines the
+ * The Java Language Specification defines the
* happens-before relation on memory operations such as reads and
* writes of shared variables. The results of a write by one thread are
* guaranteed to be visible to a read by another thread only if the write
diff --git a/src/java.base/share/classes/java/util/doc-files/coll-index.html b/src/java.base/share/classes/java/util/doc-files/coll-index.html
index bf902fa137f..803583958d4 100644
--- a/src/java.base/share/classes/java/util/doc-files/coll-index.html
+++ b/src/java.base/share/classes/java/util/doc-files/coll-index.html
@@ -53,7 +53,7 @@ framework is based on more than a dozen collection interfaces. It
includes implementations of these interfaces and algorithms to
manipulate them.
\u2014 in Java source code
* are processed as described in section 3.3 of
- * The Java™ Language Specification.
+ * The Java Language Specification.
* 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 "\u2014" and
diff --git a/src/java.base/share/classes/javax/net/ssl/package-info.java b/src/java.base/share/classes/javax/net/ssl/package-info.java
index 47ea7bf1ff6..f41b3b7f19a 100644
--- a/src/java.base/share/classes/javax/net/ssl/package-info.java
+++ b/src/java.base/share/classes/javax/net/ssl/package-info.java
@@ -32,7 +32,7 @@
*
* {
WARNING,
/**
* Problem similar to a warning, but is mandated by the tool's
- * specification. For example, the Java™ Language
+ * specification. For example, the Java Language
* Specification mandates warnings on certain
* unchecked operations and the use of deprecated methods.
*/
diff --git a/src/java.compiler/share/classes/javax/tools/DocumentationTool.java b/src/java.compiler/share/classes/javax/tools/DocumentationTool.java
index a9797fac868..b7e3af636d5 100644
--- a/src/java.compiler/share/classes/javax/tools/DocumentationTool.java
+++ b/src/java.compiler/share/classes/javax/tools/DocumentationTool.java
@@ -31,7 +31,7 @@ import java.util.Locale;
import java.util.concurrent.Callable;
/**
- * Interface to invoke Java™ programming language documentation tools from
+ * Interface to invoke Java programming language documentation tools from
* programs.
*
* @since 1.8
diff --git a/src/java.compiler/share/classes/javax/tools/JavaCompiler.java b/src/java.compiler/share/classes/javax/tools/JavaCompiler.java
index 7041fb23671..f7c1c61a41b 100644
--- a/src/java.compiler/share/classes/javax/tools/JavaCompiler.java
+++ b/src/java.compiler/share/classes/javax/tools/JavaCompiler.java
@@ -32,7 +32,7 @@ import java.util.concurrent.Callable;
import javax.annotation.processing.Processor;
/**
- * Interface to invoke Java™ programming language compilers from
+ * Interface to invoke Java programming language compilers from
* programs.
*
*
*
@@ -222,7 +222,7 @@ public interface JavaFileManager extends Closeable, Flushable, OptionChecker {
/**
* Infers a binary name of a file object based on a package-oriented location.
* The binary name returned might not be a valid binary name according to
- * The Java™ Language Specification.
+ * The Java Language Specification.
*
* @param location a location
* @param file a file object
diff --git a/src/java.compiler/share/classes/javax/tools/JavaFileObject.java b/src/java.compiler/share/classes/javax/tools/JavaFileObject.java
index f31d0fb658e..14a4fa9e698 100644
--- a/src/java.compiler/share/classes/javax/tools/JavaFileObject.java
+++ b/src/java.compiler/share/classes/javax/tools/JavaFileObject.java
@@ -30,7 +30,7 @@ import javax.lang.model.element.Modifier;
import java.util.Objects;
/**
- * File abstraction for tools operating on Java™ programming language
+ * File abstraction for tools operating on Java programming language
* source and class files.
*
* Auto-shutdown
According to
-The Java™ Virtual Machine Specification,
+The Java Virtual Machine Specification,
sections 2.17.9 and 2.19,
the Java virtual machine (JVM) initially starts up with a single non-daemon
thread, which typically calls the main method of some class.
@@ -190,7 +190,7 @@ non-daemon thread that blocks forever.
<...>
-The Java™ Virtual Machine Specification
+The Java Virtual Machine Specification
guarantees
that the JVM doesn't exit until this thread terminates.
diff --git a/src/java.desktop/share/classes/java/beans/DefaultPersistenceDelegate.java b/src/java.desktop/share/classes/java/beans/DefaultPersistenceDelegate.java
index ea0174747b8..42e73c70b48 100644
--- a/src/java.desktop/share/classes/java/beans/DefaultPersistenceDelegate.java
+++ b/src/java.desktop/share/classes/java/beans/DefaultPersistenceDelegate.java
@@ -36,7 +36,7 @@ import sun.reflect.misc.*;
* is the delegate used by default for classes about
* which no information is available. The {@code DefaultPersistenceDelegate}
* provides, version resilient, public API-based persistence for
- * classes that follow the JavaBeans™ conventions without any class specific
+ * classes that follow the JavaBeans conventions without any class specific
* configuration.
*
* public class MyBean {
* private final PropertyChangeSupport pcs = new PropertyChangeSupport(this);
diff --git a/src/java.desktop/share/classes/java/beans/VetoableChangeSupport.java b/src/java.desktop/share/classes/java/beans/VetoableChangeSupport.java
index 18e6ade3b35..cca3458e518 100644
--- a/src/java.desktop/share/classes/java/beans/VetoableChangeSupport.java
+++ b/src/java.desktop/share/classes/java/beans/VetoableChangeSupport.java
@@ -41,7 +41,7 @@ import java.util.Map.Entry;
* or for a property specified by name.
* {@code
* public class MyBean {
* private final VetoableChangeSupport vcs = new VetoableChangeSupport(this);
diff --git a/src/java.desktop/share/classes/java/beans/package-info.java b/src/java.desktop/share/classes/java/beans/package-info.java
index d6c904677b3..fefe400e6bf 100644
--- a/src/java.desktop/share/classes/java/beans/package-info.java
+++ b/src/java.desktop/share/classes/java/beans/package-info.java
@@ -25,7 +25,7 @@
/**
* Contains classes related to developing beans -- components based on
- * the JavaBeans™ architecture. A few of the classes are used by beans
+ * the JavaBeans architecture. A few of the classes are used by beans
* while they run in an application. For example, the event classes are used by
* beans that fire property and vetoable change events (see
* {@link java.beans.PropertyChangeEvent}). However, most of the classes in this
diff --git a/src/java.desktop/share/classes/javax/accessibility/package-info.java b/src/java.desktop/share/classes/javax/accessibility/package-info.java
index c288dea57d9..3e571821a7f 100644
--- a/src/java.desktop/share/classes/javax/accessibility/package-info.java
+++ b/src/java.desktop/share/classes/javax/accessibility/package-info.java
@@ -57,7 +57,7 @@
* accessible name, description, role, and
* state of the object, as well as information
* about the parent and children of the object. In addition,
- * JavaBeans™ property change support is also included to allow assistive
+ * JavaBeans property change support is also included to allow assistive
* technologies learn when the values of the accessible properties change.
* AccessibleContext also contains methods for obtaining more specific
* accessibility information about a component. If the component supports it,
diff --git a/src/java.desktop/share/classes/javax/print/attribute/package-info.java b/src/java.desktop/share/classes/javax/print/attribute/package-info.java
index 2470175ec21..7f742174cc2 100644
--- a/src/java.desktop/share/classes/javax/print/attribute/package-info.java
+++ b/src/java.desktop/share/classes/javax/print/attribute/package-info.java
@@ -24,7 +24,7 @@
*/
/**
- * Provides classes and interfaces that describe the types of Java™ Print
+ * Provides classes and interfaces that describe the types of Java Print
* Service attributes and how they can be collected into attribute sets.
*
* What is an Attribute?
diff --git a/src/java.desktop/share/classes/javax/print/package-info.java b/src/java.desktop/share/classes/javax/print/package-info.java
index d0700e766c6..7334ac05655 100644
--- a/src/java.desktop/share/classes/javax/print/package-info.java
+++ b/src/java.desktop/share/classes/javax/print/package-info.java
@@ -24,7 +24,7 @@
*/
/**
- * Provides the principal classes and interfaces for the Java™ Print
+ * Provides the principal classes and interfaces for the Java Print
* Service API. The Java Print Service API enables client and server
* applications to:
*
diff --git a/src/java.desktop/share/classes/javax/sound/midi/MidiMessage.java b/src/java.desktop/share/classes/javax/sound/midi/MidiMessage.java
index cfe6deccebc..0a0989f914c 100644
--- a/src/java.desktop/share/classes/javax/sound/midi/MidiMessage.java
+++ b/src/java.desktop/share/classes/javax/sound/midi/MidiMessage.java
@@ -48,7 +48,7 @@ package javax.sound.midi;
* Setting them is a subclass responsibility.
*
java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/AbstractButton.java b/src/java.desktop/share/classes/javax/swing/AbstractButton.java
index ed752747526..27317978ab4 100644
--- a/src/java.desktop/share/classes/javax/swing/AbstractButton.java
+++ b/src/java.desktop/share/classes/javax/swing/AbstractButton.java
@@ -62,7 +62,7 @@ import javax.swing.text.*;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
@@ -1918,7 +1918,7 @@ public abstract class AbstractButton extends JComponent implements ItemSelectabl
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*/
@@ -2341,7 +2341,7 @@ public abstract class AbstractButton extends JComponent implements ItemSelectabl
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
* @since 1.4
diff --git a/src/java.desktop/share/classes/javax/swing/AbstractCellEditor.java b/src/java.desktop/share/classes/javax/swing/AbstractCellEditor.java
index 9479eb06694..5fb32121c19 100644
--- a/src/java.desktop/share/classes/javax/swing/AbstractCellEditor.java
+++ b/src/java.desktop/share/classes/javax/swing/AbstractCellEditor.java
@@ -43,7 +43,7 @@ import java.io.Serializable;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/AbstractListModel.java b/src/java.desktop/share/classes/javax/swing/AbstractListModel.java
index 71a8895d37e..c7d36481864 100644
--- a/src/java.desktop/share/classes/javax/swing/AbstractListModel.java
+++ b/src/java.desktop/share/classes/javax/swing/AbstractListModel.java
@@ -38,7 +38,7 @@ import java.util.EventListener;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/Box.java b/src/java.desktop/share/classes/javax/swing/Box.java
index 246b4439a08..9db52ce9a0e 100644
--- a/src/java.desktop/share/classes/javax/swing/Box.java
+++ b/src/java.desktop/share/classes/javax/swing/Box.java
@@ -65,7 +65,7 @@ import javax.accessibility.*;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
@@ -297,7 +297,7 @@ public class Box extends JComponent implements Accessible {
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*/
diff --git a/src/java.desktop/share/classes/javax/swing/BoxLayout.java b/src/java.desktop/share/classes/javax/swing/BoxLayout.java
index f0635f19f6b..bc84a4fa582 100644
--- a/src/java.desktop/share/classes/javax/swing/BoxLayout.java
+++ b/src/java.desktop/share/classes/javax/swing/BoxLayout.java
@@ -121,7 +121,7 @@ import java.io.PrintStream;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the {@code java.beans} package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/ButtonGroup.java b/src/java.desktop/share/classes/javax/swing/ButtonGroup.java
index ed2820df412..6555196621e 100644
--- a/src/java.desktop/share/classes/javax/swing/ButtonGroup.java
+++ b/src/java.desktop/share/classes/javax/swing/ButtonGroup.java
@@ -59,7 +59,7 @@ import java.io.Serializable;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/CellRendererPane.java b/src/java.desktop/share/classes/javax/swing/CellRendererPane.java
index c21a282bf29..f53a1e89b87 100644
--- a/src/java.desktop/share/classes/javax/swing/CellRendererPane.java
+++ b/src/java.desktop/share/classes/javax/swing/CellRendererPane.java
@@ -57,7 +57,7 @@ import javax.accessibility.*;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/DefaultBoundedRangeModel.java b/src/java.desktop/share/classes/javax/swing/DefaultBoundedRangeModel.java
index 20f44a28ea3..7e254d5c8b3 100644
--- a/src/java.desktop/share/classes/javax/swing/DefaultBoundedRangeModel.java
+++ b/src/java.desktop/share/classes/javax/swing/DefaultBoundedRangeModel.java
@@ -37,7 +37,7 @@ import java.util.EventListener;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/DefaultButtonModel.java b/src/java.desktop/share/classes/javax/swing/DefaultButtonModel.java
index 5bcf6efb407..453b1d0ab0e 100644
--- a/src/java.desktop/share/classes/javax/swing/DefaultButtonModel.java
+++ b/src/java.desktop/share/classes/javax/swing/DefaultButtonModel.java
@@ -39,7 +39,7 @@ import javax.swing.event.*;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/DefaultCellEditor.java b/src/java.desktop/share/classes/javax/swing/DefaultCellEditor.java
index 6114760c8a7..d8d9af91b9c 100644
--- a/src/java.desktop/share/classes/javax/swing/DefaultCellEditor.java
+++ b/src/java.desktop/share/classes/javax/swing/DefaultCellEditor.java
@@ -43,7 +43,7 @@ import java.io.Serializable;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/DefaultListCellRenderer.java b/src/java.desktop/share/classes/javax/swing/DefaultListCellRenderer.java
index 6b141491720..1d6a96c25c9 100644
--- a/src/java.desktop/share/classes/javax/swing/DefaultListCellRenderer.java
+++ b/src/java.desktop/share/classes/javax/swing/DefaultListCellRenderer.java
@@ -63,7 +63,7 @@ import sun.swing.SwingUtilities2;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
@@ -343,7 +343,7 @@ public class DefaultListCellRenderer extends JLabel
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*/
diff --git a/src/java.desktop/share/classes/javax/swing/DefaultListModel.java b/src/java.desktop/share/classes/javax/swing/DefaultListModel.java
index 3d27365ca4d..1678a14893f 100644
--- a/src/java.desktop/share/classes/javax/swing/DefaultListModel.java
+++ b/src/java.desktop/share/classes/javax/swing/DefaultListModel.java
@@ -43,7 +43,7 @@ import java.util.Enumeration;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the {@code java.beans} package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/DefaultListSelectionModel.java b/src/java.desktop/share/classes/javax/swing/DefaultListSelectionModel.java
index 312eec84051..2933eefab62 100644
--- a/src/java.desktop/share/classes/javax/swing/DefaultListSelectionModel.java
+++ b/src/java.desktop/share/classes/javax/swing/DefaultListSelectionModel.java
@@ -41,7 +41,7 @@ import javax.swing.event.*;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/DefaultSingleSelectionModel.java b/src/java.desktop/share/classes/javax/swing/DefaultSingleSelectionModel.java
index 023e9f3db5a..643e54d6465 100644
--- a/src/java.desktop/share/classes/javax/swing/DefaultSingleSelectionModel.java
+++ b/src/java.desktop/share/classes/javax/swing/DefaultSingleSelectionModel.java
@@ -37,7 +37,7 @@ import java.util.EventListener;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/ImageIcon.java b/src/java.desktop/share/classes/javax/swing/ImageIcon.java
index 860235fefd8..fd0387c5ff4 100644
--- a/src/java.desktop/share/classes/javax/swing/ImageIcon.java
+++ b/src/java.desktop/share/classes/javax/swing/ImageIcon.java
@@ -60,7 +60,7 @@ import sun.awt.AWTAccessor;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
@@ -587,7 +587,7 @@ public class ImageIcon implements Icon, Serializable, Accessible {
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
* @since 1.3
diff --git a/src/java.desktop/share/classes/javax/swing/JApplet.java b/src/java.desktop/share/classes/javax/swing/JApplet.java
index 7538b0fcf00..8d9e1b21d2b 100644
--- a/src/java.desktop/share/classes/javax/swing/JApplet.java
+++ b/src/java.desktop/share/classes/javax/swing/JApplet.java
@@ -85,7 +85,7 @@ import javax.accessibility.AccessibleContext;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/JButton.java b/src/java.desktop/share/classes/javax/swing/JButton.java
index 6dd07fe654c..f2008407610 100644
--- a/src/java.desktop/share/classes/javax/swing/JButton.java
+++ b/src/java.desktop/share/classes/javax/swing/JButton.java
@@ -60,7 +60,7 @@ import java.io.IOException;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
@@ -294,7 +294,7 @@ public class JButton extends AbstractButton implements Accessible {
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*/
diff --git a/src/java.desktop/share/classes/javax/swing/JCheckBox.java b/src/java.desktop/share/classes/javax/swing/JCheckBox.java
index d561349297a..3d2eefd1937 100644
--- a/src/java.desktop/share/classes/javax/swing/JCheckBox.java
+++ b/src/java.desktop/share/classes/javax/swing/JCheckBox.java
@@ -61,7 +61,7 @@ import java.io.IOException;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
@@ -325,7 +325,7 @@ public class JCheckBox extends JToggleButton implements Accessible {
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*/
diff --git a/src/java.desktop/share/classes/javax/swing/JCheckBoxMenuItem.java b/src/java.desktop/share/classes/javax/swing/JCheckBoxMenuItem.java
index c705b2a4eee..4bc65f8eb86 100644
--- a/src/java.desktop/share/classes/javax/swing/JCheckBoxMenuItem.java
+++ b/src/java.desktop/share/classes/javax/swing/JCheckBoxMenuItem.java
@@ -83,7 +83,7 @@ import javax.accessibility.*;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
@@ -298,7 +298,7 @@ public class JCheckBoxMenuItem extends JMenuItem implements SwingConstants,
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*/
diff --git a/src/java.desktop/share/classes/javax/swing/JColorChooser.java b/src/java.desktop/share/classes/javax/swing/JColorChooser.java
index 0d3b7d5f7e2..53eea9edd06 100644
--- a/src/java.desktop/share/classes/javax/swing/JColorChooser.java
+++ b/src/java.desktop/share/classes/javax/swing/JColorChooser.java
@@ -69,7 +69,7 @@ import sun.swing.SwingUtilities2;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/JComboBox.java b/src/java.desktop/share/classes/javax/swing/JComboBox.java
index f1a7da63525..7611ae5d4c4 100644
--- a/src/java.desktop/share/classes/javax/swing/JComboBox.java
+++ b/src/java.desktop/share/classes/javax/swing/JComboBox.java
@@ -59,7 +59,7 @@ import javax.accessibility.*;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
@@ -1640,7 +1640,7 @@ implements ItemSelectable,ListDataListener,ActionListener, Accessible {
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*/
diff --git a/src/java.desktop/share/classes/javax/swing/JComponent.java b/src/java.desktop/share/classes/javax/swing/JComponent.java
index b582c8119a9..c130afd6603 100644
--- a/src/java.desktop/share/classes/javax/swing/JComponent.java
+++ b/src/java.desktop/share/classes/javax/swing/JComponent.java
@@ -155,7 +155,7 @@ import sun.swing.SwingUtilities2;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
@@ -3674,7 +3674,7 @@ public abstract class JComponent extends Container implements Serializable,
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*/
diff --git a/src/java.desktop/share/classes/javax/swing/JDesktopPane.java b/src/java.desktop/share/classes/javax/swing/JDesktopPane.java
index 64dcc2ae334..6bf5d5e4814 100644
--- a/src/java.desktop/share/classes/javax/swing/JDesktopPane.java
+++ b/src/java.desktop/share/classes/javax/swing/JDesktopPane.java
@@ -75,7 +75,7 @@ import java.util.LinkedHashSet;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
@@ -620,7 +620,7 @@ public class JDesktopPane extends JLayeredPane implements Accessible
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*/
diff --git a/src/java.desktop/share/classes/javax/swing/JDialog.java b/src/java.desktop/share/classes/javax/swing/JDialog.java
index 8ab1252895b..0cf46f45430 100644
--- a/src/java.desktop/share/classes/javax/swing/JDialog.java
+++ b/src/java.desktop/share/classes/javax/swing/JDialog.java
@@ -80,7 +80,7 @@ import javax.accessibility.*;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the {@code java.beans} package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/JEditorPane.java b/src/java.desktop/share/classes/javax/swing/JEditorPane.java
index 50702eea7c3..3facbcbf0c9 100644
--- a/src/java.desktop/share/classes/javax/swing/JEditorPane.java
+++ b/src/java.desktop/share/classes/javax/swing/JEditorPane.java
@@ -178,7 +178,7 @@ import sun.reflect.misc.ReflectUtil;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
@@ -1652,7 +1652,7 @@ public class JEditorPane extends JTextComponent {
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*/
@@ -1707,7 +1707,7 @@ public class JEditorPane extends JTextComponent {
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*/
diff --git a/src/java.desktop/share/classes/javax/swing/JFormattedTextField.java b/src/java.desktop/share/classes/javax/swing/JFormattedTextField.java
index e511fb16630..0f6a3417d22 100644
--- a/src/java.desktop/share/classes/javax/swing/JFormattedTextField.java
+++ b/src/java.desktop/share/classes/javax/swing/JFormattedTextField.java
@@ -185,7 +185,7 @@ import javax.swing.text.*;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/JFrame.java b/src/java.desktop/share/classes/javax/swing/JFrame.java
index a3b849fe26d..dc24e577001 100644
--- a/src/java.desktop/share/classes/javax/swing/JFrame.java
+++ b/src/java.desktop/share/classes/javax/swing/JFrame.java
@@ -104,7 +104,7 @@ import javax.accessibility.AccessibleStateSet;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/JInternalFrame.java b/src/java.desktop/share/classes/javax/swing/JInternalFrame.java
index 3f12e0dccc9..51cefb0c499 100644
--- a/src/java.desktop/share/classes/javax/swing/JInternalFrame.java
+++ b/src/java.desktop/share/classes/javax/swing/JInternalFrame.java
@@ -89,7 +89,7 @@ import sun.swing.SwingUtilities2;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
@@ -2003,7 +2003,7 @@ public class JInternalFrame extends JComponent implements
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*/
@@ -2119,7 +2119,7 @@ public class JInternalFrame extends JComponent implements
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
@@ -2294,7 +2294,7 @@ public class JInternalFrame extends JComponent implements
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*/
diff --git a/src/java.desktop/share/classes/javax/swing/JLabel.java b/src/java.desktop/share/classes/javax/swing/JLabel.java
index 128e38e63e2..0bef45440fa 100644
--- a/src/java.desktop/share/classes/javax/swing/JLabel.java
+++ b/src/java.desktop/share/classes/javax/swing/JLabel.java
@@ -89,7 +89,7 @@ import javax.swing.text.*;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
@@ -1035,7 +1035,7 @@ public class JLabel extends JComponent implements SwingConstants, Accessible
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*/
diff --git a/src/java.desktop/share/classes/javax/swing/JLayeredPane.java b/src/java.desktop/share/classes/javax/swing/JLayeredPane.java
index b26d291e121..62475ae854b 100644
--- a/src/java.desktop/share/classes/javax/swing/JLayeredPane.java
+++ b/src/java.desktop/share/classes/javax/swing/JLayeredPane.java
@@ -148,7 +148,7 @@ import javax.accessibility.*;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
@@ -759,7 +759,7 @@ public class JLayeredPane extends JComponent implements Accessible {
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*/
diff --git a/src/java.desktop/share/classes/javax/swing/JList.java b/src/java.desktop/share/classes/javax/swing/JList.java
index 3539d89f0f7..374f65c864f 100644
--- a/src/java.desktop/share/classes/javax/swing/JList.java
+++ b/src/java.desktop/share/classes/javax/swing/JList.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -254,7 +254,7 @@ import static sun.swing.SwingUtilities2.Section.*;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
* java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*/
@@ -3317,7 +3317,6 @@ public class JListjava.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
@@ -1148,7 +1148,7 @@ public class JMenu extends JMenuItem implements Accessible,MenuElement
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*/
@@ -1387,7 +1387,7 @@ public class JMenu extends JMenuItem implements Accessible,MenuElement
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*/
diff --git a/src/java.desktop/share/classes/javax/swing/JMenuBar.java b/src/java.desktop/share/classes/javax/swing/JMenuBar.java
index 3763251dd28..81f1fb2b559 100644
--- a/src/java.desktop/share/classes/javax/swing/JMenuBar.java
+++ b/src/java.desktop/share/classes/javax/swing/JMenuBar.java
@@ -65,7 +65,7 @@ import sun.awt.SunToolkit;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
* java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*/
diff --git a/src/java.desktop/share/classes/javax/swing/JMenuItem.java b/src/java.desktop/share/classes/javax/swing/JMenuItem.java
index 1193479a9bd..4d650698bf9 100644
--- a/src/java.desktop/share/classes/javax/swing/JMenuItem.java
+++ b/src/java.desktop/share/classes/javax/swing/JMenuItem.java
@@ -69,7 +69,7 @@ import javax.accessibility.*;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
@@ -819,7 +819,7 @@ public class JMenuItem extends AbstractButton implements Accessible,MenuElement
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*/
diff --git a/src/java.desktop/share/classes/javax/swing/JOptionPane.java b/src/java.desktop/share/classes/javax/swing/JOptionPane.java
index 7faa087ca83..666e2a05119 100644
--- a/src/java.desktop/share/classes/javax/swing/JOptionPane.java
+++ b/src/java.desktop/share/classes/javax/swing/JOptionPane.java
@@ -295,7 +295,7 @@ import sun.awt.AWTAccessor;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
@@ -2540,7 +2540,7 @@ public class JOptionPane extends JComponent implements Accessible
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*/
diff --git a/src/java.desktop/share/classes/javax/swing/JPanel.java b/src/java.desktop/share/classes/javax/swing/JPanel.java
index ebf5992afc7..9fe307c30db 100644
--- a/src/java.desktop/share/classes/javax/swing/JPanel.java
+++ b/src/java.desktop/share/classes/javax/swing/JPanel.java
@@ -52,7 +52,7 @@ import java.io.IOException;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
@@ -226,7 +226,7 @@ public class JPanel extends JComponent implements Accessible
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*/
diff --git a/src/java.desktop/share/classes/javax/swing/JPasswordField.java b/src/java.desktop/share/classes/javax/swing/JPasswordField.java
index 01ff03a0b48..4d81295b6c5 100644
--- a/src/java.desktop/share/classes/javax/swing/JPasswordField.java
+++ b/src/java.desktop/share/classes/javax/swing/JPasswordField.java
@@ -63,7 +63,7 @@ import java.util.Arrays;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
@@ -400,7 +400,7 @@ public class JPasswordField extends JTextField {
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*/
diff --git a/src/java.desktop/share/classes/javax/swing/JPopupMenu.java b/src/java.desktop/share/classes/javax/swing/JPopupMenu.java
index 36b8fee50e0..500749c6692 100644
--- a/src/java.desktop/share/classes/javax/swing/JPopupMenu.java
+++ b/src/java.desktop/share/classes/javax/swing/JPopupMenu.java
@@ -67,7 +67,7 @@ import sun.awt.SunToolkit;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/JProgressBar.java b/src/java.desktop/share/classes/javax/swing/JProgressBar.java
index 828bb23cc87..7d391288569 100644
--- a/src/java.desktop/share/classes/javax/swing/JProgressBar.java
+++ b/src/java.desktop/share/classes/javax/swing/JProgressBar.java
@@ -112,7 +112,7 @@ import javax.swing.plaf.ProgressBarUI;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
@@ -626,7 +626,7 @@ public class JProgressBar extends JComponent implements SwingConstants, Accessib
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*/
@@ -1003,7 +1003,7 @@ public class JProgressBar extends JComponent implements SwingConstants, Accessib
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*/
diff --git a/src/java.desktop/share/classes/javax/swing/JRadioButton.java b/src/java.desktop/share/classes/javax/swing/JRadioButton.java
index 4d7913b2f03..c85573c87ec 100644
--- a/src/java.desktop/share/classes/javax/swing/JRadioButton.java
+++ b/src/java.desktop/share/classes/javax/swing/JRadioButton.java
@@ -71,7 +71,7 @@ import java.io.IOException;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
@@ -278,7 +278,7 @@ public class JRadioButton extends JToggleButton implements Accessible {
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*/
diff --git a/src/java.desktop/share/classes/javax/swing/JRadioButtonMenuItem.java b/src/java.desktop/share/classes/javax/swing/JRadioButtonMenuItem.java
index 1d31c1e6990..13953db6b48 100644
--- a/src/java.desktop/share/classes/javax/swing/JRadioButtonMenuItem.java
+++ b/src/java.desktop/share/classes/javax/swing/JRadioButtonMenuItem.java
@@ -77,7 +77,7 @@ import javax.accessibility.*;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
@@ -272,7 +272,7 @@ public class JRadioButtonMenuItem extends JMenuItem implements Accessible {
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*/
diff --git a/src/java.desktop/share/classes/javax/swing/JRootPane.java b/src/java.desktop/share/classes/javax/swing/JRootPane.java
index fc229f6b46d..6275219a101 100644
--- a/src/java.desktop/share/classes/javax/swing/JRootPane.java
+++ b/src/java.desktop/share/classes/javax/swing/JRootPane.java
@@ -178,7 +178,7 @@ import sun.security.action.GetBooleanAction;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
@@ -840,7 +840,7 @@ public class JRootPane extends JComponent implements Accessible {
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*/
@@ -1006,7 +1006,7 @@ public class JRootPane extends JComponent implements Accessible {
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*/
diff --git a/src/java.desktop/share/classes/javax/swing/JScrollBar.java b/src/java.desktop/share/classes/javax/swing/JScrollBar.java
index 06158d575a8..6fb1f3df50f 100644
--- a/src/java.desktop/share/classes/javax/swing/JScrollBar.java
+++ b/src/java.desktop/share/classes/javax/swing/JScrollBar.java
@@ -64,7 +64,7 @@ import java.io.IOException;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
@@ -847,7 +847,7 @@ public class JScrollBar extends JComponent implements Adjustable, Accessible
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*/
diff --git a/src/java.desktop/share/classes/javax/swing/JScrollPane.java b/src/java.desktop/share/classes/javax/swing/JScrollPane.java
index ca32be81338..1134392db65 100644
--- a/src/java.desktop/share/classes/javax/swing/JScrollPane.java
+++ b/src/java.desktop/share/classes/javax/swing/JScrollPane.java
@@ -144,7 +144,7 @@ import java.beans.Transient;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
@@ -656,7 +656,7 @@ public class JScrollPane extends JComponent implements ScrollPaneConstants, Acce
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
@@ -1401,7 +1401,7 @@ public class JScrollPane extends JComponent implements ScrollPaneConstants, Acce
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*/
diff --git a/src/java.desktop/share/classes/javax/swing/JSeparator.java b/src/java.desktop/share/classes/javax/swing/JSeparator.java
index 6f0ab1409da..4b44496d624 100644
--- a/src/java.desktop/share/classes/javax/swing/JSeparator.java
+++ b/src/java.desktop/share/classes/javax/swing/JSeparator.java
@@ -59,7 +59,7 @@ import java.io.IOException;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
@@ -270,7 +270,7 @@ public class JSeparator extends JComponent implements SwingConstants, Accessible
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*/
diff --git a/src/java.desktop/share/classes/javax/swing/JSlider.java b/src/java.desktop/share/classes/javax/swing/JSlider.java
index 613f7bdacf9..7ad672ba483 100644
--- a/src/java.desktop/share/classes/javax/swing/JSlider.java
+++ b/src/java.desktop/share/classes/javax/swing/JSlider.java
@@ -69,7 +69,7 @@ import java.beans.PropertyChangeListener;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
@@ -1407,7 +1407,7 @@ public class JSlider extends JComponent implements SwingConstants, Accessible {
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*/
diff --git a/src/java.desktop/share/classes/javax/swing/JSpinner.java b/src/java.desktop/share/classes/javax/swing/JSpinner.java
index d275d60f5e1..ed78619f2e5 100644
--- a/src/java.desktop/share/classes/javax/swing/JSpinner.java
+++ b/src/java.desktop/share/classes/javax/swing/JSpinner.java
@@ -106,7 +106,7 @@ import sun.util.locale.provider.LocaleResources;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/JSplitPane.java b/src/java.desktop/share/classes/javax/swing/JSplitPane.java
index ef0142aee2a..517562fa817 100644
--- a/src/java.desktop/share/classes/javax/swing/JSplitPane.java
+++ b/src/java.desktop/share/classes/javax/swing/JSplitPane.java
@@ -84,7 +84,7 @@ import java.io.IOException;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
@@ -1128,7 +1128,7 @@ public class JSplitPane extends JComponent implements Accessible
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*/
diff --git a/src/java.desktop/share/classes/javax/swing/JTabbedPane.java b/src/java.desktop/share/classes/javax/swing/JTabbedPane.java
index e22cce9fab1..de68e2a7d0a 100644
--- a/src/java.desktop/share/classes/javax/swing/JTabbedPane.java
+++ b/src/java.desktop/share/classes/javax/swing/JTabbedPane.java
@@ -117,7 +117,7 @@ import java.io.IOException;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
@@ -1921,7 +1921,7 @@ public class JTabbedPane extends JComponent
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*/
diff --git a/src/java.desktop/share/classes/javax/swing/JTable.java b/src/java.desktop/share/classes/javax/swing/JTable.java
index f4e323840e6..9fbc47be394 100644
--- a/src/java.desktop/share/classes/javax/swing/JTable.java
+++ b/src/java.desktop/share/classes/javax/swing/JTable.java
@@ -206,7 +206,7 @@ import sun.swing.PrintingStatus;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
@@ -6651,7 +6651,7 @@ public class JTable extends JComponent implements TableModelListener, Scrollable
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*/
diff --git a/src/java.desktop/share/classes/javax/swing/JTextArea.java b/src/java.desktop/share/classes/javax/swing/JTextArea.java
index bf45f26ab76..4b9ba807e63 100644
--- a/src/java.desktop/share/classes/javax/swing/JTextArea.java
+++ b/src/java.desktop/share/classes/javax/swing/JTextArea.java
@@ -107,7 +107,7 @@ import java.io.IOException;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
@@ -776,7 +776,7 @@ public class JTextArea extends JTextComponent {
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*/
diff --git a/src/java.desktop/share/classes/javax/swing/JTextField.java b/src/java.desktop/share/classes/javax/swing/JTextField.java
index c857101709e..c54cef64217 100644
--- a/src/java.desktop/share/classes/javax/swing/JTextField.java
+++ b/src/java.desktop/share/classes/javax/swing/JTextField.java
@@ -147,7 +147,7 @@ import java.io.Serializable;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
@@ -943,7 +943,7 @@ public class JTextField extends JTextComponent implements SwingConstants {
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*/
diff --git a/src/java.desktop/share/classes/javax/swing/JTextPane.java b/src/java.desktop/share/classes/javax/swing/JTextPane.java
index 1688407ab00..d900103078a 100644
--- a/src/java.desktop/share/classes/javax/swing/JTextPane.java
+++ b/src/java.desktop/share/classes/javax/swing/JTextPane.java
@@ -65,7 +65,7 @@ import javax.swing.text.*;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/JToggleButton.java b/src/java.desktop/share/classes/javax/swing/JToggleButton.java
index 0fd27d8ed10..d8e9d6c010a 100644
--- a/src/java.desktop/share/classes/javax/swing/JToggleButton.java
+++ b/src/java.desktop/share/classes/javax/swing/JToggleButton.java
@@ -64,7 +64,7 @@ import java.util.Iterator;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
@@ -309,7 +309,7 @@ public class JToggleButton extends AbstractButton implements Accessible {
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*/
@@ -472,7 +472,7 @@ public class JToggleButton extends AbstractButton implements Accessible {
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*/
diff --git a/src/java.desktop/share/classes/javax/swing/JToolBar.java b/src/java.desktop/share/classes/javax/swing/JToolBar.java
index 0b2ae558ed0..e503e0788aa 100644
--- a/src/java.desktop/share/classes/javax/swing/JToolBar.java
+++ b/src/java.desktop/share/classes/javax/swing/JToolBar.java
@@ -69,7 +69,7 @@ import java.io.IOException;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/JToolTip.java b/src/java.desktop/share/classes/javax/swing/JToolTip.java
index d52fdab2d4a..3ae2d100e89 100644
--- a/src/java.desktop/share/classes/javax/swing/JToolTip.java
+++ b/src/java.desktop/share/classes/javax/swing/JToolTip.java
@@ -60,7 +60,7 @@ import java.util.Objects;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
@@ -254,7 +254,7 @@ public class JToolTip extends JComponent implements Accessible {
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*/
diff --git a/src/java.desktop/share/classes/javax/swing/JTree.java b/src/java.desktop/share/classes/javax/swing/JTree.java
index 01134ec62ed..1548ecc6e59 100644
--- a/src/java.desktop/share/classes/javax/swing/JTree.java
+++ b/src/java.desktop/share/classes/javax/swing/JTree.java
@@ -134,7 +134,7 @@ import static sun.swing.SwingUtilities2.Section.*;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*/
@@ -3434,7 +3434,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*/
@@ -3954,7 +3954,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*/
@@ -4190,7 +4190,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*/
diff --git a/src/java.desktop/share/classes/javax/swing/JViewport.java b/src/java.desktop/share/classes/javax/swing/JViewport.java
index 6ad3f2b38a3..14fdf3b57d1 100644
--- a/src/java.desktop/share/classes/javax/swing/JViewport.java
+++ b/src/java.desktop/share/classes/javax/swing/JViewport.java
@@ -102,7 +102,7 @@ import sun.swing.SwingUtilities2;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
@@ -1398,7 +1398,7 @@ public class JViewport extends JComponent implements Accessible
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*/
@@ -1869,7 +1869,7 @@ public class JViewport extends JComponent implements Accessible
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*/
diff --git a/src/java.desktop/share/classes/javax/swing/JWindow.java b/src/java.desktop/share/classes/javax/swing/JWindow.java
index 2214f11d25e..7db6227dca4 100644
--- a/src/java.desktop/share/classes/javax/swing/JWindow.java
+++ b/src/java.desktop/share/classes/javax/swing/JWindow.java
@@ -75,7 +75,7 @@ import javax.accessibility.*;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/KeyStroke.java b/src/java.desktop/share/classes/javax/swing/KeyStroke.java
index ebe6a126e55..94523beda6f 100644
--- a/src/java.desktop/share/classes/javax/swing/KeyStroke.java
+++ b/src/java.desktop/share/classes/javax/swing/KeyStroke.java
@@ -52,7 +52,7 @@ import sun.swing.SwingAccessor;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/OverlayLayout.java b/src/java.desktop/share/classes/javax/swing/OverlayLayout.java
index 4d3891ae19d..0067f6fd6bd 100644
--- a/src/java.desktop/share/classes/javax/swing/OverlayLayout.java
+++ b/src/java.desktop/share/classes/javax/swing/OverlayLayout.java
@@ -45,7 +45,7 @@ import java.io.Serializable;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/ScrollPaneLayout.java b/src/java.desktop/share/classes/javax/swing/ScrollPaneLayout.java
index 1d499be1b6d..ef906e40997 100644
--- a/src/java.desktop/share/classes/javax/swing/ScrollPaneLayout.java
+++ b/src/java.desktop/share/classes/javax/swing/ScrollPaneLayout.java
@@ -48,7 +48,7 @@ import java.io.Serializable;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/SizeRequirements.java b/src/java.desktop/share/classes/javax/swing/SizeRequirements.java
index a592ef6b563..d722c0b8a70 100644
--- a/src/java.desktop/share/classes/javax/swing/SizeRequirements.java
+++ b/src/java.desktop/share/classes/javax/swing/SizeRequirements.java
@@ -81,7 +81,7 @@ import java.io.Serializable;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/Spring.java b/src/java.desktop/share/classes/javax/swing/Spring.java
index e8a6805f970..cf28f97b673 100644
--- a/src/java.desktop/share/classes/javax/swing/Spring.java
+++ b/src/java.desktop/share/classes/javax/swing/Spring.java
@@ -117,7 +117,7 @@ import java.awt.Component;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/SpringLayout.java b/src/java.desktop/share/classes/javax/swing/SpringLayout.java
index cbb94dafb88..27641690e22 100644
--- a/src/java.desktop/share/classes/javax/swing/SpringLayout.java
+++ b/src/java.desktop/share/classes/javax/swing/SpringLayout.java
@@ -172,7 +172,7 @@ import java.util.*;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/Timer.java b/src/java.desktop/share/classes/javax/swing/Timer.java
index ab87f753596..9e4ee0fc466 100644
--- a/src/java.desktop/share/classes/javax/swing/Timer.java
+++ b/src/java.desktop/share/classes/javax/swing/Timer.java
@@ -130,7 +130,7 @@ import javax.swing.event.EventListenerList;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/UIDefaults.java b/src/java.desktop/share/classes/javax/swing/UIDefaults.java
index c9b1d2b0142..3141499d7db 100644
--- a/src/java.desktop/share/classes/javax/swing/UIDefaults.java
+++ b/src/java.desktop/share/classes/javax/swing/UIDefaults.java
@@ -67,7 +67,7 @@ import sun.swing.SwingUtilities2;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/UIManager.java b/src/java.desktop/share/classes/javax/swing/UIManager.java
index f7ae6864b41..1633b34ed2e 100644
--- a/src/java.desktop/share/classes/javax/swing/UIManager.java
+++ b/src/java.desktop/share/classes/javax/swing/UIManager.java
@@ -168,7 +168,7 @@ import sun.awt.AWTAccessor;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/UnsupportedLookAndFeelException.java b/src/java.desktop/share/classes/javax/swing/UnsupportedLookAndFeelException.java
index e28166cd2db..a82c97d9940 100644
--- a/src/java.desktop/share/classes/javax/swing/UnsupportedLookAndFeelException.java
+++ b/src/java.desktop/share/classes/javax/swing/UnsupportedLookAndFeelException.java
@@ -33,7 +33,7 @@ package javax.swing;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/ViewportLayout.java b/src/java.desktop/share/classes/javax/swing/ViewportLayout.java
index 7ed68ea48b9..283c06bec9d 100644
--- a/src/java.desktop/share/classes/javax/swing/ViewportLayout.java
+++ b/src/java.desktop/share/classes/javax/swing/ViewportLayout.java
@@ -50,7 +50,7 @@ import java.io.Serializable;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/border/AbstractBorder.java b/src/java.desktop/share/classes/javax/swing/border/AbstractBorder.java
index b329c077efd..9ee45d28651 100644
--- a/src/java.desktop/share/classes/javax/swing/border/AbstractBorder.java
+++ b/src/java.desktop/share/classes/javax/swing/border/AbstractBorder.java
@@ -40,7 +40,7 @@ import java.io.Serializable;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/border/BevelBorder.java b/src/java.desktop/share/classes/javax/swing/border/BevelBorder.java
index c3ebf0ed16b..84f2969a24a 100644
--- a/src/java.desktop/share/classes/javax/swing/border/BevelBorder.java
+++ b/src/java.desktop/share/classes/javax/swing/border/BevelBorder.java
@@ -38,7 +38,7 @@ import java.beans.ConstructorProperties;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/border/CompoundBorder.java b/src/java.desktop/share/classes/javax/swing/border/CompoundBorder.java
index acd172b324a..4353d7c3f28 100644
--- a/src/java.desktop/share/classes/javax/swing/border/CompoundBorder.java
+++ b/src/java.desktop/share/classes/javax/swing/border/CompoundBorder.java
@@ -48,7 +48,7 @@ import java.beans.ConstructorProperties;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/border/EmptyBorder.java b/src/java.desktop/share/classes/javax/swing/border/EmptyBorder.java
index f3133074a42..530856d2ddb 100644
--- a/src/java.desktop/share/classes/javax/swing/border/EmptyBorder.java
+++ b/src/java.desktop/share/classes/javax/swing/border/EmptyBorder.java
@@ -40,7 +40,7 @@ import java.beans.ConstructorProperties;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/border/EtchedBorder.java b/src/java.desktop/share/classes/javax/swing/border/EtchedBorder.java
index e9f979faef3..854e3d6c54d 100644
--- a/src/java.desktop/share/classes/javax/swing/border/EtchedBorder.java
+++ b/src/java.desktop/share/classes/javax/swing/border/EtchedBorder.java
@@ -44,7 +44,7 @@ import java.beans.ConstructorProperties;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/border/LineBorder.java b/src/java.desktop/share/classes/javax/swing/border/LineBorder.java
index 9c5fa739383..6d4fa299ba4 100644
--- a/src/java.desktop/share/classes/javax/swing/border/LineBorder.java
+++ b/src/java.desktop/share/classes/javax/swing/border/LineBorder.java
@@ -44,7 +44,7 @@ import java.beans.ConstructorProperties;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/border/MatteBorder.java b/src/java.desktop/share/classes/javax/swing/border/MatteBorder.java
index c941f2778d8..57f3501b870 100644
--- a/src/java.desktop/share/classes/javax/swing/border/MatteBorder.java
+++ b/src/java.desktop/share/classes/javax/swing/border/MatteBorder.java
@@ -40,7 +40,7 @@ import javax.swing.Icon;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/border/SoftBevelBorder.java b/src/java.desktop/share/classes/javax/swing/border/SoftBevelBorder.java
index 8cd3afdd799..6108efc56f4 100644
--- a/src/java.desktop/share/classes/javax/swing/border/SoftBevelBorder.java
+++ b/src/java.desktop/share/classes/javax/swing/border/SoftBevelBorder.java
@@ -40,7 +40,7 @@ import java.beans.ConstructorProperties;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/border/StrokeBorder.java b/src/java.desktop/share/classes/javax/swing/border/StrokeBorder.java
index 447779ac85c..e0e59237372 100644
--- a/src/java.desktop/share/classes/javax/swing/border/StrokeBorder.java
+++ b/src/java.desktop/share/classes/javax/swing/border/StrokeBorder.java
@@ -42,7 +42,7 @@ import java.beans.ConstructorProperties;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI
* between applications running the same version of Swing.
- * As of 1.4, support for long term storage of all JavaBeans™
+ * As of 1.4, support for long term storage of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/border/TitledBorder.java b/src/java.desktop/share/classes/javax/swing/border/TitledBorder.java
index 79a766fa6e4..e1f94783e2a 100644
--- a/src/java.desktop/share/classes/javax/swing/border/TitledBorder.java
+++ b/src/java.desktop/share/classes/javax/swing/border/TitledBorder.java
@@ -65,7 +65,7 @@ import jdk.internal.ref.CleanerFactory;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/colorchooser/AbstractColorChooserPanel.java b/src/java.desktop/share/classes/javax/swing/colorchooser/AbstractColorChooserPanel.java
index b3fda891612..6bfcea54b21 100644
--- a/src/java.desktop/share/classes/javax/swing/colorchooser/AbstractColorChooserPanel.java
+++ b/src/java.desktop/share/classes/javax/swing/colorchooser/AbstractColorChooserPanel.java
@@ -41,7 +41,7 @@ import javax.swing.*;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/colorchooser/ColorChooserComponentFactory.java b/src/java.desktop/share/classes/javax/swing/colorchooser/ColorChooserComponentFactory.java
index f1046c845fc..eb3920857a6 100644
--- a/src/java.desktop/share/classes/javax/swing/colorchooser/ColorChooserComponentFactory.java
+++ b/src/java.desktop/share/classes/javax/swing/colorchooser/ColorChooserComponentFactory.java
@@ -37,7 +37,7 @@ import javax.swing.JComponent;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/colorchooser/DefaultPreviewPanel.java b/src/java.desktop/share/classes/javax/swing/colorchooser/DefaultPreviewPanel.java
index 2abba55060b..30b81e076b7 100644
--- a/src/java.desktop/share/classes/javax/swing/colorchooser/DefaultPreviewPanel.java
+++ b/src/java.desktop/share/classes/javax/swing/colorchooser/DefaultPreviewPanel.java
@@ -46,7 +46,7 @@ import sun.swing.SwingUtilities2;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/colorchooser/DefaultSwatchChooserPanel.java b/src/java.desktop/share/classes/javax/swing/colorchooser/DefaultSwatchChooserPanel.java
index c8716f13c84..ce0d82bbe0f 100644
--- a/src/java.desktop/share/classes/javax/swing/colorchooser/DefaultSwatchChooserPanel.java
+++ b/src/java.desktop/share/classes/javax/swing/colorchooser/DefaultSwatchChooserPanel.java
@@ -45,7 +45,7 @@ import javax.accessibility.*;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/event/AncestorEvent.java b/src/java.desktop/share/classes/javax/swing/event/AncestorEvent.java
index d6f7ab08c28..41c833b63af 100644
--- a/src/java.desktop/share/classes/javax/swing/event/AncestorEvent.java
+++ b/src/java.desktop/share/classes/javax/swing/event/AncestorEvent.java
@@ -37,7 +37,7 @@ import javax.swing.*;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/event/CaretEvent.java b/src/java.desktop/share/classes/javax/swing/event/CaretEvent.java
index 55c50da3809..21822707142 100644
--- a/src/java.desktop/share/classes/javax/swing/event/CaretEvent.java
+++ b/src/java.desktop/share/classes/javax/swing/event/CaretEvent.java
@@ -36,7 +36,7 @@ import java.util.EventObject;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/event/ChangeEvent.java b/src/java.desktop/share/classes/javax/swing/event/ChangeEvent.java
index d9d596553f4..82e8508e62c 100644
--- a/src/java.desktop/share/classes/javax/swing/event/ChangeEvent.java
+++ b/src/java.desktop/share/classes/javax/swing/event/ChangeEvent.java
@@ -36,7 +36,7 @@ import java.util.EventObject;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/event/EventListenerList.java b/src/java.desktop/share/classes/javax/swing/event/EventListenerList.java
index 1cf242d6656..8de11e560b0 100644
--- a/src/java.desktop/share/classes/javax/swing/event/EventListenerList.java
+++ b/src/java.desktop/share/classes/javax/swing/event/EventListenerList.java
@@ -89,7 +89,7 @@ import sun.reflect.misc.ReflectUtil;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/event/HyperlinkEvent.java b/src/java.desktop/share/classes/javax/swing/event/HyperlinkEvent.java
index bcd7ea60063..57e11a4fbd8 100644
--- a/src/java.desktop/share/classes/javax/swing/event/HyperlinkEvent.java
+++ b/src/java.desktop/share/classes/javax/swing/event/HyperlinkEvent.java
@@ -39,7 +39,7 @@ import javax.swing.text.Element;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/event/InternalFrameEvent.java b/src/java.desktop/share/classes/javax/swing/event/InternalFrameEvent.java
index 3d830b22712..9019b5468e6 100644
--- a/src/java.desktop/share/classes/javax/swing/event/InternalFrameEvent.java
+++ b/src/java.desktop/share/classes/javax/swing/event/InternalFrameEvent.java
@@ -42,7 +42,7 @@ import javax.swing.JInternalFrame;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/event/ListDataEvent.java b/src/java.desktop/share/classes/javax/swing/event/ListDataEvent.java
index 3706d9733d1..ae06ade335a 100644
--- a/src/java.desktop/share/classes/javax/swing/event/ListDataEvent.java
+++ b/src/java.desktop/share/classes/javax/swing/event/ListDataEvent.java
@@ -36,7 +36,7 @@ import java.util.EventObject;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/event/ListSelectionEvent.java b/src/java.desktop/share/classes/javax/swing/event/ListSelectionEvent.java
index 907fd1307b8..c0e04878d63 100644
--- a/src/java.desktop/share/classes/javax/swing/event/ListSelectionEvent.java
+++ b/src/java.desktop/share/classes/javax/swing/event/ListSelectionEvent.java
@@ -42,7 +42,7 @@ import javax.swing.*;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/event/MenuDragMouseEvent.java b/src/java.desktop/share/classes/javax/swing/event/MenuDragMouseEvent.java
index b9da56733bd..94138d23d35 100644
--- a/src/java.desktop/share/classes/javax/swing/event/MenuDragMouseEvent.java
+++ b/src/java.desktop/share/classes/javax/swing/event/MenuDragMouseEvent.java
@@ -41,7 +41,7 @@ import java.awt.Component;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/event/MenuEvent.java b/src/java.desktop/share/classes/javax/swing/event/MenuEvent.java
index 7b68d3c4e60..0d86d51ff29 100644
--- a/src/java.desktop/share/classes/javax/swing/event/MenuEvent.java
+++ b/src/java.desktop/share/classes/javax/swing/event/MenuEvent.java
@@ -37,7 +37,7 @@ import java.util.EventObject;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/event/MenuKeyEvent.java b/src/java.desktop/share/classes/javax/swing/event/MenuKeyEvent.java
index 24407f181bd..3319408f685 100644
--- a/src/java.desktop/share/classes/javax/swing/event/MenuKeyEvent.java
+++ b/src/java.desktop/share/classes/javax/swing/event/MenuKeyEvent.java
@@ -41,7 +41,7 @@ import java.awt.Component;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/event/PopupMenuEvent.java b/src/java.desktop/share/classes/javax/swing/event/PopupMenuEvent.java
index 4431dcc0642..af4ddf6958e 100644
--- a/src/java.desktop/share/classes/javax/swing/event/PopupMenuEvent.java
+++ b/src/java.desktop/share/classes/javax/swing/event/PopupMenuEvent.java
@@ -35,7 +35,7 @@ import java.util.EventObject;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/event/TableColumnModelEvent.java b/src/java.desktop/share/classes/javax/swing/event/TableColumnModelEvent.java
index 7293238671b..db5c7b43212 100644
--- a/src/java.desktop/share/classes/javax/swing/event/TableColumnModelEvent.java
+++ b/src/java.desktop/share/classes/javax/swing/event/TableColumnModelEvent.java
@@ -38,7 +38,7 @@ import javax.swing.table.*;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/event/TableModelEvent.java b/src/java.desktop/share/classes/javax/swing/event/TableModelEvent.java
index 1ece19ee805..f5a72f4f672 100644
--- a/src/java.desktop/share/classes/javax/swing/event/TableModelEvent.java
+++ b/src/java.desktop/share/classes/javax/swing/event/TableModelEvent.java
@@ -57,7 +57,7 @@ import javax.swing.table.*;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/event/TreeExpansionEvent.java b/src/java.desktop/share/classes/javax/swing/event/TreeExpansionEvent.java
index 3fc415de46a..72e3591bb62 100644
--- a/src/java.desktop/share/classes/javax/swing/event/TreeExpansionEvent.java
+++ b/src/java.desktop/share/classes/javax/swing/event/TreeExpansionEvent.java
@@ -42,7 +42,7 @@ import javax.swing.tree.TreePath;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/event/TreeModelEvent.java b/src/java.desktop/share/classes/javax/swing/event/TreeModelEvent.java
index 264500b97e6..1d377bf2a65 100644
--- a/src/java.desktop/share/classes/javax/swing/event/TreeModelEvent.java
+++ b/src/java.desktop/share/classes/javax/swing/event/TreeModelEvent.java
@@ -42,7 +42,7 @@ import javax.swing.tree.TreePath;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/event/TreeSelectionEvent.java b/src/java.desktop/share/classes/javax/swing/event/TreeSelectionEvent.java
index 32de1e9f517..a7b91e8e050 100644
--- a/src/java.desktop/share/classes/javax/swing/event/TreeSelectionEvent.java
+++ b/src/java.desktop/share/classes/javax/swing/event/TreeSelectionEvent.java
@@ -40,7 +40,7 @@ import javax.swing.tree.TreePath;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/event/UndoableEditEvent.java b/src/java.desktop/share/classes/javax/swing/event/UndoableEditEvent.java
index bc81d9a721c..7725fedc583 100644
--- a/src/java.desktop/share/classes/javax/swing/event/UndoableEditEvent.java
+++ b/src/java.desktop/share/classes/javax/swing/event/UndoableEditEvent.java
@@ -35,7 +35,7 @@ import javax.swing.undo.*;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/BorderUIResource.java b/src/java.desktop/share/classes/javax/swing/plaf/BorderUIResource.java
index 0fa90f6a50c..a13a6c95a60 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/BorderUIResource.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/BorderUIResource.java
@@ -51,7 +51,7 @@ import javax.swing.plaf.UIResource;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/ColorUIResource.java b/src/java.desktop/share/classes/javax/swing/plaf/ColorUIResource.java
index 196fd6728fd..0b0da3f8bc3 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/ColorUIResource.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/ColorUIResource.java
@@ -37,7 +37,7 @@ import java.beans.ConstructorProperties;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/DimensionUIResource.java b/src/java.desktop/share/classes/javax/swing/plaf/DimensionUIResource.java
index 756b08d1cb7..f7a7ec9c30e 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/DimensionUIResource.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/DimensionUIResource.java
@@ -40,7 +40,7 @@ import javax.swing.plaf.UIResource;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/FontUIResource.java b/src/java.desktop/share/classes/javax/swing/plaf/FontUIResource.java
index 50ebb30eb65..9da2caecd35 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/FontUIResource.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/FontUIResource.java
@@ -39,7 +39,7 @@ import javax.swing.plaf.UIResource;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/IconUIResource.java b/src/java.desktop/share/classes/javax/swing/plaf/IconUIResource.java
index 5a25f5e8c4c..b454a0bdea4 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/IconUIResource.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/IconUIResource.java
@@ -44,7 +44,7 @@ import javax.swing.plaf.UIResource;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/InsetsUIResource.java b/src/java.desktop/share/classes/javax/swing/plaf/InsetsUIResource.java
index 16fe19a4102..a933d0ab573 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/InsetsUIResource.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/InsetsUIResource.java
@@ -39,7 +39,7 @@ import javax.swing.plaf.UIResource;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicArrowButton.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicArrowButton.java
index 33f155a3bd2..ff9c846cce4 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicArrowButton.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicArrowButton.java
@@ -43,7 +43,7 @@ import sun.swing.SwingUtilities2;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicCheckBoxUI.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicCheckBoxUI.java
index 37501888a60..11b94fddab5 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicCheckBoxUI.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicCheckBoxUI.java
@@ -43,7 +43,7 @@ import java.io.Serializable;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicComboBoxEditor.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicComboBoxEditor.java
index c7534c1e0c1..157c1dde4f7 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicComboBoxEditor.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicComboBoxEditor.java
@@ -169,7 +169,7 @@ public class BasicComboBoxEditor implements ComboBoxEditor,FocusListener {
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*/
diff --git a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicComboBoxRenderer.java b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicComboBoxRenderer.java
index 76da80e9ea2..23899e72bc4 100644
--- a/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicComboBoxRenderer.java
+++ b/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicComboBoxRenderer.java
@@ -41,7 +41,7 @@ import java.io.Serializable;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
@@ -139,7 +139,7 @@ implements ListCellRendererjava.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/tree/AbstractLayoutCache.java b/src/java.desktop/share/classes/javax/swing/tree/AbstractLayoutCache.java
index 23272555363..37d529a89c2 100644
--- a/src/java.desktop/share/classes/javax/swing/tree/AbstractLayoutCache.java
+++ b/src/java.desktop/share/classes/javax/swing/tree/AbstractLayoutCache.java
@@ -35,7 +35,7 @@ import java.util.Enumeration;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/tree/DefaultMutableTreeNode.java b/src/java.desktop/share/classes/javax/swing/tree/DefaultMutableTreeNode.java
index a487218d741..8901cdfea2e 100644
--- a/src/java.desktop/share/classes/javax/swing/tree/DefaultMutableTreeNode.java
+++ b/src/java.desktop/share/classes/javax/swing/tree/DefaultMutableTreeNode.java
@@ -77,7 +77,7 @@ import java.util.*;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeCellEditor.java b/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeCellEditor.java
index 8f76fe2952c..f0d4820a39a 100644
--- a/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeCellEditor.java
+++ b/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeCellEditor.java
@@ -49,7 +49,7 @@ import java.util.EventObject;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeCellRenderer.java b/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeCellRenderer.java
index c54673deaff..b3711074cb9 100644
--- a/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeCellRenderer.java
+++ b/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeCellRenderer.java
@@ -119,7 +119,7 @@ import sun.swing.SwingUtilities2;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeModel.java b/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeModel.java
index 3d9db10f427..d68c8c7dd70 100644
--- a/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeModel.java
+++ b/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeModel.java
@@ -41,7 +41,7 @@ import javax.swing.event.*;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java b/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java
index 80a5030c5a4..83ba0bef859 100644
--- a/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java
+++ b/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java
@@ -53,7 +53,7 @@ import javax.swing.DefaultListSelectionModel;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/tree/FixedHeightLayoutCache.java b/src/java.desktop/share/classes/javax/swing/tree/FixedHeightLayoutCache.java
index 637e549bfb8..21220526586 100644
--- a/src/java.desktop/share/classes/javax/swing/tree/FixedHeightLayoutCache.java
+++ b/src/java.desktop/share/classes/javax/swing/tree/FixedHeightLayoutCache.java
@@ -42,7 +42,7 @@ import sun.swing.SwingUtilities2;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/tree/TreePath.java b/src/java.desktop/share/classes/javax/swing/tree/TreePath.java
index e1631d981f8..e8abb0597df 100644
--- a/src/java.desktop/share/classes/javax/swing/tree/TreePath.java
+++ b/src/java.desktop/share/classes/javax/swing/tree/TreePath.java
@@ -74,7 +74,7 @@ import java.beans.ConstructorProperties;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/tree/VariableHeightLayoutCache.java b/src/java.desktop/share/classes/javax/swing/tree/VariableHeightLayoutCache.java
index e3ba2eb5b59..64a2d884f68 100644
--- a/src/java.desktop/share/classes/javax/swing/tree/VariableHeightLayoutCache.java
+++ b/src/java.desktop/share/classes/javax/swing/tree/VariableHeightLayoutCache.java
@@ -43,7 +43,7 @@ import sun.swing.SwingUtilities2;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/undo/CannotRedoException.java b/src/java.desktop/share/classes/javax/swing/undo/CannotRedoException.java
index 15ed0c1b4b4..ea8712f7f03 100644
--- a/src/java.desktop/share/classes/javax/swing/undo/CannotRedoException.java
+++ b/src/java.desktop/share/classes/javax/swing/undo/CannotRedoException.java
@@ -32,7 +32,7 @@ package javax.swing.undo;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/undo/CannotUndoException.java b/src/java.desktop/share/classes/javax/swing/undo/CannotUndoException.java
index 35606df3f69..e969e93d632 100644
--- a/src/java.desktop/share/classes/javax/swing/undo/CannotUndoException.java
+++ b/src/java.desktop/share/classes/javax/swing/undo/CannotUndoException.java
@@ -33,7 +33,7 @@ package javax.swing.undo;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.desktop/share/classes/javax/swing/undo/UndoManager.java b/src/java.desktop/share/classes/javax/swing/undo/UndoManager.java
index 42c2494c6e5..187788f4729 100644
--- a/src/java.desktop/share/classes/javax/swing/undo/UndoManager.java
+++ b/src/java.desktop/share/classes/javax/swing/undo/UndoManager.java
@@ -131,7 +131,7 @@ import sun.swing.text.UndoableEditLockSupport;
* future Swing releases. The current serialization support is
* appropriate for short term storage or RMI between applications running
* the same version of Swing. As of 1.4, support for long term storage
- * of all JavaBeans™
+ * of all JavaBeans
* has been added to the java.beans package.
* Please see {@link java.beans.XMLEncoder}.
*
diff --git a/src/java.instrument/share/classes/java/lang/instrument/ClassFileTransformer.java b/src/java.instrument/share/classes/java/lang/instrument/ClassFileTransformer.java
index 896f30904de..aff31855422 100644
--- a/src/java.instrument/share/classes/java/lang/instrument/ClassFileTransformer.java
+++ b/src/java.instrument/share/classes/java/lang/instrument/ClassFileTransformer.java
@@ -156,7 +156,7 @@ import java.security.ProtectionDomain;
*
* appendToClassPathForInstrumentation method.
*
*
@@ -87,7 +87,7 @@ questions.
notion of Standard MBeans. A Standard MBean is one
whose attributes and operations are deduced from a Java
interface using certain naming patterns, similar to those used
- by JavaBeans™. For example, consider an interface like this:
public interface ConfigurationMBean {
diff --git a/src/java.management/share/classes/javax/management/remote/package.html b/src/java.management/share/classes/javax/management/remote/package.html
index fbfc6351b10..3673d8dd8ed 100644
--- a/src/java.management/share/classes/javax/management/remote/package.html
+++ b/src/java.management/share/classes/javax/management/remote/package.html
@@ -1,6 +1,6 @@
-