8025840: Fix all the doclint warnings about trademark

Reviewed-by: art

8025840: Fix all the doclint warnings about trademark
Reviewed-by: art
f71e1235 · cl · 2814a74a · f71e1235 · f71e1235 · f71e1235
189 changed file
--- a/src/share/classes/javax/swing/AbstractAction.java
+++ b/src/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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *

--- a/src/share/classes/javax/swing/AbstractButton.java
+++ b/src/share/classes/javax/swing/AbstractButton.java
@@ -66,7 +66,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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *
@@ -1973,7 +1973,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<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
     * has been added to the <code>java.beans</code> package.
     * Please see {@link java.beans.XMLEncoder}.
     */
@@ -2379,7 +2379,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<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
     * has been added to the <code>java.beans</code> package.
     * Please see {@link java.beans.XMLEncoder}.
     * @since 1.4

--- a/src/share/classes/javax/swing/AbstractCellEditor.java
+++ b/src/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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *

--- a/src/share/classes/javax/swing/AbstractListModel.java
+++ b/src/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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *

--- a/src/share/classes/javax/swing/Box.java
+++ b/src/share/classes/javax/swing/Box.java
@@ -68,7 +68,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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *
@@ -298,7 +298,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<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
     * has been added to the <code>java.beans</code> package.
     * Please see {@link java.beans.XMLEncoder}.
     */

--- a/src/share/classes/javax/swing/BoxLayout.java
+++ b/src/share/classes/javax/swing/BoxLayout.java
@@ -36,12 +36,12 @@ import java.io.PrintStream;
 * vertically or horizontally. The components will not wrap so, for
 * example, a vertical arrangement of components will stay vertically
 * arranged when the frame is resized.
- * <TABLE ALIGN="RIGHT" BORDER="0" SUMMARY="layout">
+ * <TABLE STYLE="FLOAT:RIGHT" BORDER="0" SUMMARY="layout">
 *    <TR>
 *      <TD ALIGN="CENTER">
- *         <P ALIGN="CENTER"><IMG SRC="doc-files/BoxLayout-1.gif"
+ *         <P STYLE="TEXT-ALIGN:CENTER"><IMG SRC="doc-files/BoxLayout-1.gif"
 *          alt="The following text describes this graphic."
- *          WIDTH="191" HEIGHT="201" ALIGN="BOTTOM" BORDER="0">
+ *          WIDTH="191" HEIGHT="201" STYLE="FLOAT:BOTTOM; BORDER:0">
 *      </TD>
 *    </TR>
 * </TABLE>
@@ -124,7 +124,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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *

--- a/src/share/classes/javax/swing/ButtonGroup.java
+++ b/src/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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *

--- a/src/share/classes/javax/swing/CellRendererPane.java
+++ b/src/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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *

--- a/src/share/classes/javax/swing/DefaultBoundedRangeModel.java
+++ b/src/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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *

--- a/src/share/classes/javax/swing/DefaultButtonModel.java
+++ b/src/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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *

--- a/src/share/classes/javax/swing/DefaultCellEditor.java
+++ b/src/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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *

--- a/src/share/classes/javax/swing/DefaultListCellRenderer.java
+++ b/src/share/classes/javax/swing/DefaultListCellRenderer.java
@@ -63,7 +63,7 @@ import sun.swing.DefaultLookup;
 * 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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *
@@ -337,7 +337,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<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
     * has been added to the <code>java.beans</code> package.
     * Please see {@link java.beans.XMLEncoder}.
     */

--- a/src/share/classes/javax/swing/DefaultListModel.java
+++ b/src/share/classes/javax/swing/DefaultListModel.java
@@ -44,7 +44,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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *

--- a/src/share/classes/javax/swing/DefaultListSelectionModel.java
+++ b/src/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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *

--- a/src/share/classes/javax/swing/DefaultSingleSelectionModel.java
+++ b/src/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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *

--- a/src/share/classes/javax/swing/ImageIcon.java
+++ b/src/share/classes/javax/swing/ImageIcon.java
@@ -59,7 +59,7 @@ import java.security.*;
 * 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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *
@@ -555,7 +555,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<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
     * has been added to the <code>java.beans</code> package.
     * Please see {@link java.beans.XMLEncoder}.
     * @since 1.3

--- a/src/share/classes/javax/swing/JApplet.java
+++ b/src/share/classes/javax/swing/JApplet.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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *

--- a/src/share/classes/javax/swing/JButton.java
+++ b/src/share/classes/javax/swing/JButton.java
@@ -65,7 +65,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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *
@@ -304,7 +304,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<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
     * has been added to the <code>java.beans</code> package.
     * Please see {@link java.beans.XMLEncoder}.
     */

--- a/src/share/classes/javax/swing/JCheckBox.java
+++ b/src/share/classes/javax/swing/JCheckBox.java
@@ -63,7 +63,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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *
@@ -330,7 +330,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<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
     * has been added to the <code>java.beans</code> package.
     * Please see {@link java.beans.XMLEncoder}.
     */

--- a/src/share/classes/javax/swing/JCheckBoxMenuItem.java
+++ b/src/share/classes/javax/swing/JCheckBoxMenuItem.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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *
@@ -289,7 +289,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<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
     * has been added to the <code>java.beans</code> package.
     * Please see {@link java.beans.XMLEncoder}.
     */

