OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Font.java (decode): Handle null argument and allow space as delimiter. 

2005-04-19  vid Gilbert <david.gilbert@object-refinery.com>

	* java/awt/Font.java (decode): Handle null argument and allow
	space as delimiter.

From-SVN: r98373
This commit is contained in:
David Gilbert 2005-04-19 05:05:32 +00:00 committed by Michael Koch
parent 24809ca841
commit d6e4d86e1d
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libjava/ChangeLog
View File

@ -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.

9
libjava/java/awt/Font.java
View File

@ -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();