diff --git a/src/share/classes/java/awt/Font.java b/src/share/classes/java/awt/Font.java index c5c400c651ba276d076b77a7858968be59835df6..e6363c8c5b738f2bdf3adb1fdfca256f839b6648 100644 --- a/src/share/classes/java/awt/Font.java +++ b/src/share/classes/java/awt/Font.java @@ -71,7 +71,7 @@ import static sun.font.EAttribute.*; * and to render sequences of glyphs on Graphics and * Component objects. * - *

Characters and Glyphs

+ *

Characters and Glyphs

* * A character is a symbol that represents an item such as a letter, * a digit, or punctuation in an abstract way. For example, 'g', @@ -192,7 +192,7 @@ import static sun.font.EAttribute.*; * not serializable. See {@link java.awt.im.InputMethodHighlight}. * * - * Clients who create custom subclasses of Paint and + *

Clients who create custom subclasses of Paint and * GraphicAttribute can make them serializable and * avoid this problem. Clients who use input method highlights can * convert these to the platform-specific attributes for that diff --git a/src/share/classes/java/awt/Graphics2D.java b/src/share/classes/java/awt/Graphics2D.java index c8bb23def69114104269dbb5555616978d24aea5..6c6c1abd8304b3c509c7e297ba88c18dc63939bd 100644 --- a/src/share/classes/java/awt/Graphics2D.java +++ b/src/share/classes/java/awt/Graphics2D.java @@ -78,7 +78,7 @@ import java.util.Map; *

* When creating a Graphics2D object, the * GraphicsConfiguration - * specifies the default transform for + * specifies the default transform for * the target of the Graphics2D (a * {@link Component} or {@link Image}). This default transform maps the * user space coordinate system to screen and printer device coordinates @@ -1103,7 +1103,7 @@ public abstract class Graphics2D extends Graphics { * method is intended only for restoring the original * Graphics2D transform after rendering, as shown in this * example: - * 


+     * 
      * // Get the current transform
      * AffineTransform saveAT = g2.getTransform();
      * // Perform transformation
@@ -1112,7 +1112,7 @@ public abstract class Graphics2D extends Graphics {
      * g2d.draw(...);
      * // Restore original transform
      * g2d.setTransform(saveAT);
-     *
+ * * * @param Tx the AffineTransform that was retrieved * from the getTransform method diff --git a/src/share/classes/java/awt/GraphicsConfiguration.java b/src/share/classes/java/awt/GraphicsConfiguration.java index 1e5abd73b9aa296fb0fcbbd8fd47837eec6ac6e6..c4ca1d14eb440eefb310c46cd0d4e52521c2d3b3 100644 --- a/src/share/classes/java/awt/GraphicsConfiguration.java +++ b/src/share/classes/java/awt/GraphicsConfiguration.java @@ -75,7 +75,7 @@ import sun.awt.image.SunVolatileImage; * bounds of the virtual device. The following code sample * calculates the bounds of the virtual device. * - * 
+ * 
{@code
  *      Rectangle virtualBounds = new Rectangle();
  *      GraphicsEnvironment ge = GraphicsEnvironment.
  *              getLocalGraphicsEnvironment();
@@ -89,7 +89,7 @@ import sun.awt.image.SunVolatileImage;
  *              virtualBounds =
  *                  virtualBounds.union(gc[i].getBounds());
  *          }
- *      } 

+ *      } }
* * @see Window * @see Frame diff --git a/src/share/classes/java/awt/GraphicsDevice.java b/src/share/classes/java/awt/GraphicsDevice.java index d55ccedca2c34c0337f73efe2539e55de5926d56..819aa49989b16685908df5e14981cf878d764c4a 100644 --- a/src/share/classes/java/awt/GraphicsDevice.java +++ b/src/share/classes/java/awt/GraphicsDevice.java @@ -46,7 +46,7 @@ import sun.awt.SunToolkit; * following code sample demonstrates how to create a JFrame * object for each GraphicsConfiguration on each screen * device in the GraphicsEnvironment: - * 
+ * 
{@code
  *   GraphicsEnvironment ge = GraphicsEnvironment.
  *   getLocalGraphicsEnvironment();
  *   GraphicsDevice[] gs = ge.getScreenDevices();
@@ -66,7 +66,7 @@ import sun.awt.SunToolkit;
  *         f.show();
  *      }
  *   }