--- a/src/share/classes/javax/swing/JColorChooser.java
+++ b/src/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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *

--- a/src/share/classes/javax/swing/JComboBox.java
+++ b/src/share/classes/javax/swing/JComboBox.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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *
@@ -1608,7 +1608,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<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
     * has been added to the <code>java.beans</code> package.
     * Please see {@link java.beans.XMLEncoder}.
     */

--- a/src/share/classes/javax/swing/JComponent.java
+++ b/src/share/classes/javax/swing/JComponent.java
@@ -163,7 +163,7 @@ import sun.swing.UIClientPropertyKey;
 * 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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *
@@ -3653,7 +3653,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<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
     * has been added to the <code>java.beans</code> package.
     * Please see {@link java.beans.XMLEncoder}.
     */

--- a/src/share/classes/javax/swing/JDesktopPane.java
+++ b/src/share/classes/javax/swing/JDesktopPane.java
@@ -76,7 +76,7 @@ import java.util.TreeSet;
 * 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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *
@@ -612,7 +612,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<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
     * has been added to the <code>java.beans</code> package.
     * Please see {@link java.beans.XMLEncoder}.
     */

--- a/src/share/classes/javax/swing/JDialog.java
+++ b/src/share/classes/javax/swing/JDialog.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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the {@code java.beans} package.
 * Please see {@link java.beans.XMLEncoder}.
 *

--- a/src/share/classes/javax/swing/JEditorPane.java
+++ b/src/share/classes/javax/swing/JEditorPane.java
@@ -179,7 +179,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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *
@@ -1636,7 +1636,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<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
     * has been added to the <code>java.beans</code> package.
     * Please see {@link java.beans.XMLEncoder}.
     */
@@ -1690,7 +1690,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<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
     * has been added to the <code>java.beans</code> package.
     * Please see {@link java.beans.XMLEncoder}.
     */

--- a/src/share/classes/javax/swing/JFormattedTextField.java
+++ b/src/share/classes/javax/swing/JFormattedTextField.java
@@ -54,7 +54,7 @@ import javax.swing.text.*;
 * configuring what action should be taken when focus is lost. The possible
 * configurations are:
 * <table summary="Possible JFormattedTextField configurations and their descriptions">
- * <tr><th><p align="left">Value</p></th><th><p align="left">Description</p></th></tr>
+ * <tr><th><p style="text-align:left">Value</p></th><th><p style="text-align:left">Description</p></th></tr>
 * <tr><td>JFormattedTextField.REVERT
 *            <td>Revert the display to match that of <code>getValue</code>,
 *                possibly losing the current edit.
@@ -171,7 +171,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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *

--- a/src/share/classes/javax/swing/JFrame.java
+++ b/src/share/classes/javax/swing/JFrame.java
@@ -93,7 +93,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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *

--- a/src/share/classes/javax/swing/JInternalFrame.java
+++ b/src/share/classes/javax/swing/JInternalFrame.java
@@ -90,7 +90,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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *
@@ -2029,7 +2029,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<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
     * has been added to the <code>java.beans</code> package.
     * Please see {@link java.beans.XMLEncoder}.
     */
@@ -2144,7 +2144,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<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
     * has been added to the <code>java.beans</code> package.
     * Please see {@link java.beans.XMLEncoder}.
     *
@@ -2318,7 +2318,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<sup><font size="-2">TM</font></sup>
+         * of all JavaBeans&trade;
         * has been added to the <code>java.beans</code> package.
         * Please see {@link java.beans.XMLEncoder}.
         */

--- a/src/share/classes/javax/swing/JLabel.java
+++ b/src/share/classes/javax/swing/JLabel.java
@@ -94,7 +94,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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *
@@ -1064,7 +1064,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<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
     * has been added to the <code>java.beans</code> package.
     * Please see {@link java.beans.XMLEncoder}.
     */

--- a/src/share/classes/javax/swing/JLayeredPane.java
+++ b/src/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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *
@@ -765,7 +765,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<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
     * has been added to the <code>java.beans</code> package.
     * Please see {@link java.beans.XMLEncoder}.
     */

--- a/src/share/classes/javax/swing/JList.java
+++ b/src/share/classes/javax/swing/JList.java
@@ -253,7 +253,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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 * <p>
@@ -970,7 +970,7 @@ public class JList<E> extends JComponent implements Scrollable, Accessible
     *
     * <table border="1"
     *  summary="Describes layouts VERTICAL, HORIZONTAL_WRAP, and VERTICAL_WRAP">
-     *   <tr><th><p align="left">Value</p></th><th><p align="left">Description</p></th></tr>
+     *   <tr><th><p style="text-align:left">Value</p></th><th><p style="text-align:left">Description</p></th></tr>
     *   <tr><td><code>VERTICAL</code>
     *       <td>Cells are layed out vertically in a single column.
     *   <tr><td><code>HORIZONTAL_WRAP</code>
@@ -2877,7 +2877,7 @@ public class JList<E> 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<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
     * has been added to the <code>java.beans</code> package.
     * Please see {@link java.beans.XMLEncoder}.
     */

