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

8075284: fix up miscellaneous TM constructions

Browse Source 
Reviewed-by: lancea
This commit is contained in:
Joe Darcy 2015-05-19 13:30:03 -07:00
parent 8a9c3a81ff
commit 5899576955
26 changed files with 58 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jdk/src/demo/share/applets.html
View File

@ -56,8 +56,7 @@
</TR>
<TR>
<TD ALIGN=RIGHT COLSPAN="2"><!-- page headline --><!-------------------------------><!--EDIT THE PAGE HEADLINE HERE--><!------------BEGIN-HEADLINE-----><FONT SIZE=+2>JAVA</FONT><SUP><FONT SIZE=-2>TM</FONT></SUP><FONT SIZE=+2>
PLUG-IN</FONT> &nbsp;
<TD ALIGN=RIGHT COLSPAN="2"><!-- page headline --><!-------------------------------><!--EDIT THE PAGE HEADLINE HERE--><!------------BEGIN-HEADLINE-----><FONT SIZE=+2>JAVA&trade; PLUG-IN</FONT> &nbsp;
<BR><B>Demonstration Applets</B>&nbsp;
<BR><!-------------END-HEADLINE------><!-- END OF PAGE HEADLINE --><!-------------------------------></TD>
</TR>

2
jdk/src/demo/share/jvmti/index.html
View File

@ -5,7 +5,7 @@
<p>
The
Java<sup><font size=-2>TM</font></sup> Virtual Machine Tools Interface (JVM TI)
Java&trade; Virtual Machine Tools Interface (JVM TI)
is a native tool interface provided in JDK 5.0 and newer.
Native libraries that use JVM TI and are loaded into the
Java Virtual Machine

13
jdk/src/java.base/share/classes/java/lang/Boolean.java
View File