- * 

+ * }
*

* For more information on full-screen exclusive mode API, see the * diff --git a/src/share/classes/java/awt/Image.java b/src/share/classes/java/awt/Image.java index ce23169ea3c47e9bcf113686085957ac42cb3889..b7629f19a959425891c175639243a22ac017b303 100644 --- a/src/share/classes/java/awt/Image.java +++ b/src/share/classes/java/awt/Image.java @@ -124,7 +124,7 @@ public abstract class Image { * @param name a property name. * @param observer an object waiting for this image to be loaded. * @return the value of the named property. - * @throws NullPointerException if the property name is null. + * @throws NullPointerException if the property name is null. * @see java.awt.image.ImageObserver * @see java.awt.Image#UndefinedProperty */ diff --git a/src/share/classes/java/awt/MediaTracker.java b/src/share/classes/java/awt/MediaTracker.java index 23ec357727452267a514d8904a02f17c58814271..ec76ce4ce9fdff85a331b65a290aca34cdf7f0ff 100644 --- a/src/share/classes/java/awt/MediaTracker.java +++ b/src/share/classes/java/awt/MediaTracker.java @@ -66,7 +66,7 @@ import java.awt.image.ImageObserver; *

* Here is an example of using MediaTracker: *

- * 

+ * 
{@code
  * import java.applet.Applet;
  * import java.awt.Color;
  * import java.awt.Image;
@@ -160,7 +160,7 @@ import java.awt.image.ImageObserver;
  *          }
  *      }
  * }
- * 