--- a/src/share/classes/javax/swing/JMenu.java
+++ b/src/share/classes/javax/swing/JMenu.java
@@ -93,7 +93,7 @@ import java.lang.ref.WeakReference;
 * 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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *
@@ -1149,7 +1149,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<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
     * has been added to the <code>java.beans</code> package.
     * Please see {@link java.beans.XMLEncoder}.
     */
@@ -1386,7 +1386,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<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
     * has been added to the <code>java.beans</code> package.
     * Please see {@link java.beans.XMLEncoder}.
     */

--- a/src/share/classes/javax/swing/JMenuBar.java
+++ b/src/share/classes/javax/swing/JMenuBar.java
@@ -67,7 +67,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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 * <p>
@@ -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<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
     * has been added to the <code>java.beans</code> package.
     * Please see {@link java.beans.XMLEncoder}.
     */

--- a/src/share/classes/javax/swing/JMenuItem.java
+++ b/src/share/classes/javax/swing/JMenuItem.java
@@ -72,7 +72,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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *
@@ -826,7 +826,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<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
     * has been added to the <code>java.beans</code> package.
     * Please see {@link java.beans.XMLEncoder}.
     */

--- a/src/share/classes/javax/swing/JOptionPane.java
+++ b/src/share/classes/javax/swing/JOptionPane.java
@@ -298,7 +298,7 @@ import static javax.swing.ClientPropertyKey.PopupFactory_FORCE_HEAVYWEIGHT_POPUP
 * 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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *
@@ -2573,7 +2573,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<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
     * has been added to the <code>java.beans</code> package.
     * Please see {@link java.beans.XMLEncoder}.
     */

--- a/src/share/classes/javax/swing/JPanel.java
+++ b/src/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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *
@@ -229,7 +229,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<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
     * has been added to the <code>java.beans</code> package.
     * Please see {@link java.beans.XMLEncoder}.
     */

--- a/src/share/classes/javax/swing/JPasswordField.java
+++ b/src/share/classes/javax/swing/JPasswordField.java
@@ -64,7 +64,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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *
@@ -399,7 +399,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<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
     * has been added to the <code>java.beans</code> package.
     * Please see {@link java.beans.XMLEncoder}.
     */

--- a/src/share/classes/javax/swing/JPopupMenu.java
+++ b/src/share/classes/javax/swing/JPopupMenu.java
@@ -71,7 +71,7 @@ import java.applet.Applet;
 * 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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *

--- a/src/share/classes/javax/swing/JProgressBar.java
+++ b/src/share/classes/javax/swing/JProgressBar.java
@@ -114,7 +114,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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *
@@ -643,7 +643,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<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
     * has been added to the <code>java.beans</code> package.
     * Please see {@link java.beans.XMLEncoder}.
     */
@@ -1031,7 +1031,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<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
     * has been added to the <code>java.beans</code> package.
     * Please see {@link java.beans.XMLEncoder}.
     */

--- a/src/share/classes/javax/swing/JRadioButton.java
+++ b/src/share/classes/javax/swing/JRadioButton.java
@@ -74,7 +74,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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *
@@ -280,7 +280,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<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
     * has been added to the <code>java.beans</code> package.
     * Please see {@link java.beans.XMLEncoder}.
     */

--- a/src/share/classes/javax/swing/JRadioButtonMenuItem.java
+++ b/src/share/classes/javax/swing/JRadioButtonMenuItem.java
@@ -71,7 +71,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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *
@@ -262,7 +262,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<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
     * has been added to the <code>java.beans</code> package.
     * Please see {@link java.beans.XMLEncoder}.
     */

--- a/src/share/classes/javax/swing/JRootPane.java
+++ b/src/share/classes/javax/swing/JRootPane.java
@@ -49,7 +49,7 @@ import sun.security.action.GetBooleanAction;
 * <p>
 * The following image shows the relationships between
 * the classes that use root panes.
