diff options
| author | chegar <none@none> | 2013-10-15 13:54:01 +0100 |
|---|---|---|
| committer | chegar <none@none> | 2013-10-15 13:54:01 +0100 |
| commit | f9378ce911dc47e4fc6240797d2a51e0929b13d5 (patch) | |
| tree | b29b505038c5a25f88f43c26e263f471f303418a /src/share/classes/javax/swing/text | |
| parent | 8f27d65d9ff48e01a85e51c235927b3eaa2bd553 (diff) | |
| parent | 1693f5680c5f1d34b941fdda605cb28b69e8a749 (diff) | |
Merge
Diffstat (limited to 'src/share/classes/javax/swing/text')
28 files changed, 209 insertions, 209 deletions
diff --git a/src/share/classes/javax/swing/text/AbstractDocument.java b/src/share/classes/javax/swing/text/AbstractDocument.java index d9eefe375..e20d10af8 100644 --- a/src/share/classes/javax/swing/text/AbstractDocument.java +++ b/src/share/classes/javax/swing/text/AbstractDocument.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™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -408,7 +408,7 @@ public abstract class AbstractDocument implements Document, Serializable { * <p> * This method is thread safe, although most Swing methods * are not. Please see - * <A HREF="http://download.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency + * <A HREF="http://docs.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency * in Swing</A> for more information. * * @param r the renderer to execute @@ -426,7 +426,7 @@ public abstract class AbstractDocument implements Document, Serializable { * Returns the length of the data. This is the number of * characters of content that represents the users data. * - * @return the length >= 0 + * @return the length >= 0 * @see Document#getLength */ public int getLength() { @@ -569,11 +569,11 @@ public abstract class AbstractDocument implements Document, Serializable { * <p> * This method is thread safe, although most Swing methods * are not. Please see - * <A HREF="http://download.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency + * <A HREF="http://docs.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency * in Swing</A> for more information. * - * @param offs the starting offset >= 0 - * @param len the number of characters to remove >= 0 + * @param offs the starting offset >= 0 + * @param len the number of characters to remove >= 0 * @exception BadLocationException the given remove position is not a valid * position within the document * @see Document#remove @@ -682,10 +682,10 @@ public abstract class AbstractDocument implements Document, Serializable { * <p> * This method is thread safe, although most Swing methods * are not. Please see - * <A HREF="http://download.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency + * <A HREF="http://docs.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency * in Swing</A> for more information. * - * @param offs the starting offset >= 0 + * @param offs the starting offset >= 0 * @param str the string to insert; does nothing with null/empty strings * @param a the attributes for the inserted content * @exception BadLocationException the given insert position is not a valid @@ -777,8 +777,8 @@ public abstract class AbstractDocument implements Document, Serializable { /** * Gets a sequence of text from the document. * - * @param offset the starting offset >= 0 - * @param length the number of characters to retrieve >= 0 + * @param offset the starting offset >= 0 + * @param length the number of characters to retrieve >= 0 * @return the text * @exception BadLocationException the range given includes a position * that is not a valid position within the document @@ -810,7 +810,7 @@ public abstract class AbstractDocument implements Document, Serializable { * Segment text = new Segment(); * int offs = 0; * text.setPartialReturn(true); - * while (nleft > 0) { + * while (nleft > 0) { * doc.getText(offs, nleft, text); * // do something with text * nleft -= text.count; @@ -818,8 +818,8 @@ public abstract class AbstractDocument implements Document, Serializable { * } * </pre> * - * @param offset the starting offset >= 0 - * @param length the number of characters to retrieve >= 0 + * @param offset the starting offset >= 0 + * @param length the number of characters to retrieve >= 0 * @param txt the Segment object to retrieve the text into * @exception BadLocationException the range given includes a position * that is not a valid position within the document @@ -837,10 +837,10 @@ public abstract class AbstractDocument implements Document, Serializable { * <p> * This method is thread safe, although most Swing methods * are not. Please see - * <A HREF="http://download.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency + * <A HREF="http://docs.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency * in Swing</A> for more information. * - * @param offs the position in the model >= 0 + * @param offs the position in the model >= 0 * @return the position * @exception BadLocationException if the given position does not * represent a valid location in the associated document @@ -956,7 +956,7 @@ public abstract class AbstractDocument implements Document, Serializable { * should keep in mind however that a paragraph should at least be the * unit of text over which to run the Unicode bidirectional algorithm. * - * @param pos the starting offset >= 0 + * @param pos the starting offset >= 0 * @return the element */ public abstract Element getParagraphElement(int pos); @@ -1288,8 +1288,8 @@ public abstract class AbstractDocument implements Document, Serializable { * * @param parent the parent element * @param a the attributes for the element - * @param p0 the beginning of the range >= 0 - * @param p1 the end of the range >= p0 + * @param p0 the beginning of the range >= 0 + * @param p1 the end of the range >= p0 * @return the new element */ protected Element createLeafElement(Element parent, AttributeSet a, int p0, int p1) { @@ -1610,7 +1610,7 @@ public abstract class AbstractDocument implements Document, Serializable { * Creates a position within the content that will * track change as the content is mutated. * - * @param offset the offset in the content >= 0 + * @param offset the offset in the content >= 0 * @return a Position * @exception BadLocationException for an invalid offset */ @@ -1619,14 +1619,14 @@ public abstract class AbstractDocument implements Document, Serializable { /** * Current length of the sequence of character content. * - * @return the length >= 0 + * @return the length >= 0 */ public int length(); /** * Inserts a string of characters into the sequence. * - * @param where offset into the sequence to make the insertion >= 0 + * @param where offset into the sequence to make the insertion >= 0 * @param str string to insert * @return if the implementation supports a history mechanism, * a reference to an <code>Edit</code> implementation will be returned, @@ -1640,8 +1640,8 @@ public abstract class AbstractDocument implements Document, Serializable { * Removes some portion of the sequence. * * @param where The offset into the sequence to make the - * insertion >= 0. - * @param nitems The number of items in the sequence to remove >= 0. + * insertion >= 0. + * @param nitems The number of items in the sequence to remove >= 0. * @return If the implementation supports a history mechansim, * a reference to an Edit implementation will be returned, * otherwise null. @@ -1653,8 +1653,8 @@ public abstract class AbstractDocument implements Document, Serializable { /** * Fetches a string of characters contained in the sequence. * - * @param where Offset into the sequence to fetch >= 0. - * @param len number of characters to copy >= 0. + * @param where Offset into the sequence to fetch >= 0. + * @param len number of characters to copy >= 0. * @return the string * @exception BadLocationException Thrown if the area covered by * the arguments is not contained in the character sequence. @@ -1664,8 +1664,8 @@ public abstract class AbstractDocument implements Document, Serializable { /** * Gets a sequence of characters and copies them into a Segment. * - * @param where the starting offset >= 0 - * @param len the number of characters >= 0 + * @param where the starting offset >= 0 + * @param len the number of characters >= 0 * @param txt the target location to copy into * @exception BadLocationException Thrown if the area covered by * the arguments is not contained in the character sequence. @@ -1778,7 +1778,7 @@ public abstract class AbstractDocument implements Document, 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™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */ @@ -1809,7 +1809,7 @@ public abstract class AbstractDocument implements Document, Serializable { * Dumps a debugging representation of the element hierarchy. * * @param psOut the output stream - * @param indentAmount the indentation level >= 0 + * @param indentAmount the indentation level >= 0 */ public void dump(PrintStream psOut, int indentAmount) { PrintWriter out; @@ -1867,7 +1867,7 @@ public abstract class AbstractDocument implements Document, Serializable { /** * Gets the number of attributes that are defined. * - * @return the number of attributes >= 0 + * @return the number of attributes >= 0 * @see AttributeSet#getAttributeCount */ public int getAttributeCount() { @@ -2116,21 +2116,21 @@ public abstract class AbstractDocument implements Document, Serializable { /** * Gets the starting offset in the model for the element. * - * @return the offset >= 0 + * @return the offset >= 0 */ public abstract int getStartOffset(); /** * Gets the ending offset in the model for the element. * - * @return the offset >= 0 + * @return the offset >= 0 */ public abstract int getEndOffset(); /** * Gets a child element. * - * @param index the child index, >= 0 && < getElementCount() + * @param index the child index, >= 0 && < getElementCount() * @return the child element */ public abstract Element getElement(int index); @@ -2138,15 +2138,15 @@ public abstract class AbstractDocument implements Document, Serializable { /** * Gets the number of children for the element. * - * @return the number of children >= 0 + * @return the number of children >= 0 */ public abstract int getElementCount(); /** * Gets the child element index closest to the given model offset. * - * @param offset the offset >= 0 - * @return the element index >= 0 + * @param offset the offset >= 0 + * @return the element index >= 0 */ public abstract int getElementIndex(int offset); @@ -2247,7 +2247,7 @@ public abstract class AbstractDocument implements Document, 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™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */ @@ -2272,7 +2272,7 @@ public abstract class AbstractDocument implements Document, Serializable { * Gets the child element that contains * the given model position. * - * @param pos the position >= 0 + * @param pos the position >= 0 * @return the element, null if none */ public Element positionToElement(int pos) { @@ -2289,8 +2289,8 @@ public abstract class AbstractDocument implements Document, Serializable { /** * Replaces content with a new set of elements. * - * @param offset the starting offset >= 0 - * @param length the length to replace >= 0 + * @param offset the starting offset >= 0 + * @param length the length to replace >= 0 * @param elems the new elements */ public void replace(int offset, int length, Element[] elems) { @@ -2342,7 +2342,7 @@ public abstract class AbstractDocument implements Document, Serializable { /** * Gets the starting offset in the model for the element. * - * @return the offset >= 0 + * @return the offset >= 0 */ public int getStartOffset() { return children[0].getStartOffset(); @@ -2352,7 +2352,7 @@ public abstract class AbstractDocument implements Document, Serializable { * Gets the ending offset in the model for the element. * @throws NullPointerException if this element has no children * - * @return the offset >= 0 + * @return the offset >= 0 */ public int getEndOffset() { Element child = @@ -2363,7 +2363,7 @@ public abstract class AbstractDocument implements Document, Serializable { /** * Gets a child element. * - * @param index the child index, >= 0 && < getElementCount() + * @param index the child index, >= 0 && < getElementCount() * @return the child element, null if none */ public Element getElement(int index) { @@ -2376,7 +2376,7 @@ public abstract class AbstractDocument implements Document, Serializable { /** * Gets the number of children for the element. * - * @return the number of children >= 0 + * @return the number of children >= 0 */ public int getElementCount() { return nchildren; @@ -2385,8 +2385,8 @@ public abstract class AbstractDocument implements Document, Serializable { /** * Gets the child element index closest to the given model offset. * - * @param offset the offset >= 0 - * @return the element index >= 0 + * @param offset the offset >= 0 + * @return the element index >= 0 */ public int getElementIndex(int offset) { int index; @@ -2501,7 +2501,7 @@ public abstract class AbstractDocument implements Document, 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™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -2515,8 +2515,8 @@ public abstract class AbstractDocument implements Document, Serializable { * * @param parent The parent element * @param a The element attributes - * @param offs0 The start offset >= 0 - * @param offs1 The end offset >= offs0 + * @param offs0 The start offset >= 0 + * @param offs1 The end offset >= offs0 * @since 1.4 */ public LeafElement(Element parent, AttributeSet a, int offs0, int offs1) { @@ -2545,7 +2545,7 @@ public abstract class AbstractDocument implements Document, Serializable { /** * Gets the starting offset in the model for the element. * - * @return the offset >= 0 + * @return the offset >= 0 */ public int getStartOffset() { return p0.getOffset(); @@ -2554,7 +2554,7 @@ public abstract class AbstractDocument implements Document, Serializable { /** * Gets the ending offset in the model for the element. * - * @return the offset >= 0 + * @return the offset >= 0 */ public int getEndOffset() { return p1.getOffset(); @@ -2576,8 +2576,8 @@ public abstract class AbstractDocument implements Document, Serializable { /** * Gets the child element index closest to the given model offset. * - * @param pos the offset >= 0 - * @return the element index >= 0 + * @param pos the offset >= 0 + * @return the element index >= 0 */ public int getElementIndex(int pos) { return -1; @@ -2586,7 +2586,7 @@ public abstract class AbstractDocument implements Document, Serializable { /** * Gets a child element. * - * @param index the child index, >= 0 && < getElementCount() + * @param index the child index, >= 0 && < getElementCount() * @return the child element */ public Element getElement(int index) { @@ -2596,7 +2596,7 @@ public abstract class AbstractDocument implements Document, Serializable { /** * Returns the number of child elements. * - * @return the number of children >= 0 + * @return the number of children >= 0 */ public int getElementCount() { return 0; @@ -2731,8 +2731,8 @@ public abstract class AbstractDocument implements Document, Serializable { /** * Constructs a change record. * - * @param offs the offset into the document of the change >= 0 - * @param len the length of the change >= 0 + * @param offs the offset into the document of the change >= 0 + * @param len the length of the change >= 0 * @param type the type of event (DocumentEvent.EventType) * @since 1.4 */ @@ -2901,7 +2901,7 @@ public abstract class AbstractDocument implements Document, Serializable { /** * Returns the offset within the document of the start of the change. * - * @return the offset >= 0 + * @return the offset >= 0 * @see DocumentEvent#getOffset */ public int getOffset() { @@ -2911,7 +2911,7 @@ public abstract class AbstractDocument implements Document, Serializable { /** * Returns the length of the change. * - * @return the length >= 0 + * @return the length >= 0 * @see DocumentEvent#getLength */ public int getLength() { @@ -3024,7 +3024,7 @@ public abstract class AbstractDocument implements Document, Serializable { * current model state for views that just attached to a model. * * @param e the element - * @param index the index into the model >= 0 + * @param index the index into the model >= 0 * @param removed a set of elements that were removed * @param added a set of elements that were added */ @@ -3048,7 +3048,7 @@ public abstract class AbstractDocument implements Document, Serializable { /** * Returns the index into the list of elements. * - * @return the index >= 0 + * @return the index >= 0 */ public int getIndex() { return index; diff --git a/src/share/classes/javax/swing/text/AbstractWriter.java b/src/share/classes/javax/swing/text/AbstractWriter.java index f3397e866..1a664ce90 100644 --- a/src/share/classes/javax/swing/text/AbstractWriter.java +++ b/src/share/classes/javax/swing/text/AbstractWriter.java @@ -417,7 +417,7 @@ public abstract class AbstractWriter { /** * Increments the indent level. If indenting would cause - * <code>getIndentSpace()</code> *<code>getIndentLevel()</code> to be > + * <code>getIndentSpace()</code> *<code>getIndentLevel()</code> to be > * than <code>getLineLength()</code> this will not cause an indent. */ protected void incrIndent() { @@ -663,7 +663,7 @@ public abstract class AbstractWriter { } /** - * Writes out the set of attributes as " <name>=<value>" + * Writes out the set of attributes as " <name>=<value>" * pairs. It throws an IOException when encountered. * * @param attr an AttributeSet. diff --git a/src/share/classes/javax/swing/text/AsyncBoxView.java b/src/share/classes/javax/swing/text/AsyncBoxView.java index 7876a2c1e..7440eee2a 100644 --- a/src/share/classes/javax/swing/text/AsyncBoxView.java +++ b/src/share/classes/javax/swing/text/AsyncBoxView.java @@ -193,7 +193,7 @@ public class AsyncBoxView extends View { * of the child at the given index. * * @param index the child index. This should be a - * value >= 0 and < getViewCount(). + * value >= 0 and < getViewCount(). */ protected ChildState getChildState(int index) { synchronized(stats) { @@ -350,8 +350,8 @@ public class AsyncBoxView extends View { * thread will not happen (i.e. the layout thread * acquires a read lock before doing anything). * - * @param offset the starting offset into the child views >= 0 - * @param length the number of existing views to replace >= 0 + * @param offset the starting offset into the child views >= 0 + * @param length the number of existing views to replace >= 0 * @param views the child views to insert */ public void replace(int offset, int length, View[] views) { @@ -417,7 +417,7 @@ public class AsyncBoxView extends View { * the model. This is implemented to fetch the view in the case * where there is a child view for each child element. * - * @param pos the position >= 0 + * @param pos the position >= 0 * @return index of the view representing the given position, or * -1 if no view represents that position */ @@ -525,8 +525,8 @@ public class AsyncBoxView extends View { * axis. Since the minor axis is flexible, work is queued to resize * the children if the minor span changes. * - * @param width the width >= 0 - * @param height the height >= 0 + * @param width the width >= 0 + * @param height the height >= 0 */ public void setSize(float width, float height) { setSpanOnAxis(X_AXIS, width); @@ -618,7 +618,7 @@ public class AsyncBoxView extends View { * axis. * * @param axis may be either View.X_AXIS or View.Y_AXIS - * @return the span the view would like to be rendered into >= 0. + * @return the span the view would like to be rendered into >= 0. * Typically the view is told to render into the span * that is returned, although there is no guarantee. * The parent may choose to resize or break the view. @@ -643,7 +643,7 @@ public class AsyncBoxView extends View { * axis. * * @param axis may be either View.X_AXIS or View.Y_AXIS - * @return the span the view would like to be rendered into >= 0. + * @return the span the view would like to be rendered into >= 0. * Typically the view is told to render into the span * that is returned, although there is no guarantee. * The parent may choose to resize or break the view. @@ -671,7 +671,7 @@ public class AsyncBoxView extends View { * axis. * * @param axis may be either View.X_AXIS or View.Y_AXIS - * @return the span the view would like to be rendered into >= 0. + * @return the span the view would like to be rendered into >= 0. * Typically the view is told to render into the span * that is returned, although there is no guarantee. * The parent may choose to resize or break the view. @@ -690,7 +690,7 @@ public class AsyncBoxView extends View { * the default is to not be a composite view this * returns 0. * - * @return the number of views >= 0 + * @return the number of views >= 0 * @see View#getViewCount */ public int getViewCount() { @@ -703,7 +703,7 @@ public class AsyncBoxView extends View { * Gets the nth child view. Since there are no * children by default, this returns null. * - * @param n the number of the view to get, >= 0 && < getViewCount() + * @param n the number of the view to get, >= 0 && < getViewCount() * @return the view */ public View getView(int n) { @@ -721,7 +721,7 @@ public class AsyncBoxView extends View { * their location. This returns null since the * default is to not have any child views. * - * @param index the index of the child, >= 0 && < getViewCount() + * @param index the index of the child, >= 0 && < getViewCount() * @param a the allocation to this view. * @return the allocation to the child */ @@ -736,7 +736,7 @@ public class AsyncBoxView extends View { * to return -1 to indicate there is no valid child index for any * position. * - * @param pos the position >= 0 + * @param pos the position >= 0 * @return index of the view representing the given position, or * -1 if no view represents that position * @since 1.3 @@ -749,7 +749,7 @@ public class AsyncBoxView extends View { * Provides a mapping from the document model coordinate space * to the coordinate space of the view mapped to it. * - * @param pos the position to convert >= 0 + * @param pos the position to convert >= 0 * @param a the allocated region to render into * @param b the bias toward the previous character or the * next character represented by the offset, in case the @@ -788,11 +788,11 @@ public class AsyncBoxView extends View { * on the child view with a lock on the ChildState object * to avoid interaction with the layout thread. * - * @param x the X coordinate >= 0 - * @param y the Y coordinate >= 0 + * @param x the X coordinate >= 0 + * @param y the Y coordinate >= 0 * @param a the allocated region to render into * @return the location within the model that best represents the - * given point in the view >= 0. The biasReturn argument will be + * given point in the view >= 0. The biasReturn argument will be * filled in to indicate that the point given is closer to the next * character in the model or the previous character in the model. */ @@ -828,16 +828,16 @@ public class AsyncBoxView extends View { * they might not be in the same order found in the model, or they just * might not allow access to some of the locations in the model. * - * @param pos the position to convert >= 0 + * @param pos the position to convert >= 0 * @param a the allocated region to render into * @param direction the direction from the current position that can * be thought of as the arrow keys typically found on a keyboard; * this may be one of the following: - * <ul> - * <code>SwingConstants.WEST</code> - * <code>SwingConstants.EAST</code> - * <code>SwingConstants.NORTH</code> - * <code>SwingConstants.SOUTH</code> + * <ul style="list-style-type:none"> + * <li><code>SwingConstants.WEST</code></li> + * <li><code>SwingConstants.EAST</code></li> + * <li><code>SwingConstants.NORTH</code></li> + * <li><code>SwingConstants.SOUTH</code></li> * </ul> * @param biasRet an array contain the bias that was checked * @return the location within the model that best represents the next @@ -1007,8 +1007,8 @@ public class AsyncBoxView extends View { * with one or more calls to getChildAllocation that * should also be in the synchronized block. * - * @param x the X coordinate >= 0 - * @param y the Y coordinate >= 0 + * @param x the X coordinate >= 0 + * @param y the Y coordinate >= 0 * @param a the allocation to the View * @return the nearest child index */ diff --git a/src/share/classes/javax/swing/text/AttributeSet.java b/src/share/classes/javax/swing/text/AttributeSet.java index 659136d96..dc146e520 100644 --- a/src/share/classes/javax/swing/text/AttributeSet.java +++ b/src/share/classes/javax/swing/text/AttributeSet.java @@ -89,7 +89,7 @@ public interface AttributeSet { * Returns the number of attributes that are defined locally in this set. * Attributes that are defined in the parent set are not included. * - * @return the number of attributes >= 0 + * @return the number of attributes >= 0 */ public int getAttributeCount(); diff --git a/src/share/classes/javax/swing/text/BadLocationException.java b/src/share/classes/javax/swing/text/BadLocationException.java index c900e61cf..62032aeac 100644 --- a/src/share/classes/javax/swing/text/BadLocationException.java +++ b/src/share/classes/javax/swing/text/BadLocationException.java @@ -33,7 +33,7 @@ package 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™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * diff --git a/src/share/classes/javax/swing/text/DateFormatter.java b/src/share/classes/javax/swing/text/DateFormatter.java index 68310bc16..b301bf97a 100644 --- a/src/share/classes/javax/swing/text/DateFormatter.java +++ b/src/share/classes/javax/swing/text/DateFormatter.java @@ -39,7 +39,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™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * diff --git a/src/share/classes/javax/swing/text/DefaultCaret.java b/src/share/classes/javax/swing/text/DefaultCaret.java index 0d2031cff..7b06fb3f1 100644 --- a/src/share/classes/javax/swing/text/DefaultCaret.java +++ b/src/share/classes/javax/swing/text/DefaultCaret.java @@ -98,7 +98,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™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -237,7 +237,7 @@ public class DefaultCaret extends Rectangle implements Caret, FocusListener, Mou * <p> * This method is thread safe, although most Swing methods * are not. Please see - * <A HREF="http://download.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency + * <A HREF="http://docs.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency * in Swing</A> for more information. */ protected final synchronized void repaint() { diff --git a/src/share/classes/javax/swing/text/DefaultEditorKit.java b/src/share/classes/javax/swing/text/DefaultEditorKit.java index cd310104d..f47a1c62c 100644 --- a/src/share/classes/javax/swing/text/DefaultEditorKit.java +++ b/src/share/classes/javax/swing/text/DefaultEditorKit.java @@ -840,7 +840,7 @@ public class DefaultEditorKit extends EditorKit { * future Swing releases. The current serialization support is * appropriate for short 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™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -899,7 +899,7 @@ public class DefaultEditorKit extends EditorKit { * future Swing releases. The current serialization support is * appropriate for short 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™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -947,7 +947,7 @@ public class DefaultEditorKit extends EditorKit { * future Swing releases. The current serialization support is * appropriate for short 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™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -989,7 +989,7 @@ public class DefaultEditorKit extends EditorKit { * future Swing releases. The current serialization support is * appropriate for short 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™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -1265,7 +1265,7 @@ public class DefaultEditorKit extends EditorKit { * future Swing releases. The current serialization support is * appropriate for short 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™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -1301,7 +1301,7 @@ public class DefaultEditorKit extends EditorKit { * future Swing releases. The current serialization support is * appropriate for short 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™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -1338,7 +1338,7 @@ public class DefaultEditorKit extends EditorKit { * future Swing releases. The current serialization support is * appropriate for short 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™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -1373,7 +1373,7 @@ public class DefaultEditorKit extends EditorKit { * future Swing releases. The current serialization support is * appropriate for short 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™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * diff --git a/src/share/classes/javax/swing/text/DefaultFormatter.java b/src/share/classes/javax/swing/text/DefaultFormatter.java index ac5bc72e7..33cf83cd1 100644 --- a/src/share/classes/javax/swing/text/DefaultFormatter.java +++ b/src/share/classes/javax/swing/text/DefaultFormatter.java @@ -51,7 +51,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™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * diff --git a/src/share/classes/javax/swing/text/DefaultFormatterFactory.java b/src/share/classes/javax/swing/text/DefaultFormatterFactory.java index ad367dff0..7474dcbc2 100644 --- a/src/share/classes/javax/swing/text/DefaultFormatterFactory.java +++ b/src/share/classes/javax/swing/text/DefaultFormatterFactory.java @@ -64,7 +64,7 @@ import javax.swing.JFormattedTextField; * future Swing releases. The current serialization support is * appropriate for short 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™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * diff --git a/src/share/classes/javax/swing/text/DefaultStyledDocument.java b/src/share/classes/javax/swing/text/DefaultStyledDocument.java index 4a6419e77..ec94ebddd 100644 --- a/src/share/classes/javax/swing/text/DefaultStyledDocument.java +++ b/src/share/classes/javax/swing/text/DefaultStyledDocument.java @@ -61,7 +61,7 @@ import static sun.swing.SwingUtilities2.IMPLIED_CR; * future Swing releases. The current serialization support is * appropriate for short 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™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -173,7 +173,7 @@ public class DefaultStyledDocument extends AbstractDocument implements StyledDoc * <p> * This method is thread safe, although most Swing methods * are not. Please see - * <A HREF="http://download.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency + * <A HREF="http://docs.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency * in Swing</A> for more information. * * @param offset the starting offset >= 0 @@ -426,7 +426,7 @@ public class DefaultStyledDocument extends AbstractDocument implements StyledDoc * <p> * This method is thread safe, although most Swing methods * are not. Please see - * <A HREF="http://download.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency + * <A HREF="http://docs.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency * in Swing</A> for more information. * * @param pos the offset from the start of the document >= 0 @@ -483,7 +483,7 @@ public class DefaultStyledDocument extends AbstractDocument implements StyledDoc * <p> * This method is thread safe, although most Swing methods * are not. Please see - * <A HREF="http://download.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency + * <A HREF="http://docs.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency * in Swing</A> for more information. * * @param offset the offset in the document >= 0 @@ -536,7 +536,7 @@ public class DefaultStyledDocument extends AbstractDocument implements StyledDoc * <p> * This method is thread safe, although most Swing methods * are not. Please see - * <A HREF="http://download.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency + * <A HREF="http://docs.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency * in Swing</A> for more information. * * @param offset the offset into the paragraph >= 0 @@ -1124,7 +1124,7 @@ public class DefaultStyledDocument extends AbstractDocument implements StyledDoc * future Swing releases. The current serialization support is * appropriate for short 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™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */ @@ -1155,7 +1155,7 @@ public class DefaultStyledDocument extends AbstractDocument implements StyledDoc * future Swing releases. The current serialization support is * appropriate for short 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™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */ @@ -1390,7 +1390,7 @@ public class DefaultStyledDocument extends AbstractDocument implements StyledDoc * future Swing releases. The current serialization support is * appropriate for short 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™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */ diff --git a/src/share/classes/javax/swing/text/Document.java b/src/share/classes/javax/swing/text/Document.java index 51505707d..5ce9b4c93 100644 --- a/src/share/classes/javax/swing/text/Document.java +++ b/src/share/classes/javax/swing/text/Document.java @@ -46,7 +46,7 @@ import javax.swing.event.*; * used are the location between two characters. As the diagram * below shows, a location in a text document can be referred to * as a position, or an offset. This position is zero-based. - * <p align=center><img src="doc-files/Document-coord.gif" + * <p style="text-align:center"><img src="doc-files/Document-coord.gif" * alt="The following text describes this graphic."> * <p> * In the example, if the content of a document is the @@ -69,7 +69,7 @@ import javax.swing.event.*; * Exactly what structure is modeled is up to a particular Document * implementation. It might be as simple as no structure (i.e. a * simple text field), or it might be something like diagram below. - * <p align=center><img src="doc-files/Document-structure.gif" + * <p style="text-align:center"><img src="doc-files/Document-structure.gif" * alt="Diagram shows Book->Chapter->Paragraph"> * <p> * The unit of structure (i.e. a node of the tree) is referred to @@ -122,7 +122,7 @@ import javax.swing.event.*; * generated since that edit is actually the source of the change * rather than a mutation to the <code>Document</code> made through its * api. - * <p align=center><img src="doc-files/Document-notification.gif" + * <p style="text-align:center"><img src="doc-files/Document-notification.gif" * alt="The preceeding text describes this graphic."> * <p> * Referring to the above diagram, suppose that the component shown @@ -187,7 +187,7 @@ public interface Document { * Returns number of characters of content currently * in the document. * - * @return number of characters >= 0 + * @return number of characters >= 0 */ public int getLength(); @@ -267,7 +267,7 @@ public interface Document { * For a removal, the end of the removal range is collapsed * down to the start of the range, and any marks in the removal * range are collapsed down to the start of the range. - * <p align=center><img src="doc-files/Document-remove.gif" + * <p style="text-align:center"><img src="doc-files/Document-remove.gif" * alt="Diagram shows removal of 'quick' from 'The quick brown fox.'"> * <p> * If the Document structure changed as result of the removal, @@ -280,8 +280,8 @@ public interface Document { * If the Document supports undo/redo, an UndoableEditEvent will * also be generated. * - * @param offs the offset from the beginning >= 0 - * @param len the number of characters to remove >= 0 + * @param offs the offset from the beginning >= 0 + * @param len the number of characters to remove >= 0 * @exception BadLocationException some portion of the removal range * was not a valid part of the document. The location in the exception * is the first bad position encountered. @@ -300,7 +300,7 @@ public interface Document { * insertUpdate method on the DocumentListener. * The offset and length of the generated DocumentEvent * will indicate what change was actually made to the Document. - * <p align=center><img src="doc-files/Document-insert.gif" + * <p style="text-align:center"><img src="doc-files/Document-insert.gif" * alt="Diagram shows insertion of 'quick' in 'The quick brown fox'"> * <p> * If the Document structure changed as result of the insertion, @@ -313,7 +313,7 @@ public interface Document { * If the Document supports undo/redo, an UndoableEditEvent will * also be generated. * - * @param offset the offset into the document to insert the content >= 0. + * @param offset the offset into the document to insert the content >= 0. * All positions that track change at or after the given location * will move. * @param str the string to insert @@ -333,9 +333,9 @@ public interface Document { * of the document. * * @param offset the offset into the document representing the desired - * start of the text >= 0 - * @param length the length of the desired string >= 0 - * @return the text, in a String of length >= 0 + * start of the text >= 0 + * @param length the length of the desired string >= 0 + * @return the text, in a String of length >= 0 * @exception BadLocationException some portion of the given range * was not a valid part of the document. The location in the exception * is the first bad position encountered. @@ -361,7 +361,7 @@ public interface Document { * Segment text = new Segment(); * int offs = 0; * text.setPartialReturn(true); - * while (nleft > 0) { + * while (nleft > 0) { * doc.getText(offs, nleft, text); * // do someting with text * nleft -= text.count; @@ -371,8 +371,8 @@ public interface Document { * </code></pre> * * @param offset the offset into the document representing the desired - * start of the text >= 0 - * @param length the length of the desired string >= 0 + * start of the text >= 0 + * @param length the length of the desired string >= 0 * @param txt the Segment object to return the text in * * @exception BadLocationException Some portion of the given range @@ -409,7 +409,7 @@ public interface Document { * insertion is forced to a position that follows the * original position. * - * @param offs the offset from the start of the document >= 0 + * @param offs the offset from the start of the document >= 0 * @return the position * @exception BadLocationException if the given position does not * represent a valid location in the associated document diff --git a/src/share/classes/javax/swing/text/Element.java b/src/share/classes/javax/swing/text/Element.java index b0510a240..cde494b36 100644 --- a/src/share/classes/javax/swing/text/Element.java +++ b/src/share/classes/javax/swing/text/Element.java @@ -69,7 +69,7 @@ public interface Element { * children, this will be the offset of the first child. * As a document position, there is an implied forward bias. * - * @return the starting offset >= 0 and < getEndOffset(); + * @return the starting offset >= 0 and < getEndOffset(); * @see Document * @see AbstractDocument */ @@ -87,8 +87,8 @@ public interface Element { * the document. As a result of this, it is possible for this to * return a value greater than the length of the document. * - * @return the ending offset > getStartOffset() and - * <= getDocument().getLength() + 1 + * @return the ending offset > getStartOffset() and + * <= getDocument().getLength() + 1 * @see Document * @see AbstractDocument */ @@ -105,8 +105,8 @@ public interface Element { * <code>getElementCount() - 1</code> if the location is * greater than or equal to the end offset. * - * @param offset the specified offset >= 0 - * @return the element index >= 0 + * @param offset the specified offset >= 0 + * @return the element index >= 0 */ public int getElementIndex(int offset); @@ -114,14 +114,14 @@ public interface Element { * Gets the number of child elements contained by this element. * If this element is a leaf, a count of zero is returned. * - * @return the number of child elements >= 0 + * @return the number of child elements >= 0 */ public int getElementCount(); /** * Fetches the child element at the given index. * - * @param index the specified index >= 0 + * @param index the specified index >= 0 * @return the child element */ public Element getElement(int index); diff --git a/src/share/classes/javax/swing/text/InternationalFormatter.java b/src/share/classes/javax/swing/text/InternationalFormatter.java index 52331d761..f7308d47d 100644 --- a/src/share/classes/javax/swing/text/InternationalFormatter.java +++ b/src/share/classes/javax/swing/text/InternationalFormatter.java @@ -83,7 +83,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™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * diff --git a/src/share/classes/javax/swing/text/JTextComponent.java b/src/share/classes/javax/swing/text/JTextComponent.java index c88b11656..52052b7a8 100644 --- a/src/share/classes/javax/swing/text/JTextComponent.java +++ b/src/share/classes/javax/swing/text/JTextComponent.java @@ -84,7 +84,7 @@ import sun.swing.SwingAccessor; * support). * You can find information on how to use the functionality * this class provides in - * <a href="http://java.sun.com/docs/books/tutorial/uiswing/components/generaltext.html">General Rules for Using Text Components</a>, + * <a href="http://docs.oracle.com/javase/tutorial/uiswing/components/generaltext.html">General Rules for Using Text Components</a>, * a section in <em>The Java Tutorial.</em> * * <p> @@ -281,7 +281,7 @@ import sun.swing.SwingAccessor; * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -1122,7 +1122,7 @@ public abstract class JTextComponent extends JComponent implements Scrollable, A * future Swing releases. The current serialization support is * appropriate for short 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™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */ @@ -2215,7 +2215,7 @@ public abstract class JTextComponent extends JComponent implements Scrollable, A * <p> * This method is thread-safe, although most Swing methods are not. Please * see <A - * HREF="http://download.oracle.com/javase/tutorial/uiswing/concurrency/index.html"> + * HREF="http://docs.oracle.com/javase/tutorial/uiswing/concurrency/index.html"> * Concurrency in Swing</A> for more information. * * <p> @@ -2473,7 +2473,7 @@ public abstract class JTextComponent extends JComponent implements Scrollable, A * <p> * This method is thread-safe, although most Swing methods are not. Please * see <A - * HREF="http://download.oracle.com/javase/tutorial/uiswing/concurrency/index.html"> + * HREF="http://docs.oracle.com/javase/tutorial/uiswing/concurrency/index.html"> * Concurrency in Swing</A> for more information. * * <p> @@ -2539,7 +2539,7 @@ public abstract class JTextComponent extends JComponent implements Scrollable, A * future Swing releases. The current serialization support is * appropriate for short 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™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */ diff --git a/src/share/classes/javax/swing/text/MaskFormatter.java b/src/share/classes/javax/swing/text/MaskFormatter.java index a477e610b..2285e4ef1 100644 --- a/src/share/classes/javax/swing/text/MaskFormatter.java +++ b/src/share/classes/javax/swing/text/MaskFormatter.java @@ -40,7 +40,7 @@ import javax.swing.*; * <table border=1 summary="Valid characters and their descriptions"> * <tr> * <th>Character </th> - * <th><p align="left">Description</p></th> + * <th><p style="text-align:left">Description</p></th> * </tr> * <tr> * <td>#</td> @@ -143,7 +143,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™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * diff --git a/src/share/classes/javax/swing/text/NumberFormatter.java b/src/share/classes/javax/swing/text/NumberFormatter.java index 672a92e5b..fa6978867 100644 --- a/src/share/classes/javax/swing/text/NumberFormatter.java +++ b/src/share/classes/javax/swing/text/NumberFormatter.java @@ -85,7 +85,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™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * diff --git a/src/share/classes/javax/swing/text/PlainDocument.java b/src/share/classes/javax/swing/text/PlainDocument.java index 8424faf09..8c731da6f 100644 --- a/src/share/classes/javax/swing/text/PlainDocument.java +++ b/src/share/classes/javax/swing/text/PlainDocument.java @@ -48,7 +48,7 @@ import java.util.Vector; * future Swing releases. The current serialization support is * appropriate for short 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™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -100,7 +100,7 @@ public class PlainDocument extends AbstractDocument { * <p> * This method is thread safe, although most Swing methods * are not. Please see - * <A HREF="http://download.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency + * <A HREF="http://docs.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency * in Swing</A> for more information. * * @param offs the starting offset >= 0 diff --git a/src/share/classes/javax/swing/text/SimpleAttributeSet.java b/src/share/classes/javax/swing/text/SimpleAttributeSet.java index b0ad80ecb..8539687b4 100644 --- a/src/share/classes/javax/swing/text/SimpleAttributeSet.java +++ b/src/share/classes/javax/swing/text/SimpleAttributeSet.java @@ -41,7 +41,7 @@ import java.io.Serializable; * future Swing releases. The current serialization support is * appropriate for short term storage or RMI between applications running * the same version of Swing. As of 1.4, support for long term storage - * of all JavaBeans<sup><font size="-2">TM</font></sup> + * of all JavaBeans™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * diff --git a/src/share/classes/javax/swing/text/StringContent.java b/src/share/classes/javax/swing/text/StringContent.java index c83489484..a62fcc4ba 100644 --- a/src/share/classes/javax/swing/text/StringContent.java +++ b/src/share/classes/javax/swing/text/StringContent.java @@ -44,7 +44,7 @@ import javax.swing.SwingUtilities; * future Swing releases. The current serialization support is * appropriate for short 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™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * diff --git a/src/share/classes/javax/swing/text/StyleContext.java b/src/share/classes/javax/swing/text/StyleContext.java index ac11b1f82..dc004c6ae 100644 --- a/src/share/classes/javax/swing/text/StyleContext.java +++ b/src/share/classes/javax/swing/text/StyleContext.java @@ -56,7 +56,7 @@ import sun.font.FontUtilities; * future Swing releases. The current serialization support is * appropriate for short 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™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * @@ -292,7 +292,7 @@ public class StyleContext implements Serializable, AbstractDocument.AttributeCon * <p> * This method is thread safe, although most Swing methods * are not. Please see - * <A HREF="http://download.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency + * <A HREF="http://docs.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency * in Swing</A> for more information. * * @param old the old attribute set @@ -321,7 +321,7 @@ public class StyleContext implements Serializable, AbstractDocument.AttributeCon * <p> * This method is thread safe, although most Swing methods * are not. Please see - * <A HREF="http://download.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency + * <A HREF="http://docs.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency * in Swing</A> for more information. * * @param old the old attribute set @@ -349,7 +349,7 @@ public class StyleContext implements Serializable, AbstractDocument.AttributeCon * <p> * This method is thread safe, although most Swing methods * are not. Please see - * <A HREF="http://download.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency + * <A HREF="http://docs.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency * in Swing</A> for more information. * * @param old the old set of attributes @@ -377,7 +377,7 @@ public class StyleContext implements Serializable, AbstractDocument.AttributeCon * <p> * This method is thread safe, although most Swing methods * are not. Please see - * <A HREF="http://download.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency + * <A HREF="http://docs.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency * in Swing</A> for more information. * * @param old the old attribute set @@ -405,7 +405,7 @@ public class StyleContext implements Serializable, AbstractDocument.AttributeCon * <p> * This method is thread safe, although most Swing methods * are not. Please see - * <A HREF="http://download.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency + * <A HREF="http://docs.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency * in Swing</A> for more information. * * @param old the old attribute set @@ -445,7 +445,7 @@ public class StyleContext implements Serializable, AbstractDocument.AttributeCon * <p> * This method is thread safe, although most Swing methods * are not. Please see - * <A HREF="http://download.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency + * <A HREF="http://docs.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency * in Swing</A> for more information. * * @param a the set to reclaim @@ -1240,7 +1240,7 @@ public class StyleContext implements Serializable, AbstractDocument.AttributeCon * future Swing releases. The current serialization support is * appropriate for short 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™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */ diff --git a/src/share/classes/javax/swing/text/StyledEditorKit.java b/src/share/classes/javax/swing/text/StyledEditorKit.java index 20832c6c8..57b8ac000 100644 --- a/src/share/classes/javax/swing/text/StyledEditorKit.java +++ b/src/share/classes/javax/swing/text/StyledEditorKit.java @@ -371,7 +371,7 @@ public class StyledEditorKit extends DefaultEditorKit { * future Swing releases. The current serialization support is * appropriate for short 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™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */ @@ -490,7 +490,7 @@ public class StyledEditorKit extends DefaultEditorKit { * future Swing releases. The current serialization support is * appropriate for short 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™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */ @@ -546,7 +546,7 @@ public class StyledEditorKit extends DefaultEditorKit { * future Swing releases. The current serialization support is * appropriate for short 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™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */ @@ -613,7 +613,7 @@ public class StyledEditorKit extends DefaultEditorKit { * future Swing releases. The current serialization support is * appropriate for short 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™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */ @@ -679,7 +679,7 @@ public class StyledEditorKit extends DefaultEditorKit { * future Swing releases. The current serialization support is * appropriate for short 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™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */ @@ -729,7 +729,7 @@ public class StyledEditorKit extends DefaultEditorKit { * future Swing releases. The current serialization support is * appropriate for short 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™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */ @@ -768,7 +768,7 @@ public class StyledEditorKit extends DefaultEditorKit { * future Swing releases. The current serialization support is * appropriate for short 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™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */ @@ -807,7 +807,7 @@ public class StyledEditorKit extends DefaultEditorKit { * future Swing releases. The current serialization support is * appropriate for short 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™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. */ diff --git a/src/share/classes/javax/swing/text/TabSet.java b/src/share/classes/javax/swing/text/TabSet.java index 690ca5743..2a5351607 100644 --- a/src/share/classes/javax/swing/text/TabSet.java +++ b/src/share/classes/javax/swing/text/TabSet.java @@ -37,7 +37,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™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * diff --git a/src/share/classes/javax/swing/text/TabStop.java b/src/share/classes/javax/swing/text/TabStop.java index 70d5c1608..a78ea24b0 100644 --- a/src/share/classes/javax/swing/text/TabStop.java +++ b/src/share/classes/javax/swing/text/TabStop.java @@ -37,7 +37,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™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * diff --git a/src/share/classes/javax/swing/text/TextAction.java b/src/share/classes/javax/swing/text/TextAction.java index 9a5c9379a..bcfa7c390 100644 --- a/src/share/classes/javax/swing/text/TextAction.java +++ b/src/share/classes/javax/swing/text/TextAction.java @@ -52,7 +52,7 @@ import javax.swing.KeyStroke; * future Swing releases. The current serialization support is * appropriate for short 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™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * diff --git a/src/share/classes/javax/swing/text/View.java b/src/share/classes/javax/swing/text/View.java index 7eed01ef1..1bd352070 100644 --- a/src/share/classes/javax/swing/text/View.java +++ b/src/share/classes/javax/swing/text/View.java @@ -68,7 +68,7 @@ A view has the following responsibilities: implementation, the minimum span will be <= the preferred span which in turn will be <= the maximum span. </p> - <p align=center><img src="doc-files/View-flexibility.jpg" + <p style="text-align:center"><img src="doc-files/View-flexibility.jpg" alt="The above text describes this graphic."> <p>The minimum set of methods for layout are: <ul> @@ -95,7 +95,7 @@ A view has the following responsibilities: This allows parent View implementations to cache the child requirements if desired. The calling sequence looks something like the following: </p> - <p align=center> + <p style="text-align:center"> <img src="doc-files/View-layout.jpg" alt="Sample calling sequence between parent view and child view: setSize, getMinimum, getPreferred, getMaximum, getAlignment, setSize"> @@ -293,7 +293,7 @@ public abstract class View implements SwingConstants { /** * Determines the desired alignment for this view along an * axis. The desired alignment is returned. This should be - * a value >= 0.0 and <= 1.0, where 0 indicates alignment at + * a value >= 0.0 and <= 1.0, where 0 indicates alignment at * the origin and 1.0 indicates alignment to the full span * away from the origin. An alignment of 0.5 would be the * center of the view. @@ -351,7 +351,7 @@ public abstract class View implements SwingConstants { * the default is to not be a composite view this * returns 0. * - * @return the number of views >= 0 + * @return the number of views >= 0 * @see View#getViewCount */ public int getViewCount() { @@ -362,7 +362,7 @@ public abstract class View implements SwingConstants { * Gets the <i>n</i>th child view. Since there are no * children by default, this returns <code>null</code>. * - * @param n the number of the view to get, >= 0 && < getViewCount() + * @param n the number of the view to get, >= 0 && < getViewCount() * @return the view */ public View getView(int n) { @@ -393,7 +393,7 @@ public abstract class View implements SwingConstants { * Inserts a single child view. This is a convenience * call to <code>replace</code>. * - * @param offs the offset of the view to insert before >= 0 + * @param offs the offset of the view to insert before >= 0 * @param v the view * @see #replace * @since 1.3 @@ -428,9 +428,9 @@ public abstract class View implements SwingConstants { * a view has no children. * * @param offset the starting index into the child views to insert - * the new views. This should be a value >= 0 and <= getViewCount + * the new views. This should be a value >= 0 and <= getViewCount * @param length the number of existing child views to remove - * This should be a value >= 0 and <= (getViewCount() - offset). + * This should be a value >= 0 and <= (getViewCount() - offset). * @param views the child views to add. This value can be * <code>null</code> to indicate no children are being added * (useful to remove). @@ -445,7 +445,7 @@ public abstract class View implements SwingConstants { * to return -1 to indicate there is no valid child index for any * position. * - * @param pos the position >= 0 + * @param pos the position >= 0 * @return index of the view representing the given position, or * -1 if no view represents that position * @since 1.3 @@ -461,7 +461,7 @@ public abstract class View implements SwingConstants { * their location. This returns <code>null</code> since the * default is to not have any child views. * - * @param index the index of the child, >= 0 && < + * @param index the index of the child, >= 0 && < * <code>getViewCount()</code> * @param a the allocation to this view * @return the allocation to the child @@ -477,7 +477,7 @@ public abstract class View implements SwingConstants { * they might not be in the same order found in the model, or they just * might not allow access to some of the locations in the model. * - * @param pos the position to convert >= 0 + * @param pos the position to convert >= 0 * @param a the allocated region in which to render * @param direction the direction from the current position that can * be thought of as the arrow keys typically found on a keyboard. @@ -566,7 +566,7 @@ public abstract class View implements SwingConstants { * from the document model coordinate space * to the view coordinate space. * - * @param pos the position of the desired character (>=0) + * @param pos the position of the desired character (>=0) * @param a the area of the view, which encompasses the requested character * @param b the bias toward the previous character or the * next character represented by the offset, in case the @@ -592,17 +592,17 @@ public abstract class View implements SwingConstants { * to the view coordinate space. The specified region is * created as a union of the first and last character positions. * - * @param p0 the position of the first character (>=0) + * @param p0 the position of the first character (>=0) * @param b0 the bias of the first character position, * toward the previous character or the * next character represented by the offset, in case the * position is a boundary of two views; <code>b0</code> will have one * of these values: - * <ul> + * <ul style="list-style-type:none"> * <li> <code>Position.Bias.Forward</code> * <li> <code>Position.Bias.Backward</code> * </ul> - * @param p1 the position of the last character (>=0) + * @param p1 the position of the last character (>=0) * @param b1 the bias for the second character position, defined * one of the legal values shown above * @param a the area of the view, which encompasses the requested region @@ -656,11 +656,11 @@ public abstract class View implements SwingConstants { * closer to the next character in the model or the previous * character in the model. * - * @param x the X coordinate >= 0 - * @param y the Y coordinate >= 0 + * @param x the X coordinate >= 0 + * @param y the Y coordinate >= 0 * @param a the allocated region in which to render * @return the location within the model that best represents the - * given point in the view >= 0. The <code>biasReturn</code> + * given point in the view >= 0. The <code>biasReturn</code> * argument will be * filled in to indicate that the point given is closer to the next * character in the model or the previous character in the model. @@ -804,7 +804,7 @@ public abstract class View implements SwingConstants { * Fetches the portion of the model for which this view is * responsible. * - * @return the starting offset into the model >= 0 + * @return the starting offset into the model >= 0 * @see View#getStartOffset */ public int getStartOffset() { @@ -815,7 +815,7 @@ public abstract class View implements SwingConstants { * Fetches the portion of the model for which this view is * responsible. * - * @return the ending offset into the model >= 0 + * @return the ending offset into the model >= 0 * @see View#getEndOffset */ public int getEndOffset() { @@ -884,14 +884,14 @@ public abstract class View implements SwingConstants { * @param axis may be either <code>View.X_AXIS</code> or * <code>View.Y_AXIS</code> * @param offset the location in the document model - * that a broken fragment would occupy >= 0. This + * that a broken fragment would occupy >= 0. This * would be the starting offset of the fragment * returned * @param pos the position along the axis that the - * broken view would occupy >= 0. This may be useful for + * broken view would occupy >= 0. This may be useful for * things like tab calculations * @param len specifies the distance along the axis - * where a potential break is desired >= 0 + * where a potential break is desired >= 0 * @return the fragment of the view that represents the * given span, if the view can be broken. If the view * doesn't support breaking behavior, the view itself is @@ -909,10 +909,10 @@ public abstract class View implements SwingConstants { * the view doesn't support fragmenting (the default), it * should return itself. * - * @param p0 the starting offset >= 0. This should be a value + * @param p0 the starting offset >= 0. This should be a value * greater or equal to the element starting offset and * less than the element ending offset. - * @param p1 the ending offset > p0. This should be a value + * @param p1 the ending offset > p0. This should be a value * less than or equal to the elements end offset and * greater than the elements starting offset. * @return the view fragment, or itself if the view doesn't @@ -949,10 +949,10 @@ public abstract class View implements SwingConstants { * @param axis may be either <code>View.X_AXIS</code> or * <code>View.Y_AXIS</code> * @param pos the potential location of the start of the - * broken view >= 0. This may be useful for calculating tab + * broken view >= 0. This may be useful for calculating tab * positions * @param len specifies the relative length from <em>pos</em> - * where a potential break is desired >= 0 + * where a potential break is desired >= 0 * @return the weight, which should be a value between * ForcedBreakWeight and BadBreakWeight * @see LabelView @@ -986,8 +986,8 @@ public abstract class View implements SwingConstants { * layout of the view along the given axis, if it * has any layout duties. * - * @param width the width >= 0 - * @param height the height >= 0 + * @param width the width >= 0 + * @param height the height >= 0 */ public void setSize(float width, float height) { } @@ -1314,7 +1314,7 @@ public abstract class View implements SwingConstants { * implemented to default the bias to <code>Position.Bias.Forward</code> * which was previously implied. * - * @param pos the position to convert >= 0 + * @param pos the position to convert >= 0 * @param a the allocated region in which to render * @return the bounding box of the given position is returned * @exception BadLocationException if the given position does @@ -1332,11 +1332,11 @@ public abstract class View implements SwingConstants { * Provides a mapping from the view coordinate space to the logical * coordinate space of the model. * - * @param x the X coordinate >= 0 - * @param y the Y coordinate >= 0 + * @param x the X coordinate >= 0 + * @param y the Y coordinate >= 0 * @param a the allocated region in which to render * @return the location within the model that best represents the - * given point in the view >= 0 + * given point in the view >= 0 * @see View#viewToModel * @deprecated */ diff --git a/src/share/classes/javax/swing/text/html/HTMLDocument.java b/src/share/classes/javax/swing/text/html/HTMLDocument.java index 71f260932..abbee8037 100644 --- a/src/share/classes/javax/swing/text/html/HTMLDocument.java +++ b/src/share/classes/javax/swing/text/html/HTMLDocument.java @@ -195,14 +195,14 @@ import static sun.swing.SwingUtilities2.IMPLIED_CR; * <th><code>setOuterHTML</code></th> * </tr> * <tr valign="top"> - * <td nowrap="nowrap"> + * <td style="white-space:nowrap"> * <div style="background-color: silver;"> * <p>Paragraph 1</p> * <p>Paragraph 2</p> * </div> * </td> * <!--insertAfterStart--> - * <td nowrap="nowrap"> + * <td style="white-space:nowrap"> * <div style="background-color: silver;"> * <ul style="color: red;"> * <li>List Item</li> @@ -212,7 +212,7 @@ import static sun.swing.SwingUtilities2.IMPLIED_CR; * </div> * </td> * <!--insertBeforeEnd--> - * <td nowrap="nowrap"> + * <td style="white-space:nowrap"> * <div style="background-color: silver;"> * <p>Paragraph 1</p> * <p>Paragraph 2</p> @@ -222,7 +222,7 @@ import static sun.swing.SwingUtilities2.IMPLIED_CR; * </div> * </td> * <!--insertBeforeStart--> - * <td nowrap="nowrap"> + * <td style="white-space:nowrap"> * <ul style="color: red;"> * <li>List Item</li> * </ul> @@ -232,7 +232,7 @@ import static sun.swing.SwingUtilities2.IMPLIED_CR; * </div> * </td> * <!--insertAfterEnd--> - * <td nowrap="nowrap"> + * <td style="white-space:nowrap"> * <div style="background-color: silver;"> * <p>Paragraph 1</p> * <p>Paragraph 2</p> @@ -242,7 +242,7 @@ import static sun.swing.SwingUtilities2.IMPLIED_CR; * </ul> * </td> * <!--setInnerHTML--> - * <td nowrap="nowrap"> + * <td style="white-space:nowrap"> * <div style="background-color: silver;"> * <ul style="color: red;"> * <li>List Item</li> @@ -250,7 +250,7 @@ import static sun.swing.SwingUtilities2.IMPLIED_CR; * </div> * </td> * <!--setOuterHTML--> - * <td nowrap="nowrap"> + * <td style="white-space:nowrap"> * <ul style="color: red;"> * <li>List Item</li> * </ul> @@ -475,7 +475,7 @@ public class HTMLDocument extends DefaultStyledDocument { * <p> * This method is thread safe, although most Swing methods * are not. Please see - * <A HREF="http://download.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency + * <A HREF="http://docs.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency * in Swing</A> for more information. * * @param offset the offset into the paragraph (must be at least 0) diff --git a/src/share/classes/javax/swing/text/html/Option.java b/src/share/classes/javax/swing/text/html/Option.java index 9628fdad8..181b87cde 100644 --- a/src/share/classes/javax/swing/text/html/Option.java +++ b/src/share/classes/javax/swing/text/html/Option.java @@ -38,7 +38,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™ * has been added to the <code>java.beans</code> package. * Please see {@link java.beans.XMLEncoder}. * |