/[classpath]/classpath/java/awt/Font.java
ViewVC logotype

Diff of /classpath/java/awt/Font.java

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.18.2.6 by gnu_andrew, Sat Sep 10 15:31:42 2005 UTC revision 1.18.2.7 by gnu_andrew, Wed Sep 28 17:50:19 2005 UTC
# Line 44  import gnu.java.awt.peer.ClasspathFontPe Line 44  import gnu.java.awt.peer.ClasspathFontPe
44  import java.awt.font.FontRenderContext;  import java.awt.font.FontRenderContext;
45  import java.awt.font.GlyphVector;  import java.awt.font.GlyphVector;
46  import java.awt.font.LineMetrics;  import java.awt.font.LineMetrics;
47    import java.awt.font.TextAttribute;
48  import java.awt.font.TextLayout;  import java.awt.font.TextLayout;
49  import java.awt.geom.AffineTransform;  import java.awt.geom.AffineTransform;
50  import java.awt.geom.Rectangle2D;  import java.awt.geom.Rectangle2D;
# Line 51  import java.awt.peer.FontPeer; Line 52  import java.awt.peer.FontPeer;
52  import java.io.IOException;  import java.io.IOException;
53  import java.io.InputStream;  import java.io.InputStream;
54  import java.io.Serializable;  import java.io.Serializable;
55  import java.text.AttributedCharacterIterator;  import static java.text.AttributedCharacterIterator.Attribute;
56  import java.text.CharacterIterator;  import java.text.CharacterIterator;
57  import java.text.StringCharacterIterator;  import java.text.StringCharacterIterator;
58  import java.util.HashMap;  import java.util.HashMap;
# Line 348  private static final long serialVersionU Line 349  private static final long serialVersionU
349      this.peer = getPeerFromToolkit (name, attrs);      this.peer = getPeerFromToolkit (name, attrs);
350    }    }
351    
352    public Font (Map attrs)    public Font (Map<? extends Attribute, ?> attrs)
353    {    {
354      this(null, attrs);      this(null, attrs);
355    }    }
# Line 769  private static final long serialVersionU Line 770  private static final long serialVersionU
770    *    *
771    * @since 1.2    * @since 1.2
772    */    */
773    public Font deriveFont (Map attributes)    public Font deriveFont (Map<? extends Attribute, ?> attributes)
774  {  {
775      return peer.deriveFont (this, attributes);      return peer.deriveFont (this, attributes);
776  }  }
# Line 783  private static final long serialVersionU Line 784  private static final long serialVersionU
784    * @see java.text.AttributedCharacterIterator.Attribute    * @see java.text.AttributedCharacterIterator.Attribute
785    * @see java.awt.font.TextAttribute    * @see java.awt.font.TextAttribute
786    */    */
787    public Map getAttributes ()    public Map<TextAttribute,?> getAttributes ()
788  {  {
789      return peer.getAttributes (this);    return peer.getAttributes (this);
790  }  }
791    
792  /**  /**
# Line 797  private static final long serialVersionU Line 798  private static final long serialVersionU
798    * @see java.text.AttributedCharacterIterator.Attribute    * @see java.text.AttributedCharacterIterator.Attribute
799    * @see java.awt.font.TextAttribute    * @see java.awt.font.TextAttribute
800    */    */
801    public AttributedCharacterIterator.Attribute[] getAvailableAttributes()    public Attribute[] getAvailableAttributes()
802  {  {
803      return peer.getAvailableAttributes (this);      return peer.getAvailableAttributes (this);
804  }  }
# Line 862  private static final long serialVersionU Line 863  private static final long serialVersionU
863    *    *
864    * @see java.awt.font.TextAttribute      * @see java.awt.font.TextAttribute  
865    */    */
866    public static Font getFont (Map attributes)    public static Font getFont (Map<? extends Attribute, ?> attributes)
867  {  {
868      return getFontFromToolkit (null, attributes);      return getFontFromToolkit (null, attributes);
869  }  }

Legend:
Removed from v.1.18.2.6  
changed lines
  Added in v.1.18.2.7

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26