@ -230,13 +230,12 @@ public final class Boolean implements java.io.Serializable,
}
/**
* Returns {@code true} if and only if the system property
* named by the argument exists and is equal to the string
* {@code "true"}. (Beginning with version 1.0.2 of the
* Java<small><sup>TM</sup></small> platform, the test of
* this string is case insensitive.) A system property is accessible
* through {@code getProperty}, a method defined by the
* {@code System} class.
* Returns {@code true} if and only if the system property named
* by the argument exists and is equal to the string {@code
* "true"}. (Beginning with version 1.0.2 of the Java&trade;
* platform, the test of this string is case insensitive.) A
* system property is accessible through {@code getProperty}, a
* method defined by the {@code System} class.
* <p>
* If there is no property with the specified name, or if the specified
* name is empty or null, then {@code false} is returned.

6
jdk/src/java.base/share/classes/javax/crypto/interfaces/package.html
View File

@ -47,8 +47,7 @@ cryptographic provider developer guide:
<ul>
<li><a href=
"{@docRoot}/../technotes/guides/security/crypto/HowToImplAProvider.html">
<b>How to Implement a Provider for the
Java<FONT SIZE=-2><SUP>TM</SUP></FONT> Cryptography Architecture
<b>How to Implement a Provider for the Java&trade; Cryptography Architecture
</b></a></li>
</ul>
@ -66,8 +65,7 @@ For further documentation, please see:
<li>
<a href=
"{@docRoot}/../technotes/guides/security/crypto/CryptoSpec.html">
<b>Java<FONT SIZE=-2><SUP>TM</SUP></FONT>
Cryptography Architecture API Specification and Reference
<b>Java&trade; Cryptography Architecture API Specification and Reference
</b></a></li>
</ul>

5
jdk/src/java.base/share/classes/javax/crypto/spec/package.html
View File

@ -62,14 +62,13 @@ and key specifications, please see:
<li>
<a href=
"{@docRoot}/../technotes/guides/security/crypto/CryptoSpec.html">
<b>Java<FONT SIZE=-2><SUP>TM</SUP></FONT>
Cryptography Architecture API Specification and Reference
<b>Java&trade; Cryptography Architecture API Specification and Reference
</b></a></li>
<li>
<a href=
"{@docRoot}/../technotes/guides/security/crypto/HowToImplAProvider.html">
<b>How to Implement a Provider for the
Java<FONT SIZE=-2><SUP>TM</SUP></FONT> Cryptography Architecture
Java&trade; Cryptography Architecture
</b></a></li>
</ul>

3
jdk/src/java.base/share/classes/javax/net/ssl/package.html
View File

@ -38,8 +38,7 @@ and to optionally encrypt the data and/or authenticate the communicating peers.
<ul>
<li><a href="{@docRoot}/../technotes/guides/security/StandardNames.html">
<b>Java<FONT SIZE=-2><SUP>TM</SUP></FONT>
Cryptography Architecture Standard Algorithm Name
<b>Java&trade; Cryptography Architecture Standard Algorithm Name
Documentation</b></a></li>
</ul>

3
jdk/src/java.logging/share/classes/java/util/logging/package.html
View File

@ -30,8 +30,7 @@ questions.
<body bgcolor="white">
<P>
Provides the classes and interfaces of
the Java<SUP><FONT SIZE="-2">TM</FONT></SUP> 2
platform's core logging facilities.
the Java&trade; 2 platform's core logging facilities.
The central goal of the logging APIs is to support maintaining and servicing
software at customer sites.

5
jdk/src/java.management/share/classes/javax/management/package.html
View File

@ -30,7 +30,7 @@ questions.
<p>Provides the core classes for the Java Management Extensions.</p>
<p>The Java Management Extensions
(JMX<sup><font size="-1">TM</font></sup>) API is a standard
(JMX&trade;) API is a standard
API for management and monitoring. Typical uses include:</p>
<ul>
@ -87,8 +87,7 @@ questions.
notion of <em>Standard MBeans</em>. 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<sup><font size="-1">TM</font></sup>. For
example, consider an interface like this:</p>
by JavaBeans&trade;. For example, consider an interface like this:</p>
<pre>
public interface ConfigurationMBean {

2
jdk/src/java.management/share/classes/javax/management/remote/package.html
View File

@ -1,6 +1,6 @@
<html>
<head>
<title>JMX<sup><font size="-2">TM</font></sup> Remote API.</title>
<title>JMX&trade; Remote API.</title>
<!--
Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

5
jdk/src/java.management/share/classes/javax/management/remote/rmi/package.html
View File

@ -387,12 +387,11 @@ questions.
@see <a href="{@docRoot}/../technotes/guides/rmi/index.html">
Java<sup><font size="-1">TM</font></sup> Remote Method
Java&trade; Remote Method
Invocation (RMI)</a>
@see <a href="{@docRoot}/../technotes/guides/jndi/index.html">
Java Naming and Directory Interface<sup><font
size="-1">TM</font></sup> (JNDI)</a>
Java Naming and Directory Interface&trade; (JNDI)</a>
@see <a href="http://www.ietf.org/rfc/rfc2045.txt">RFC 2045,
section 6.8, "Base64 Content-Transfer-Encoding"</a>

2
jdk/src/java.naming/share/classes/javax/naming/directory/package.html
View File

@ -33,7 +33,7 @@ for accessing directory services.
<p>
This package defines the directory operations of the Java Naming and
Directory Interface<font size=-2><sup>TM</sup></font> (JNDI). &nbsp;
Directory Interface&trade; (JNDI). &nbsp;
JNDI provides naming and directory functionality to applications
written in the Java programming language. It is designed to be
independent of any specific naming or directory service

2
jdk/src/java.naming/share/classes/javax/naming/event/package.html
View File

@ -33,7 +33,7 @@ directory services.
<p>
This package defines the event notification operations of the Java Naming
and Directory Interface<font size=-2><sup>TM</sup></font> (JNDI). &nbsp;
and Directory Interface&trade; (JNDI). &nbsp;
JNDI provides naming and directory functionality to applications
written in the Java programming language. It is designed to be
independent of any specific naming or directory service

2
jdk/src/java.naming/share/classes/javax/naming/ldap/package.html
View File

@ -33,7 +33,7 @@ Provides support for LDAPv3 extended operations and controls.
<p>
This package extends the directory operations of the Java Naming and
Directory Interface<font size=-2><sup>TM</sup></font> (JNDI). &nbsp;
Directory Interface&trade; (JNDI). &nbsp;
JNDI provides naming and directory functionality to applications
written in the Java programming language. It is designed to be
independent of any specific naming or directory service

2
jdk/src/java.naming/share/classes/javax/naming/package.html
View File

@ -32,7 +32,7 @@ Provides the classes and interfaces for accessing naming services.
<p>
This package defines the naming operations of the Java Naming and
Directory Interface<font size=-2><sup>TM</sup></font> (JNDI). &nbsp;
Directory Interface&trade; (JNDI). &nbsp;
JNDI provides naming and directory functionality to applications
written in the Java programming language. It is designed to be
independent of any specific naming or directory service

2
jdk/src/java.naming/share/classes/javax/naming/spi/package.html
View File

@ -34,7 +34,7 @@ and related packages.
<p>
This package defines the service provider interface (SPI) of the Java Naming
and Directory Interface<font size=-2><sup>TM</sup></font> (JNDI). &nbsp;
and Directory Interface&trade; (JNDI). &nbsp;
JNDI provides naming and directory functionality to applications
written in the Java programming language. It is designed to be
independent of any specific naming or directory service

2
jdk/src/java.scripting/share/classes/javax/script/package.html
View File

@ -29,7 +29,7 @@ questions.
</head>
<body bgcolor="white">
<p>The scripting API consists of interfaces and classes that define
Java <font size=1><sup>TM</sup></font> Scripting Engines and provides
Java&trade; Scripting Engines and provides
a framework for their use in Java applications. This API is intended
for use by application programmers who wish to execute programs
written in scripting languages in their Java applications. The

23
jdk/src/java.sql/share/classes/java/sql/package.html
View File

@ -34,10 +34,10 @@ questions.
Provides the API for accessing and processing data stored in a
data source (usually a relational database) using the
Java<sup><font size=-2>TM</font></sup> programming language.
Java&trade; programming language.
This API includes a framework whereby different
drivers can be installed dynamically to access different data sources.
Although the JDBC<sup><font size=-2>TM</font></sup> API is mainly geared
Although the JDBC&trade; API is mainly geared
to passing SQL statements to a database, it provides for reading and
writing data from any data source with a tabular format.
The reader/writer facility, available through the
@ -45,17 +45,16 @@ The reader/writer facility, available through the
use and update data from a spread sheet, flat file, or any other tabular
data source.
<h2>What the JDBC<sup><font size=-2>TM</font></sup> 4.2 API Includes</h2>
The JDBC<sup><font size=-2>TM</font></sup> 4.2 API includes both
<h2>What the JDBC&trade; 4.2 API Includes</h2>
The JDBC&trade; 4.2 API includes both
the <code>java.sql</code> package, referred to as the JDBC core API,
and the <code>javax.sql</code> package, referred to as the JDBC Optional
Package API. This complete JDBC API
is included in the Java<sup><font size=-2>TM</font></sup>
Standard Edition (Java SE<sup><font size=-2>TM</font></sup>), version 7.
is included in the Java&trade; Standard Edition (Java SE&trade;), version 7.
The <code>javax.sql</code> package extends the functionality of the JDBC API
from a client-side API to a server-side API, and it is an essential part
of the Java<sup><font size=-2>TM</font></sup> Enterprise Edition
(Java EE<sup><font size=-2>TM</font></sup>) technology.
of the Java&trade; Enterprise Edition
(Java EE&trade;) technology.
<h2>Versions</h2>
The JDBC 4.2 API incorporates all of the previous JDBC API versions:
@ -74,7 +73,7 @@ The JDBC 4.2 API incorporates all of the previous JDBC API versions:
Classes, interfaces, methods, fields, constructors, and exceptions
have the following "since" tags that indicate when they were introduced
into the Java platform. When these "since" tags are used in
Javadoc<sup><font size=-2>TM</font></sup> comments for the JDBC API,
Javadoc&trade; comments for the JDBC API,
they indicate the following:
<UL>
<LI>Since 1.8 -- new in the JDBC 4.2 API and part of the Java SE platform,
@ -88,7 +87,7 @@ they indicate the following:
<LI>Since 1.2 -- new in the JDBC 2.0 API and part of the J2SE platform,
version 1.2</li>
<LI>Since 1.1 or no "since" tag -- in the original JDBC 1.0 API and part of
the JDK<sup><font size=-2>TM</font></sup>, version 1.1</li>
the JDK&trade;, version 1.1</li>
</UL>
<P>
<b>NOTE:</b> Many of the new features are optional; consequently, there is
@ -97,7 +96,7 @@ check your driver's documentation to see whether it supports a feature before
you try to use it.
<P>
<b>NOTE:</b> The class <code>SQLPermission</code> was added in the
Java<sup><font size=-2>TM</font></sup> 2 SDK, Standard Edition,
Java&trade; 2 SDK, Standard Edition,
version 1.3 release. This class is used to prevent unauthorized
access to the logging stream associated with the <code>DriverManager</code>,
which may contain information such as table names, column data, and so on.
@ -277,7 +276,7 @@ The <code>java.sql</code> package contains API for the following:
Package API</h3>
<UL>
<LI>The <code>DataSource</code> interface as a means of making a connection. The
Java Naming and Directory Interface<sup><font size=-2>TM</font></sup>
Java Naming and Directory Interface&trade;
(JNDI) is used for registering a <code>DataSource</code> object with a
naming service and also for retrieving it.
<LI>Pooled connections -- allowing connections to be used and reused

6
jdk/src/java.sql/share/classes/javax/sql/package.html
View File

@ -33,7 +33,7 @@ questions.
<body bgcolor="white">
Provides the API for server side data source access and processing from
the Java<sup><font size=-2>TM</font></sup> programming language.
the Java&trade; programming language.
This package supplements the <code>java.sql</code>
package and, as of the version 1.4 release, is included in the
Java Platform, Standard Edition (Java SE&trade;).
@ -84,7 +84,7 @@ physical data source, and each connection the <code>DataSource</code> object
creates is a connection to that physical data source.
<P>
A logical name for the data source is registered with a naming service that
uses the Java Naming and Directory Interface<sup><font size=-2>TM</font></sup>
uses the Java Naming and Directory Interface&trade;
(JNDI) API, usually by a system administrator or someone performing the
duties of a system administrator. An application can retrieve the
<code>DataSource</code> object it wants by doing a lookup on the logical
@ -189,7 +189,7 @@ interfaces behind the scenes. These can be grouped into three categories.
<LI>Event Notification
<UL>
<LI><code>RowSetListener</code><br>
A <code>RowSet</code> object is a JavaBeans<sup><font size=-2>TM</font></sup>
A <code>RowSet</code> object is a JavaBeans&trade;
component because it has properties and participates in the JavaBeans
event notification mechanism. The <code>RowSetListener</code> interface
is implemented by a component that wants to be notified about events that

3
jdk/src/jdk.attach/share/classes/com/sun/tools/attach/package-info.java
View File

@ -24,8 +24,7 @@
*/
/**
* Provides the API to attach to a Java<sup><font size=-2>TM</font></sup>
* virtual machine.
* Provides the API to attach to a Java&trade; virtual machine.
* <p>
* A tool, written in the Java Language, uses this API to attach to a target
* virtual machine (VM) and load its tool agent into the target VM. For

4
jdk/src/jdk.jdi/share/classes/com/sun/jdi/Accessible.java
View File

@ -40,8 +40,8 @@ package com.sun.jdi;
public interface Accessible {
/**
* Returns the Java<sup><font size=-2>TM</font></sup>
* programming language modifiers, encoded in an integer.
* Returns the Java&trade; programming language modifiers, encoded
* in an integer.
* <p>
* The modifier encodings are defined in
* <cite>The Java&trade; Virtual Machine Specification</cite>

2
jdk/src/jdk.jdi/share/classes/com/sun/jdi/ClassNotLoadedException.java
View File

@ -45,7 +45,7 @@ package com.sun.jdi;
* <li>There can be no guarantee that running the appropriate class
* loader won't cause a deadlock in loading the
* class. Class loaders can consist of arbitrary
* Java<sup><font size=-2>TM</font></sup> programming language code and the
* Java&trade; programming language code and the
* class loading methods are usually synchronized. Most of the work
* done by a debugger happens when threads are suspended. If another
* application thread is suspended within the same class loader,

8
jdk/src/jdk.jdi/share/classes/com/sun/jdi/Locatable.java
View File

@ -36,10 +36,10 @@ package com.sun.jdi;
@jdk.Exported
public interface Locatable {
/**
* Returns the {@link Location} of this mirror, if there
* is executable code associated with it. Note that both
* Java<SUP><FONT SIZE="-2">TM</FONT></SUP> programming
* language methods and native methods have executable code.
* Returns the {@link Location} of this mirror, if there is
* executable code associated with it. Note that both Java&trade;
* programming language methods and native methods have executable
* code.
* Returns null for abstract methods, since abstract methods
* have no executable code.
*

3
jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/AccessWatchpointRequest.java
View File

@ -31,8 +31,7 @@ import com.sun.jdi.*;
* Request for notification when the contents of a field are accessed
* in the target VM.
* This event will be triggered when the specified field is accessed
* by Java<SUP><FONT SIZE="-2">TM</FONT></SUP> programming
* language code or by a
* by Java&trade; programming language code or by a
* Java Native Interface (JNI) get function (<code>Get&lt;Type&gt;Field,
* GetStatic&lt;Type&gt;Field</code>).
* Access by JDI does not trigger this event.

2
jdk/src/jdk.jdi/share/classes/com/sun/jdi/request/ModificationWatchpointRequest.java
View File

@ -30,7 +30,7 @@ import com.sun.jdi.*;
/**
* Request for notification when a field is set.
* This event will be triggered when a value is assigned to the specified
* field with a Java<SUP><FONT SIZE="-2">TM</FONT></SUP> programming
* field with a Java&trade; programming
* language statement (assignment, increment, etc) or by a
* Java Native Interface (JNI) set function (<code>Set&lt;Type&gt;Field,
* SetStatic&lt;Type&gt;Field</code>).

5
jdk/src/jdk.jdi/share/classes/jdi-overview.html
View File

@ -1,11 +1,10 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
<head>
<title>Java(tm) Debug Interface</title>
<title>Java&trade; Debug Interface</title>
</head>
<body>
The Java<sup><font size="-2">TM</font></sup>
Debug Interface (JDI) is a high level Java
The Java&trade; Debug Interface (JDI) is a high level Java
API providing information useful for debuggers and similar
systems needing access to the running state of a (usually remote)
virtual machine.

14
jdk/src/sample/share/jmx/jmx-scandir/index.html
View File

@ -33,11 +33,11 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-->
<title>JMX(TM) "scandir" Example</title>
<title>JMX&trade; "scandir" Example</title>
</head>
<body>
<h1><center>Java<font size="-1"><sup>TM</sup></font> Management Extensions (JMX<font size="-1"><sup>TM</sup></font>) <i>scandir</i> Example</center></h1>
<h1><center>Java&trade; Management Extensions (JMX&trade;) <i>scandir</i> Example</center></h1>
<h2><a name="h2-Introduction">Introduction</a></h2>
<ul>
@ -1197,7 +1197,7 @@ href="http://www.netbeans.org"
<p>Another common best practice when you want
to improve interoperability is to use directly
the Notification base classes provided in the
JMX<sup>TM</sup> API. Do not create your own
JMX&trade; API. Do not create your own
subclasses of these standard classes.
</p>
<p>Indeed, if you code your own subclass, a generic
@ -1974,7 +1974,7 @@ java
More information on SSL authentication can be obtained from the <a
href="http://java.sun.com/javase/6/docs/technotes/guides/security/jsse/JSSERefGuide.html#HowSSLWorks"
title="How SSL Works"
>Java<sup>TM</sup> Secure Socket Extension (JSSE) Reference Guide</a>.
>Java&trade; Secure Socket Extension (JSSE) Reference Guide</a>.
</p>
<p>To start jconsole with our provided keystore and
truststore, go to the scandir example root directory and
@ -2202,13 +2202,13 @@ href="http://java.sun.com/javase/6/docs/technotes/guides/management/jconsole.htm
<li><a
href="http://java.sun.com/javase/6/docs/technotes/guides/security/jsse/JSSERefGuide.html#HowSSLWorks"
title="The JSSE Reference Guide"
>Java<sup>TM</sup> Secure Socket Extension (JSSE) Reference Guide</a>:
comprehensive documentation about the Java<sup>TM</sup> Secure Socket
>Java&trade; Secure Socket Extension (JSSE) Reference Guide</a>:
comprehensive documentation about the Java&trade; Secure Socket
Extension (JSSE)
</li>
<li><a href="http://java.sun.com/javase/6/docs/"
>Java SE 6 Documentation Index</a>: This document covers the
Java<sup>TM</sup> Platform, Standard Edition 6 JDK.</li>
Java&trade; Platform, Standard Edition 6 JDK.</li>
</ol>
<p>
<hr>