diff options
| author | Tania Bento <tbento@redhat.com> | 2006-07-13 17:30:23 +0000 |
|---|---|---|
| committer | Tania Bento <tbento@redhat.com> | 2006-07-13 17:30:23 +0000 |
| commit | 4d2adfe9f85063d6d7228ed7a2344e03c89624ef (patch) | |
| tree | b7b0aaecef5bded3e5b9a2291ccfc7032a0265c6 /gnu/java/awt/peer/ClasspathFontPeer.java | |
| parent | 7ad10a9ed662742b59108859d59d98aa0c27fdc7 (diff) | |
| download | classpath-4d2adfe9f85063d6d7228ed7a2344e03c89624ef.tar.gz | |
2006-07-13 Tania Bento <tbento@redhat.com>
* gnu/java/awt/peer/ClasspathFontPeer.java
(isLogicalFontName): Return true if name == default.
(logicalFontNameToFaceName): Check if name == default,
and if so, return "Dialog.plain".
(setStandardAttributes(String, Map)): If name == null,
it should be set to "Default", not "SansSerif".
* java/awt/Canvas.java
(generateName): Fixed documentation.
* java/awt/CheckboxMenuItem.java
Added static variable "next_chkmenuitem_number".
(generateName): Added and implemented method.
(getUniqueLong): Likewise.
* java/awt/Choice.java
Added static variable "next_choice_number".
(generateName): Added and implemented method.
(getUniqueLong): Likewise.
* java/awt/Cursor.java
(Cursor(int)): Set name depending on the type passed.
* java/awt/List.java
Added static variable "next_list_number".
(generateName): Added and implemented method.
(getUniqueLong): Likewise.
* java/awt/Menu.java
Added static variable "next_menu_number".
(generateName): Added and implemented method.
(getUniqueLong): Likewise.
* java/awt/MenuBar.java
Added static variable "next_menubar_number".
(generateName): Added and implemented method.
(getUniqueLong): Likewise.
* java/awt/MenuComponent.java
(getName): Before returning name, check if name == null
and name is not explicity set. If this is the case,
name will be generated.
(generateName): Added and implemented method.
* java/awt/MenuItem.java
Added static variable "next_menuitem_number".
(generateName): Added and implemented method.
(getUniqueLong): Likewise.
* java/awt/PopupMenu.java
Added static variable "next_popup_number".
(generateName): Added and implemented method.
(getUniqueLong): Likewise.
* java/awt/ScrollPane.java
Added static variable "next_scrollpane_number".
(generateName): Added and implemented method.
(getUniqueLong): Likewise.
* java/awt/TextField.java
Added static variable "next_textfield_number".
(generateName): Added and implemented method.
(getUniqueLong): Likewise.
Diffstat (limited to 'gnu/java/awt/peer/ClasspathFontPeer.java')
| -rw-r--r-- | gnu/java/awt/peer/ClasspathFontPeer.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/gnu/java/awt/peer/ClasspathFontPeer.java b/gnu/java/awt/peer/ClasspathFontPeer.java index 78ab3a9de..dad7bb0b0 100644 --- a/gnu/java/awt/peer/ClasspathFontPeer.java +++ b/gnu/java/awt/peer/ClasspathFontPeer.java @@ -145,7 +145,8 @@ public abstract class ClasspathFontPeer uname.equals ("SERIF") || uname.equals ("MONOSPACED") || uname.equals ("DIALOG") || - uname.equals ("DIALOGINPUT")); + uname.equals ("DIALOGINPUT") || + uname.equals ("DEFAULT")); } protected static String logicalFontNameToFaceName (String name) @@ -161,6 +162,8 @@ public abstract class ClasspathFontPeer return "Helvetica"; else if (uname.equals ("DIALOGINPUT")) return "Helvetica"; + else if (uname.equals ("DEFAULT")) + return "Dialog.plain"; else return "Helvetica"; } @@ -233,7 +236,7 @@ public abstract class ClasspathFontPeer family = (String) attribs.get (TextAttribute.FAMILY); if (name == null) - name = "SansSerif"; + name = "Default"; if (attribs.containsKey (TextAttribute.WEIGHT)) { |