- * <p align=center><img src="doc-files/JRootPane-1.gif"
+ * <p style="text-align:center"><img src="doc-files/JRootPane-1.gif"
 * alt="The following text describes this graphic."
 * HEIGHT=484 WIDTH=629></p>
 * The &quot;heavyweight&quot; components (those that delegate to a peer, or native
@@ -69,7 +69,7 @@ import sun.security.action.GetBooleanAction;
 * can be used to obtain the <code>JRootPane</code> that contains
 * a given component.
 * </blockquote>
- * <table align="right" border="0" summary="layout">
+ * <table style="float:right" border="0" summary="layout">
 * <tr>
 * <td align="center">
 * <img src="doc-files/JRootPane-2.gif"
@@ -179,7 +179,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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *
@@ -898,7 +898,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<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
     * has been added to the <code>java.beans</code> package.
     * Please see {@link java.beans.XMLEncoder}.
     */
@@ -1064,7 +1064,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<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
     * has been added to the <code>java.beans</code> package.
     * Please see {@link java.beans.XMLEncoder}.
     */

--- a/src/share/classes/javax/swing/JScrollBar.java
+++ b/src/share/classes/javax/swing/JScrollBar.java
@@ -67,7 +67,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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *
@@ -838,7 +838,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<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
     * has been added to the <code>java.beans</code> package.
     * Please see {@link java.beans.XMLEncoder}.
     */

--- a/src/share/classes/javax/swing/JScrollPane.java
+++ b/src/share/classes/javax/swing/JScrollPane.java
@@ -146,7 +146,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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *
@@ -677,7 +677,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<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
     * has been added to the <code>java.beans</code> package.
     * Please see {@link java.beans.XMLEncoder}.
     *
@@ -1437,7 +1437,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<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
     * has been added to the <code>java.beans</code> package.
     * Please see {@link java.beans.XMLEncoder}.
     */

--- a/src/share/classes/javax/swing/JSeparator.java
+++ b/src/share/classes/javax/swing/JSeparator.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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *
@@ -276,7 +276,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<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
     * has been added to the <code>java.beans</code> package.
     * Please see {@link java.beans.XMLEncoder}.
     */

--- a/src/share/classes/javax/swing/JSlider.java
+++ b/src/share/classes/javax/swing/JSlider.java
@@ -68,7 +68,7 @@ import java.beans.*;
 * 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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *
@@ -1425,7 +1425,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<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
     * has been added to the <code>java.beans</code> package.
     * Please see {@link java.beans.XMLEncoder}.
     */

--- a/src/share/classes/javax/swing/JSpinner.java
+++ b/src/share/classes/javax/swing/JSpinner.java
@@ -106,7 +106,7 @@ import sun.util.locale.provider.LocaleServiceProviderPool;
 * 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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *

--- a/src/share/classes/javax/swing/JSplitPane.java
+++ b/src/share/classes/javax/swing/JSplitPane.java
@@ -89,7 +89,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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *
@@ -1152,7 +1152,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<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
     * has been added to the <code>java.beans</code> package.
     * Please see {@link java.beans.XMLEncoder}.
     */

--- a/src/share/classes/javax/swing/JTabbedPane.java
+++ b/src/share/classes/javax/swing/JTabbedPane.java
@@ -91,7 +91,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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *
@@ -1885,7 +1885,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<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
     * has been added to the <code>java.beans</code> package.
     * Please see {@link java.beans.XMLEncoder}.
     */

--- a/src/share/classes/javax/swing/JTable.java
+++ b/src/share/classes/javax/swing/JTable.java
@@ -200,7 +200,7 @@ import sun.swing.SwingLazyValue;
 * 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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *
@@ -6575,7 +6575,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<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
     * has been added to the <code>java.beans</code> package.
     * Please see {@link java.beans.XMLEncoder}.
     */

--- a/src/share/classes/javax/swing/JTextArea.java
+++ b/src/share/classes/javax/swing/JTextArea.java
@@ -112,7 +112,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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *
@@ -783,7 +783,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<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
     * has been added to the <code>java.beans</code> package.
     * Please see {@link java.beans.XMLEncoder}.
     */

--- a/src/share/classes/javax/swing/JTextField.java
+++ b/src/share/classes/javax/swing/JTextField.java
@@ -148,7 +148,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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *
@@ -939,7 +939,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<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
     * has been added to the <code>java.beans</code> package.
     * Please see {@link java.beans.XMLEncoder}.
     */

--- a/src/share/classes/javax/swing/JTextPane.java
+++ b/src/share/classes/javax/swing/JTextPane.java
@@ -68,7 +68,7 @@ import javax.swing.plaf.*;
 * 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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *

--- a/src/share/classes/javax/swing/JToggleButton.java
+++ b/src/share/classes/javax/swing/JToggleButton.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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *
@@ -218,7 +218,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<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
     * has been added to the <code>java.beans</code> package.
     * Please see {@link java.beans.XMLEncoder}.
     */
@@ -380,7 +380,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<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
     * has been added to the <code>java.beans</code> package.
     * Please see {@link java.beans.XMLEncoder}.
     */

--- a/src/share/classes/javax/swing/JToolBar.java
+++ b/src/share/classes/javax/swing/JToolBar.java
@@ -74,7 +74,7 @@ import java.util.Hashtable;
 * 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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *

--- a/src/share/classes/javax/swing/JToolTip.java
+++ b/src/share/classes/javax/swing/JToolTip.java
@@ -58,7 +58,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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> 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<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
     * has been added to the <code>java.beans</code> package.
     * Please see {@link java.beans.XMLEncoder}.
     */

--- a/src/share/classes/javax/swing/JTree.java
+++ b/src/share/classes/javax/swing/JTree.java
@@ -130,7 +130,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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *</p>
@@ -3238,7 +3238,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<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
     * has been added to the <code>java.beans</code> package.
     * Please see {@link java.beans.XMLEncoder}.
     */
@@ -3360,7 +3360,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<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
     * has been added to the <code>java.beans</code> package.
     * Please see {@link java.beans.XMLEncoder}.
     */
@@ -3861,7 +3861,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<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
     * has been added to the <code>java.beans</code> package.
     * Please see {@link java.beans.XMLEncoder}.
     */
@@ -4093,7 +4093,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<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
     * has been added to the <code>java.beans</code> package.
     * Please see {@link java.beans.XMLEncoder}.
     */

--- a/src/share/classes/javax/swing/JViewport.java
+++ b/src/share/classes/javax/swing/JViewport.java
@@ -94,7 +94,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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *
@@ -1292,7 +1292,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<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
     * has been added to the <code>java.beans</code> package.
     * Please see {@link java.beans.XMLEncoder}.
     */
@@ -1761,7 +1761,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<sup><font size="-2">TM</font></sup>
+     * of all JavaBeans&trade;
     * has been added to the <code>java.beans</code> package.
     * Please see {@link java.beans.XMLEncoder}.
     */

--- a/src/share/classes/javax/swing/JWindow.java
+++ b/src/share/classes/javax/swing/JWindow.java
@@ -76,7 +76,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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *

--- a/src/share/classes/javax/swing/KeyStroke.java
+++ b/src/share/classes/javax/swing/KeyStroke.java
@@ -51,7 +51,7 @@ import java.awt.event.KeyEvent;
 * 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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *

--- a/src/share/classes/javax/swing/OverlayLayout.java
+++ b/src/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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *

--- a/src/share/classes/javax/swing/ScrollPaneLayout.java
+++ b/src/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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *

--- a/src/share/classes/javax/swing/SizeRequirements.java
+++ b/src/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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *

--- a/src/share/classes/javax/swing/Spring.java
+++ b/src/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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *

--- a/src/share/classes/javax/swing/SpringLayout.java
+++ b/src/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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *

--- a/src/share/classes/javax/swing/Timer.java
+++ b/src/share/classes/javax/swing/Timer.java
@@ -137,7 +137,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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *

--- a/src/share/classes/javax/swing/UIDefaults.java
+++ b/src/share/classes/javax/swing/UIDefaults.java
@@ -64,7 +64,7 @@ import sun.util.CoreResourceBundleControl;
 * 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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *

--- a/src/share/classes/javax/swing/UIManager.java
+++ b/src/share/classes/javax/swing/UIManager.java
@@ -167,7 +167,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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *

--- a/src/share/classes/javax/swing/UnsupportedLookAndFeelException.java
+++ b/src/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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *

--- a/src/share/classes/javax/swing/ViewportLayout.java
+++ b/src/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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *

--- a/src/share/classes/javax/swing/border/AbstractBorder.java
+++ b/src/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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *

--- a/src/share/classes/javax/swing/border/BevelBorder.java
+++ b/src/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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *

--- a/src/share/classes/javax/swing/border/CompoundBorder.java
+++ b/src/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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *

--- a/src/share/classes/javax/swing/border/EmptyBorder.java
+++ b/src/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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *

--- a/src/share/classes/javax/swing/border/EtchedBorder.java
+++ b/src/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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *

--- a/src/share/classes/javax/swing/border/LineBorder.java
+++ b/src/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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *

--- a/src/share/classes/javax/swing/border/MatteBorder.java
+++ b/src/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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *

--- a/src/share/classes/javax/swing/border/SoftBevelBorder.java
+++ b/src/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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *

--- a/src/share/classes/javax/swing/border/TitledBorder.java
+++ b/src/share/classes/javax/swing/border/TitledBorder.java
@@ -60,7 +60,7 @@ import javax.swing.plaf.basic.BasicHTML;
 * 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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *

--- a/src/share/classes/javax/swing/colorchooser/AbstractColorChooserPanel.java
+++ b/src/share/classes/javax/swing/colorchooser/AbstractColorChooserPanel.java
@@ -40,7 +40,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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *

--- a/src/share/classes/javax/swing/colorchooser/ColorChooserComponentFactory.java
+++ b/src/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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *

--- a/src/share/classes/javax/swing/colorchooser/DefaultPreviewPanel.java
+++ b/src/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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *

--- a/src/share/classes/javax/swing/colorchooser/DefaultSwatchChooserPanel.java
+++ b/src/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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *

--- a/src/share/classes/javax/swing/event/AncestorEvent.java
+++ b/src/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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *

--- a/src/share/classes/javax/swing/event/CaretEvent.java
+++ b/src/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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *

--- a/src/share/classes/javax/swing/event/ChangeEvent.java
+++ b/src/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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *

--- a/src/share/classes/javax/swing/event/EventListenerList.java
+++ b/src/share/classes/javax/swing/event/EventListenerList.java
@@ -88,7 +88,7 @@ import java.lang.reflect.Array;
 * 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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *

--- a/src/share/classes/javax/swing/event/HyperlinkEvent.java
+++ b/src/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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *

--- a/src/share/classes/javax/swing/event/InternalFrameEvent.java
+++ b/src/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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *

--- a/src/share/classes/javax/swing/event/ListDataEvent.java
+++ b/src/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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *

--- a/src/share/classes/javax/swing/event/ListSelectionEvent.java
+++ b/src/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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *

--- a/src/share/classes/javax/swing/event/MenuDragMouseEvent.java
+++ b/src/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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *

--- a/src/share/classes/javax/swing/event/MenuEvent.java
+++ b/src/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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *

--- a/src/share/classes/javax/swing/event/MenuKeyEvent.java
+++ b/src/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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *

--- a/src/share/classes/javax/swing/event/PopupMenuEvent.java
+++ b/src/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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *

--- a/src/share/classes/javax/swing/event/TableColumnModelEvent.java
+++ b/src/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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *

--- a/src/share/classes/javax/swing/event/TableModelEvent.java
+++ b/src/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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *

--- a/src/share/classes/javax/swing/event/TreeExpansionEvent.java
+++ b/src/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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *

--- a/src/share/classes/javax/swing/event/TreeModelEvent.java
+++ b/src/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<sup><font size="-2">TM</font></sup>
+ * of all JavaBeans&trade;
 * has been added to the <code>java.beans</code> package.
 * Please see {@link java.beans.XMLEncoder}.
 *

--- a/src/share/classes/javax/swing/event/TreeSelectionEvent.java
+++ b/src/share/classes/javax/swing/event/TreeSelectionEvent.java
--- a/src/share/classes/javax/swing/event/UndoableEditEvent.java
+++ b/src/share/classes/javax/swing/event/UndoableEditEvent.java
--- a/src/share/classes/javax/swing/plaf/BorderUIResource.java
+++ b/src/share/classes/javax/swing/plaf/BorderUIResource.java
--- a/src/share/classes/javax/swing/plaf/ColorUIResource.java
+++ b/src/share/classes/javax/swing/plaf/ColorUIResource.java
--- a/src/share/classes/javax/swing/plaf/DimensionUIResource.java
+++ b/src/share/classes/javax/swing/plaf/DimensionUIResource.java
--- a/src/share/classes/javax/swing/plaf/FontUIResource.java
+++ b/src/share/classes/javax/swing/plaf/FontUIResource.java
--- a/src/share/classes/javax/swing/plaf/IconUIResource.java
+++ b/src/share/classes/javax/swing/plaf/IconUIResource.java
--- a/src/share/classes/javax/swing/plaf/InsetsUIResource.java
+++ b/src/share/classes/javax/swing/plaf/InsetsUIResource.java
--- a/src/share/classes/javax/swing/plaf/basic/BasicArrowButton.java
+++ b/src/share/classes/javax/swing/plaf/basic/BasicArrowButton.java
--- a/src/share/classes/javax/swing/plaf/basic/BasicCheckBoxUI.java
+++ b/src/share/classes/javax/swing/plaf/basic/BasicCheckBoxUI.java
--- a/src/share/classes/javax/swing/plaf/basic/BasicComboBoxEditor.java
+++ b/src/share/classes/javax/swing/plaf/basic/BasicComboBoxEditor.java
--- a/src/share/classes/javax/swing/plaf/basic/BasicComboBoxRenderer.java
+++ b/src/share/classes/javax/swing/plaf/basic/BasicComboBoxRenderer.java
--- a/src/share/classes/javax/swing/plaf/basic/BasicComboPopup.java
+++ b/src/share/classes/javax/swing/plaf/basic/BasicComboPopup.java
--- a/src/share/classes/javax/swing/plaf/basic/BasicEditorPaneUI.java
+++ b/src/share/classes/javax/swing/plaf/basic/BasicEditorPaneUI.java
--- a/src/share/classes/javax/swing/plaf/basic/BasicIconFactory.java
+++ b/src/share/classes/javax/swing/plaf/basic/BasicIconFactory.java
--- a/src/share/classes/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java
+++ b/src/share/classes/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java
--- a/src/share/classes/javax/swing/plaf/basic/BasicListUI.java
+++ b/src/share/classes/javax/swing/plaf/basic/BasicListUI.java
--- a/src/share/classes/javax/swing/plaf/basic/BasicLookAndFeel.java
+++ b/src/share/classes/javax/swing/plaf/basic/BasicLookAndFeel.java
--- a/src/share/classes/javax/swing/plaf/basic/BasicSplitPaneDivider.java
+++ b/src/share/classes/javax/swing/plaf/basic/BasicSplitPaneDivider.java
--- a/src/share/classes/javax/swing/plaf/basic/BasicTextAreaUI.java
+++ b/src/share/classes/javax/swing/plaf/basic/BasicTextAreaUI.java
--- a/src/share/classes/javax/swing/plaf/basic/BasicTextFieldUI.java
+++ b/src/share/classes/javax/swing/plaf/basic/BasicTextFieldUI.java
--- a/src/share/classes/javax/swing/plaf/basic/BasicTextPaneUI.java
+++ b/src/share/classes/javax/swing/plaf/basic/BasicTextPaneUI.java
--- a/src/share/classes/javax/swing/plaf/basic/BasicTextUI.java
+++ b/src/share/classes/javax/swing/plaf/basic/BasicTextUI.java
--- a/src/share/classes/javax/swing/plaf/basic/ComboPopup.java
+++ b/src/share/classes/javax/swing/plaf/basic/ComboPopup.java
--- a/src/share/classes/javax/swing/plaf/metal/DefaultMetalTheme.java
+++ b/src/share/classes/javax/swing/plaf/metal/DefaultMetalTheme.java
--- a/src/share/classes/javax/swing/plaf/metal/MetalButtonUI.java
+++ b/src/share/classes/javax/swing/plaf/metal/MetalButtonUI.java
--- a/src/share/classes/javax/swing/plaf/metal/MetalCheckBoxIcon.java
+++ b/src/share/classes/javax/swing/plaf/metal/MetalCheckBoxIcon.java
--- a/src/share/classes/javax/swing/plaf/metal/MetalCheckBoxUI.java
+++ b/src/share/classes/javax/swing/plaf/metal/MetalCheckBoxUI.java
--- a/src/share/classes/javax/swing/plaf/metal/MetalComboBoxButton.java
+++ b/src/share/classes/javax/swing/plaf/metal/MetalComboBoxButton.java
--- a/src/share/classes/javax/swing/plaf/metal/MetalComboBoxEditor.java
+++ b/src/share/classes/javax/swing/plaf/metal/MetalComboBoxEditor.java
--- a/src/share/classes/javax/swing/plaf/metal/MetalComboBoxUI.java
+++ b/src/share/classes/javax/swing/plaf/metal/MetalComboBoxUI.java
--- a/src/share/classes/javax/swing/plaf/metal/MetalIconFactory.java
+++ b/src/share/classes/javax/swing/plaf/metal/MetalIconFactory.java
--- a/src/share/classes/javax/swing/plaf/metal/MetalLookAndFeel.java
+++ b/src/share/classes/javax/swing/plaf/metal/MetalLookAndFeel.java
--- a/src/share/classes/javax/swing/plaf/metal/MetalProgressBarUI.java
+++ b/src/share/classes/javax/swing/plaf/metal/MetalProgressBarUI.java
--- a/src/share/classes/javax/swing/plaf/metal/MetalRadioButtonUI.java
+++ b/src/share/classes/javax/swing/plaf/metal/MetalRadioButtonUI.java
--- a/src/share/classes/javax/swing/plaf/metal/MetalRootPaneUI.java
+++ b/src/share/classes/javax/swing/plaf/metal/MetalRootPaneUI.java
--- a/src/share/classes/javax/swing/plaf/metal/MetalScrollButton.java
+++ b/src/share/classes/javax/swing/plaf/metal/MetalScrollButton.java
--- a/src/share/classes/javax/swing/plaf/metal/MetalScrollPaneUI.java
+++ b/src/share/classes/javax/swing/plaf/metal/MetalScrollPaneUI.java
--- a/src/share/classes/javax/swing/plaf/metal/MetalSeparatorUI.java
+++ b/src/share/classes/javax/swing/plaf/metal/MetalSeparatorUI.java
--- a/src/share/classes/javax/swing/plaf/metal/MetalSliderUI.java
+++ b/src/share/classes/javax/swing/plaf/metal/MetalSliderUI.java
--- a/src/share/classes/javax/swing/plaf/metal/MetalSplitPaneDivider.java
+++ b/src/share/classes/javax/swing/plaf/metal/MetalSplitPaneDivider.java
--- a/src/share/classes/javax/swing/plaf/metal/MetalSplitPaneUI.java
+++ b/src/share/classes/javax/swing/plaf/metal/MetalSplitPaneUI.java
--- a/src/share/classes/javax/swing/plaf/metal/MetalTabbedPaneUI.java
+++ b/src/share/classes/javax/swing/plaf/metal/MetalTabbedPaneUI.java
--- a/src/share/classes/javax/swing/plaf/metal/MetalTextFieldUI.java
+++ b/src/share/classes/javax/swing/plaf/metal/MetalTextFieldUI.java
--- a/src/share/classes/javax/swing/plaf/metal/MetalToggleButtonUI.java
+++ b/src/share/classes/javax/swing/plaf/metal/MetalToggleButtonUI.java
--- a/src/share/classes/javax/swing/plaf/metal/MetalToolTipUI.java
+++ b/src/share/classes/javax/swing/plaf/metal/MetalToolTipUI.java
--- a/src/share/classes/javax/swing/plaf/multi/MultiLookAndFeel.java
+++ b/src/share/classes/javax/swing/plaf/multi/MultiLookAndFeel.java
--- a/src/share/classes/javax/swing/plaf/synth/SynthTextAreaUI.java
+++ b/src/share/classes/javax/swing/plaf/synth/SynthTextAreaUI.java
--- a/src/share/classes/javax/swing/plaf/synth/SynthTextFieldUI.java
+++ b/src/share/classes/javax/swing/plaf/synth/SynthTextFieldUI.java
--- a/src/share/classes/javax/swing/plaf/synth/SynthTextPaneUI.java
+++ b/src/share/classes/javax/swing/plaf/synth/SynthTextPaneUI.java
--- a/src/share/classes/javax/swing/table/AbstractTableModel.java
+++ b/src/share/classes/javax/swing/table/AbstractTableModel.java
--- a/src/share/classes/javax/swing/table/DefaultTableCellRenderer.java
+++ b/src/share/classes/javax/swing/table/DefaultTableCellRenderer.java
--- a/src/share/classes/javax/swing/table/DefaultTableColumnModel.java
+++ b/src/share/classes/javax/swing/table/DefaultTableColumnModel.java
--- a/src/share/classes/javax/swing/table/DefaultTableModel.java
+++ b/src/share/classes/javax/swing/table/DefaultTableModel.java
--- a/src/share/classes/javax/swing/table/JTableHeader.java
+++ b/src/share/classes/javax/swing/table/JTableHeader.java
--- a/src/share/classes/javax/swing/table/TableColumn.java
+++ b/src/share/classes/javax/swing/table/TableColumn.java
--- a/src/share/classes/javax/swing/text/AbstractDocument.java
+++ b/src/share/classes/javax/swing/text/AbstractDocument.java
--- a/src/share/classes/javax/swing/text/BadLocationException.java
+++ b/src/share/classes/javax/swing/text/BadLocationException.java
--- a/src/share/classes/javax/swing/text/DateFormatter.java
+++ b/src/share/classes/javax/swing/text/DateFormatter.java
--- a/src/share/classes/javax/swing/text/DefaultCaret.java
+++ b/src/share/classes/javax/swing/text/DefaultCaret.java
--- a/src/share/classes/javax/swing/text/DefaultEditorKit.java
+++ b/src/share/classes/javax/swing/text/DefaultEditorKit.java
--- a/src/share/classes/javax/swing/text/DefaultFormatter.java
+++ b/src/share/classes/javax/swing/text/DefaultFormatter.java
--- a/src/share/classes/javax/swing/text/DefaultFormatterFactory.java
+++ b/src/share/classes/javax/swing/text/DefaultFormatterFactory.java
--- a/src/share/classes/javax/swing/text/DefaultStyledDocument.java
+++ b/src/share/classes/javax/swing/text/DefaultStyledDocument.java
--- a/src/share/classes/javax/swing/text/InternationalFormatter.java
+++ b/src/share/classes/javax/swing/text/InternationalFormatter.java
--- a/src/share/classes/javax/swing/text/JTextComponent.java
+++ b/src/share/classes/javax/swing/text/JTextComponent.java
--- a/src/share/classes/javax/swing/text/MaskFormatter.java
+++ b/src/share/classes/javax/swing/text/MaskFormatter.java
--- a/src/share/classes/javax/swing/text/NumberFormatter.java
+++ b/src/share/classes/javax/swing/text/NumberFormatter.java
--- a/src/share/classes/javax/swing/text/PlainDocument.java
+++ b/src/share/classes/javax/swing/text/PlainDocument.java
--- a/src/share/classes/javax/swing/text/SimpleAttributeSet.java
+++ b/src/share/classes/javax/swing/text/SimpleAttributeSet.java
--- a/src/share/classes/javax/swing/text/StringContent.java
+++ b/src/share/classes/javax/swing/text/StringContent.java
--- a/src/share/classes/javax/swing/text/StyleContext.java
+++ b/src/share/classes/javax/swing/text/StyleContext.java
--- a/src/share/classes/javax/swing/text/StyledEditorKit.java
+++ b/src/share/classes/javax/swing/text/StyledEditorKit.java
--- a/src/share/classes/javax/swing/text/TabSet.java
+++ b/src/share/classes/javax/swing/text/TabSet.java
--- a/src/share/classes/javax/swing/text/TabStop.java
+++ b/src/share/classes/javax/swing/text/TabStop.java
--- a/src/share/classes/javax/swing/text/TextAction.java
+++ b/src/share/classes/javax/swing/text/TextAction.java
--- a/src/share/classes/javax/swing/text/html/Option.java
+++ b/src/share/classes/javax/swing/text/html/Option.java
--- a/src/share/classes/javax/swing/tree/AbstractLayoutCache.java
+++ b/src/share/classes/javax/swing/tree/AbstractLayoutCache.java
--- a/src/share/classes/javax/swing/tree/DefaultMutableTreeNode.java
+++ b/src/share/classes/javax/swing/tree/DefaultMutableTreeNode.java
--- a/src/share/classes/javax/swing/tree/DefaultTreeCellEditor.java
+++ b/src/share/classes/javax/swing/tree/DefaultTreeCellEditor.java
--- a/src/share/classes/javax/swing/tree/DefaultTreeCellRenderer.java
+++ b/src/share/classes/javax/swing/tree/DefaultTreeCellRenderer.java
--- a/src/share/classes/javax/swing/tree/DefaultTreeModel.java
+++ b/src/share/classes/javax/swing/tree/DefaultTreeModel.java
--- a/src/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java
+++ b/src/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java
--- a/src/share/classes/javax/swing/tree/FixedHeightLayoutCache.java
+++ b/src/share/classes/javax/swing/tree/FixedHeightLayoutCache.java
--- a/src/share/classes/javax/swing/tree/TreePath.java
+++ b/src/share/classes/javax/swing/tree/TreePath.java
--- a/src/share/classes/javax/swing/tree/VariableHeightLayoutCache.java
+++ b/src/share/classes/javax/swing/tree/VariableHeightLayoutCache.java
--- a/src/share/classes/javax/swing/undo/CannotRedoException.java
+++ b/src/share/classes/javax/swing/undo/CannotRedoException.java
--- a/src/share/classes/javax/swing/undo/CannotUndoException.java
+++ b/src/share/classes/javax/swing/undo/CannotUndoException.java
--- a/src/share/classes/javax/swing/undo/UndoManager.java
+++ b/src/share/classes/javax/swing/undo/UndoManager.java