[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: added missing fields to Font

[Kaffe CVS]

PatchSet 5412 
Date: 2004/11/07 15:34:55
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: added missing fields to Font

2004-11-07  Dalibor Topic  <robilad at kaffe.org>

        * libraries/javalib/java/awt/Font.java:
        Resynced with GNU Classpath.

        2004-11-02  Thomas Fitzsimmons  <fitzsim at redhat.com>

        * java/awt/Font.java (name): New field.
        (size): Likewise.
        (style): Likewise.

Members: 
	ChangeLog:1.2961->1.2962 
	libraries/javalib/java/awt/Font.java:1.21->1.22 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2961 kaffe/ChangeLog:1.2962
--- kaffe/ChangeLog:1.2961	Sun Nov  7 14:34:00 2004
+++ kaffe/ChangeLog	Sun Nov  7 15:34:55 2004
@@ -1,5 +1,16 @@
 2004-11-07  Dalibor Topic  <robilad at kaffe.org>
 
+	* libraries/javalib/java/awt/Font.java:
+        Resynced with GNU Classpath.
+
+	2004-11-02  Thomas Fitzsimmons  <fitzsim at redhat.com>
+
+        * java/awt/Font.java (name): New field.
+        (size): Likewise.
+        (style): Likewise.
+
+2004-11-07  Dalibor Topic  <robilad at kaffe.org>
+
 	* libraries/javalib/java/util/GregorianCalendar.java:
         Resynced with GNU Classpath.
 
Index: kaffe/libraries/javalib/java/awt/Font.java
diff -u kaffe/libraries/javalib/java/awt/Font.java:1.21 kaffe/libraries/javalib/java/awt/Font.java:1.22
--- kaffe/libraries/javalib/java/awt/Font.java:1.21	Sat Oct 23 22:46:01 2004
+++ kaffe/libraries/javalib/java/awt/Font.java	Sun Nov  7 15:34:57 2004
@@ -161,6 +161,26 @@
    */
   public static final int LAYOUT_NO_LIMIT_CONTEXT = 4;
 
+  /**
+   * The logical name of this font.
+   *
+   * @since 1.0
+   */
+  protected String name;
+
+  /**
+   * The size of this font in pixels.
+   *
+   * @since 1.0
+   */
+  protected int size;
+
+  /**
+   * The style of this font -- PLAIN, BOLD, ITALIC or BOLD+ITALIC.
+   *
+   * @since 1.0
+   */
+  protected int style;
 
 // Serialization constant
 private static final long serialVersionUID = -4206021311591459213L;