--- /home/cpdev/src/classpath/java/awt/Font.java 2005-07-02 21:03:21.000000000 +0000 +++ java/awt/Font.java 2005-06-30 05:34:26.000000000 +0000 @@ -44,7 +44,6 @@ import java.awt.font.FontRenderContext; import java.awt.font.GlyphVector; import java.awt.font.LineMetrics; -import java.awt.font.TextLayout; import java.awt.geom.AffineTransform; import java.awt.geom.Rectangle2D; import java.awt.peer.FontPeer; @@ -378,8 +377,8 @@ * * @return The logical name of the font. * - * @see #getFamily() - * @see #getFontName() + * @see getFamily() + * @see getFontName() */ public String getName () { @@ -454,9 +453,9 @@ * * @since 1.2 * - * @see #getName() - * @see #getFontName() - * @see GraphicsEnvironment#getAvailableFontFamilyNames() + * @see getName() + * @see getFontName() + * @see GraphicsEnvironment.getAvailableFontFamilyNames() */ public String getFamily () { @@ -465,13 +464,13 @@ /** * Returns integer code representing the sum of style flags of this font, a - * combination of either {@link #PLAIN}, {@link #BOLD}, or {@link #ITALIC}. + * combination of either {@link PLAIN}, {@link BOLD}, or {@link ITALIC}. * * @return code representing the style of this font. * - * @see #isPlain() - * @see #isBold() - * @see #isItalic() + * @see isPlain() + * @see isBold() + * @see isItalic() */ public int getStyle () { @@ -556,13 +555,13 @@ } /** - * Creates a new font with point size 1 and {@link #PLAIN} style, + * Creates a new font with point size 1 and {@link PLAIN} style, * reading font data from the provided input stream. The resulting font * can have further fonts derived from it using its * deriveFont method. * * @param fontFormat Integer code indicating the format the font data is - * in.Currently this can only be {@link #TRUETYPE_FONT}. + * in.Currently this can only be {@link TRUETYPE_FONT}. * @param is {@link InputStream} from which font data will be read. This * stream is not closed after font data is extracted. * @@ -595,7 +594,7 @@ * @return A new {@link GlyphVector} containing glyphs mapped from str, * through the font's cmap table. * - * @see #layoutGlyphVector(FontRenderContext, char[], int, int, int) + * @see layoutGlyphVector() */ public GlyphVector createGlyphVector (FontRenderContext ctx, String str) { @@ -615,7 +614,7 @@ * @return A new {@link GlyphVector} containing glyphs mapped from str, * through the font's cmap table. * - * @see #layoutGlyphVector(FontRenderContext, char[], int, int, int) + * @see layoutGlyphVector() */ public GlyphVector createGlyphVector (FontRenderContext ctx, CharacterIterator i) { @@ -635,7 +634,7 @@ * @return A new {@link GlyphVector} containing glyphs mapped from str, * through the font's cmap table. * - * @see #layoutGlyphVector(FontRenderContext, char[], int, int, int) + * @see layoutGlyphVector() */ public GlyphVector createGlyphVector (FontRenderContext ctx, char[] chars) { @@ -653,7 +652,7 @@ * @return A new {@link GlyphVector} containing glyphs mapped from str, * through the font's cmap table. * - * @see #layoutGlyphVector(FontRenderContext, char[], int, int, int) + * @see layoutGlyphVector() * * @specnote This method is documented to perform character-to-glyph * conversions, in the Sun documentation, but its second parameter name is @@ -777,7 +776,7 @@ * * @return A map of chracter attributes which this font currently has set. * - * @see #getAvailableAttributes() + * @see getAvailableAttributes() * @see java.text.AttributedCharacterIterator.Attribute * @see java.awt.font.TextAttribute */ @@ -791,7 +790,7 @@ * * @return An array of chracter attribute keys which this font understands. * - * @see #getAttributes() + * @see getAttributes() * @see java.text.AttributedCharacterIterator.Attribute * @see java.awt.font.TextAttribute */ @@ -801,8 +800,8 @@ } /** - * Returns a baseline code (one of {@link #ROMAN_BASELINE}, {@link - * #CENTER_BASELINE} or {@link #HANGING_BASELINE}) indicating which baseline + * Returns a baseline code (one of {@link ROMAN_BASELINE}, {@link + * CENTER_BASELINE} or {@link HANGING_BASELINE}) indicating which baseline * this font will measure baseline offsets for, when presenting glyph * metrics for a given character. * @@ -819,7 +818,7 @@ * * @since 1.2 * - * @see LineMetrics#getBaselineOffsets() + * @see LineMetrics.getBaselineOffsets() */ public byte getBaselineFor (char c) { @@ -839,9 +838,9 @@ * * @since 1.2 * - * @see #getName() - * @see #getFontName() - * @see GraphicsEnvironment#getAvailableFontFamilyNames() + * @see getName() + * @see getFontName() + * @see GraphicsEnvironment.getAvailableFontFamilyNames() * @see Locale */ public String getFamily (Locale lc) @@ -858,7 +857,7 @@ * * @since 1.2 * - * @see java.awt.font.TextAttribute + * @see TextAttribure */ public static Font getFont (Map attributes) { @@ -875,8 +874,8 @@ * * @since 1.2 * - * @see #getName() - * @see #getFamily() + * @see getName() + * @see getFamily() */ public String getFontName () { @@ -895,8 +894,8 @@ * * @since 1.2 * - * @see #getName() - * @see #getFamily() + * @see getName() + * @see getFamily() */ public String getFontName (Locale lc) { @@ -905,12 +904,12 @@ /** * Returns the italic angle of this font, a measurement of its slant when - * style is {@link #ITALIC}. The precise meaning is the inverse slope of a + * style is {@link ITALIC}. The precise meaning is the inverse slope of a * caret line which "best measures" the font's italic posture. * * @return The italic angle. * - * @see java.awt.font.TextAttribute#POSTURE + * @see TextAttribute.POSTURE */ public float getItalicAngle () { @@ -1029,9 +1028,9 @@ * * @since 1.2 * - * @see #getName() - * @see #getFamily() - * @see #getFontName() + * @see getName() + * @see getFamily() + * @see getFontName() */ public String getPSName () { @@ -1043,7 +1042,7 @@ * font in the specified {@link FontRenderContext}. This box will include the * glyph origin, ascent, advance, height, and leading, but may not include all * diacritics or accents. To get the complete visual bounding box of all the - * glyphs in a run of text, use the {@link TextLayout#getBounds} method of + * glyphs in a run of text, use the {@link TextLayout#getBounds} method of * {@link TextLayout}. * * @param str The string to measure. @@ -1051,7 +1050,7 @@ * * @return A bounding box covering the logical bounds of the specified text. * - * @see #createGlyphVector(FontRenderContext, String) + * @see createGlyphVector() */ public Rectangle2D getStringBounds (String str, FontRenderContext frc) { @@ -1078,7 +1077,7 @@ * * @since 1.2 * - * @see #createGlyphVector(FontRenderContext, String) + * @see createGlyphVector() */ public Rectangle2D getStringBounds (String str, int begin, int limit, FontRenderContext frc) @@ -1106,7 +1105,7 @@ * * @since 1.2 * - * @see #createGlyphVector(FontRenderContext, CharacterIterator) + * @see createGlyphVector() */ public Rectangle2D getStringBounds (CharacterIterator ci, int begin, int limit, FontRenderContext frc) @@ -1134,7 +1133,7 @@ * * @since 1.2 * - * @see #createGlyphVector(FontRenderContext, char[]) + * @see createGlyphVector() */ public Rectangle2D getStringBounds (char[] chars, int begin, int limit, FontRenderContext frc) @@ -1164,7 +1163,7 @@ * @return Whether this font has uniform line metrics. * * @see LineMetrics - * @see #getLineMetrics(String, FontRenderContext) + * @see getLineMetrics() */ public boolean hasUniformLineMetrics () { @@ -1190,12 +1189,12 @@ * * Bidirectional (bidi) layout is not performed in this method; text * should have its bidi direction specified with one of the flags {@link - * #LAYOUT_LEFT_TO_RIGHT} or {@link #LAYOUT_RIGHT_TO_LEFT}. + * LAYOUT_LEFT_TO_RIGHT} or {@link LAYOUT_RIGHT_TO_LEFT}. * * Some types of layout (notably Arabic glyph shaping) may examine context * characters beyond the bounds of the indicated range, in order to select - * an appropriate shape. The flags {@link #LAYOUT_NO_START_CONTEXT} and - * {@link #LAYOUT_NO_LIMIT_CONTEXT} can be provided to prevent these extra + * an appropriate shape. The flags {@link LAYOUT_NO_START_CONTEXT} and + * {@link LAYOUT_NO_LIMIT_CONTEXT} can be provided to prevent these extra * context areas from being examined, for instance if they contain invalid * characters. *