+ * }
* * @author Jim Graham * @since JDK1.0 diff --git a/src/share/classes/java/awt/PageAttributes.java b/src/share/classes/java/awt/PageAttributes.java index 85f52ffbe14935efd1158eb79b5130204a7a0bc6..7e7bf1ce4a8a26172d24bf2063bdbff435fadf01 100644 --- a/src/share/classes/java/awt/PageAttributes.java +++ b/src/share/classes/java/awt/PageAttributes.java @@ -187,55 +187,55 @@ public final class PageAttributes implements Cloneable { }; /** - * The MediaType instance for ISO/DIN & JIS 4A0, 1682 x 2378 mm. + * The MediaType instance for ISO/DIN and JIS 4A0, 1682 x 2378 mm. */ public static final MediaType ISO_4A0 = new MediaType(I_ISO_4A0); /** - * The MediaType instance for ISO/DIN & JIS 2A0, 1189 x 1682 mm. + * The MediaType instance for ISO/DIN and JIS 2A0, 1189 x 1682 mm. */ public static final MediaType ISO_2A0 = new MediaType(I_ISO_2A0); /** - * The MediaType instance for ISO/DIN & JIS A0, 841 x 1189 mm. + * The MediaType instance for ISO/DIN and JIS A0, 841 x 1189 mm. */ public static final MediaType ISO_A0 = new MediaType(I_ISO_A0); /** - * The MediaType instance for ISO/DIN & JIS A1, 594 x 841 mm. + * The MediaType instance for ISO/DIN and JIS A1, 594 x 841 mm. */ public static final MediaType ISO_A1 = new MediaType(I_ISO_A1); /** - * The MediaType instance for ISO/DIN & JIS A2, 420 x 594 mm. + * The MediaType instance for ISO/DIN and JIS A2, 420 x 594 mm. */ public static final MediaType ISO_A2 = new MediaType(I_ISO_A2); /** - * The MediaType instance for ISO/DIN & JIS A3, 297 x 420 mm. + * The MediaType instance for ISO/DIN and JIS A3, 297 x 420 mm. */ public static final MediaType ISO_A3 = new MediaType(I_ISO_A3); /** - * The MediaType instance for ISO/DIN & JIS A4, 210 x 297 mm. + * The MediaType instance for ISO/DIN and JIS A4, 210 x 297 mm. */ public static final MediaType ISO_A4 = new MediaType(I_ISO_A4); /** - * The MediaType instance for ISO/DIN & JIS A5, 148 x 210 mm. + * The MediaType instance for ISO/DIN and JIS A5, 148 x 210 mm. */ public static final MediaType ISO_A5 = new MediaType(I_ISO_A5); /** - * The MediaType instance for ISO/DIN & JIS A6, 105 x 148 mm. + * The MediaType instance for ISO/DIN and JIS A6, 105 x 148 mm. */ public static final MediaType ISO_A6 = new MediaType(I_ISO_A6); /** - * The MediaType instance for ISO/DIN & JIS A7, 74 x 105 mm. + * The MediaType instance for ISO/DIN and JIS A7, 74 x 105 mm. */ public static final MediaType ISO_A7 = new MediaType(I_ISO_A7); /** - * The MediaType instance for ISO/DIN & JIS A8, 52 x 74 mm. + * The MediaType instance for ISO/DIN and JIS A8, 52 x 74 mm. */ public static final MediaType ISO_A8 = new MediaType(I_ISO_A8); /** - * The MediaType instance for ISO/DIN & JIS A9, 37 x 52 mm. + * The MediaType instance for ISO/DIN and JIS A9, 37 x 52 mm. */ public static final MediaType ISO_A9 = new MediaType(I_ISO_A9); /** - * The MediaType instance for ISO/DIN & JIS A10, 26 x 37 mm. + * The MediaType instance for ISO/DIN and JIS A10, 26 x 37 mm. */ public static final MediaType ISO_A10 = new MediaType(I_ISO_A10); /** diff --git a/src/share/classes/java/awt/Rectangle.java b/src/share/classes/java/awt/Rectangle.java index c826022a63b63c7e1140c97f46ab8440d3b7184d..0b550073b0ab23a72b1bffa0078ecde555a6082a 100644 --- a/src/share/classes/java/awt/Rectangle.java +++ b/src/share/classes/java/awt/Rectangle.java @@ -76,19 +76,19 @@ import java.beans.Transient; * negative width and height or it should use the first point in the set * to construct the {@code Rectangle}. * For example: - * 
+ * 
{@code
  *     Rectangle bounds = new Rectangle(0, 0, -1, -1);
  *     for (int i = 0; i < points.length; i++) {
  *         bounds.add(points[i]);
  *     }
- * 

+ * }
* or if we know that the points array contains at least one point: - * 
+ * 
{@code
  *     Rectangle bounds = new Rectangle(points[0]);
  *     for (int i = 1; i < points.length; i++) {
  *         bounds.add(points[i]);
  *     }
- * 

+ * }
*

* This class uses 32-bit integers to store its location and dimensions. * Frequently operations may produce a result that exceeds the range of diff --git a/src/share/classes/java/awt/RenderingHints.java b/src/share/classes/java/awt/RenderingHints.java index 4238679705507ce03cda6d1ff164c7865ede4686..931639c15e30739516c803495317210f086e0d1a 100644 --- a/src/share/classes/java/awt/RenderingHints.java +++ b/src/share/classes/java/awt/RenderingHints.java @@ -999,15 +999,15 @@ public class RenderingHints } /** - * Returns true if this RenderingHints + * Returns {@code true} if this {@code RenderingHints} * contains a mapping for the specified key. * * @param key key whose presence in this - * RenderingHints is to be tested. - * @return true if this RenderingHints + * {@code RenderingHints} is to be tested. + * @return {@code true} if this {@code RenderingHints} * contains a mapping for the specified key. - * @exception ClassCastException if the key can not - * be cast to RenderingHints.Key + * @exception ClassCastException if the key can not + * be cast to {@code RenderingHints.Key} */ public boolean containsKey(Object key) { return hintmap.containsKey((Key) key); @@ -1039,10 +1039,10 @@ public class RenderingHints * Returns the value to which the specified key is mapped. * @param key a rendering hint key * @return the value to which the key is mapped in this object or - * null if the key is not mapped to any value in + * {@code null} if the key is not mapped to any value in * this object. - * @exception ClassCastException if the key can not - * be cast to RenderingHints.Key + * @exception ClassCastException if the key can not + * be cast to {@code RenderingHints.Key} * @see #put(Object, Object) */ public Object get(Object key) { @@ -1050,20 +1050,20 @@ public class RenderingHints } /** - * Maps the specified key to the specified - * value in this RenderingHints object. - * Neither the key nor the value can be null. - * The value can be retrieved by calling the get method + * Maps the specified {@code key} to the specified + * {@code value} in this {@code RenderingHints} object. + * Neither the key nor the value can be {@code null}. + * The value can be retrieved by calling the {@code get} method * with a key that is equal to the original key. * @param key the rendering hint key. * @param value the rendering hint value. * @return the previous value of the specified key in this object - * or null if it did not have one. - * @exception NullPointerException if the key is - * null. - * @exception ClassCastException if the key can not - * be cast to RenderingHints.Key - * @exception IllegalArgumentException if the + * or {@code null} if it did not have one. + * @exception NullPointerException if the key is + * {@code null}. + * @exception ClassCastException if the key can not + * be cast to {@code RenderingHints.Key} + * @exception IllegalArgumentException if the * {@link Key#isCompatibleValue(java.lang.Object) * Key.isCompatibleValue()} * method of the specified key returns false for the @@ -1102,13 +1102,13 @@ public class RenderingHints /** * Removes the key and its corresponding value from this - * RenderingHints object. This method does nothing if the - * key is not in this RenderingHints object. + * {@code RenderingHints} object. This method does nothing if the + * key is not in this {@code RenderingHints} object. * @param key the rendering hints key that needs to be removed - * @exception ClassCastException if the key can not - * be cast to RenderingHints.Key + * @exception ClassCastException if the key can not + * be cast to {@code RenderingHints.Key} * @return the value to which the key had previously been mapped in this - * RenderingHints object, or null + * {@code RenderingHints} object, or {@code null} * if the key did not have a mapping. */ public Object remove(Object key) { @@ -1116,18 +1116,18 @@ public class RenderingHints } /** - * Copies all of the mappings from the specified Map - * to this RenderingHints. These mappings replace - * any mappings that this RenderingHints had for any - * of the keys currently in the specified Map. - * @param m the specified Map - * @exception ClassCastException class of a key or value - * in the specified Map prevents it from being - * stored in this RenderingHints. - * @exception IllegalArgumentException some aspect - * of a key or value in the specified Map + * Copies all of the mappings from the specified {@code Map} + * to this {@code RenderingHints}. These mappings replace + * any mappings that this {@code RenderingHints} had for any + * of the keys currently in the specified {@code Map}. + * @param m the specified {@code Map} + * @exception ClassCastException class of a key or value + * in the specified {@code Map} prevents it from being + * stored in this {@code RenderingHints}. + * @exception IllegalArgumentException some aspect + * of a key or value in the specified {@code Map} * prevents it from being stored in - * this RenderingHints. + * this {@code RenderingHints}. */ public void putAll(Map m) { // ## javac bug? diff --git a/src/share/classes/java/awt/font/NumericShaper.java b/src/share/classes/java/awt/font/NumericShaper.java index 0de80e91f39e62110366a2c20bdaadee6d0fe6f9..63a1a6afe3a442a230f80a16229de1bb7e2d580e 100644 --- a/src/share/classes/java/awt/font/NumericShaper.java +++ b/src/share/classes/java/awt/font/NumericShaper.java @@ -1212,7 +1212,7 @@ public final class NumericShaper implements java.io.Serializable { * For example, to check if a shaper shapes to Arabic, you would use the * following: *

- * if ((shaper.getRanges() & shaper.ARABIC) != 0) { ... + * {@code if ((shaper.getRanges() & shaper.ARABIC) != 0) { ... } *
* *

Note that this method supports only the bit mask-based diff --git a/src/share/classes/java/awt/font/TextAttribute.java b/src/share/classes/java/awt/font/TextAttribute.java index c462636348fc0e6e1b84f59f889194b2109fc6e0..8b1612d385c2df2600ce2b971c5cb56466a3c615 100644 --- a/src/share/classes/java/awt/font/TextAttribute.java +++ b/src/share/classes/java/awt/font/TextAttribute.java @@ -66,7 +66,7 @@ import java.util.HashMap; *

  • a description of the effect. * *

    - *

    Values

    + *

    Values

    *