diff options
| author | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-04-19 05:05:32 +0000 |
|---|---|---|
| committer | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-04-19 05:05:32 +0000 |
| commit | e345cd2aa064d5e5c08045ee6a6fcc1e460fdc63 (patch) | |
| tree | bdc3086931221165db1a78271b075e5e960c75e5 /libjava | |
| parent | 4560ec84d1941b7d1dc387ca2fa2087617053271 (diff) | |
| download | ppe42-gcc-e345cd2aa064d5e5c08045ee6a6fcc1e460fdc63.tar.gz ppe42-gcc-e345cd2aa064d5e5c08045ee6a6fcc1e460fdc63.zip | |
2005-04-19 vid Gilbert <david.gilbert@object-refinery.com>
* java/awt/Font.java (decode): Handle null argument and allow
space as delimiter.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@98373 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/java/awt/Font.java | 9 |
2 files changed, 13 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 1aa3fc0327e..378723b9e29 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2005-04-19 vid Gilbert <david.gilbert@object-refinery.com> + + * java/awt/Font.java (decode): Handle null argument and allow + space as delimiter. + 2005-04-19 Robert Schuster <thebohemian@gmx.net> * java/beans/EventHandler.java: Reworked documentation. diff --git a/libjava/java/awt/Font.java b/libjava/java/awt/Font.java index c43297759ca..ec74e14eb81 100644 --- a/libjava/java/awt/Font.java +++ b/libjava/java/awt/Font.java @@ -209,14 +209,21 @@ private static final long serialVersionUID = -4206021311591459213L; * The style should be one of BOLD, ITALIC, or BOLDITALIC. The default * style if none is specified is PLAIN. The default size if none * is specified is 12. + * + * @param fontspec a string specifying the required font (<code>null</code> + * permitted, interpreted as 'Dialog-PLAIN-12'). + * + * @return A font. */ public static Font decode (String fontspec) { + if (fontspec == null) + fontspec = "Dialog-PLAIN-12"; String name = null; int style = PLAIN; int size = 12; - StringTokenizer st = new StringTokenizer(fontspec, "-"); + StringTokenizer st = new StringTokenizer(fontspec, "- "); while (st.hasMoreTokens()) { String token = st.nextToken(); |
